external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added Confiscation Coup (Harnessed Lightning will now use UnlessSwitched)

Browse Source
This commit is contained in:
Sol
2016-09-22 13:22:43 +00:00
parent 1488240ada
commit 60a017429d
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -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/cogworkers_puzzleknot.txt -text
forge-gui/res/cardsfolder/upcoming/commencement_of_festivities.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/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_skygate.txt -text
forge-gui/res/cardsfolder/upcoming/consulate_surveillance.txt -text forge-gui/res/cardsfolder/upcoming/consulate_surveillance.txt -text
forge-gui/res/cardsfolder/upcoming/consuls_shieldguard.txt -text forge-gui/res/cardsfolder/upcoming/consuls_shieldguard.txt -text

9
forge-gui/res/cardsfolder/upcoming/confiscation_coup.txt Normal file
View File

@@ -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<X> | 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.

5
forge-gui/res/cardsfolder/upcoming/harnessed_lightning.txt
View File

@@ -2,9 +2,8 @@ Name:Harnessed Lightning
ManaCost:1 R ManaCost:1 R
Types:Instant 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. 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:DBChooseNumber:DB$ ChooseNumber | Max$ Max | ListTitle$ Pay Energy for Damage | SubAbility$ DBDealDamage
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 | UnlessCost$ PayEnergy<X> | UnlessPayer$ You | UnlessSwitched$ True
SVar:DBDealDamage:DB$ DealDamage | References$ X | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X
SVar:Max:Count$YourCountersEnergy SVar:Max:Count$YourCountersEnergy
SVar:X:Count$ChosenNumber SVar:X:Count$ChosenNumber
SVar:RemAIDeck:True SVar:RemAIDeck:True

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

@@ -241,7 +241,8 @@ public class HumanPlay {
*/ */
private static int getAmountFromPartX(CostPart part, Card source, SpellAbility sourceAbility) { private static int getAmountFromPartX(CostPart part, Card source, SpellAbility sourceAbility) {
String amountString = part.getAmount(); 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);
} }
/** /**