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

- Fixed bug with payManaCost() failing to pay with combo mana

Browse Source
This commit is contained in:
excessum
2015-10-14 12:29:15 +00:00
parent 08f6b5a4b8
commit ac7cc30120
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
View File

@@ -43,20 +43,24 @@ public class ManaEffect extends SpellAbilityEffect {
int amount = sa.hasParam("Amount") ? AbilityUtils.calculateAmount(card, sa.getParam("Amount"), sa) : 1; int amount = sa.hasParam("Amount") ? AbilityUtils.calculateAmount(card, sa.getParam("Amount"), sa) : 1;
if (tgt == null || p.canBeTargetedBy(sa)) { if (tgt == null || p.canBeTargetedBy(sa)) {
Player activator = sa.getActivatingPlayer(); Player activator = sa.getActivatingPlayer();
//String colorsNeeded = abMana.getExpressChoice(); String express = abMana.getExpressChoice();
String[] colorsProduced = abMana.getComboColors().split(" "); String[] colorsProduced = abMana.getComboColors().split(" ");
final StringBuilder choiceString = new StringBuilder(); final StringBuilder choiceString = new StringBuilder();
ColorSet colorOptions = null; ColorSet colorOptions = null;
String[] colorsNeeded = express.isEmpty() ? null : express.split(" ");
if (!abMana.isAnyMana()) { if (!abMana.isAnyMana()) {
colorOptions = ColorSet.fromNames(colorsProduced); colorOptions = ColorSet.fromNames(colorsProduced);
} } else {
else { colorOptions = ColorSet.fromNames(MagicColor.Constant.ONLY_COLORS);
colorOptions = ColorSet.fromNames(MagicColor.Constant.ONLY_COLORS); }
} final ColorSet fullOptions = colorOptions;
for (int nMana = 1; nMana <= amount; nMana++) { for (int nMana = 1; nMana <= amount; nMana++) {
String choice = ""; String choice = "";
if (colorsNeeded != null && colorsNeeded.length >= nMana) { // select from express choices if possible
colorOptions = ColorSet
.fromMask(fullOptions.getColor() & MagicColor.fromName(colorsNeeded[nMana - 1]));
}
byte chosenColor = activator.getController().chooseColor("Select Mana to Produce", sa, colorOptions); byte chosenColor = activator.getController().chooseColor("Select Mana to Produce", sa, colorOptions);
if (chosenColor == 0) if (chosenColor == 0)
throw new RuntimeException("ManaEffect::resolve() /*combo mana*/ - " + activator + " color mana choice is empty for " + card.getName()); throw new RuntimeException("ManaEffect::resolve() /*combo mana*/ - " + activator + " color mana choice is empty for " + card.getName());