From 12e9728e019c8508bca56a729940656c5d2b921e Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Sun, 22 Aug 2021 16:49:24 +0200
Subject: [PATCH 1/5] Fix protection from colorless

---
 .../java/forge/game/ability/effects/ProtectEffect.java     | 7 +------
 forge-game/src/main/java/forge/game/card/Card.java         | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
index 6e70f7dc965..114aed22927 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
+++ b/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;
     }
 
-
 }
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 0eb3c559be5..39301119b1d 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/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

From 4c231ace0f29577f56def265d5f42238a90ce399 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Sun, 22 Aug 2021 17:56:59 +0200
Subject: [PATCH 2/5] cards: fix cards with DelayedTrigger Sacrifice and
 Destory

---
 forge-gui/res/cardsfolder/a/abomination.txt            |  7 +++----
 forge-gui/res/cardsfolder/b/basalt_golem.txt           |  6 +++---
 forge-gui/res/cardsfolder/b/battering_ram.txt          |  5 ++---
 forge-gui/res/cardsfolder/c/ceremonial_guard.txt       |  2 +-
 forge-gui/res/cardsfolder/c/cockatrice.txt             |  7 +++----
 forge-gui/res/cardsfolder/c/corrosive_ooze.txt         |  9 +++++----
 forge-gui/res/cardsfolder/c/crumbling_colossus.txt     |  2 +-
 forge-gui/res/cardsfolder/c/cunning.txt                |  2 +-
 forge-gui/res/cardsfolder/d/deathgazer.txt             |  7 +++----
 forge-gui/res/cardsfolder/d/dread_specter.txt          |  7 +++----
 forge-gui/res/cardsfolder/f/fog_elemental.txt          |  2 +-
 forge-gui/res/cardsfolder/g/goblin_sappers.txt         | 10 ++++------
 forge-gui/res/cardsfolder/g/gorgon_recluse.txt         |  7 +++----
 forge-gui/res/cardsfolder/i/infernal_medusa.txt        |  7 +++----
 forge-gui/res/cardsfolder/k/keldon_battlewagon.txt     |  2 +-
 forge-gui/res/cardsfolder/l/lowland_basilisk.txt       |  5 ++---
 forge-gui/res/cardsfolder/m/mardu_blazebringer.txt     |  2 +-
 forge-gui/res/cardsfolder/o/ohran_viper.txt            |  5 ++---
 forge-gui/res/cardsfolder/p/prized_amalgam.txt         |  4 ++--
 forge-gui/res/cardsfolder/r/rock_basilisk.txt          |  7 +++----
 forge-gui/res/cardsfolder/r/runaway_carriage.txt       |  4 ++--
 forge-gui/res/cardsfolder/s/serpentine_basilisk.txt    |  5 ++---
 forge-gui/res/cardsfolder/s/simic_basilisk.txt         |  5 ++---
 forge-gui/res/cardsfolder/s/sosuke_son_of_seshiro.txt  |  5 ++---
 forge-gui/res/cardsfolder/s/stoic_ephemera.txt         |  2 +-
 forge-gui/res/cardsfolder/s/stone_tongue_basilisk.txt  |  5 ++---
 forge-gui/res/cardsfolder/t/tangle_asp.txt             |  7 +++----
 forge-gui/res/cardsfolder/t/thawing_glaciers.txt       |  4 ++--
 forge-gui/res/cardsfolder/t/thicket_basilisk.txt       |  7 +++----
 forge-gui/res/cardsfolder/t/time_elemental.txt         |  4 ++--
 forge-gui/res/cardsfolder/v/venom.txt                  |  7 +++----
 forge-gui/res/cardsfolder/v/venomous_dragonfly.txt     |  7 +++----
 forge-gui/res/cardsfolder/w/wine_of_blood_and_iron.txt |  2 +-
 forge-gui/res/cardsfolder/w/winters_chill.txt          |  2 +-
 34 files changed, 76 insertions(+), 95 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/abomination.txt b/forge-gui/res/cardsfolder/a/abomination.txt
