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

won't ask to pay X twice

Browse Source
This commit is contained in:
Maxmtg
2013-04-05 10:25:51 +00:00
parent aac8e6945b
commit 5430a5f119
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/card/cost/CostPartMana.java
View File

@@ -118,11 +118,13 @@ public class CostPartMana extends CostPart {
final Card source = ability.getSourceCard(); final Card source = ability.getSourceCard();
ManaCostBeingPaid toPay = new ManaCostBeingPaid(getManaToPay()); ManaCostBeingPaid toPay = new ManaCostBeingPaid(getManaToPay());
boolean xWasBilled = false;
if (this.getAmountOfX() > 0 && !ability.getSVar("X").equals("Count$xPaid")) { // announce X will overwrite whatever was in card script if (this.getAmountOfX() > 0 && !ability.getSVar("X").equals("Count$xPaid")) { // announce X will overwrite whatever was in card script
// this currently only works for things about Targeted object // this currently only works for things about Targeted object
int xCost = AbilityUtils.calculateAmount(source, "X", ability) * this.getAmountOfX(); int xCost = AbilityUtils.calculateAmount(source, "X", ability) * this.getAmountOfX();
byte xColor = MagicColor.fromName(ability.hasParam("XColor") ? ability.getParam("XColor") : "1"); byte xColor = MagicColor.fromName(ability.hasParam("XColor") ? ability.getParam("XColor") : "1");
toPay.increaseShard(ManaCostShard.valueOf(xColor), xCost); toPay.increaseShard(ManaCostShard.valueOf(xColor), xCost);
xWasBilled = true;
} }
int timesMultikicked = ability.getSourceCard().getMultiKickerMagnitude(); int timesMultikicked = ability.getSourceCard().getMultiKickerMagnitude();
if ( timesMultikicked > 0 && ability.isAnnouncing("Multikicker")) { if ( timesMultikicked > 0 && ability.isAnnouncing("Multikicker")) {
@@ -138,7 +140,7 @@ public class CostPartMana extends CostPart {
if(!inpPayment.isPaid()) if(!inpPayment.isPaid())
return false; return false;
} }
if (this.getAmountOfX() > 0) { if (this.getAmountOfX() > 0 && !xWasBilled) {
if( !ability.isAnnouncing("X") ) { if( !ability.isAnnouncing("X") ) {
source.setXManaCostPaid(0); source.setXManaCostPaid(0);
InputPayment inpPayment = new InputPayManaX(ability, this.getAmountOfX(), this.canXbe0()); InputPayment inpPayment = new InputPayManaX(ability, this.getAmountOfX(), this.canXbe0());