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

- Fixed Arm with AEther to not affect creatures that enter the battlefield after it was cast.

Browse Source
This commit is contained in:
Sloth
2011-09-11 19:08:24 +00:00
parent 6038c17ccf
commit b6b4e7308c
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/cardsfolder/a/arm_with_aether.txt
View File

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

14
src/main/java/forge/card/abilityFactory/AbilityFactory_Animate.java
View File

@@ -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<String> sVars = new ArrayList<String>();
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;