external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keyword: Protection from each color (#5424)

Browse Source
This commit is contained in:
Hans Mackowiak
2024-06-14 05:56:05 +02:00
committed by GitHub
parent 7b651e1859
commit 4804dbc637
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java
View File

@@ -120,8 +120,8 @@ public class DebuffEffect extends SpellAbilityEffect {
ProtectionFromColor = true;
}
if (ProtectionFromColor) {
// Split "Protection from all colors" into extra Protection from <color>
String allColors = "Protection from all colors";
// Split "Protection from each color" into extra Protection from <color>
String allColors = "Protection from each color";
if (tgtC.hasKeyword(allColors)) {
final List<String> allColorsProtect = Lists.newArrayList();
@@ -134,7 +134,7 @@ public class DebuffEffect extends SpellAbilityEffect {
}
// Extra for Spectra Ward
allColors = "Protection:Card.nonColorless:all colors:Aura";
allColors = "Protection:Card.nonColorless:each color:Aura";
if (tgtC.hasKeyword(allColors)) {
final List<String> allColorsProtect = Lists.newArrayList();

2
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -6735,7 +6735,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
pW = true;
protectKey += "W";
}
} else if (kw.contains("all colors")) {
} else if (kw.contains("each color")) {
protectKey += "allcolors:";
} else if (kw.equals("Protection from everything")) {
protectKey += "everything:";

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -676,7 +676,7 @@ public class CardFactoryUtil {
validSource = "Green" + (damage ? "Source" : "");
} else if (protectType.equals("colorless")) {
validSource = "Colorless" + (damage ? "Source" : "");
} else if (protectType.equals("all colors")) {
} else if (protectType.equals("each color")) {
validSource = "nonColorless" + (damage ? "Source" : "");
} else if (protectType.equals("everything")) {
return "";