index 8b9e57a719d..1dd36b8473d 100644
--- a/forge-gui/res/cardsfolder/a/abomination.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/abomination.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Whenever Abomination blocks or becomes blocked by a green or white creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/b/basalt_golem.txt b/forge-gui/res/cardsfolder/b/basalt_golem.txt
index 8142b118a75..ae9bfebb110 100644
--- a/forge-gui/res/cardsfolder/b/basalt_golem.txt
+++ b/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:TrigSacBlocker:DB$ Destroy | Defined$ DelayTriggerRemembered | Sacrifice$ True | SubAbility$ DBToken | RememberDestroyed$ True
+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$ 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.
\ No newline at end of file
+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.
diff --git a/forge-gui/res/cardsfolder/b/battering_ram.txt b/forge-gui/res/cardsfolder/b/battering_ram.txt
index 6f33633fd46..6642171ef93 100644
--- a/forge-gui/res/cardsfolder/b/battering_ram.txt
+++ b/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:TrigDestroyBlocker:DB$ Destroy | Defined$ DelayTriggerRemembered
+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$ 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.
diff --git a/forge-gui/res/cardsfolder/c/ceremonial_guard.txt b/forge-gui/res/cardsfolder/c/ceremonial_guard.txt
index f8f20f372d2..848469be168 100644
--- a/forge-gui/res/cardsfolder/c/ceremonial_guard.txt
+++ b/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.
diff --git a/forge-gui/res/cardsfolder/c/cockatrice.txt b/forge-gui/res/cardsfolder/c/cockatrice.txt
index c35e915aa5f..559f10328e7 100644
--- a/forge-gui/res/cardsfolder/c/cockatrice.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cockatrice.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Flying\nWhenever Cockatrice blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/c/corrosive_ooze.txt b/forge-gui/res/cardsfolder/c/corrosive_ooze.txt
index c1c699d7b6d..376e26a666a 100644
--- a/forge-gui/res/cardsfolder/c/corrosive_ooze.txt
+++ b/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: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:TrigRem:DB$ Pump | RememberObjects$ DelayTriggerRemembered | SubAbility$ TrigDestroy
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy all Equipment attached to blocking creature at end of combat.
+#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.
\ No newline at end of file
+Oracle:Whenever Corrosive Ooze blocks or becomes blocked by an equipped creature, destroy all Equipment attached to that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/c/crumbling_colossus.txt b/forge-gui/res/cardsfolder/c/crumbling_colossus.txt
index f2c0d1ddf87..043b50e34b5 100644
--- a/forge-gui/res/cardsfolder/c/crumbling_colossus.txt
+++ b/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.
diff --git a/forge-gui/res/cardsfolder/c/cunning.txt b/forge-gui/res/cardsfolder/c/cunning.txt
index d15ccf941c4..3a2f874cd63 100644
--- a/forge-gui/res/cardsfolder/c/cunning.txt
+++ b/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.
diff --git a/forge-gui/res/cardsfolder/d/deathgazer.txt b/forge-gui/res/cardsfolder/d/deathgazer.txt
index fafb71389d0..471db691b1a 100644
--- a/forge-gui/res/cardsfolder/d/deathgazer.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/deathgazer.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Whenever Deathgazer blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/d/dread_specter.txt b/forge-gui/res/cardsfolder/d/dread_specter.txt
index bb7c2e52bb3..2c9e86185f8 100644
--- a/forge-gui/res/cardsfolder/d/dread_specter.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_specter.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Whenever Dread Specter blocks or becomes blocked by a nonblack creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/f/fog_elemental.txt b/forge-gui/res/cardsfolder/f/fog_elemental.txt
index 42229329d09..3ddf16c995b 100644
--- a/forge-gui/res/cardsfolder/f/fog_elemental.txt
+++ b/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.
diff --git a/forge-gui/res/cardsfolder/g/goblin_sappers.txt b/forge-gui/res/cardsfolder/g/goblin_sappers.txt
index f2f181dcedb..deffd0617ce 100644
--- a/forge-gui/res/cardsfolder/g/goblin_sappers.txt
+++ b/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:TrigDestroyFriend:DB$ Destroy | Defined$ DelayTriggerRemembered
-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:TrigDestroySapper:DB$ Destroy | Defined$ Self | SubAbility$ TrigDestroyFriend
+SVar:DelTrigFriend:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy it at end of combat. | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKICopy
+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: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.
diff --git a/forge-gui/res/cardsfolder/g/gorgon_recluse.txt b/forge-gui/res/cardsfolder/g/gorgon_recluse.txt
index e5aeadadf2a..c7769349ff6 100644
--- a/forge-gui/res/cardsfolder/g/gorgon_recluse.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+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.)
diff --git a/forge-gui/res/cardsfolder/i/infernal_medusa.txt b/forge-gui/res/cardsfolder/i/infernal_medusa.txt
index 79d5a187af0..a409d9c0b4f 100644
--- a/forge-gui/res/cardsfolder/i/infernal_medusa.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_medusa.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 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.
diff --git a/forge-gui/res/cardsfolder/k/keldon_battlewagon.txt b/forge-gui/res/cardsfolder/k/keldon_battlewagon.txt
index 3cb6e82cbce..8d3c52e203d 100644
--- a/forge-gui/res/cardsfolder/k/keldon_battlewagon.txt
+++ b/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
diff --git a/forge-gui/res/cardsfolder/l/lowland_basilisk.txt b/forge-gui/res/cardsfolder/l/lowland_basilisk.txt
index 173ff23f550..8700cad245c 100644
--- a/forge-gui/res/cardsfolder/l/lowland_basilisk.txt
+++ b/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:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/lowland_basilisk.jpg
+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$ DelayTriggerRememberedLKI
 Oracle:Whenever Lowland Basilisk deals damage to a creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/m/mardu_blazebringer.txt b/forge-gui/res/cardsfolder/m/mardu_blazebringer.txt
