Merge branch 'atEOTSvar' into 'master'

At eot svar

See merge request core-developers/forge!1254

forge-game/src/main/java/forge/game/GameAction.java

@@ -70,10 +70,8 @@ public class GameAction {
     }
 
     public final void resetActivationsPerTurn() {
-        final CardCollectionView all = game.getCardsInGame();
-
         // Reset Activations per Turn
-        for (final Card card : all) {
+        for (final Card card : game.getCardsInGame()) {
             for (final SpellAbility sa : card.getAllSpellAbilities()) {
                 sa.getRestrictions().resetTurnActivations();
             }
@@ -157,7 +155,9 @@ public class GameAction {
         }
 
         // Clean up the temporary Dash SVar when the Dashed card leaves the battlefield
-        if (fromBattlefield && c.getSVar("EndOfTurnLeavePlay").equals("Dash")) {
+        // Clean up the temporary AtEOT SVar
+        String endofTurn = c.getSVar("EndOfTurnLeavePlay");
+        if (fromBattlefield && (endofTurn.equals("Dash") || endofTurn.equals("AtEOT"))) {
             c.removeSVar("EndOfTurnLeavePlay");
         }
 
@@ -484,10 +484,6 @@ public class GameAction {
             unattachCardLeavingBattlefield(copied);
             // Remove all changed keywords
             copied.removeAllChangedText(game.getNextTimestamp());
-            // reset activations
-            for (SpellAbility ab : copied.getSpellAbilities()) {
-                ab.getRestrictions().resetTurnActivations();
-            }
         } else if (toBattlefield) {
             // reset timestamp in changezone effects so they have same timestamp if ETB simutaneously 
             copied.setTimestamp(game.getNextTimestamp());

forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java

@@ -230,8 +230,17 @@ public abstract class SpellAbilityEffect {
         
         if (desc.isEmpty()) {
             StringBuilder sb = new StringBuilder();
-            sb.append(location).append(" ");
+            if (location.equals("Hand")) {
+                sb.append("Return ");
+            } else if (location.equals("SacrificeCtrl")) {
+                sb.append("Its controller sacrifices ");
+            } else {
+                sb.append(location).append(" ");
+            }
             sb.append(Lang.joinHomogenous(crds));
+            if (location.equals("Hand")) {
+                sb.append("to your hand").append(" ");
+            }
             sb.append(" at the ");
             if (combat) {
                 sb.append("end of combat.");
@@ -255,9 +264,18 @@ public abstract class SpellAbilityEffect {
         final Trigger trig = TriggerHandler.parseTrigger(delTrig.toString(), sa.getHostCard(), intrinsic);
         for (final Card c : crds) {
             trig.addRemembered(c);
+
+            // Svar for AI
+            if (!c.hasSVar("EndOfTurnLeavePlay")) {
+                c.setSVar("EndOfTurnLeavePlay", "AtEOT");
+            }
         }
         String trigSA = "";
-        if (location.equals("Sacrifice")) {
+        if (location.equals("Hand")) {
+            trigSA = "DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Hand";
+        } else if (location.equals("SacrificeCtrl")) {
+            trigSA = "DB$ SacrificeAll | Defined$ DelayTriggerRemembered";
+        } else if (location.equals("Sacrifice")) {
             trigSA = "DB$ SacrificeAll | Defined$ DelayTriggerRemembered | Controller$ You";
         } else if (location.equals("Exile")) {
             trigSA = "DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Exile";
@@ -289,6 +307,11 @@ public abstract class SpellAbilityEffect {
         }
         trig.setOverridingAbility(AbilityFactory.getAbility(trigSA, card));
         card.addTrigger(trig);
+
+        // Svar for AI
+        if (!card.hasSVar("EndOfTurnLeavePlay")) {
+            card.setSVar("EndOfTurnLeavePlay", "AtEOT");
+        }
     }
     
     protected static void addForgetOnMovedTrigger(final Card card, final String zone) {

forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java

@@ -264,7 +264,6 @@ public class CopyPermanentEffect extends SpellAbilityEffect {
         final List<String> svars = Lists.newArrayList();
         final List<String> triggers = Lists.newArrayList();
         boolean asNonLegendary = false;
-        boolean resetActivations = false;
 
         if (sa.hasParam("Keywords")) {
             keywords.addAll(Arrays.asList(sa.getParam("Keywords").split(" & ")));
@@ -275,9 +274,6 @@ public class CopyPermanentEffect extends SpellAbilityEffect {
         if (sa.hasParam("NonLegendary")) {
             asNonLegendary = true;
         }
-        if (sa.hasParam("ResetAbilityActivations")) {
-            resetActivations = true;
-        }
         if (sa.hasParam("AddSVars")) {
             svars.addAll(Arrays.asList(sa.getParam("AddSVars").split(" & ")));
         }
@@ -409,11 +405,6 @@ public class CopyPermanentEffect extends SpellAbilityEffect {
             copy.removeIntrinsicKeyword("Devoid");
         }
 
-        if (resetActivations) {
-            for (SpellAbility ab : copy.getSpellAbilities()) {
-                ab.getRestrictions().resetTurnActivations();
-            }
-        }
         copy.updateStateForView();
         return copy;
     }

forge-game/src/main/java/forge/game/card/CardFactory.java

@@ -617,6 +617,9 @@ public class CardFactory {
         }
         if (from.getRestrictions() != null) {
             to.setRestrictions((SpellAbilityRestriction) from.getRestrictions().copy());
+            if (!lki) {
+                to.getRestrictions().resetTurnActivations();
+            }
         }
         if (from.getConditions() != null) {
             to.setConditions((SpellAbilityCondition) from.getConditions().copy());

forge-gui/res/cardsfolder/a/akoum_stonewaker.txt

@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Human Shaman
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may pay {2}{R}. If you do, create a 3/1 red Elemental creature token with trample and haste. Exile that token at the beginning of the next end step.
-SVar:TrigToken:AB$Token | Cost$ 2 R | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenImage$ r 3 1 elemental bfz | TokenKeywords$ Trample<>Haste | TokenSVars$ AkoumEOT | AtEOT$ Exile
+SVar:TrigToken:AB$Token | Cost$ 2 R | TokenScript$ r_3_1_elemental_trample_haste | AtEOT$ Exile
-SVar:AkoumEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/akoum_stonewaker.jpg
 Oracle:Landfall — Whenever a land enters the battlefield under your control, you may pay {2}{R}. If you do, create a 3/1 red Elemental creature token with trample and haste. Exile that token at the beginning of the next end step.

forge-gui/res/cardsfolder/a/angelic_favor.txt

@@ -1,9 +1,9 @@
 Name:Angelic Favor
 ManaCost:3 W
 Types:Instant
-A:SP$ Token | Cost$ 3 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenSVars$ AngelicFavorEOT | AtEOT$ Exile | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ Cast CARDNAME only during combat. Create a 4/4 white Angel creature token with flying. Exile it at the beginning of the next end step.
+A:SP$ Token | Cost$ 3 W | TokenScript$ w_4_4_angel_flying | AtEOT$ Exile | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ Cast CARDNAME only during combat. Create a 4/4 white Angel creature token with flying. Exile it at the beginning of the next end step.
-SVar:AngelicFavorEOT:SVar:EndOfTurnLeavePlay:True
+SVar:AltCost:Cost$ tapXType<1/Creature> | IsPresent$ Plains.YouCtrl | Description$ If you control a Plains, you may tap an untapped creature you control rather than pay CARDNAME's mana cost.
-SVar:AltCost:Cost$ tapXType<1/Creature> | IsPresent$ Plains.YouCtrl | Description$ If you control a Plains, you may tap an untapped creature you control rather than pay CARDNAME's mana cost. 
+DeckHas:Ability$Token
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_favor.jpg
 Oracle:If you control a Plains, you may tap an untapped creature you control rather than pay this spell's mana cost.\nCast this spell only during combat.\nCreate a 4/4 white Angel creature token with flying. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/a/apprentice_necromancer.txt

@@ -2,8 +2,8 @@ Name:Apprentice Necromancer
 ManaCost:1 B
 Types:Creature Zombie Wizard
 PT:1/1
-A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | AITgts$ Card.cmcGE5 | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
+A:AB$ ChangeZone | Cost$ B T Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | AITgts$ Card.cmcGE5 | TgtPrompt$ Select target creature in your graveyard | SubAbility$ DBPump | AILogic$ BeforeCombat | RememberChanged$ True | SpellDescription$ Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Targeted | sVars$ SneakAttackEOT | Permanent$ True | AtEOT$ Sacrifice
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apprentice_necromancer.jpg
 Oracle:{B}, {T}, Sacrifice Apprentice Necromancer: Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.

forge-gui/res/cardsfolder/b/balduvian_dead.txt

@@ -2,7 +2,6 @@ Name:Balduvian Dead
 ManaCost:3 B
 Types:Creature Zombie
 PT:2/3
-A:AB$ Token | Cost$ 2 R ExileFromGrave<1/Creature> | TokenAmount$ 1 | TokenName$ Graveborn | TokenTypes$ Creature,Graveborn | TokenOwner$ You | TokenColors$ Black,Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste | TokenSVars$ BalduvianDeadEOT | AtEOT$ Sacrifice | SpellDescription$ Create a 3/1 black and red Graveborn creature token with haste. Sacrifice it at the beginning of the next end step.
+A:AB$ Token | Cost$ 2 R ExileFromGrave<1/Creature> | TokenScript$ br_3_1_graveborn | AtEOT$ Sacrifice | SpellDescription$ Create a 3/1 black and red Graveborn creature token with haste. Sacrifice it at the beginning of the next end step.
-SVar:BalduvianDeadEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balduvian_dead.jpg
 Oracle:{2}{R}, Exile a creature card from your graveyard: Create a 3/1 black and red Graveborn creature token with haste. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/b/broken_visage.txt

@@ -2,8 +2,7 @@ Name:Broken Visage
 ManaCost:4 B
 Types:Instant
 A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Creature.attacking+nonArtifact | TgtPrompt$ Select target nonartifact attacking creature | NoRegen$ True | SubAbility$ DBToken | SpellDescription$ Destroy target nonartifact attacking creature. It can't be regenerated. Create a black Spirit creature token. Its power is equal to that creature's power and its toughness is equal to that creature's toughness. Sacrifice the token at the beginning of the next end step.
-SVar:DBToken:DB$ Token | Defined$ Targeted | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ Black | TokenPower$ dX | TokenToughness$ dY | References$ dX,dY | TokenSVars$ BrokenVisageEOT | AtEOT$ Sacrifice
+SVar:DBToken:DB$ Token | Defined$ Targeted | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ Black | TokenPower$ dX | TokenToughness$ dY | References$ dX,dY | AtEOT$ Sacrifice
-SVar:BrokenVisageEOT:SVar:EndOfTurnLeavePlay:True
 SVar:dX:Targeted$CardPower
 SVar:dY:Targeted$CardToughness
 SVar:Picture:http://www.wizards.com/global/images/magic/general/broken_visage.jpg

forge-gui/res/cardsfolder/c/cauldron_dance.txt

@@ -2,14 +2,9 @@ Name:Cauldron Dance
 ManaCost:4 B R
 Types:Instant
 A:SP$ ChangeZone | Cost$ 4 B R | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature from your graveyard | ActivationPhases$ BeginCombat->EndCombat | RememberChanged$ True | AILogic$ SurpriseBlock | SubAbility$ DBAnimate | SpellDescription$ Cast CARDNAME only during combat. Return target creature card from your graveyard to the battlefield. That creature gains haste. Return it to your hand at the beginning of the next end step. You may put a creature card from your hand onto the battlefield. That creature gains haste. Its controller sacrifices it at the beginning of the next end step.
-SVar:DBAnimate:DB$ Animate | Keywords$ Haste | Permanent$ True | sVars$ SneakAttackEOT | Defined$ Remembered | SubAbility$ DelTrig 
+SVar:DBAnimate:DB$ Animate | Keywords$ Haste | Permanent$ True | Defined$ Remembered | SubAbility$ DBChangeZone | AtEOT$ Hand
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigBounce | RememberObjects$ Remembered | TriggerDescription$ Return the permanent to its owner's hand at the beginning of the next end step. | SubAbility$ DBChangeZone | AILogic$ Always | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:TrigBounce:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Hand
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Optional$ You | ChangeType$ Creature | ChangeNum$ 1 | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBAnimate2
-SVar:DBAnimate2:DB$ Animate | Keywords$ Haste | Permanent$ True | sVars$ SneakAttackEOT | Defined$ Remembered | SubAbility$ DelTrig2 
+SVar:DBAnimate2:DB$ Animate | Keywords$ Haste | Permanent$ True | Defined$ Remembered | SubAbility$ DBCleanup | AtEOT$ SacrificeCtrl
-SVar:DelTrig2:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigSac | RememberObjects$ Remembered | TriggerDescription$ Its controller sacrifices it at the beginning of the next end step. | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:TrigSac:DB$ SacrificeAll | Defined$ DelayTriggerRemembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cauldron_dance.jpg
 Oracle:Cast this spell only during combat.\nReturn target creature card from your graveyard to the battlefield. That creature gains haste. Return it to your hand at the beginning of the next end step.\nYou may put a creature card from your hand onto the battlefield. That creature gains haste. Its controller sacrifices it at the beginning of the next end step.

forge-gui/res/cardsfolder/c/chandra_flamecaller.txt

@@ -2,14 +2,14 @@ Name:Chandra, Flamecaller
 ManaCost:4 R R
 Types:Legendary Planeswalker Chandra
 Loyalty:4
-A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 2 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenImage$ r 3 1 elemental OGW | TokenKeywords$ Haste | AtEOT$ Exile | TokenSVars$ ChandraEOT | SpellDescription$ Create two 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.
+A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 2 | TokenScript$ r_3_1_elemental_haste | AtEOT$ Exile | SpellDescription$ Create two 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.
-SVar:ChandraEOT:SVar:EndOfTurnLeavePlay:True 
 A:AB$ Discard | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | Defined$ You | Mode$ Hand | RememberDiscarded$ True | SubAbility$ DBDraw | SpellDescription$ Discard all the cards in your hand, then draw that many cards plus one.
 SVar:DBDraw:DB$ Draw | NumCards$ Y | Defined$ You | SubAbility$ DBCleanup | SpellDescription$ Draw that many cards | References$ Y
 SVar:Y:Remembered$Amount.Plus.1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True 
 A:AB$ DamageAll | Cost$ SubCounter<X/LOYALTY> | NumDmg$ ChosenX | References$ X | ValidCards$ Creature | Planeswalker$ True | Ultimate$ True | ValidDescription$ each creature. | SpellDescription$ CARDNAME deals X damage to each creature.
-SVar:X:XChoice 
+SVar:X:XChoice
+DeckHas:Ability$Token
 SVar:PlayMain1:ALWAYS
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chandra_flamecaller.jpg
 Oracle:+1: Create two 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.\n0: Discard all the cards in your hand, then draw that many cards plus one.\n−X: Chandra, Flamecaller deals X damage to each creature.

forge-gui/res/cardsfolder/c/chimeric_coils.txt

@@ -1,9 +1,8 @@
 Name:Chimeric Coils
 ManaCost:1
 Types:Artifact
-A:AB$ Animate | Cost$ X 1 | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | sVars$ ChimericCoilsEOT | AtEOT$ Sacrifice | Permanent$ True | References$ X | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.
+A:AB$ Animate | Cost$ X 1 | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | AtEOT$ Sacrifice | Permanent$ True | References$ X | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.
 SVar:X:Count$xPaid
-SVar:ChimericCoilsEOT:SVar:EndOfTurnLeavePlay:True
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chimeric_coils.jpg
 Oracle:{X}{1}: Chimeric Coils becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/c/cogwork_assembler.txt

@@ -2,7 +2,6 @@ Name:Cogwork Assembler
 ManaCost:3
 Types:Artifact Creature Assembly-Worker
 PT:2/3
-A:AB$ CopyPermanent | Cost$ 7 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact. | AddSVars$ SneakAttackEOT | PumpKeywords$ Haste | AtEOT$ Exile | SpellDescription$ Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step.
+A:AB$ CopyPermanent | Cost$ 7 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact. | PumpKeywords$ Haste | AtEOT$ Exile | AILogic$ BeforeCombat | SpellDescription$ Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step.
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cogwork_assembler.jpg
-Oracle:{7}: Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step.
+Oracle:{7}: Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/c/corpse_dance.txt

@@ -3,9 +3,8 @@ ManaCost:2 B
 Types:Instant
 K:Buyback:2
 A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.TopGraveyardCreature+YouCtrl | Hidden$ True | Mandatory$ True | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Return the top creature card of your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | AtEOT$ Exile | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste  | Defined$ Remembered | AtEOT$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:NeedsOrderedGraveyard:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/corpse_dance.jpg
 Oracle:Buyback {2} (You may pay an additional {2} as you cast this spell. If you do, put this card into your hand as it resolves.)\nReturn the top creature card of your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/d/dawn_of_the_dead.txt

@@ -4,9 +4,9 @@ Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, you lose 1 life.
 SVar:TrigLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ 1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, you may return target creature card from your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.
-SVar:TrigChange:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | SubAbility$ DBPump
+SVar:TrigChange:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Targeted | AtEOT$ Exile
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | AtEOT$ Exile | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:Random
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dawn_of_the_dead.jpg
 Oracle:At the beginning of your upkeep, you lose 1 life.\nAt the beginning of your upkeep, you may return target creature card from your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/e/echo_chamber.txt

@@ -1,9 +1,6 @@
 Name:Echo Chamber
 ManaCost:4
 Types:Artifact
-A:AB$ CopyPermanent | Cost$ 4 T | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | TgtPrompt$ Select target creature you control | RememberCopied$ True | AtEOT$ Exile | SorcerySpeed$ True | SubAbility$ DBPump | SpellDescription$ An opponent chooses target creature they control. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step. Activate this ability only any time you could cast a sorcery.
+A:AB$ CopyPermanent | Cost$ 4 T | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | TgtPrompt$ Select target creature you control | PumpKeywords$ Haste | AtEOT$ Exile | SorcerySpeed$ True | SpellDescription$ An opponent chooses target creature they control. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step. Activate this ability only any time you could cast a sorcery.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/echo_chamber.jpg
 Oracle:{4}, {T}: An opponent chooses target creature they control. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step. Activate this ability only any time you could cast a sorcery.

forge-gui/res/cardsfolder/e/elemental_appeal.txt

@@ -2,9 +2,8 @@ Name:Elemental Appeal
 ManaCost:R R R R
 Types:Sorcery
 K:Kicker:5
-A:SP$ Token | Cost$ R R R R | TokenAmount$ 1 | TokenImage$ r 7 1 elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenPower$ 7 | TokenToughness$ 1 | TokenKeywords$ Haste<>Trample | TokenSVars$ EOTExile | RememberTokens$ True | AtEOT$ Exile | TokenOwner$ You | TokenAmount$ 1 | SubAbility$ KickerPump | SpellDescription$ Create a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step. If CARDNAME was kicked, that creature gets +7/+0 until end of turn.
+A:SP$ Token | Cost$ R R R R | TokenScript$ r_7_1_elemental_trample_haste | RememberTokens$ True | AtEOT$ Exile | TokenOwner$ You | SubAbility$ KickerPump | SpellDescription$ Create a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step. If CARDNAME was kicked, that creature gets +7/+0 until end of turn.
 SVar:KickerPump:DB$ Pump | Defined$ Remembered | NumAtt$ +7 | Condition$ Kicked | ConditionDescription$ If it was kicked, | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:EOTExile:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elemental_appeal.jpg
 Oracle:Kicker {5} (You may pay an additional {5} as you cast this spell.)\nCreate a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step. If Elemental Appeal was kicked, that creature gets +7/+0 until end of turn.

forge-gui/res/cardsfolder/e/elemental_mastery.txt

@@ -4,9 +4,9 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Token | AddSVar$ ElementalMasteryCount | Description$ Enchanted creature has "{T}: Create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step."
-SVar:Token:AB$ Token | Cost$ T | TokenAmount$ ElementalMasteryCount | TokenImage$ r 1 1 elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenKeywords$ Haste | TokenSVars$ ElementalMasteryEOT | AtEOT$ Exile | TokenPower$ 1 | TokenToughness$ 1 | References$ ElementalMasteryCount | SpellDescription$ Create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step.
+SVar:Token:AB$ Token | Cost$ T | TokenAmount$ ElementalMasteryCount | TokenScript$ r_1_1_elemental_haste | AtEOT$ Exile | References$ ElementalMasteryCount | SpellDescription$ Create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step.
 SVar:ElementalMasteryCount:Count$CardPower
 SVar:NonStackingAttachEffect:True
-SVar:ElementalMasteryEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elemental_mastery.jpg
 Oracle:Enchant creature\nEnchanted creature has "{T}: Create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step."

forge-gui/res/cardsfolder/f/feldon_of_the_third_path.txt

@@ -2,7 +2,6 @@ Name:Feldon of the Third Path
 ManaCost:1 R R
 Types:Legendary Creature Human Artificer
 PT:2/3
-A:AB$ CopyPermanent | Cost$ 2 R T | TgtZone$ Graveyard | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature card in your graveyard | NumCopies$ 1 | AddTypes$ Artifact | AddSVars$ SneakAttackEOT | PumpKeywords$ Haste | AtEOT$ Sacrifice | SpellDescription$ Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step.
+A:AB$ CopyPermanent | Cost$ 2 R T | TgtZone$ Graveyard | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature card in your graveyard | NumCopies$ 1 | AddTypes$ Artifact | PumpKeywords$ Haste | AtEOT$ Sacrifice | SpellDescription$ Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step.
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/feldon_of_the_third_path.jpg
 Oracle:{2}{R}, {T}: Create a token that's a copy of target creature card in your graveyard, except it's an artifact in addition to its other types. It gains haste. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/f/felhide_spiritbinder.txt

@@ -3,7 +3,6 @@ ManaCost:3 R
 Types:Creature Minotaur Shaman
 PT:3/4
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Inspired — Whenever CARDNAME becomes untapped, you may pay {1}{R}. If you do, create a token that's a copy of another target creature, except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step.
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ 1 R | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature to copy | PumpKeywords$ Haste | AtEOT$ Exile | AddSVars$ SneakAttackEOT | AddTypes$ Enchantment
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ 1 R | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature to copy | PumpKeywords$ Haste | AtEOT$ Exile | AddTypes$ Enchantment
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/felhide_spiritbinder.txt
 Oracle:Inspired — Whenever Felhide Spiritbinder becomes untapped, you may pay {1}{R}. If you do, create a token that's a copy of another target creature, except it's an enchantment in addition to its other types. It gains haste. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/f/feral_lightning.txt

@@ -1,8 +1,7 @@
 Name:Feral Lightning
 ManaCost:3 R R R
 Types:Sorcery
-A:SP$ Token | Cost$ 3 R R R | TokenAmount$ 3 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenImage$ r 3 1 elemental SOK | TokenKeywords$ Haste | TokenSVars$ FeralLightningEOT | AtEOT$ Exile | SpellDescription$ Create three 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.
+A:SP$ Token | Cost$ 3 R R R | TokenAmount$ 3 | TokenScript$ r_3_1_elemental_haste | AtEOT$ Exile | SpellDescription$ Create three 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.
-SVar:FeralLightningEOT:SVar:EndOfTurnLeavePlay:True
 SVar:PlayMain1:TRUE
 SVar:Picture:http://resources.wizards.com/magic/cards/sok/en-us/card84373.jpg
 Oracle:Create three 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.

forge-gui/res/cardsfolder/f/firecat_blitz.txt

@@ -1,13 +1,11 @@
 Name:Firecat Blitz
 ManaCost:X R R
 Types:Sorcery
-A:SP$ Token | Cost$ X R R | TokenAmount$ X | TokenName$ Elemental Cat | TokenTypes$ Creature,Elemental,Cat | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste | TokenSVars$ FirecatBlitzEOT | AtEOT$ Exile | References$ X | SpellDescription$ Create X 1/1 red Elemental Cat creature tokens with haste. Exile them at the beginning of the next end step.
+A:SP$ Token | Cost$ X R R | TokenAmount$ X | TokenScript$ r_1_1_elemental_cat_haste | AtEOT$ Exile | References$ X | SpellDescription$ Create X 1/1 red Elemental Cat creature tokens with haste. Exile them at the beginning of the next end step.
-A:SP$ Token | Cost$ R R Sac<Y/Mountain> | TokenAmount$ ChosenX | TokenName$ Elemental Cat | TokenTypes$ Creature,Elemental,Cat | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste | TokenSVars$ FirecatBlitzEOT | AtEOT$ Exile | Flashback$ True | CostDesc$Flashback—{R}{R}, Sacrifice X Mountains. | References$ Y | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.)
-SVar:FirecatBlitzEOT:SVar:EndOfTurnLeavePlay:True
 SVar:X:Count$xPaid
-SVar:Y:XChoice
+#X Will get overwritten by Announce
-#Flashback uses Y because SVars can't overlap
+K:Flashback:R R Sac<X/Mountain>
-#ChosenX SVar created by Cost payment
+DeckHas:Ability$Token
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/firecat_blitz.jpg
 Oracle:Create X 1/1 red Elemental Cat creature tokens with haste. Exile them at the beginning of the next end step.\nFlashback—{R}{R}, Sacrifice X Mountains. (You may cast this card from your graveyard for its flashback cost. Then exile it.)

forge-gui/res/cardsfolder/f/flameshadow_conjuring.txt

@@ -2,8 +2,7 @@ Name:Flameshadow Conjuring
 ManaCost:3 R
 Types:Enchantment
 T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, create a token that's a copy of that creature.That token gains haste. Exile it at the beginning of the next end step.
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ R | Defined$ TriggeredCard | AddSVars$ SneakAttackEOT | PumpKeywords$ Haste | AtEOT$ Exile | RememberCopied$ True
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ R | Defined$ TriggeredCard | PumpKeywords$ Haste | AtEOT$ Exile | RememberCopied$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:BuffedBy:Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flameshadow_conjuring.jpg
 Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {R}. If you do, create a token that's a copy of that creature. That token gains haste. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/g/geist_of_saint_traft.txt

@@ -4,8 +4,7 @@ Types:Legendary Creature Spirit Cleric
 PT:2/2
 K:Hexproof
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat.
-SVar:TrigToken:DB$ Token | TokenImage$ w 4 4 angel ISD | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenTapped$ True | TokenAttacking$ True | TokenSVars$ SaintTraftEOT | AtEOT$ ExileCombat
+SVar:TrigToken:DB$ Token | TokenScript$ w_4_4_angel_flying | TokenTapped$ True | TokenAttacking$ True | AtEOT$ ExileCombat
 SVar:HasAttackEffect:TRUE
-SVar:SaintTraftEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/geist_of_saint_traft.jpg
 Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\nWhenever Geist of Saint Traft attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat.

forge-gui/res/cardsfolder/g/gemini_engine.txt

@@ -3,10 +3,9 @@ ManaCost:6
 Types:Artifact Creature Construct
 PT:3/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a colorless Construct artifact creature token named Twin that's attacking. Its power is equal to CARDNAME's power and its toughness is equal to CARDNAME's toughness. Sacrifice the token at end of combat.
-SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Twin | TokenTypes$ Artifact,Creature,Construct | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ X | TokenToughness$ Y | TokenAttacking$ True | TokenSVars$ GeminiEngineEOT | AtEOT$ SacrificeCombat | References$ X,Y
+SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Twin | TokenTypes$ Artifact,Creature,Construct | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ X | TokenToughness$ Y | TokenAttacking$ True | AtEOT$ SacrificeCombat | References$ X,Y
 SVar:X:Count$CardPower
 SVar:Y:Count$CardToughness
 SVar:HasAttackEffect:TRUE
-SVar:GeminiEngineEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gemini_engine.jpg
 Oracle:Whenever Gemini Engine attacks, create a colorless Construct artifact creature token named Twin that's attacking. Its power is equal to Gemini Engine's power and its toughness is equal to Gemini Engine's toughness. Sacrifice the token at end of combat.

forge-gui/res/cardsfolder/g/giantbaiting.txt

@@ -1,8 +1,8 @@
 Name:Giantbaiting
 ManaCost:2 RG
 Types:Sorcery
-A:SP$ Token | Cost$ 2 RG | TokenAmount$ 1 | TokenName$ Giant Warrior | TokenTypes$ Creature,Giant,Warrior | TokenOwner$ You | TokenColors$ Red,Green | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Haste | TokenSVars$ GiantbaitingEOT | AtEOT$ Exile | SpellDescription$ Create a 4/4 red and green Giant Warrior creature token with haste. Exile it at the beginning of the next end step.
+A:SP$ Token | Cost$ 2 RG | TokenScript$ rb_4_4_giant_warrior_haste | AtEOT$ Exile | SpellDescription$ Create a 4/4 red and green Giant Warrior creature token with haste. Exile it at the beginning of the next end step.
-SVar:GiantbaitingEOT:SVar:EndOfTurnLeavePlay:True
 K:Conspire
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/giantbaiting.jpg
 Oracle:Create a 4/4 red and green Giant Warrior creature token with haste. Exile it at the beginning of the next end step.\nConspire (As you cast this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it.)

forge-gui/res/cardsfolder/g/goryos_vengeance.txt

@@ -2,10 +2,10 @@ Name:Goryo's Vengeance
 ManaCost:1 B
 Types:Instant Arcane
 K:Splice:Arcane:2 B
-A:SP$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select target legendary creature in your graveyard | GainControl$ True | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ Return target legendary creature card from your graveyard to the battlefield. That creature gains haste. Exile it at the beginning of the next end step.
+A:SP$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Select target legendary creature in your graveyard | GainControl$ True | SubAbility$ DBPump | RememberChanged$ True | AILogic$ BeforeCombat | SpellDescription$ Return target legendary creature card from your graveyard to the battlefield. That creature gains haste. Exile it at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Targeted | Permanent$ True | AtEOT$ Exile
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Permanent$ True | AtEOT$ Exile | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:Random
 DeckHints:Type$Spirit|Arcane
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goryos_vengeance.jpg
 Oracle:Return target legendary creature card from your graveyard to the battlefield. That creature gains haste. Exile it at the beginning of the next end step.\nSplice onto Arcane {2}{B} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)

forge-gui/res/cardsfolder/g/gruesome_encore.txt

@@ -1,8 +1,8 @@
 Name:Gruesome Encore
 ManaCost:2 B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.OppOwn | TgtPrompt$ Select target creature in an opponent's graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Put target creature card from an opponent's graveyard onto the battlefield under your control. It gains haste. Exile it at the beginning of the next end step. If that creature would leave the battlefield, exile it instead of putting it anywhere else.
+A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.OppOwn | TgtPrompt$ Select target creature in an opponent's graveyard | GainControl$ True | SubAbility$ DBPump | RememberChanged$ True | SpellDescription$ Put target creature card from an opponent's graveyard onto the battlefield under your control. It gains haste. Exile it at the beginning of the next end step. If that creature would leave the battlefield, exile it instead of putting it anywhere else.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | LeaveBattlefield$ Exile | sVars$ SneakAttackEOT | Defined$ Targeted | Permanent$ True | AtEOT$ Exile
+SVar:DBPump:DB$ Animate | Keywords$ Haste | LeaveBattlefield$ Exile | Defined$ Remembered | Permanent$ True | AtEOT$ Exile | SubAbility$ DBCleanup
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruesome_encore.jpg
 Oracle:Put target creature card from an opponent's graveyard onto the battlefield under your control. It gains haste. Exile it at the beginning of the next end step. If that creature would leave the battlefield, exile it instead of putting it anywhere else.

forge-gui/res/cardsfolder/h/heat_shimmer.txt

@@ -1,7 +1,6 @@
 Name:Heat Shimmer
 ManaCost:2 R
 Types:Sorcery
-A:SP$ CopyPermanent | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Haste | AtEOTTrig$ Exile | AddSVars$ SneakAttackEOT | SpellDescription$ Create a token that's a copy of target creature. That token has haste and "At the beginning of the end step, exile this permanent."
+A:SP$ CopyPermanent | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Haste | AtEOTTrig$ Exile | SpellDescription$ Create a token that's a copy of target creature. That token has haste and "At the beginning of the end step, exile this permanent."
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heat_shimmer.jpg
 Oracle:Create a token that's a copy of target creature. That token has haste and "At the beginning of the end step, exile this permanent."

forge-gui/res/cardsfolder/h/helm_of_the_host.txt

@@ -3,7 +3,7 @@ ManaCost:4
 Types:Legendary Artifact Equipment
 K:Equip:5
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, create a token that's a copy of equipped creature, except the token isn't legendary if equipped creature is legendary. That token gains haste.
-SVar:TrigCopy:DB$ CopyPermanent | Defined$ Equipped | Keywords$ Haste | NonLegendary$ True | ResetAbilityActivations$ True
+SVar:TrigCopy:DB$ CopyPermanent | Defined$ Equipped | Keywords$ Haste | NonLegendary$ True
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/helm_of_the_host.jpg
 Oracle:At the beginning of combat on your turn, create a token that's a copy of equipped creature, except the token isn't legendary if equipped creature is legendary. That token gains haste.\nEquip {5}

forge-gui/res/cardsfolder/h/hornet_cannon.txt

@@ -1,7 +1,7 @@
 Name:Hornet Cannon
 ManaCost:4
 Types:Artifact
-A:AB$ Token | Cost$ 3 T | TokenAmount$ 1 | TokenName$ Hornet | TokenTypes$ Artifact,Creature,Insect | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>Haste | TokenSVars$ HornetCannonEOT | AtEOT$ Destroy | SpellDescription$ Create a 1/1 colorless Insect artifact creature token with flying and haste named Hornet. Destroy it at the beginning of the next end step.
+A:AB$ Token | Cost$ 3 T | TokenAmount$ 1 | TokenScript$ hornet | AtEOT$ Destroy | SpellDescription$ Create a 1/1 colorless Insect artifact creature token with flying and haste named Hornet. Destroy it at the beginning of the next end step.
-SVar:HornetCannonEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hornet_cannon.jpg
 Oracle:{3}, {T}: Create a 1/1 colorless Insect artifact creature token with flying and haste named Hornet. Destroy it at the beginning of the next end step.

forge-gui/res/cardsfolder/i/impromptu_raid.txt

@@ -2,9 +2,8 @@ Name:Impromptu Raid
 ManaCost:3 RG
 Types:Enchantment
 A:AB$ Dig | Cost$ 2 RG | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Creature | DestinationZone$ Battlefield | DestinationZone2$ Graveyard | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Reveal the top card of your library. If it isn't a creature card, put it into your graveyard. Otherwise, put that card onto the battlefield. That creature gains haste. Sacrifice it at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/impromptu_raid.jpg
 Oracle:{2}{R/G}: Reveal the top card of your library. If it isn't a creature card, put it into your graveyard. Otherwise, put that card onto the battlefield. That creature gains haste. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/i/inalla_archmage_ritualist.txt

@@ -4,9 +4,8 @@ Types:Legendary Creature Human Wizard
 PT:4/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Wizard.YouCtrl+nonToken+Other | TriggerZones$ Command | PresentZone$ Command | Execute$ TrigCopyPermanent | TriggerDescription$ Eminence — Whenever another nontoken Wizard enters the battlefield under your control, if CARDNAME is in the command zone or on the battlefield, you may pay {1}. If you do, create a token that's a copy of that Wizard. The token gains haste. Exile it at the beginning of the next end step.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Wizard.YouCtrl+nonToken+Other | TriggerZones$ Battlefield | PresentZone$ Battlefield | Execute$ TrigCopyPermanent | Secondary$ True | TriggerDescription$ Eminence — Whenever another nontoken Wizard enters the battlefield under your control, if CARDNAME is in the command zone or on the battlefield, you may pay {1}. If you do, create a token that's a copy of that Wizard. The token gains haste. Exile it at the beginning of the next end step.
-SVar:TrigCopyPermanent:AB$ CopyPermanent | Cost$ 1 | Defined$ TriggeredCard | NumCopies$ 1 | AddSVars$ SneakAttackEOT | PumpKeywords$ Haste | AtEOT$ Exile
+SVar:TrigCopyPermanent:AB$ CopyPermanent | Cost$ 1 | Defined$ TriggeredCard | NumCopies$ 1 | PumpKeywords$ Haste | AtEOT$ Exile
 A:AB$ LoseLife | Cost$ tapXType<5/Wizard> | ValidTgts$ Player | TgtPrompt$ Select a player to lose 7 life | LifeAmount$ 7 | SpellDescription$ Target player loses 7 life. 
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:BuffedBy:Wizard
 DeckHints:Type$Wizard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inalla_archmage_ritualist.jpg

forge-gui/res/cardsfolder/i/incandescent_soulstoke.txt

@@ -4,10 +4,9 @@ Types:Creature Elemental Shaman
 PT:2/2
 S:Mode$ Continuous | Affected$ Creature.Elemental+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Elemental creatures you control get +1/+1.
 A:AB$ ChangeZone | Cost$ 1 R T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Elemental+YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ You may put an Elemental creature card from your hand onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | AtEOT$ Sacrifice | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | AtEOT$ Sacrifice | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
 SVar:PlayMain1:TRUE
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/incandescent_soulstoke.jpg
 Oracle:Other Elemental creatures you control get +1/+1.\n{1}{R}, {T}: You may put an Elemental creature card from your hand onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/i/invocation_of_saint_traft.txt

@@ -3,10 +3,10 @@ ManaCost:1 W U
 Types:Enchantment Aura
 K:Enchant Creature
 A:SP$ Attach | Cost$ 1 W U | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ SaintTraftTrig | AddSVar$ SaintTraftToken & SaintTraftDelTrig & SaintTraftTrigExile & SaintTraftCleanup | Description$ Enchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat."
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddTrigger$ SaintTraftTrig | AddSVar$ SaintTraftToken | Description$ Enchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat."
 SVar:SaintTraftTrig:Mode$ Attacks | ValidCard$ Card.Self | Execute$ SaintTraftToken | TriggerDescription$ Whenever this creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield tapped and attacking. Exile that token at end of combat.
-SVar:SaintTraftToken:DB$Token | TokenImage$ w 4 4 angel SOI | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | TokenTapped$ True | TokenAttacking$ True | TokenSVars$ SaintTraftEOT | AtEOT$ ExileCombat
+SVar:SaintTraftToken:DB$Token | TokenScript$ w_4_4_angel_flying | TokenTapped$ True | TokenAttacking$ True | AtEOT$ ExileCombat
 SVar:HasAttackEffect:TRUE
-SVar:SaintTraftEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/invocation_of_saint_traft.jpg
 Oracle:Enchant creature\nEnchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying that's tapped and attacking. Exile that token at end of combat."

forge-gui/res/cardsfolder/j/jace_cunning_castaway.txt

@@ -10,6 +10,6 @@ A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1
 SVar:SacOnSpell:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ DoSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
 SVar:TokenTgtDies:SVar:Targeting:Dies
 SVar:DoSac:DB$ Sacrifice | Defined$ Self
-A:AB$ CopyPermanent | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Defined$ Self | NumCopies$ 2 | NonLegendary$ True | ResetAbilityActivations$ True | SpellDescription$ Create two tokens that are copies of CARDNAME, except they're not legendary.
+A:AB$ CopyPermanent | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Defined$ Self | NumCopies$ 2 | NonLegendary$ True | SpellDescription$ Create two tokens that are copies of CARDNAME, except they're not legendary.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_cunning_castaway.jpg
-Oracle:[+1]: Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card.\n[-2]: Create a 2/2 blue Illusion token with "When this creature becomes the target of a spell, sacrifice it."\n[-5]: Create two tokens that are copies of Jace, Cunning Castaway, except they're not legendary.
+Oracle:[+1]: Whenever one or more creatures you control deal combat damage to a player this turn, draw a card, then discard a card.\n[-2]: Create a 2/2 blue Illusion token with "When this creature becomes the target of a spell, sacrifice it."\n[-5]: Create two tokens that are copies of Jace, Cunning Castaway, except they're not legendary.

forge-gui/res/cardsfolder/k/kari_zev_skyship_raider.txt

@@ -5,8 +5,8 @@ PT:1/3
 K:First Strike
 K:Menace
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a legendary 2/1 red Monkey creature token named Ragavan that's tapped and attacking. Exile that token at the end of combat.
-SVar:TrigToken:DB$ Token | TokenImage$ r 2 1 ragavan AER | TokenAmount$ 1 | TokenName$ Ragavan | TokenTypes$ Creature,Monkey,Legendary | TokenOwner$ You | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 1 | TokenTapped$ True | TokenAttacking$ True | TokenSVars$ RagavanEOT | AtEOT$ ExileCombat
+SVar:TrigToken:DB$ Token | TokenScript$ ragavan | TokenTapped$ True | TokenAttacking$ True | AtEOT$ ExileCombat
 SVar:HasAttackEffect:TRUE
-SVar:RagavanEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kari_zev_skyship_raider.jpg
 Oracle:First strike, menace\nWhenever Kari Zev, Skyship Raider attacks, create a legendary 2/1 red Monkey creature token named Ragavan that's tapped and attacking. Exile that token at the end of combat.

forge-gui/res/cardsfolder/k/kiki_jiki_mirror_breaker.txt

@@ -3,7 +3,6 @@ ManaCost:2 R R R
 Types:Legendary Creature Goblin Shaman
 PT:2/2
 K:Haste
-A:AB$ CopyPermanent | Cost$ T | ValidTgts$ Creature.nonLegendary+YouCtrl | TgtPrompt$ Select target nonlegendary creature you control | Keywords$ Haste | AtEOT$ Sacrifice | AddSVars$ SneakAttackEOT | SpellDescription$ Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step.
+A:AB$ CopyPermanent | Cost$ T | ValidTgts$ Creature.nonLegendary+YouCtrl | TgtPrompt$ Select target nonlegendary creature you control | Keywords$ Haste | AtEOT$ Sacrifice | AILogic$ BeforeCombat | SpellDescription$ Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step.
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card50321.jpg
 Oracle:Haste\n{T}: Create a token that's a copy of target nonlegendary creature you control. That token has haste. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/k/killer_instinct.txt

@@ -3,8 +3,7 @@ ManaCost:4 R G
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ At the beginning of your upkeep, reveal the top card of your library. If it's a creature card, put it onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.
 SVar:TrigDig:DB$ Dig | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Creature | DestinationZone$ Battlefield | RememberChanged$ True | LibraryPosition2$ 0 | SubAbility$ DBPump
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | AtEOT$ Sacrifice | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste  | Defined$ Remembered | AtEOT$ Sacrifice | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/killer_instinct.jpg
 Oracle:At the beginning of your upkeep, reveal the top card of your library. If it's a creature card, put it onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/k/kindred_charge.txt

@@ -3,7 +3,6 @@ ManaCost:4 R R
 Types:Sorcery
 A:SP$ ChooseType | Cost$ 4 R R | Defined$ You | Type$ Creature | SubAbility$ DBRepeatEach | AILogic$ MostProminentComputerControls | SpellDescription$ Choose a creature type. For each creature you control of the chosen type, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step.
 SVar:DBRepeatEach:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Creature.ChosenType+YouCtrl | Zone$ Battlefield | RepeatSubAbility$ DBClone
-SVar:DBClone:DB$ CopyPermanent | Defined$ Imprinted | Keywords$ Haste | NumCopies$ 1 | AtEOT$ Exile | AddSVars$ SneakAttackEOT
+SVar:DBClone:DB$ CopyPermanent | Defined$ Imprinted | Keywords$ Haste | NumCopies$ 1 | AtEOT$ Exile
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kindred_charge.jpg
 Oracle:Choose a creature type. For each creature you control of the chosen type, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step.

forge-gui/res/cardsfolder/l/lightning_coils.txt

@@ -5,9 +5,9 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+counters_GE5_CHARGE | Execute$ DBRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if CARDNAME has five or more charge counters on it, remove all of them from it and create that many 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.
 SVar:DBRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenAmount$ X | TokenImage$ r 3 1 elemental MRD | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenKeywords$ Haste | TokenSVars$ EOTExile | TokenPower$ 3 | TokenToughness$ 1 | AtEOT$ Exile | References$ X | SubAbility$ DBCleanup
+SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ r_3_1_elemental_haste | AtEOT$ Exile | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:EOTExile:SVar:EndOfTurnLeavePlay:True
 SVar:X:Count$RememberedSize
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_coils.jpg
 Oracle:Whenever a nontoken creature you control dies, put a charge counter on Lightning Coils.\nAt the beginning of your upkeep, if Lightning Coils has five or more charge counters on it, remove all of them from it and create that many 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.

forge-gui/res/cardsfolder/m/mimic_vat.txt

@@ -5,13 +5,12 @@ T:Mode$ ChangesZone | ValidCard$ Creature.nonToken | Origin$ Battlefield | Desti
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Graveyard | Defined$ Imprinted | ChangeNum$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | SubAbility$ DBExile
 SVar:DBExile:DB$ ChangeZone | Imprint$ True | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredCard | ChangeNum$ 1 | AILogic$ MimicVat
-A:AB$ CopyPermanent | Cost$ 3 T | Defined$ Imprinted.ExiledWithSource | AddSVars$ SneakAttackEOT | PumpKeywords$ Haste | AtEOT$ Exile | AILogic$ MimicVat | SpellDescription$ Create a token that's a copy of a card exiled with CARDNAME. It gains haste. Exile it at the beginning of the next end step.
+A:AB$ CopyPermanent | Cost$ 3 T | Defined$ Imprinted.ExiledWithSource | PumpKeywords$ Haste | AtEOT$ Exile | AILogic$ MimicVat | SpellDescription$ Create a token that's a copy of a card exiled with CARDNAME. It gains haste. Exile it at the beginning of the next end step.
 T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsImprinted+ExiledWithSource | Execute$ DBForget
 SVar:DBForget:DB$ Pump | ForgetImprinted$ TriggeredCard
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanImprinted | Static$ True
 SVar:DBCleanImprinted:DB$ Cleanup | ClearImprinted$ True
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mimic_vat.jpg
 Oracle:Imprint — Whenever a nontoken creature dies, you may exile that card. If you do, return each other card exiled with Mimic Vat to its owner's graveyard.\n{3}, {T}: Create a token that's a copy of a card exiled with Mimic Vat. It gains haste. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/m/minion_reflector.txt

@@ -2,8 +2,7 @@ Name:Minion Reflector
 ManaCost:5
 Types:Artifact
 T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, create a token that's a copy of that creature. That token has haste and "At the beginning of the end step, sacrifice this permanent."
-SVar:TrigCopy:AB$ CopyPermanent | Cost$ 2 | Defined$ TriggeredCard | Keywords$ Haste | AddSVars$ SneakAttackEOT | AtEOTTrig$ Sacrifice
+SVar:TrigCopy:AB$ CopyPermanent | Cost$ 2 | Defined$ TriggeredCard | Keywords$ Haste | AtEOTTrig$ Sacrifice
 SVar:BuffedBy:Creature
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/minion_reflector.jpg
 Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {2}. If you do, create a token that's a copy of that creature. That token has haste and "At the beginning of the end step, sacrifice this permanent."

forge-gui/res/cardsfolder/n/nahiri_the_harbinger.txt

@@ -7,10 +7,7 @@ SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | ConditionDefined$ Remembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Enchantment,Artifact.tapped,Creature.tapped | TgtPrompt$ Select target enchantment, tapped artifact, or tapped creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target enchantment, tapped artifact, or tapped creature.
 A:AB$ ChangeZone | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Artifact,Creature | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Search your library for an artifact or creature card, put it onto the battlefield, then shuffle your library. It gains haste. Return it to your hand at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | Permanent$ True | sVars$ SneakAttackEOT | Defined$ Remembered | SubAbility$ DelTrig 
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Permanent$ True | AtEOT$ Hand | Defined$ Remembered | SubAbility$ DBCleanup
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigBounce | RememberObjects$ Remembered | TriggerDescription$ Return the permanent to its owner's hand at the beginning of the next end step. | SubAbility$ DBCleanup | AILogic$ Always | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
-SVar:TrigBounce:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Hand 
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nahiri_the_harbinger.jpg
 Oracle:[+2]: You may discard a card. If you do, draw a card.\n[-2]: Exile target enchantment, tapped artifact, or tapped creature.\n[-8]: Search your library for an artifact or creature card, put it onto the battlefield, then shuffle your library. It gains haste. Return it to your hand at the beginning of the next end step.

forge-gui/res/cardsfolder/p/puppeteer_clique.txt

@@ -6,9 +6,8 @@ K:Flying
 K:Persist
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, put target creature card from an opponent's graveyard onto the battlefield under your control. It gains haste. At the beginning of your next end step, exile it.
 SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Creature.OppOwn | TgtPrompt$ Select target creature from an opponent's graveyard | RememberChanged$ True | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | SubAbility$ DBPump
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | Permanent$ True | AtEOT$ Exile | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Permanent$ True | AtEOT$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:PlayMain1:ALWAYS
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/puppeteer_clique.jpg
 Oracle:Flying\nWhen Puppeteer Clique enters the battlefield, put target creature card from an opponent's graveyard onto the battlefield under your control. It gains haste. At the beginning of your next end step, exile it.\nPersist (When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.)

forge-gui/res/cardsfolder/r/rakdos_guildmage.txt

@@ -3,7 +3,7 @@ ManaCost:BR BR
 Types:Creature Zombie Shaman
 PT:2/2
 A:AB$ Pump | Cost$ 3 B Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$True | SpellDescription$ Target creature gets -2/-2 until end of turn.
-A:AB$ Token | Cost$ 3 R | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 1 | TokenKeywords$ Haste | TokenSVars$ RakdosEOT | AtEOT$ Exile | SpellDescription$ Create a 2/1 red Goblin creature token with haste. Exile it at the beginning of the next end step.
+A:AB$ Token | Cost$ 3 R | TokenScript$ r_2_1_goblin_haste | AtEOT$ Exile | SpellDescription$ Create a 2/1 red Goblin creature token with haste. Exile it at the beginning of the next end step.
-SVar:RakdosEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_guildmage.jpg
 Oracle:{3}{B}, Discard a card: Target creature gets -2/-2 until end of turn.\n{3}{R}: Create a 2/1 red Goblin creature token with haste. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/r/rite_of_the_raging_storm.txt

@@ -3,8 +3,8 @@ ManaCost:3 R R
 Types:Enchantment
 S:Mode$ CantAttack | ValidCard$ Creature.namedLightning Rager | Target$ You,Planeswalker.YouCtrl | Description$ Creatures named Lightning Rager can't attack you or planeswalkers you control.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player creates a 5/1 red Elemental creature token named Lightning Rager. It has trample, haste, and "At the beginning of the end step, sacrifice this creature."
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Lightning Rager | TokenTypes$ Creature,Elemental | TokenOwner$ TriggeredPlayer | TokenPower$ 5 | TokenToughness$ 1 | TokenKeywords$ Trample<>Haste | TokenSVars$ LightningRagerEOT | TokenColors$ Red | TokenImage$ r 5 1 lightning rager | AtEOTTrig$ Sacrifice
+SVar:TrigToken:DB$ Token | TokenScript$ lightning_rager | TokenOwner$ TriggeredPlayer
-SVar:LightningRagerEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rite_of_the_raging_storm.jpg
-Oracle:Creatures named Lightning Rager can't attack you or planeswalkers you control.\nAt the beginning of each player's upkeep, that player creates a 5/1 red Elemental creature token named Lightning Rager. It has trample, haste, and "At the beginning of the end step, sacrifice this creature."
+Oracle:Creatures named Lightning Rager can't attack you or planeswalkers you control.\nAt the beginning of each player's upkeep, that player creates a 5/1 red Elemental creature token named Lightning Rager. It has trample, haste, and "At the beginning of the end step, sacrifice this creature."

forge-gui/res/cardsfolder/s/saheeli_rai.txt

@@ -4,8 +4,7 @@ Types:Legendary Planeswalker Saheeli
 Loyalty:3
 A:AB$ Scry | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ScryNum$ 1 | SubAbility$ DBDealDamage | SpellDescription$ Scry 1. CARDNAME deals 1 damage to each opponent.
 SVar:DBDealDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 1 | AILogic$ Good
-A:AB$ CopyPermanent | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl,Artifact.YouCtrl | TgtPrompt$ Select target artifact or creature you control. | AddTypes$ Artifact | AddSVars$ SneakAttackEOT | PumpKeywords$ Haste | ResetAbilityActivations$ True | AtEOT$ Exile | SpellDescription$ Create a token that's a copy of target artifact or creature you control, except it's an artifact in addition to its other types. That token gains haste. Exile it at the beginning of the next end step.
+A:AB$ CopyPermanent | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl,Artifact.YouCtrl | TgtPrompt$ Select target artifact or creature you control. | AddTypes$ Artifact | PumpKeywords$ Haste | AtEOT$ Exile | SpellDescription$ Create a token that's a copy of target artifact or creature you control, except it's an artifact in addition to its other types. That token gains haste. Exile it at the beginning of the next end step.
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True 
 A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Artifact | ChangeNum$ 3 | DifferentNames$ True | SpellDescription$ Search your library for up to three artifact cards with different names, put them onto the battlefield, then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/saheeli_rai.jpg
-Oracle:[+1]: Scry 1. Saheeli Rai deals 1 damage to each opponent.\n[-2]: Create a token that's a copy of target artifact or creature you control, except it's an artifact in addition to its other types. That token gains haste. Exile it at the beginning of the next end step.\n[-7]: Search your library for up to three artifact cards with different names, put them onto the battlefield, then shuffle your library. 
+Oracle:[+1]: Scry 1. Saheeli Rai deals 1 damage to each opponent.\n[-2]: Create a token that's a copy of target artifact or creature you control, except it's an artifact in addition to its other types. That token gains haste. Exile it at the beginning of the next end step.\n[-7]: Search your library for up to three artifact cards with different names, put them onto the battlefield, then shuffle your library.

forge-gui/res/cardsfolder/s/saheeli_the_gifted.txt

@@ -9,8 +9,7 @@ SVar:TrigCastSpell:Mode$ SpellCast | ValidActivatingPlayer$ You | TriggerZones$
 SVar:RemoveEffect:DB$ ChangeZone | Origin$ Command | Destination$ Exile
 SVar:X:Count$Valid Artifact.YouCtrl
 SVar:RemRandomDeck
-A:AB$ RepeatEach | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | RepeatSubAbility$ DBClone | RepeatCards$ Artifact.YouCtrl | AtEOT$ ExileCombat | AddSVars$ SneakAttackEOT | SpellDescription$ For each artifact you control, create a token that's a copy of it. Those tokens gain haste. Exile those tokens at the beginning of the next end step.
+A:AB$ RepeatEach | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | RepeatSubAbility$ DBClone | RepeatCards$ Artifact.YouCtrl | SpellDescription$ For each artifact you control, create a token that's a copy of it. Those tokens gain haste. Exile those tokens at the beginning of the next end step.
-SVar:DBClone:DB$ CopyPermanent | Defined$ Remembered | Keywords$ Haste | AtEOT$ Exile | AddSVars$ SneakAttackEOT
+SVar:DBClone:DB$ CopyPermanent | Defined$ Remembered | Keywords$ Haste | AtEOT$ Exile
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 K:CARDNAME can be your commander.
 Oracle:[+1]: Create a 1/1 colorless Servo artifact creature token.\n[+1]: The next spell you cast this turn costs {1} less to cast for each artifact you control as you cast it.\n[-7]: For each artifact you control, create a token that's a copy of it. Those tokens gain haste. Exile those tokens at the beginning of the next end step.\nSaheeli, the Gifted can be your commander.

forge-gui/res/cardsfolder/s/seance.txt

@@ -3,9 +3,8 @@ ManaCost:2 W W
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ At the beginning of each upkeep, you may exile target creature card from your graveyard. If you do, create a token that's a copy of that card, except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step.
 SVar:TrigExile:DB$ ChangeZone | RememberChanged$ True | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature.YouCtrl | ChangeNum$ 1 | SubAbility$ DBCopy
-SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | AddTypes$ Spirit | AtEOT$ Exile | AddSVars$ SneakAttackEOT | SubAbility$ DBCleanup | SpellDescription$ Create a token that's a copy of that card, except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step.
+SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | AddTypes$ Spirit | AtEOT$ Exile | SubAbility$ DBCleanup | SpellDescription$ Create a token that's a copy of that card, except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seance.jpg
 Oracle:At the beginning of each upkeep, you may exile target creature card from your graveyard. If you do, create a token that's a copy of that card, except it's a Spirit in addition to its other types. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/s/sekkuar_deathkeeper.txt

@@ -3,6 +3,7 @@ ManaCost:2 B R G
 Types:Legendary Creature Orc Shaman
 PT:4/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken creature you control dies, create a 3/1 black and red Graveborn creature token with haste.
-SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Graveborn | TokenTypes$ Creature,Graveborn | TokenOwner$ You | TokenColors$ Black,Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste
+SVar:TrigToken:DB$Token | TokenScript$ br_3_1_graveborn
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sekkuar_deathkeeper.jpg
 Oracle:Whenever another nontoken creature you control dies, create a 3/1 black and red Graveborn creature token with haste.

forge-gui/res/cardsfolder/s/shallow_grave.txt

@@ -2,9 +2,8 @@ Name:Shallow Grave
 ManaCost:1 B
 Types:Instant
 A:SP$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.TopGraveyardCreature+YouCtrl | Hidden$ True | Mandatory$ True | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Return the top creature card of your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | AtEOT$ Exile | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | AtEOT$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:NeedsOrderedGraveyard:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shallow_grave.jpg
 Oracle:Return the top creature card of your graveyard to the battlefield. That creature gains haste until end of turn. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/s/sneak_attack.txt

@@ -2,9 +2,8 @@ Name:Sneak Attack
 ManaCost:3 R
 Types:Enchantment
 A:AB$ ChangeZone | Cost$ R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | AILogic$ BeforeCombat | SpellDescription$ You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice the creature at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 SVar:PlayMain1:ALWAYS

forge-gui/res/cardsfolder/s/sparkspitter.txt

@@ -2,8 +2,8 @@ Name:Sparkspitter
 ManaCost:2 R
 Types:Creature Elemental Spellshaper
 PT:1/3
-A:AB$ Token | Cost$ R T Discard<1/Card> | TokenAmount$ 1 | TokenName$ Spark Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste<>Trample | AtEOTTrig$ Sacrifice | TokenSVars$ SparkspitterEOT | SpellDescription$ Create a 3/1 red Elemental creature token named Spark Elemental. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental."
+A:AB$ Token | Cost$ R T Discard<1/Card> | TokenScript$ spark_elemental | SpellDescription$ Create a 3/1 red Elemental creature token named Spark Elemental. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental."
-SVar:SparkspitterEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 AI:RemoveDeck:Random
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card130341.jpg
 Oracle:{R}, {T}, Discard a card: Create a 3/1 red Elemental creature token named Spark Elemental. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental."

forge-gui/res/cardsfolder/s/spinal_embrace.txt

@@ -8,6 +8,6 @@ SVar:TrigSac:DB$ SacrificeAll | Defined$ DelayTriggerRemembered | Controller$ Yo
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | SubAbility$ DBCleanup | References$ X | ConditionDefined$ Remembered | ConditionPresent$ Card
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:RememberedLKI$CardToughness
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
+SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:AtEOT
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spinal_embrace.jpg
 Oracle:Cast Spinal Embrace only during combat.\nUntap target creature you don't control and gain control of it. It gains haste until end of turn. At the beginning of the next end step, sacrifice it. If you do, you gain life equal to its toughness.

forge-gui/res/cardsfolder/s/splinter_twin.txt

@@ -4,8 +4,7 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 R R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ ABCopy | Description$ Enchanted creature has "{T}: Create a token that's a copy of this creature. That token has haste. Exile it at the beginning of the next end step."
-SVar:ABCopy:AB$ CopyPermanent | Cost$ T | Defined$ Self | Keywords$ Haste | AtEOT$ Exile | AddSVars$ SneakAttackEOT | SpellDescription$ Create a token that's a copy of this creature. That token has haste. Exile it at the beginning of the next end step.
+SVar:ABCopy:AB$ CopyPermanent | Cost$ T | Defined$ Self | Keywords$ Haste | AtEOT$ Exile | SpellDescription$ Create a token that's a copy of this creature. That token has haste. Exile it at the beginning of the next end step.
 SVar:NonStackingAttachEffect:True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/splinter_twin.jpg
 Oracle:Enchant creature\nEnchanted creature has "{T}: Create a token that's a copy of this creature. That token has haste. Exile it at the beginning of the next end step."

forge-gui/res/cardsfolder/s/swift_warkite.txt

@@ -5,11 +5,8 @@ PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may put a creature card with converted mana cost 3 or less from your hand or graveyard onto the battlefield. That creature gains haste. Return it to your hand at the beginning of the next end step.
 SVar:TrigChange:DB$ChangeZone | Origin$ Hand,Graveyard | Destination$ Battlefield | ChangeType$ Creature.cmcLE3+YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ChangeNum$ 1
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | Permanent$ True | SubAbility$ DelTrig
+SVar:DBPump:DB$ Animate | Keywords$ Haste | AtEOT$ Hand | Defined$ Remembered | Permanent$ True | SubAbility$ DBCleanup
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ CARDNAME - Return the creature to your hand at the beginning of the next end step. | SubAbility$ DBCleanup | AILogic$ Always
-SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Battlefield | Destination$ Hand
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/swift_warkite.jpg
 Oracle:Flying\nWhen Swift Warkite enters the battlefield, you may put a creature card with converted mana cost 3 or less from your hand or graveyard onto the battlefield. That creature gains haste. Return it to your hand at the beginning of the next end step.

forge-gui/res/cardsfolder/t/thatcher_revolt.txt

@@ -1,8 +1,7 @@
 Name:Thatcher Revolt
 ManaCost:2 R
 Types:Sorcery
-A:SP$ Token | Cost$ 2 R | TokenAmount$ 3 | TokenName$ Human | TokenTypes$ Creature,Human | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste | TokenSVars$ ThatcherRevoltEOT | AtEOT$ Sacrifice | SpellDescription$ Create three 1/1 red Human creature tokens with haste. Sacrifice those tokens at the beginning of the next end step.
+A:SP$ Token | Cost$ 2 R | TokenAmount$ 3 | TokenName$ Human | TokenTypes$ Creature,Human | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste | AtEOT$ Sacrifice | SpellDescription$ Create three 1/1 red Human creature tokens with haste. Sacrifice those tokens at the beginning of the next end step.
-SVar:ThatcherRevoltEOT:SVar:EndOfTurnLeavePlay:True
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thatcher_revolt.jpg
 Oracle:Create three 1/1 red Human creature tokens with haste. Sacrifice those tokens at the beginning of the next end step.

forge-gui/res/cardsfolder/t/through_the_breach.txt

@@ -3,9 +3,8 @@ ManaCost:4 R
 Types:Instant Arcane
 K:Splice:Arcane:2 R R
 A:SP$ ChangeZone | Cost$ 4 R | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | AILogic$ BeforeCombat | SpellDescription$ You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice that creature at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ ThroughtheBreachEOT | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:ThroughtheBreachEOT:SVar:EndOfTurnLeavePlay:True
 AI:RemoveDeck:All
 SVar:PlayMain1:TRUE
 DeckHints:Type$Arcane

forge-gui/res/cardsfolder/t/thunderheads.txt

@@ -2,8 +2,7 @@ Name:Thunderheads
 ManaCost:2 U
 Types:Instant
 K:Replicate:2 U
-A:SP$ Token | Cost$ 2 U | TokenName$ Weird | TokenOwner$ You | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Defender<>Flying | TokenSVars$ ThunderheadsEOT | AtEOT$ Exile | TokenAmount$ 1 | TokenColors$ Blue | TokenTypes$ Creature,Weird | SpellDescription$ Create a 3/3 blue Weird creature token with defender and flying. Exile it at the beginning of the next end step.
+A:SP$ Token | Cost$ 2 U | TokenScript$ u_3_3_weird_defender_flying | AtEOT$ Exile | SpellDescription$ Create a 3/3 blue Weird creature token with defender and flying. Exile it at the beginning of the next end step.
-SVar:ThunderheadsEOT:SVar:EndOfTurnLeavePlay:True
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thunderheads.jpg
 Oracle:Replicate {2}{U} (When you cast this spell, copy it for each time you paid its replicate cost.)\nCreate a 3/3 blue Weird creature token with defender and flying. Exile it at the beginning of the next end step.

forge-gui/res/cardsfolder/t/tidal_wave.txt

@@ -1,8 +1,7 @@
 Name:Tidal Wave
 ManaCost:2 U
 Types:Instant
-A:SP$ Token | Cost$ 2 U | TokenAmount$ 1 | TokenName$ Wall | TokenTypes$ Creature,Wall | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Defender | TokenSVars$ TidalWaveEOT | AtEOT$ Sacrifice | SpellDescription$ Create a 5/5 blue Wall creature token with defender. Sacrifice it at the beginning of the next end step.
+A:SP$ Token | Cost$ 2 U | TokenScript$ u_5_5_wall_defender | AtEOT$ Sacrifice | SpellDescription$ Create a 5/5 blue Wall creature token with defender. Sacrifice it at the beginning of the next end step.
-SVar:TidalWaveEOT:SVar:EndOfTurnLeavePlay:True
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tidal_wave.jpg
 Oracle:Create a 5/5 blue Wall creature token with defender. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/t/treacherous_urge.txt

@@ -2,8 +2,7 @@ Name:Treacherous Urge
 ManaCost:4 B
 Types:Instant
 A:SP$ ChangeZone | Cost$ 4 B | Origin$ Hand | Destination$ Battlefield | ValidTgts$ Opponent | ChangeType$ Creature | GainControl$ True | SubAbility$ DBPump | RememberChanged$ True | IsCurse$ True | SpellDescription$ Target opponent reveals their hand. You may put a creature card from it onto the battlefield under your control. That creature gains haste. Sacrifice it at the beginning of the next end step.
-SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
+SVar:DBPump:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Permanent$ True | AtEOT$ Sacrifice | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treacherous_urge.jpg
 Oracle:Target opponent reveals their hand. You may put a creature card from it onto the battlefield under your control. That creature gains haste. Sacrifice it at the beginning of the next end step.

forge-gui/res/cardsfolder/t/twinflame.txt

@@ -2,8 +2,7 @@ Name:Twinflame
 ManaCost:1 R
 Types:Sorcery
 K:Strive:2 R
-A:SP$ CopyPermanent | Cost$ 1 R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | TargetMin$ 0 | TargetMax$ MaxTargets | Keywords$ Haste | AtEOT$ Exile | AddSVars$ SneakAttackEOT | References$ MaxTargets | SpellDescription$ Choose any number of target creatures you control. For each of them, create a token that's a copy of that creature. Those tokens have haste. Exile them at the beginning of the next end step.
+A:SP$ CopyPermanent | Cost$ 1 R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | TargetMin$ 0 | TargetMax$ MaxTargets | Keywords$ Haste | AtEOT$ Exile | References$ MaxTargets | SpellDescription$ Choose any number of target creatures you control. For each of them, create a token that's a copy of that creature. Those tokens have haste. Exile them at the beginning of the next end step.
 SVar:MaxTargets:Count$Valid Creature.YouCtrl
-SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/twinflame.jpg
 Oracle:Strive — Twinflame costs {2}{R} more to cast for each target beyond the first.\nChoose any number of target creatures you control. For each of them, create a token that's a copy of that creature. Those tokens have haste. Exile them at the beginning of the next end step.

forge-gui/res/cardsfolder/v/valduk_keeper_of_the_flame.txt

@@ -3,8 +3,7 @@ ManaCost:2 R
 Types:Legendary Creature Human Shaman
 PT:3/2
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of combat on your turn, for each Aura and Equipment attached to CARDNAME, create a 3/1 red Elemental creature token with trample and haste. Exile those tokens at the beginning of the next end step.
-SVar:TrigToken:DB$ Token | TokenAmount$ X | References$ X | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenImage$ r 3 1 elemental dom | TokenKeywords$ Trample<>Haste | TokenSVars$ AkoumEOT | AtEOT$ Exile
+SVar:TrigToken:DB$ Token | TokenAmount$ X | References$ X | TokenScript$ r_3_1_elemental_trample_haste | AtEOT$ Exile
-SVar:AkoumEOT:SVar:EndOfTurnLeavePlay:True
 SVar:X:Count$Valid Equipment.Attached,Aura.Attached
 SVar:EnchantMe:Multiple
 SVar:EquipMe:Multiple

forge-gui/res/cardsfolder/w/waylay.txt

@@ -1,8 +1,8 @@
 Name:Waylay
 ManaCost:2 W
 Types:Instant
-A:SP$ Token | Cost$ 2 W | TokenAmount$ 3 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenSVars$ WaylayEOT | AtEOT$ Exile | SpellDescription$ Create three 2/2 white Knight creature tokens. Exile them at the beginning of the next cleanup step.
+A:SP$ Token | Cost$ 2 W | TokenAmount$ 3 | TokenScript$ w_2_2_knight | AtEOT$ Exile | SpellDescription$ Create three 2/2 white Knight creature tokens. Exile them at the beginning of the next cleanup step.
-SVar:WaylayEOT:SVar:EndOfTurnLeavePlay:True
+DeckHas:Ability$Token
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waylay.jpg
 Oracle:Create three 2/2 white Knight creature tokens. Exile them at the beginning of the next cleanup step.

forge-gui/res/cardsfolder/z/zektar_shrine_expedition.txt

@@ -1,8 +1,7 @@
 Name:Zektar Shrine Expedition
 ManaCost:1 R
 Types:Enchantment
-A:AB$ Token | Cost$ SubCounter<3/QUEST> Sac<1/CARDNAME> | TokenAmount$ 1 | TokenImage$ r 7 1 elemental | TokenName$ Elemental | TokenColors$ Red | TokenTypes$ Creature,Elemental | TokenPower$ 7 | TokenToughness$ 1 | TokenKeywords$ Haste<>Trample | TokenSVars$ ZektarEOT | AtEOT$ Exile | TokenOwner$ You | TokenAmount$ 1 | SpellDescription$ Create a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step.
+A:AB$ Token | Cost$ SubCounter<3/QUEST> Sac<1/CARDNAME> | TokenScript$ r_7_1_elemental_trample_haste | AtEOT$ Exile | SpellDescription$ Create a 7/1 red Elemental creature token with trample and haste. Exile it at the beginning of the next end step.
-SVar:ZektarEOT:SVar:EndOfTurnLeavePlay:True
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may put a quest counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
 SVar:MaxQuestEffect:3

forge-gui/res/tokenscripts/br_3_1_graveborn.txt

@@ -0,0 +1,9 @@
+Name:Graveborn
+ManaCost:no cost
+Types:Creature Graveborn
+Colors:black,red
+PT:3/1
+K:Haste
+Oracle:Haste
+
+

forge-gui/res/tokenscripts/hornet.txt

@@ -0,0 +1,8 @@
+Name:Hornet
+ManaCost:no cost
+Types:Artifact Creature Insect
+Colors:colorless
+PT:1/1
+K:Flying
+K:Haste
+Oracle:Flying, Haste

forge-gui/res/tokenscripts/lightning_rager.txt

@@ -0,0 +1,11 @@
+Name:Lightning Rager
+ManaCost:no cost
+Types:Creature Elemental
+Colors:red
+PT:5/1
+K;Trample
+K:Haste
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, sacrifice CARDNAME.
+SVar:TrigSac:DB$ Sacrifice | SacValid$ Self
+SVar:EndOfTurnLeavePlay:True
+Oracle:Trample, Haste\nAt the beginning of the end step, sacrifice Lightning Rager.

forge-gui/res/tokenscripts/r_1_1_elemental_cat_haste.txt

@@ -0,0 +1,7 @@
+Name:Elemental Cat
+ManaCost:no cost
+Types:Creature Elemental Cat
+Colors:red
+PT:1/1
+K:Haste
+Oracle:Haste

forge-gui/res/tokenscripts/r_1_1_elemental_haste.txt

@@ -0,0 +1,7 @@
+Name:Elemental
+ManaCost:no cost
+Types:Creature Elemental
+Colors:red
+PT:1/1
+K:Haste
+Oracle:Haste

forge-gui/res/tokenscripts/r_2_1_goblin_haste.txt

@@ -0,0 +1,7 @@
+Name:Goblin
+ManaCost:no cost
+Types:Creature Goblin
+Colors:red
+PT:2/1
+K:Haste
+Oracle:Haste

forge-gui/res/tokenscripts/r_3_1_elemental_haste.txt

@@ -0,0 +1,7 @@
+Name:Elemental
+ManaCost:no cost
+Types:Creature Elemental
+Colors:red
+PT:3/1
+K:Haste
+Oracle:Haste

forge-gui/res/tokenscripts/r_3_1_elemental_trample_haste.txt

@@ -0,0 +1,8 @@
+Name:Elemental
+ManaCost:no cost
+Types:Creature Elemental
+Colors:red
+PT:3/1
+K;Trample
+K:Haste
+Oracle:Trample, Haste

forge-gui/res/tokenscripts/r_7_1_elemental_trample_haste.txt

@@ -0,0 +1,8 @@
+Name:Elemental
+ManaCost:no cost
+Types:Creature Elemental
+Colors:red
+PT:7/1
+K;Trample
+K:Haste
+Oracle:Trample, Haste

forge-gui/res/tokenscripts/ragavan.txt

@@ -0,0 +1,11 @@
+Name:Hornet
+ManaCost:no cost
+Types:Artifact Creature Insect
+Colors:colorless
+PT:1/1
+K:Flying
+K:Haste
+Oracle:Flying, Haste
+
+
+| TokenName$ Hornet | TokenTypes$ Artifact,Creature,Insect | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>Haste 

forge-gui/res/tokenscripts/rg_4_4_giant_warrior_haste.txt

@@ -0,0 +1,7 @@
+Name:Giant Warrior
+ManaCost:no cost
+Types:Creature Giant Warrior
+Colors:red,green
+PT:4/4
+K:Haste
+Oracle:Haste

forge-gui/res/tokenscripts/spark_elemental.txt

@@ -0,0 +1,11 @@
+Name:Spark Elemental
+ManaCost:no cost
+Types:Creature Elemental
+Colors:red
+PT:3/1
+K:Trample
+K:Haste
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, sacrifice CARDNAME.
+SVar:TrigSac:DB$ Sacrifice | SacValid$ Self
+SVar:EndOfTurnLeavePlay:True
+Oracle:Trample, haste\nAt the beginning of the end step, sacrifice Spark Elemental.

forge-gui/res/tokenscripts/u_3_3_weird_defender_flying.txt

@@ -0,0 +1,8 @@
+Name:Weird
+ManaCost:no cost
+Types:Creature Weird
+Colors:blue
+PT:3/3
+K:Defender
+K:Flying
+Oracle:Defender, Flying

forge-gui/res/tokenscripts/u_5_5_wall_defender.txt

@@ -0,0 +1,7 @@
+Name:Wall
+ManaCost:no cost
+Types:Creature Wall
+Colors:blue
+PT:5/5
+K:Defender
+Oracle:Defender

forge-gui/res/tokenscripts/w_2_2_knight.txt

@@ -0,0 +1,6 @@
+Name:Knight
+ManaCost:no cost
+Types:Creature Knight
+Colors:white
+PT:2/2
+Oracle:

forge-gui/res/tokenscripts/w_4_4_angel_flying.txt

@@ -0,0 +1,7 @@
+Name:Angel
+ManaCost:no cost
+Types:Creature Angel
+Colors:white
+PT:4/4
+K:Flying
+Oracle:Flying