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

Avoid being unnecessarily prompted when tapping multi-color creature for convoke

Browse Source
This commit is contained in:
drdev
2015-09-26 15:01:45 +00:00
parent e9552ec17f
commit bd9ee4f24d
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java
View File

@@ -580,4 +580,12 @@ public class ManaCostBeingPaid {
} }
return 0; return 0;
} }
public final byte getUnpaidColors() {
byte result = 0;
for (ManaCostShard s : unpaidShards.keySet()) {
result |= s.getColorMask();
}
return result;
}
} }

11
forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvoke.java
View File

@@ -54,12 +54,17 @@ public final class InputSelectCardsForConvoke extends InputSelectManyBase<Card>
} }
else { else {
byte chosenColor; byte chosenColor;
final ColorSet colors = CardUtil.getColors(card); ColorSet colors = CardUtil.getColors(card);
if (colors.isMonoColor()) { if (colors.isMulticolor()) {
//if card is multicolor, strip out any colors which can't be paid towards remaining cost
colors = ColorSet.fromMask(colors.getColor() & remainingCost.getUnpaidColors());
}
if (!colors.isMulticolor()) {
// Since the convoke mana logic can use colored mana as colorless if needed, // Since the convoke mana logic can use colored mana as colorless if needed,
// there is no need to prompt the user when convoking with a mono-color creature. // there is no need to prompt the user when convoking with a mono-color creature.
chosenColor = colors.getColor(); chosenColor = colors.getColor();
} else { }
else { //prompt user if more than one option for which color to pay towards convoke
chosenColor = player.getController().chooseColorAllowColorless("Convoke " + card.toString() + " for which color?", card, colors); chosenColor = player.getController().chooseColorAllowColorless("Convoke " + card.toString() + " for which color?", card, colors);
} }
final ManaCostShard shard = remainingCost.payManaViaConvoke(chosenColor); final ManaCostShard shard = remainingCost.payManaViaConvoke(chosenColor);