index 94c657ac507..fb4368292ac 100644
--- a/forge-gui/res/cardsfolder/m/mardu_blazebringer.txt
+++ b/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.
diff --git a/forge-gui/res/cardsfolder/o/ohran_viper.txt b/forge-gui/res/cardsfolder/o/ohran_viper.txt
index 80e258adab4..c115af0e15d 100644
--- a/forge-gui/res/cardsfolder/o/ohran_viper.txt
+++ b/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:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+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$ 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.
diff --git a/forge-gui/res/cardsfolder/p/prized_amalgam.txt b/forge-gui/res/cardsfolder/p/prized_amalgam.txt
index b81766916a1..f7df7340bf2 100644
--- a/forge-gui/res/cardsfolder/p/prized_amalgam.txt
+++ b/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:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
+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.
diff --git a/forge-gui/res/cardsfolder/r/rock_basilisk.txt b/forge-gui/res/cardsfolder/r/rock_basilisk.txt
index 735b4d36cc1..a492238058f 100644
--- a/forge-gui/res/cardsfolder/r/rock_basilisk.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rock_basilisk.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Whenever Rock Basilisk blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/r/runaway_carriage.txt b/forge-gui/res/cardsfolder/r/runaway_carriage.txt
index e157bd07062..6c7954dd07b 100644
--- a/forge-gui/res/cardsfolder/r/runaway_carriage.txt
+++ b/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:TrigSacrifice:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigSacrifice | TriggerDescription$ Sacrifice CARDNAME at end of combat.
+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.
diff --git a/forge-gui/res/cardsfolder/s/serpentine_basilisk.txt b/forge-gui/res/cardsfolder/s/serpentine_basilisk.txt
index 4408054b40e..47e5fe4f702 100644
--- a/forge-gui/res/cardsfolder/s/serpentine_basilisk.txt
+++ b/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:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+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$ 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.)
diff --git a/forge-gui/res/cardsfolder/s/simic_basilisk.txt b/forge-gui/res/cardsfolder/s/simic_basilisk.txt
index d9f51faad36..2313c1bb12f 100644
--- a/forge-gui/res/cardsfolder/s/simic_basilisk.txt
+++ b/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:TrigDestroySimic:DB$ Destroy | Defined$ DelayTriggerRemembered
+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$ 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."
diff --git a/forge-gui/res/cardsfolder/s/sosuke_son_of_seshiro.txt b/forge-gui/res/cardsfolder/s/sosuke_son_of_seshiro.txt
index 29f9114c0d0..6caa109eb8e 100644
--- a/forge-gui/res/cardsfolder/s/sosuke_son_of_seshiro.txt
+++ b/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:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
+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$ 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.
diff --git a/forge-gui/res/cardsfolder/s/stoic_ephemera.txt b/forge-gui/res/cardsfolder/s/stoic_ephemera.txt
index e1749ee178d..e1adf3ac391 100644
--- a/forge-gui/res/cardsfolder/s/stoic_ephemera.txt
+++ b/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.
diff --git a/forge-gui/res/cardsfolder/s/stone_tongue_basilisk.txt b/forge-gui/res/cardsfolder/s/stone_tongue_basilisk.txt
index 9eed351d265..6a45ea88cbe 100644
--- a/forge-gui/res/cardsfolder/s/stone_tongue_basilisk.txt
+++ b/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:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stone_tongue_basilisk.jpg
+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$ DelayTriggerRememberedLKI
 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.
