diff --git a/res/cardsfolder/a/arm_with_aether.txt b/res/cardsfolder/a/arm_with_aether.txt index 3f8d12b9d73..a158650690f 100644 --- a/res/cardsfolder/a/arm_with_aether.txt +++ b/res/cardsfolder/a/arm_with_aether.txt @@ -2,10 +2,11 @@ Name:Arm with AEther ManaCost:2 U Types:Sorcery Text:no text -A:SP$Effect | Cost$ 2 U | StaticAbilities$ PumpTrigs | SVars$ Trig,Eff | Name$ Arm with AEther effect. | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." -SVar:PumpTrigs:Mode$ Continuous | Affected$ Creature.YouCtrl | AddTrigger$ Trig | AddSVar$ Eff | Description$ Creatures you control have "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." +A:SP$ AnimateAll | Cost$ 2 U | ValidCards$ Creature.YouCtrl | Triggers$ Trig | sVars$ Eff | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." SVar:Trig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | Execute$ Eff | TriggerDescription$ Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand. SVar:Eff:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control. | Origin$ Battlefield | Destination$ Hand +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/arm_with_aether.jpg SetInfo:NPH|Uncommon|http://magiccards.info/scans/en/nph/28.jpg Oracle:Until end of turn, creatures you control gain "Whenever this creature deals damage to an opponent, you may return target creature that player controls to its owner's hand." End \ No newline at end of file diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java index 9d23b36415e..f4fb93e1d31 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java @@ -1023,6 +1023,12 @@ public final class AbilityFactory_Animate { if (params.containsKey("Triggers")) { triggers.addAll(Arrays.asList(params.get("Triggers").split(","))); } + + //sVars to add to the animated being + ArrayList sVars = new ArrayList(); + if (params.containsKey("sVars")) { + sVars.addAll(Arrays.asList(params.get("sVars").split(","))); + } String valid = ""; @@ -1071,6 +1077,14 @@ public final class AbilityFactory_Animate { AllZone.getTriggerHandler().registerTrigger(parsedTrigger); } } + + //give sVars + if (sVars.size() > 0) { + for (String s : sVars) { + String actualsVar = host.getSVar(s); + c.setSVar(s, actualsVar); + } + } final Command unanimate = new Command() { private static final long serialVersionUID = -5861759814760561373L;