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

move Commander color ID keyword builder to correct spot

Browse Source
This commit is contained in:
Northmoc
2020-11-17 11:56:04 -05:00
parent ed7955306a
commit a9c1542d24
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
View File

@@ -232,7 +232,20 @@ public final class StaticAbilityContinuous {
}
return true;
}
if (input.contains("CommanderColorID")) {
if (!hostCard.getController().getCommanders().isEmpty()) {
if (input.contains("NotCommanderColorID")) {
for (Byte color : hostCard.getController().getNotCommanderColorID()) {
newKeywords.add(input.replace("NotCommanderColorID", MagicColor.toLongString(color)));
}
return true;
} else for (Byte color : hostCard.getController().getCommanderColorID()) {
newKeywords.add(input.replace("CommanderColorID", MagicColor.toLongString(color)));
}
return true;
}
return true;
}
// two variants for Red vs. red in keyword
if (input.contains("ColorsYouCtrl") || input.contains("colorsYouCtrl")) {
for (byte color : colorsYouCtrl) {
@@ -632,27 +645,11 @@ public final class StaticAbilityContinuous {
}
}
// replace one Keyword with list of keywords
if (input.startsWith("Protection")) {
if (input.contains("CardColors")) {
for (Byte color : affectedCard.determineColor()) {
extraKeywords.add(input.replace("CardColors", MagicColor.toLongString(color)));
}
return true;
}
if (input.contains("CommanderColorID")) {
if (!affectedCard.getController().getCommanders().isEmpty()) {
if (input.contains("NotCommanderColorID")) {
for (Byte color : affectedCard.getController().getNotCommanderColorID()) {
extraKeywords.add(input.replace("NotCommanderColorID", MagicColor.toLongString(color)));
}
return true;
} else for (Byte color : affectedCard.getController().getCommanderColorID()) {
extraKeywords.add(input.replace("CommanderColorID", MagicColor.toLongString(color)));
}
return true;
}
return true;
if (input.startsWith("Protection") && input.contains("CardColors")) {
for (Byte color : affectedCard.determineColor()) {
extraKeywords.add(input.replace("CardColors", MagicColor.toLongString(color)));
}
return true;
}
return false;