diff --git a/forge-gui/res/cardsfolder/t/tangle_asp.txt b/forge-gui/res/cardsfolder/t/tangle_asp.txt
index 76336012a80..85648d60bf2 100644
--- a/forge-gui/res/cardsfolder/t/tangle_asp.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/tangle_asp.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Whenever Tangle Asp blocks or becomes blocked by a creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/t/thawing_glaciers.txt b/forge-gui/res/cardsfolder/t/thawing_glaciers.txt
index ce21e813e0b..1b48c381b7a 100644
--- a/forge-gui/res/cardsfolder/t/thawing_glaciers.txt
+++ b/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:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ DelayTriggerRememberedLKI
+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$ 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.
diff --git a/forge-gui/res/cardsfolder/t/thicket_basilisk.txt b/forge-gui/res/cardsfolder/t/thicket_basilisk.txt
index ddac28340b0..03080f8ab59 100644
--- a/forge-gui/res/cardsfolder/t/thicket_basilisk.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/thicket_basilisk.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Whenever Thicket Basilisk blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/t/time_elemental.txt b/forge-gui/res/cardsfolder/t/time_elemental.txt
index f3347ca4396..d6e379c35b4 100644
--- a/forge-gui/res/cardsfolder/t/time_elemental.txt
+++ b/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:DBDamage:DB$DealDamage | NumDmg$ 5 | Defined$ You
+SVar:TrigSacrifice:DB$ SacrificeAll | Defined$ Self | Controller$ You | SubAbility$ DBDamage
+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.
diff --git a/forge-gui/res/cardsfolder/v/venom.txt b/forge-gui/res/cardsfolder/v/venom.txt
index 5c202540f51..638324ebbf0 100644
--- a/forge-gui/res/cardsfolder/v/venom.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/venom.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Enchant creature\nWhenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/v/venomous_dragonfly.txt b/forge-gui/res/cardsfolder/v/venomous_dragonfly.txt
index 621c1183c2d..595705d5794 100644
--- a/forge-gui/res/cardsfolder/v/venomous_dragonfly.txt
+++ b/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:DelTrigBlocker:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | RememberObjects$ TriggeredBlocker | TriggerDescription$ Destroy blocking creature at end of combat.
-SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRemembered
-SVar:Picture:http://www.wizards.com/global/images/magic/general/venomous_dragonfly.jpg
+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$ TriggeredBlockerLKICopy | TriggerDescription$ Destroy blocking creature at end of combat.
+SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
 Oracle:Flying\nWhenever Venomous Dragonfly blocks or becomes blocked by a creature, destroy that creature at end of combat.
diff --git a/forge-gui/res/cardsfolder/w/wine_of_blood_and_iron.txt b/forge-gui/res/cardsfolder/w/wine_of_blood_and_iron.txt
index 6d0a515d8a3..4e73b83e8d8 100644
--- a/forge-gui/res/cardsfolder/w/wine_of_blood_and_iron.txt
+++ b/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.
diff --git a/forge-gui/res/cardsfolder/w/winters_chill.txt b/forge-gui/res/cardsfolder/w/winters_chill.txt
index b5f12f535d5..eb3db9c92f0 100644
--- a/forge-gui/res/cardsfolder/w/winters_chill.txt
+++ b/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

From 2948d816d0ab913f1a7960fa15ba028101388d5a Mon Sep 17 00:00:00 2001
From: Meerkov <gomeerkov@gmail.com>
Date: Sun, 22 Aug 2021 16:41:08 +0000
Subject: [PATCH 3/5] Unban Absorb Identity for AI

---
 forge-gui/res/cardsfolder/a/absorb_identity.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/a/absorb_identity.txt b/forge-gui/res/cardsfolder/a/absorb_identity.txt
index 617f3b81f6a..9590509d8b3 100644
--- a/forge-gui/res/cardsfolder/a/absorb_identity.txt
+++ b/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.

From fa697d0e60777191afec2ad0562a4b2a0471111c Mon Sep 17 00:00:00 2001
From: Meerkov <gomeerkov@gmail.com>
Date: Sun, 22 Aug 2021 16:48:02 +0000
Subject: [PATCH 4/5] Unban AI from using abunas_chant

---
 forge-gui/res/cardsfolder/a/abunas_chant.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/a/abunas_chant.txt b/forge-gui/res/cardsfolder/a/abunas_chant.txt
index e31ecb7d145..511c4660ba0 100644
--- a/forge-gui/res/cardsfolder/a/abunas_chant.txt
+++ b/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.)

From bc1a91186f1e77e222a13e583fb6787a32d9aac8 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Sun, 22 Aug 2021 21:14:21 +0200
Subject: [PATCH 5/5] Card Renderer: do not display hidden cards

---
 forge-gui-desktop/src/main/java/forge/ImageCache.java         | 2 +-
 .../src/main/java/forge/view/arcane/CardPanel.java            | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java
index ee0206a0de1..5fc44718e67 100644
--- a/forge-gui-desktop/src/main/java/forge/ImageCache.java
+++ b/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;
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
index b0a1267e3db..50060021408 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
+++ b/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