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

improve ability choice

Browse Source
This commit is contained in:
Maxmtg
2013-05-19 21:57:14 +00:00
parent 9a66973dc4
commit a60ac3bcde
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/control/input/InputPayManaBase.java
View File

@@ -166,7 +166,7 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I
// express Mana Choice // express Mana Choice
final ArrayList<SpellAbility> colorMatches = new ArrayList<SpellAbility>(); final ArrayList<SpellAbility> colorMatches = new ArrayList<SpellAbility>();
for (SpellAbility sa : abilities) { for (SpellAbility sa : abilities) {
if (abilityProducesManaColor(sa, colorNeeded)) if (colorNeeded != 0 && abilityProducesManaColor(sa, colorNeeded))
colorMatches.add(sa); colorMatches.add(sa);
} }
@@ -187,11 +187,8 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I
subchosen = subchosen.getSubAbility(); subchosen = subchosen.getSubAbility();
} }
if( 0 == colorNeeded ) { ColorSet colors = ColorSet.fromMask(0 == colorNeeded ? colorCanUse : colorNeeded);
subchosen.getManaPart().setExpressChoice(ColorSet.fromMask(colorCanUse)); subchosen.getManaPart().setExpressChoice(colors);
} else {
subchosen.getManaPart().setExpressChoice(ColorSet.fromMask(colorNeeded));
}
// System.out.println("Chosen sa=" + chosen + " of " + chosen.getSourceCard() + " to pay mana"); // System.out.println("Chosen sa=" + chosen + " of " + chosen.getSourceCard() + " to pay mana");
Runnable proc = new Runnable() { Runnable proc = new Runnable() {