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

renamed add/subtract methods, fixed bug with colorless payment

Browse Source
This commit is contained in:
Maxmtg
2014-02-08 12:56:54 +00:00
parent 715ee1f9ab
commit 676fee32c6
6 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ import forge.FThreads;
import forge.ai.ComputerUtilMana;
import forge.card.ColorSet;
import forge.card.MagicColor;
import forge.card.mana.ManaAtom;
import forge.card.mana.ManaCostShard;
import forge.game.Game;
import forge.game.ability.ApiType;
@@ -110,8 +111,8 @@ public abstract class InputPayMana extends InputSyncronizedBase {
if (manaCost.isAnyPartPayableWith(color, player.getManaPool())) { colorCanUse |= color; }
if (manaCost.needsColor(color, player.getManaPool())) { colorNeeded |= color; }
}
if (manaCost.isAnyPartPayableWith(MagicColor.COLORLESS, player.getManaPool()))
colorCanUse |= MagicColor.COLORLESS;
if (manaCost.isAnyPartPayableWith((byte) ManaAtom.COLORLESS, player.getManaPool()))
colorCanUse |= ManaAtom.COLORLESS;
if ( 0 == colorCanUse ) // no mana cost or something
return;
@@ -266,6 +267,8 @@ public abstract class InputPayMana extends InputSyncronizedBase {
if (0 != (neededColor & MagicColor.fromName(color))) {
return true;
}
if( (neededColor & ManaAtom.COLORLESS) != 0)
return true;
}
}
return false;

2
forge-gui/src/main/java/forge/gui/player/HumanPlay.java
View File

@@ -726,7 +726,7 @@ public class HumanPlay {
if ( timesMultikicked > 0 && ability.isAnnouncing("Multikicker")) {
ManaCost mkCost = ability.getMultiKickerManaCost();
for(int i = 0; i < timesMultikicked; i++)
toPay.combineManaCost(mkCost);
toPay.addManaCost(mkCost);
}
InputPayMana inpPayment;