diff --git a/.gitattributes b/.gitattributes index 69364199b15..31217fcfac4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2487,6 +2487,7 @@ res/cardsfolder/e/energy_storm.txt svneol=native#text/plain res/cardsfolder/e/energy_tap.txt svneol=native#text/plain res/cardsfolder/e/enervate.txt svneol=native#text/plain res/cardsfolder/e/enfeeblement.txt svneol=native#text/plain +res/cardsfolder/e/engineered_explosives.txt -text res/cardsfolder/e/engineered_plague.txt svneol=native#text/plain res/cardsfolder/e/engulfing_flames.txt svneol=native#text/plain res/cardsfolder/e/engulfing_slagwurm.txt svneol=native#text/plain @@ -4045,6 +4046,7 @@ res/cardsfolder/i/infinite_hourglass.txt -text res/cardsfolder/i/inflame.txt svneol=native#text/plain res/cardsfolder/i/information_dealer.txt svneol=native#text/plain res/cardsfolder/i/infuse.txt svneol=native#text/plain +res/cardsfolder/i/infused_arrows.txt -text res/cardsfolder/i/ingenious_thief.txt svneol=native#text/plain res/cardsfolder/i/ingot_chewer.txt svneol=native#text/plain res/cardsfolder/i/inheritance.txt svneol=native#text/plain diff --git a/res/cardsfolder/e/engineered_explosives.txt b/res/cardsfolder/e/engineered_explosives.txt new file mode 100644 index 00000000000..665d051ca6b --- /dev/null +++ b/res/cardsfolder/e/engineered_explosives.txt @@ -0,0 +1,11 @@ +Name:Engineered Explosives +ManaCost:X +Types:Artifact +Text:no text +K:Sunburst +A:AB$ DestroyAll | Cost$ T Sac<1/CARDNAME> | ValidCards$ Permanent.nonLand+cmcEQX | SpellDescription$ Destroy each nonland permanent with converted mana cost equal to the number of charge counters on CARDNAME. +SVar:X:Count$CardCounters.CHARGE +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/engineered_explosives.jpg +SetInfo:5DN|Rare|http://magiccards.info/scans/en/5dn/118.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/i/infused_arrows.txt b/res/cardsfolder/i/infused_arrows.txt new file mode 100644 index 00000000000..fb25e4da77b --- /dev/null +++ b/res/cardsfolder/i/infused_arrows.txt @@ -0,0 +1,14 @@ +Name:Infused Arrows +ManaCost:4 +Types:Artifact +Text:no text +K:Sunburst +#ChosenX SVar created by Cost payment +A:AB$ Pump | Cost$ T SubCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -ChosenX | NumDef$ -ChosenX | SpellDescription$ Target creature gets -X/-X until end of turn. +SVar:X:XChoice +SVar:RemAIDeck:True +SVar:RemRandomDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/infused_arrows.jpg +SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/133.jpg +End \ No newline at end of file diff --git a/src/main/java/forge/card/cost/CostMana.java b/src/main/java/forge/card/cost/CostMana.java index 8ebf9201eb2..6e34f650130 100644 --- a/src/main/java/forge/card/cost/CostMana.java +++ b/src/main/java/forge/card/cost/CostMana.java @@ -239,6 +239,7 @@ public class CostMana extends CostPart { final Input payX = new Input() { private static final long serialVersionUID = -6900234444347364050L; private int xPaid = 0; + private String colorsPaid = ""; private ManaCost manaCost = new ManaCost(Integer.toString(numX)); @Override @@ -270,6 +271,9 @@ public class CostMana extends CostPart { this.manaCost = InputPayManaCostUtil.activateManaAbility(sa, card, this.manaCost); if (this.manaCost.isPaid()) { + if (!colorsPaid.contains(this.manaCost.getColorsPaid())) { + colorsPaid += this.manaCost.getColorsPaid(); + } this.manaCost = new ManaCost(Integer.toString(numX)); this.xPaid++; } @@ -291,6 +295,8 @@ public class CostMana extends CostPart { this.stop(); payment.getCard().setXManaCostPaid(this.xPaid); payment.paidCost(costMana); + payment.getCard().setColorsPaid(colorsPaid); + payment.getCard().setSunburstValue(colorsPaid.length()); } };