Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

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

@@ -27,7 +27,6 @@ public class ProtectEffect extends SpellAbilityEffect {
          */
     @Override
     protected String getStackDescription(SpellAbility sa) {
-
         final List<String> gains = getProtectionList(sa);
         final boolean choose = sa.hasParam("Choices");
         final String joiner = choose ? "or" : "and";
@@ -36,9 +35,7 @@ public class ProtectEffect extends SpellAbilityEffect {
 
         List<Card> tgtCards = getTargetCards(sa);
 
-
         if (!tgtCards.isEmpty()) {
-
             final Iterator<Card> it = tgtCards.iterator();
             while (it.hasNext()) {
                 final Card tgtC = it.next();
@@ -111,7 +108,7 @@ public class ProtectEffect extends SpellAbilityEffect {
                 choser = tgtCards.get(0).getController();
             }
             final String choice = choser.getController().chooseProtectionType(Localizer.getInstance().getMessage("lblChooseAProtection"), sa, choices);
-            if( null == choice)
+            if (null == choice)
                 return;
             gains.add(choice);
             game.getAction().notifyOfValue(sa, choser, Lang.joinHomogenous(gains), choser);
@@ -188,7 +185,6 @@ public class ProtectEffect extends SpellAbilityEffect {
         }
     } // protectResolve()
     
-
     public static List<String> getProtectionList(final SpellAbility sa) {
         final List<String> gains = new ArrayList<>();
 
@@ -211,5 +207,4 @@ public class ProtectEffect extends SpellAbilityEffect {
         return gains;
     }
 
-
 }

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

@@ -5693,6 +5693,10 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
                 if (!source.isColorless() && !colorlessDamage) {
                     return true;
                 }
+            } else if (kw.equals("Protection from colorless")) {
+                if (source.isColorless() || colorlessDamage) {
+                    return true;
+                }
             } else if (kw.equals("Protection from everything")) {
                 return true;
             } else if (kw.startsWith("Protection:")) { // uses isValid; Protection:characteristic:desc:exception

forge-gui-desktop/src/main/java/forge/ImageCache.java

@@ -243,7 +243,7 @@ public class ImageCache {
         // a default "not available" image, however do not add it to the cache,
         // as otherwise it's problematic to update if the real image gets fetched.
         if (original == null || useArtCrop) {
-            if (ipc != null || cardView != null) {
+            if ((ipc != null || cardView != null) && !originalKey.equals(ImageKeys.getTokenKey(ImageKeys.HIDDEN_CARD))) {
                 int width = 488, height = 680;
                 BufferedImage art = original;
                 CardView card = ipc != null ? Card.getCardForUi(ipc).getView() : cardView;

forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java

@@ -117,7 +117,6 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
     static {
 
         try {
-
             Font roboto = Font.createFont(Font.TRUETYPE_FONT, Paths.get(ForgeConstants.COMMON_FONTS_DIR, "Roboto-Bold.ttf").toFile());
 
             GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -834,7 +833,6 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
         } else if (counters > 3) {
             CardFaceSymbols.drawSymbol("countersMulti", g, cardXOffset - 15, yCounters);
         }
-
     }
 
     private void drawMarkersTabs(final Graphics g, List<String> markers) {
@@ -883,7 +881,6 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
             nameBounds.width = 43;
             drawVerticallyCenteredString(g, marker, nameBounds, smallCounterFont, smallFontMetrics);
         }
-
     }
 
     /**
@@ -903,7 +900,6 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
         g.setFont(font);
         g.drawString(text, x, y);
         g.setFont(oldFont);
-
     }
 
     @Override

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

@@ -4,8 +4,7 @@ Types:Creature Horror
 PT:2/6
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.Green,Creature.White | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Green,Creature.White | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/abomination.jpg
 Oracle:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.

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

@@ -8,5 +8,4 @@ SVar:DBCopy:DB$ Clone | Defined$ Remembered | CloneTarget$ Imprinted | Duration$
 SVar:DBNoop:DB$ Cleanup | SpellDescription$ Do nothing.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 DeckHints:Type$Shapeshifter
-AI:RemoveDeck:All
 Oracle:Return target creature to its owner's hand. You may have Shapeshifters you control become copies of that creature until end of turn.

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

@@ -5,6 +5,5 @@ K:Entwine:2
 A:SP$ Charm | Cost$ 3 W | Choices$ DBGainLife,DBPreventDmg
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 5 | SpellDescription$ You gain 5 life.
 SVar:DBPreventDmg:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 5 | SpellDescription$ Prevent the next 5 damage that would be dealt to target creature this turn.
-AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abunas_chant.jpg
 Oracle:Choose one —\n• You gain 5 life.\n• Prevent the next 5 damage that would be dealt to target creature this turn.\nEntwine {2} (Choose both if you pay the entwine cost.)

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

@@ -4,8 +4,8 @@ Types:Artifact Creature Golem
 PT:2/4
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Artifact.Creature | Description$ CARDNAME can't be blocked by artifact creatures.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigEndCombat | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, that creature's controller sacrifices it at end of combat. If the player does, they create a 0/2 colorless Wall artifact creature token with defender.
-SVar:TrigEndCombat:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigSacBlocker | RememberObjects$ TriggeredBlocker | TriggerDescription$ At end of combat, the controller of the creature that blocked CARDNAME sacrifices that creature. If the player does, they create a 0/2 colorless Wall artifact creature token with defender.
+SVar:TrigEndCombat:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | Execute$ TrigSacBlocker | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ At end of combat, the controller of the creature that blocked CARDNAME sacrifices that creature. If the player does, they create a 0/2 colorless Wall artifact creature token with defender.
-SVar:TrigSacBlocker:DB$ Destroy | Defined$ DelayTriggerRemembered | Sacrifice$ True | SubAbility$ DBToken | RememberDestroyed$ True
+SVar:TrigSacBlocker:DB$ Destroy | Defined$ DelayTriggerRememberedLKI | Sacrifice$ True | SubAbility$ DBToken | RememberDestroyed$ True
 SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenScript$ c_0_2_a_wall_defender | LegacyImage$ c 0 2 a wall defender mir | TokenOwner$ DelayTriggerRememberedController | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Basalt Golem can't be blocked by artifact creatures.\nWhenever Basalt Golem becomes blocked by a creature, that creature's controller sacrifices it at end of combat. If the player does, they create a 0/2 colorless Wall artifact creature token with defender.

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

@@ -5,8 +5,7 @@ PT:1/1
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigBanding | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, CARDNAME gains banding until end of combat.
 SVar:TrigBanding:DB$ Pump | Defined$ Self | KW$ Banding | Duration$ UntilEndOfCombat
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Wall | Execute$ DelayAttackTrig | TriggerDescription$ Whenever CARDNAME becomes blocked by a Wall, destroy that Wall at end of combat.
-SVar:DelayAttackTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelayAttackTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyBlocker | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:TrigDestroyBlocker:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroyBlocker:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/battering_ram.jpg
 Oracle:At the beginning of combat on your turn, Battering Ram gains banding until end of combat. (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's blocking.)\nWhenever Battering Ram becomes blocked by a Wall, destroy that Wall at end of combat.

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

@@ -5,5 +5,5 @@ PT:3/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, destroy it at end of combat.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, destroy it at end of combat.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Destroy CARDNAME at end of combat.
-SVar:TrigSacrifice:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
+SVar:TrigSacrifice:DB$ Destroy | Defined$ Self
 Oracle:When Ceremonial Guard attacks or blocks, destroy it at end of combat.

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

@@ -5,8 +5,7 @@ PT:2/4
 K:Flying
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cockatrice.jpg
 Oracle:Flying\nWhenever Cockatrice blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.

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

@@ -4,9 +4,10 @@ Types:Creature Ooze
 PT:2/2
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.equipped | ValidBlocker$ Card.Self | Execute$ DelTrigAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by an equipped creature, destroy all Equipment attached to that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.equipped | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by an equipped creature, destroy all Equipment attached to that creature at end of combat.
-SVar:DelTrigAttacker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigRem | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy all Equipment attached to blocked creature at end of combat.
+SVar:DelTrigAttacker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigRem | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy all Equipment attached to blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigRem | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy all Equipment attached to blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigRem | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy all Equipment attached to blocking creature at end of combat.
-SVar:TrigRem:DB$ Pump | RememberObjects$ DelayTriggerRemembered | SubAbility$ TrigDestroy
+#TODO check rules
+SVar:TrigRem:DB$ Pump | RememberObjects$ DelayTriggerRememberedLKI | SubAbility$ TrigDestroy
 SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Remembered.Equipment+Attached | SpellDescription$ Destroy all Equipment attached to that creature. | SubAbility$ Cleanup
 SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Whenever Corrosive Ooze blocks or becomes blocked by an equipped creature, destroy all Equipment attached to that creature at end of combat.

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

@@ -5,6 +5,6 @@ PT:7/4
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME attacks, sacrifice it at end of combat.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You
 SVar:SacrificeEndCombat:True
 Oracle:Trample (This creature can deal excess combat damage to the player or planeswalker it's attacking.)\nWhen Crumbling Colossus attacks, sacrifice it at end of combat.

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

@@ -7,5 +7,5 @@ S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ DelayedTrig | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
 T:Mode$ Blocks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ DelayedTrig | Secondary$ True | TriggerDescription$ When enchanted creature attacks or blocks, sacrifice CARDNAME at the beginning of the next cleanup step.
 SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Cleanup | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME.
-SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You
 Oracle:Enchant creature\nEnchanted creature gets +3/+3.\nWhen enchanted creature attacks or blocks, sacrifice Cunning at the beginning of the next cleanup step.

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

@@ -4,8 +4,7 @@ Types:Creature Lizard
 PT:2/2
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/deathgazer.jpg
 Oracle:Whenever Deathgazer blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.

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

@@ -4,8 +4,7 @@ Types:Creature Specter
 PT:2/2
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_specter.jpg
 Oracle:Whenever Dread Specter blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.

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

@@ -6,6 +6,6 @@ K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You
 SVar:SacrificeEndCombat:True
 Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhen Fog Elemental attacks or blocks, sacrifice it at end of combat.

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

@@ -2,13 +2,11 @@ Name:Goblin Sappers
 ManaCost:1 R
 Types:Creature Goblin
 PT:1/1
-A:AB$ Pump | Cost$ R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ HIDDEN Unblockable | SubAbility$ DelTrigBoth | RememberTargets$ True | SpellDescription$ Target creature you control can't be blocked this turn. Destroy it and Goblin Sappers at end of combat.
+A:AB$ Pump | Cost$ R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ HIDDEN Unblockable | SubAbility$ DelTrigBoth | RememberObjects$ Self | RememberTargets$ True | SpellDescription$ Target creature you control can't be blocked this turn. Destroy it and Goblin Sappers at end of combat.
 A:AB$ Pump | Cost$ R R R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ HIDDEN Unblockable | SubAbility$ DelTrigFriend | RememberTargets$ True | SpellDescription$ Target creature you control can't be blocked this turn. Destroy it at end of combat.
-SVar:DelTrigFriend:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroyFriend | TriggerDescription$ Destroy it at end of combat. | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:DelTrigFriend:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy it at end of combat. | RememberObjects$ Remembered | SubAbility$ DBCleanup
-SVar:TrigDestroyFriend:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKICopy
-SVar:DelTrigBoth:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroySapper | TriggerDescription$ Destroy it and CARDNAME at end of combat. | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:DelTrigBoth:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy it and CARDNAME at end of combat. | RememberObjects$ Remembered | SubAbility$ DBCleanup
-SVar:TrigDestroySapper:DB$ Destroy | Defined$ Self | SubAbility$ TrigDestroyFriend
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_sappers.jpg
 Oracle:{R}{R}, {T}: Target creature you control can't be blocked this turn. Destroy it and Goblin Sappers at end of combat.\n{R}{R}{R}{R}, {T}: Target creature you control can't be blocked this turn. Destroy it at end of combat.

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

@@ -4,9 +4,8 @@ Types:Creature Gorgon
 PT:2/4
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonBlack | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonBlack | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 K:Madness:B B
-SVar:Picture:http://www.wizards.com/global/images/magic/general/gorgon_recluse.jpg
 Oracle:Whenever Gorgon Recluse blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.\nMadness {B}{B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)

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

@@ -4,8 +4,7 @@ Types:Creature Gorgon
 PT:2/4
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks a creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_medusa.jpg
 Oracle:Whenever Infernal Medusa blocks a creature, destroy that creature at end of combat.\nWhenever Infernal Medusa becomes blocked by a non-Wall creature, destroy that creature at end of combat.

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

@@ -6,7 +6,7 @@ K:Trample
 K:CARDNAME can't block.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME attacks, sacrifice it at end of combat.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You
 SVar:SacrificeEndCombat:True
 A:AB$ Pump | Cost$ tapXType<1/Creature> | NumAtt$ +X | SpellDescription$ CARDNAME gets +X/+0 until end of turn, where X is the power of the creature tapped this way.
 SVar:X:Tapped$CardPower

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

@@ -3,7 +3,6 @@ ManaCost:2 G
 Types:Creature Basilisk
 PT:1/3
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTargetLKICopy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/lowland_basilisk.jpg
 Oracle:Whenever Lowland Basilisk deals damage to a creature, destroy that creature at end of combat.

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

@@ -5,7 +5,7 @@ PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME attacks or blocks, sacrifice it at end of combat.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You
 SVar:SacrificeEndCombat:True
 AI:RemoveDeck:All
 Oracle:When Mardu Blazebringer attacks or blocks, sacrifice it at end of combat.

forge-gui/res/cardsfolder/o/ohran_viper.txt

@@ -3,9 +3,8 @@ ManaCost:1 G G
 Types:Snow Creature Snake
 PT:1/3
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTargetLKICopy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card.
 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ohran_viper.jpg
 Oracle:Whenever Ohran Viper deals combat damage to a creature, destroy that creature at end of combat.\nWhenever Ohran Viper deals combat damage to a player, you may draw a card.

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

@@ -4,8 +4,8 @@ Types:Creature Zombie
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | TriggerZones$ Graveyard | ValidCard$ Creature.YouOwn+Other | Execute$ DelTrig | TriggerDescription$ Whenever a creature enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, return CARDNAME from your graveyard to the battlefield tapped at the beginning of the next end step.
 T:Mode$ ChangesZone | Destination$ Battlefield | TriggerZones$ Graveyard | ValidCard$ Creature.YouOwn+YouCtrl+Other+wasCastFromGraveyard | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever a creature enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, return CARDNAME from your graveyard to the battlefield tapped at the beginning of the next end step.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Self | TriggerDescription$ Return CARDNAME to the battlefield.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
-SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
+SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
 SVar:DiscardMe:2
 SVar:SacMe:1
 Oracle:Whenever a creature enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, return Prized Amalgam from your graveyard to the battlefield tapped at the beginning of the next end step.

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

@@ -4,8 +4,7 @@ Types:Creature Basilisk
 PT:4/5
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rock_basilisk.jpg
 Oracle:Whenever Rock Basilisk blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.

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

@@ -5,7 +5,7 @@ PT:5/6
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or blocks, sacrifice it at end of combat.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | RememberObjects$ Self | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You
 SVar:SacrificeEndCombat:True
 Oracle:Trample\nWhen Runaway Carriage attacks or blocks, sacrifice it at end of combat.

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

@@ -3,8 +3,7 @@ ManaCost:2 G G
 Types:Creature Basilisk
 PT:2/3
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTargetLKICopy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 K:Morph:1 G G
-SVar:Picture:http://www.wizards.com/global/images/magic/general/serpentine_basilisk.jpg
 Oracle:Whenever Serpentine Basilisk deals combat damage to a creature, destroy that creature at end of combat.\nMorph {1}{G}{G} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)

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

@@ -5,11 +5,10 @@ PT:0/0
 K:Graft:3
 A:AB$ Animate | Cost$ 1 G | ValidTgts$ Creature.counters_GE1_P1P1 | TgtPrompt$ Select target creature with a +1/+1 counter on it | Triggers$ DestroyTrigger | sVars$ DelTrigSimic,TrigDestroySimic | SpellDescription$ Until end of turn, target creature with a +1/+1 counter on it gains "Whenever this creature deals combat damage to a creature, destroy that creature at end of combat."
 SVar:DestroyTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrigSimic:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroySimic | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:DelTrigSimic:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroySimic | RememberObjects$ TriggeredTargetLKICopy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroySimic:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroySimic:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 DeckNeeds:Ability$Counters
 DeckHas:Ability$Counters
 SVar:AIGraftPreference:DontMoveCounterIfLethal
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/simic_basilisk.jpg
 Oracle:Graft 3 (This creature enters the battlefield with three +1/+1 counters on it. Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.)\n{1}{G}: Until end of turn, target creature with a +1/+1 counter on it gains "Whenever this creature deals combat damage to a creature, destroy that creature at end of combat."

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

@@ -4,8 +4,7 @@ Types:Legendary Creature Snake Warrior
 PT:3/4
 S:Mode$ Continuous | Affected$ Creature.Snake+Other+YouCtrl | AddPower$ 1 | Description$ Other Snake creatures you control get +1/+0.
 T:Mode$ DamageDone | ValidSource$ Warrior.YouCtrl | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever a Warrior you control deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTargetLKICopy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 DeckHints:Type$Snake|Warrior
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sosuke_son_of_seshiro.jpg
 Oracle:Other Snake creatures you control get +1/+0.\nWhenever a Warrior you control deals combat damage to a creature, destroy that creature at end of combat.

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

@@ -6,6 +6,6 @@ K:Defender
 K:Flying
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelTrig | TriggerDescription$ When CARDNAME blocks, sacrifice it at end of combat.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Opponent | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
-SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You
 SVar:SacrificeEndCombat:True
 Oracle:Defender (This creature can't attack.)\nFlying\nWhen Stoic Ephemera blocks, sacrifice it at end of combat.

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

@@ -4,7 +4,6 @@ Types:Creature Basilisk
 PT:4/5
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ All creatures able to block CARDNAME do so. | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, all creatures able to block CARDNAME do so.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ DelTrig | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature at end of combat.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTarget | TriggerDescription$ Destroy damaged creature at end of combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredTargetLKICopy | TriggerDescription$ Destroy damaged creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stone_tongue_basilisk.jpg
 Oracle:Whenever Stone-Tongue Basilisk deals combat damage to a creature, destroy that creature at end of combat.\nThreshold — As long as seven or more cards are in your graveyard, all creatures able to block Stone-Tongue Basilisk do so.

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

@@ -4,8 +4,7 @@ Types:Creature Snake
 PT:1/2
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/tangle_asp.jpg
 Oracle:Whenever Tangle Asp blocks or becomes blocked by a creature, destroy that creature at end of combat.

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

@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 K:CARDNAME enters the battlefield tapped.
 A:AB$ ChangeZone | Cost$ 1 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | Shuffle$ True | SubAbility$ DBDelTrig | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Return CARDNAME to its owner's hand at the beginning of the next cleanup step.
-SVar:DBDelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ Cleanup | ValidPlayer$ Player | Execute$ TrigBounce | RememberObjects$ Self | TriggerDescription$ Return CARDNAME to its owner's hand at the beginning of the next cleanup step.
+SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Cleanup | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return CARDNAME to its owner's hand at the beginning of the next cleanup step.
-SVar:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRememberedLKI
+SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 Oracle:Thawing Glaciers enters the battlefield tapped.\n{1}, {T}: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Return Thawing Glaciers to its owner's hand at the beginning of the next cleanup step.

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

@@ -4,8 +4,7 @@ Types:Creature Basilisk
 PT:2/4
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/thicket_basilisk.jpg
 Oracle:Whenever Thicket Basilisk blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.

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

@@ -6,7 +6,7 @@ A:AB$ ChangeZone | Cost$ 2 U U T | ValidTgts$ Permanent.unenchanted | TgtPrompt$
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DelayedTrig | TriggerDescription$ When CARDNAME attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ DelayedTrig | Secondary$ True | TriggerDescription$ When CARDNAME attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.
 SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ At end of combat, sacrifice CARDNAME and CARDNAME deals 5 damage to you.
-SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI | SubAbility$ DBDamage
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You | SubAbility$ DBDamage
-SVar:DBDamage:DB$DealDamage | NumDmg$ 5 | Defined$ You
+SVar:DBDamage:DB$ DealDamage | NumDmg$ 5 | Defined$ You
 AI:RemoveDeck:All
 Oracle:When Time Elemental attacks or blocks, at end of combat, sacrifice it and it deals 5 damage to you.\n{2}{U}{U}, {T}: Return target permanent that isn't enchanted to its owner's hand.

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

@@ -5,8 +5,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 G G | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature.nonWall | ValidBlocker$ Card.AttachedBy | Execute$ DelTrigBlocked | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.AttachedBy | ValidBlocker$ Creature.nonWall | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/venom.jpg
 Oracle:Enchant creature\nWhenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.

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

@@ -5,8 +5,7 @@ PT:1/1
 K:Flying
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ DelTrigBlocked | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ DelTrigBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, destroy that creature at end of combat.
-SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttacker | TriggerDescription$ Destroy blocked creature at end of combat.
+SVar:DelTrigBlocked:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredAttackerLKICopy | TriggerDescription$ Destroy blocked creature at end of combat.
-SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:Picture:http://www.wizards.com/global/images/magic/general/venomous_dragonfly.jpg
 Oracle:Flying\nWhenever Venomous Dragonfly blocks or becomes blocked by a creature, destroy that creature at end of combat.

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

@@ -3,6 +3,6 @@ ManaCost:3
 Types:Artifact
 A:AB$ Pump | Cost$ 4 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | SubAbility$ DBDelay | AILogic$ Berserk | SpellDescription$ Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice CARDNAME at the beginning of the next end step.
 SVar:DBDelay:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigSac | TriggerDescription$ Sacrifice CARDNAME at the beginning of the next end step.
-SVar:TrigSac:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI | Controller$ You
+SVar:TrigSac:DB$ SacrificeAll | Defined$ Self | Controller$ You
 SVar:X:Targeted$CardPower
 Oracle:{4}: Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice Wine of Blood and Iron at the beginning of the next end step.

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

@@ -8,7 +8,7 @@ SVar:Pay2:DB$ Cleanup | ClearRemembered$ True | UnlessCost$ 2 | UnlessPayer$ Rem
 SVar:Pay1:DB$ Pump | Defined$ Remembered | KW$ Prevent all combat damage that would be dealt to and dealt by CARDNAME. | Duration$ UntilEndOfCombat | UnlessCost$ 1 | UnlessPayer$ RememberedController | UnlessSwitched$ True | UnlessResolveSubs$ WhenPaid | SubAbility$ DBCleanup | ShowCurrentCard$ Remembered | SpellDescription$ You may pay {1}, prevent all combat damage that would be dealt to and dealt by that creature this combat.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:DBDelayTrigger:DB$ DelayedTrigger | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ GE1 | RememberObjects$ Remembered | Mode$ Phase | Phase$ EndCombat | Execute$ TrigDestroy | TriggerDescription$ Destroy that creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 SVar:X:Count$xPaid
 SVar:Snow:Count$Valid Land.Snow+YouCtrl
 AI:RemoveDeck:All