diff --git a/.gitattributes b/.gitattributes index ad479769545..ae8f1cbc3e6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16252,6 +16252,7 @@ forge-gui/res/cardsfolder/upcoming/cloudblazer.txt -text forge-gui/res/cardsfolder/upcoming/cogworkers_puzzleknot.txt -text forge-gui/res/cardsfolder/upcoming/commencement_of_festivities.txt -text forge-gui/res/cardsfolder/upcoming/concealed_courtyard.txt -text +forge-gui/res/cardsfolder/upcoming/confiscation_coup.txt -text forge-gui/res/cardsfolder/upcoming/consulate_skygate.txt -text forge-gui/res/cardsfolder/upcoming/consulate_surveillance.txt -text forge-gui/res/cardsfolder/upcoming/consuls_shieldguard.txt -text diff --git a/forge-gui/res/cardsfolder/upcoming/confiscation_coup.txt b/forge-gui/res/cardsfolder/upcoming/confiscation_coup.txt new file mode 100644 index 00000000000..5b2483638c9 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/confiscation_coup.txt @@ -0,0 +1,9 @@ +Name:Confiscation Coup +ManaCost:3 U U +Types:Sorcery +A:SP$ PutCounter | Cost$ 3 U U | Defined$ You | CounterType$ ENERGY | CounterNum$ 4 | SubAbility$ DBGainControl | SpellDescription$ Choose target artifact or creature. You get {E}{E}{E}{E} (four energy counters), then you may pay an amount of {E} equal to that permanent's converted mana cost. If you do, gain control of it. +SVar:DBGainControl:DB$ GainControl | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | References$ X | UnlessCost$ PayEnergy | UnlessPayer$ You | UnlessSwitched$ True +SVar:RemAIDeck:True +SVar:X:Targeted$CardManaCost +SVar:Picture:http://www.wizards.com/global/images/magic/general/confiscation_coup.jpg +Oracle:Choose target artifact or creature. You get {E}{E}{E}{E} (four energy counters), then you may pay an amount of {E} equal to that permanent's converted mana cost. If you do, gain control of it. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/harnessed_lightning.txt b/forge-gui/res/cardsfolder/upcoming/harnessed_lightning.txt index fe8ffaf5103..8507f4890f5 100644 --- a/forge-gui/res/cardsfolder/upcoming/harnessed_lightning.txt +++ b/forge-gui/res/cardsfolder/upcoming/harnessed_lightning.txt @@ -2,9 +2,8 @@ Name:Harnessed Lightning ManaCost:1 R Types:Instant A:SP$ PutCounter | Cost$ 1 R | Defined$ You | CounterType$ ENERGY | CounterNum$ 3 | SubAbility$ DBChooseNumber | SpellDescription$ Choose target creature. You get {E}{E}{E} (three energy counters), then you may pay any amount of {E}. Harnessed Lightning deals that much damage to that creature. -SVar:DBChooseNumber:DB$ ChooseNumber | Max$ Max | ListTitle$ Pay Any Energy | SubAbility$ DBPayEnergy -SVar:DBPayEnergy:DB$ RemoveCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ X | SubAbility$ DBDealDamage -SVar:DBDealDamage:DB$ DealDamage | References$ X | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X +SVar:DBChooseNumber:DB$ ChooseNumber | Max$ Max | ListTitle$ Pay Energy for Damage | SubAbility$ DBDealDamage +SVar:DBDealDamage:DB$ DealDamage | References$ X | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | UnlessCost$ PayEnergy | UnlessPayer$ You | UnlessSwitched$ True SVar:Max:Count$YourCountersEnergy SVar:X:Count$ChosenNumber SVar:RemAIDeck:True diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java index c47f16a3707..e96c97dc096 100644 --- a/forge-gui/src/main/java/forge/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/player/HumanPlay.java @@ -241,7 +241,8 @@ public class HumanPlay { */ private static int getAmountFromPartX(CostPart part, Card source, SpellAbility sourceAbility) { String amountString = part.getAmount(); - return StringUtils.isNumeric(amountString) ? Integer.parseInt(amountString) : CardFactoryUtil.xCount(source, source.getSVar(amountString)); + // Probably should just be - + return AbilityUtils.calculateAmount(source, amountString, sourceAbility); } /**