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

Avoid prompting for color when using "Add one mana of any color" effect to pay for a colorless cost

Browse Source
This commit is contained in:
drdev
2013-12-12 12:43:50 +00:00
parent 849655cb2f
commit bdfd2e9adf
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui/src/main/java/forge/gui/input/InputPayMana.java
View File

@@ -164,9 +164,16 @@ public abstract class InputPayMana extends InputSyncronizedBase {
boolean choice = true; boolean choice = true;
if (guessAbilityWithRequiredColors) { if (guessAbilityWithRequiredColors) {
// express Mana Choice // express Mana Choice
if (colorNeeded == 0) {
choice = false;
//avoid unnecessary prompt by pretending we need White
//for the sake of "Add one mana of any color" effects
colorNeeded = MagicColor.WHITE;
}
else {
final ArrayList<SpellAbility> colorMatches = new ArrayList<SpellAbility>(); final ArrayList<SpellAbility> colorMatches = new ArrayList<SpellAbility>();
for (SpellAbility sa : abilities) { for (SpellAbility sa : abilities) {
if (colorNeeded != 0 && abilityProducesManaColor(sa, sa.getManaPartRecursive(), colorNeeded)) { if (abilityProducesManaColor(sa, sa.getManaPartRecursive(), colorNeeded)) {
colorMatches.add(sa); colorMatches.add(sa);
} }
} }
@@ -181,6 +188,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
abilities = colorMatches; abilities = colorMatches;
} }
} }
}
final SpellAbility chosen = abilities.size() > 1 && choice ? GuiChoose.one("Choose mana ability", abilities) : abilities.get(0); final SpellAbility chosen = abilities.size() > 1 && choice ? GuiChoose.one("Choose mana ability", abilities) : abilities.get(0);
ColorSet colors = ColorSet.fromMask(0 == colorNeeded ? colorCanUse : colorNeeded); ColorSet colors = ColorSet.fromMask(0 == colorNeeded ? colorCanUse : colorNeeded);