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

more paths require manapool

Browse Source
This commit is contained in:
Maxmtg
2014-02-08 11:33:17 +00:00
parent 1ec656f2ed
commit c5a791f361
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,10 +107,10 @@ public abstract class InputPayMana extends InputSyncronizedBase {
byte colorNeeded = 0;
for (final byte color : MagicColor.WUBRG) {
if (manaCost.isAnyPartPayableWith(color)) { colorCanUse |= color; }
if (manaCost.needsColor(color)) { colorNeeded |= color; }
if (manaCost.isAnyPartPayableWith(color, player.getManaPool())) { colorCanUse |= color; }
if (manaCost.needsColor(color, player.getManaPool())) { colorNeeded |= color; }
}
boolean canUseColorless = manaCost.isAnyPartPayableWith((byte)0);
boolean canUseColorless = manaCost.isAnyPartPayableWith((byte)0, player.getManaPool());
List<SpellAbility> abilities = new ArrayList<SpellAbility>();
// you can't remove unneeded abilities inside a for (am:abilities) loop :(

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

@@ -52,7 +52,7 @@ public final class InputSelectCardsForConvoke extends InputSelectManyBase<Card>
byte chosenColor = player.getController().chooseColorAllowColorless("Convoke " + card.toString() + " for which color?", card, CardUtil.getColors(card));
if (remainingCost.getColorlessManaAmount() > 0 && (chosenColor == 0 || !remainingCost.needsColor(chosenColor))) {
if (remainingCost.getColorlessManaAmount() > 0 && (chosenColor == 0 || !remainingCost.needsColor(chosenColor, player.getManaPool()))) {
registerConvoked(card, ManaCostShard.COLORLESS, chosenColor);
} else {
for (ManaCostShard shard : remainingCost.getDistinctShards()) {