From e1f70c89069ff3bc3a6584789ee4fa7ae1926edb Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 1 Feb 2023 12:24:38 +0100
Subject: [PATCH 1/5] Clean up

---
 forge-game/src/main/java/forge/game/card/CardProperty.java  | 6 ------
 .../forge/screens/home/settings/CSubmenuReleaseNotes.java   | 2 --
 forge-gui/res/cardsfolder/a/altar_of_the_lost.txt           | 2 +-
 forge-gui/res/cardsfolder/m/monstrous_onslaught.txt         | 2 --
 forge-gui/res/cardsfolder/p/phantom_carriage.txt            | 2 +-
 forge-gui/res/cardsfolder/q/quiet_speculation.txt           | 2 +-
 forge-gui/res/cardsfolder/r/rootcoil_creeper.txt            | 2 +-
 forge-gui/res/cardsfolder/r/runic_repetition.txt            | 2 +-
 forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt | 2 +-
 forge-gui/res/cardsfolder/t/tombfire.txt                    | 2 +-
 10 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index 54142f27953..20eb2cfc1fa 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -17,7 +17,6 @@ import forge.game.combat.AttackRequirement;
 import forge.game.combat.AttackingBand;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
-import forge.game.keyword.Keyword;
 import forge.game.mana.Mana;
 import forge.game.player.Player;
 import forge.game.spellability.OptionalCost;
@@ -1020,11 +1019,6 @@ public class CardProperty {
             if (!card.hasKeyword(property.substring(10))) {
                 return false;
             }
-        } else if (property.startsWith("withFlashback")) {
-            boolean fb = card.hasKeyword(Keyword.FLASHBACK);
-            if (!fb) {
-                return false;
-            }
         } else if (property.startsWith("with")) {
             // ... Card keywords
             if (property.startsWith("without") && card.hasStartOfUnHiddenKeyword(property.substring(7))) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java
index 766a5c2c4bf..f4efe48833b 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuReleaseNotes.java
@@ -70,7 +70,6 @@ public enum CSubmenuReleaseNotes implements ICDoc {
      * Returns content of README.txt (release) or CHANGES.txt (snapshot).
      */
     private static String getReleaseNotes() {
-
         final String filename = ForgeConstants.CHANGES_FILE_NO_RELEASE;
         final String filePath = FileUtil.pathCombine(System.getProperty("user.dir"), filename);
 
@@ -87,7 +86,6 @@ public enum CSubmenuReleaseNotes implements ICDoc {
         } else {
             notes = filePath + "\nis MISSING!";
         }
-
         return notes;
 
     }
diff --git a/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt b/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
index ea6370647c0..5f880fa6f2d 100644
--- a/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
+++ b/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
@@ -2,6 +2,6 @@ Name:Altar of the Lost
 ManaCost:3
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Spell.wasCastFromGraveyard+withFlashback | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast spells with flashback from a graveyard.
+A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Spell.wasCastFromGraveyard+hasKeywordFlashback | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast spells with flashback from a graveyard.
 AI:RemoveDeck:Random
 Oracle:Altar of the Lost enters the battlefield tapped.\n{T}: Add two mana in any combination of colors. Spend this mana only to cast spells with flashback from a graveyard.
diff --git a/forge-gui/res/cardsfolder/m/monstrous_onslaught.txt b/forge-gui/res/cardsfolder/m/monstrous_onslaught.txt
index 6aac9a41ac8..ace565fd821 100644
--- a/forge-gui/res/cardsfolder/m/monstrous_onslaught.txt
+++ b/forge-gui/res/cardsfolder/m/monstrous_onslaught.txt
@@ -2,8 +2,6 @@ Name:Monstrous Onslaught
 ManaCost:3 G G
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 3 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute damage to | NumDmg$ OrigPower | TargetMin$ Min | TargetMax$ OrigPower | DividedAsYouChoose$ OrigPower | SpellDescription$ CARDNAME deals X damage divided as you choose among any number of target creatures, where X is the greatest power among creatures you control as you cast this spell.
-T:Mode$ SpellCast | ValidCard$ Card.Self | Static$ True | Execute$ CountPowerAtCast
-SVar:CountPowerAtCast:DB$ StoreSVar | SVar$ OrigPower | Type$ Calculate | Expression$ OrigPower
 SVar:OrigPower:Count$Valid Creature.YouCtrl$GreatestPower
 SVar:Min:SVar$OrigPower/LimitMax.1
 Oracle:Monstrous Onslaught deals X damage divided as you choose among any number of target creatures, where X is the greatest power among creatures you control as you cast this spell.
diff --git a/forge-gui/res/cardsfolder/p/phantom_carriage.txt b/forge-gui/res/cardsfolder/p/phantom_carriage.txt
index eb81b43d654..0f2fe8b892a 100644
--- a/forge-gui/res/cardsfolder/p/phantom_carriage.txt
+++ b/forge-gui/res/cardsfolder/p/phantom_carriage.txt
@@ -4,5 +4,5 @@ Types:Creature Spirit
 PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ PhantomSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card with flashback or disturb, put it into your graveyard, then shuffle.
-SVar:PhantomSearch:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | ChangeType$ Card.withFlashback+YouOwn,Card.withDisturb+YouOwn
+SVar:PhantomSearch:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | ChangeType$ Card.hasKeywordFlashback+YouOwn,Card.withDisturb+YouOwn
 Oracle:Flying\nWhen Phantom Carriage enters the battlefield, you may search your library for a card with flashback or disturb, put it into your graveyard, then shuffle.
diff --git a/forge-gui/res/cardsfolder/q/quiet_speculation.txt b/forge-gui/res/cardsfolder/q/quiet_speculation.txt
index bb7341111db..a0dc17be3ae 100644
--- a/forge-gui/res/cardsfolder/q/quiet_speculation.txt
+++ b/forge-gui/res/cardsfolder/q/quiet_speculation.txt
@@ -1,6 +1,6 @@
 Name:Quiet Speculation
 ManaCost:1 U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Graveyard | ValidTgts$ Player | ChangeType$ Card.withFlashback | ChangeNum$ 3 | SpellDescription$ Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
+A:SP$ ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Graveyard | ValidTgts$ Player | ChangeType$ Card.hasKeywordFlashback | ChangeNum$ 3 | SpellDescription$ Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
 AI:RemoveDeck:All
 Oracle:Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
diff --git a/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt b/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt
index 14c2f9dbd74..ea9d5dcd26b 100644
--- a/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt
+++ b/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt
@@ -4,6 +4,6 @@ Types:Creature Plant Horror
 PT:2/2
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | RestrictValid$ Spell.wasCastFromYourGraveyard | SpellDescription$ Add two mana of any one color. Spend this mana only to cast spells from your graveyard.
-A:AB$ ChangeZone | Cost$ G U T Exile<1/CARDNAME> | Origin$ Exile | Destination$ Hand | ValidTgts$ Card.withFlashback+YouOwn | TgtPrompt$ Select target card with flashback you own in exile | SpellDescription$ Return target card with flashback you own in exile to your hand.
+A:AB$ ChangeZone | Cost$ G U T Exile<1/CARDNAME> | Origin$ Exile | Destination$ Hand | ValidTgts$ Card.hasKeywordFlashback+YouOwn | TgtPrompt$ Select target card with flashback you own in exile | SpellDescription$ Return target card with flashback you own in exile to your hand.
 DeckHints:Ability$Graveyard & Keyword$Flashback
 Oracle:{T}: Add one mana of any color.\n{T}: Add two mana of any one color. Spend this mana only to cast spells from your graveyard.\n{G}{U}, {T}, Exile Rootcoil Creeper: Return target card with flashback you own in exile to your hand.
diff --git a/forge-gui/res/cardsfolder/r/runic_repetition.txt b/forge-gui/res/cardsfolder/r/runic_repetition.txt
index 8e11928b800..4a08c6281c1 100644
--- a/forge-gui/res/cardsfolder/r/runic_repetition.txt
+++ b/forge-gui/res/cardsfolder/r/runic_repetition.txt
@@ -1,6 +1,6 @@
 Name:Runic Repetition
 ManaCost:2 U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 U | Origin$ Exile | Destination$ Hand | TgtPrompt$ Select target exiled card with flashback you own | ValidTgts$ Card.YouOwn+withFlashback | SpellDescription$ Return target exiled card with flashback you own to your hand.
+A:SP$ ChangeZone | Cost$ 2 U | Origin$ Exile | Destination$ Hand | TgtPrompt$ Select target exiled card with flashback you own | ValidTgts$ Card.YouOwn+hasKeywordFlashback | SpellDescription$ Return target exiled card with flashback you own to your hand.
 AI:RemoveDeck:Random
 Oracle:Return target exiled card with flashback you own to your hand.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt b/forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt
index b0fb1da9c20..69b3f3e9cb7 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt
@@ -4,5 +4,5 @@ Types:Creature Spirit
 PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ PhantomSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card with flashback or disturb, put it into your graveyard, then shuffle.
-SVar:PhantomSearch:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | ChangeType$ Card.withFlashback+YouOwn,Card.withDisturb+YouOwn
+SVar:PhantomSearch:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | ChangeType$ Card.hasKeywordFlashback+YouOwn,Card.withDisturb+YouOwn
 Oracle:Flying\nWhen Phantom Carriage enters the battlefield, you may search your library for a card with flashback or disturb, put it into your graveyard, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/tombfire.txt b/forge-gui/res/cardsfolder/t/tombfire.txt
index f0395070f30..62303d8d583 100644
--- a/forge-gui/res/cardsfolder/t/tombfire.txt
+++ b/forge-gui/res/cardsfolder/t/tombfire.txt
@@ -1,6 +1,6 @@
 Name:Tombfire
 ManaCost:B
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ B | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.withFlashback | SpellDescription$ Target player exiles all cards with flashback from their graveyard.
+A:SP$ ChangeZoneAll | Cost$ B | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.hasKeywordFlashback | SpellDescription$ Target player exiles all cards with flashback from their graveyard.
 AI:RemoveDeck:Random
 Oracle:Target player exiles all cards with flashback from their graveyard.

From a6374d12a8a9020b3b36d1b955a1c84868cd1386 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 1 Feb 2023 12:25:16 +0100
Subject: [PATCH 2/5] Remove obsolete condition

---
 forge-gui/res/cardsfolder/a/algae_gharial.txt            | 2 +-
 forge-gui/res/cardsfolder/b/blood_cultist.txt            | 2 +-
 forge-gui/res/cardsfolder/d/dauthi_ghoul.txt             | 2 +-
 forge-gui/res/cardsfolder/e/elenda_the_dusk_rose.txt     | 4 ++--
 forge-gui/res/cardsfolder/g/gavony_unhallowed.txt        | 2 +-
 forge-gui/res/cardsfolder/g/grakmaw_skyclave_ravager.txt | 6 +++---
 forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt  | 4 ++--
 forge-gui/res/cardsfolder/h/havengul_vampire.txt         | 2 +-
 forge-gui/res/cardsfolder/i/indebted_samurai.txt         | 2 +-
 forge-gui/res/cardsfolder/k/kresh_the_bloodbraided.txt   | 2 +-
 forge-gui/res/cardsfolder/l/lightning_coils.txt          | 2 +-
 forge-gui/res/cardsfolder/l/lumberknot.txt               | 2 +-
 forge-gui/res/cardsfolder/m/malakir_cullblade.txt        | 2 +-
 forge-gui/res/cardsfolder/m/malefic_scythe.txt           | 2 +-
 forge-gui/res/cardsfolder/m/mausoleum_harpy.txt          | 2 +-
 forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt    | 2 +-
 forge-gui/res/cardsfolder/p/predator_ooze.txt            | 2 +-
 forge-gui/res/cardsfolder/r/repentant_vampire.txt        | 2 +-
 forge-gui/res/cardsfolder/r/resplendent_griffin.txt      | 2 +-
 forge-gui/res/cardsfolder/r/rising_populace.txt          | 2 +-
 forge-gui/res/cardsfolder/r/rockslide_elemental.txt      | 2 +-
 forge-gui/res/cardsfolder/r/rot_shambler.txt             | 2 +-
 forge-gui/res/cardsfolder/s/scavenger_drake.txt          | 2 +-
 forge-gui/res/cardsfolder/s/sengir_bats.txt              | 2 +-
 forge-gui/res/cardsfolder/s/sengir_vampire.txt           | 2 +-
 forge-gui/res/cardsfolder/s/silumgar_scavenger.txt       | 2 +-
 forge-gui/res/cardsfolder/s/soulcatcher.txt              | 2 +-
 forge-gui/res/cardsfolder/s/swarm_of_bloodflies.txt      | 2 +-
 forge-gui/res/cardsfolder/t/trophy_hunter.txt            | 2 +-
 forge-gui/res/cardsfolder/u/unruly_mob.txt               | 2 +-
 forge-gui/res/cardsfolder/v/vampiric_dragon.txt          | 2 +-
 forge-gui/res/cardsfolder/v/vein_drinker.txt             | 2 +-
 forge-gui/res/cardsfolder/v/village_cannibals.txt        | 2 +-
 forge-gui/res/cardsfolder/v/vitalizing_cascade.txt       | 4 ++--
 forge-gui/res/cardsfolder/y/yahenni_undying_partisan.txt | 2 +-
 forge-gui/res/cardsfolder/z/zurgo_helmsmasher.txt        | 2 +-
 36 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/algae_gharial.txt b/forge-gui/res/cardsfolder/a/algae_gharial.txt
index 85caacea910..c0f614436e7 100644
--- a/forge-gui/res/cardsfolder/a/algae_gharial.txt
+++ b/forge-gui/res/cardsfolder/a/algae_gharial.txt
@@ -4,6 +4,6 @@ Types:Creature Crocodile
 PT:1/1
 K:Shroud
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever another creature dies, you may put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 Oracle:Shroud (This creature can't be the target of spells or abilities.)\nWhenever another creature dies, you may put a +1/+1 counter on Algae Gharial.
diff --git a/forge-gui/res/cardsfolder/b/blood_cultist.txt b/forge-gui/res/cardsfolder/b/blood_cultist.txt
index 5b65c662867..e7902691e10 100644
--- a/forge-gui/res/cardsfolder/b/blood_cultist.txt
+++ b/forge-gui/res/cardsfolder/b/blood_cultist.txt
@@ -4,5 +4,5 @@ Types:Creature Human Wizard
 PT:1/1
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:{T}: Blood Cultist deals 1 damage to target creature.\nWhenever a creature dealt damage by Blood Cultist this turn dies, put a +1/+1 counter on Blood Cultist.
diff --git a/forge-gui/res/cardsfolder/d/dauthi_ghoul.txt b/forge-gui/res/cardsfolder/d/dauthi_ghoul.txt
index 74ae97be6a7..84ceed888fc 100644
--- a/forge-gui/res/cardsfolder/d/dauthi_ghoul.txt
+++ b/forge-gui/res/cardsfolder/d/dauthi_ghoul.txt
@@ -4,5 +4,5 @@ Types:Creature Dauthi Zombie
 PT:1/1
 K:Shadow
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.withShadow | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature with shadow dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Shadow (This creature can block or be blocked by only creatures with shadow.)\nWhenever a creature with shadow dies, put a +1/+1 counter on Dauthi Ghoul.
diff --git a/forge-gui/res/cardsfolder/e/elenda_the_dusk_rose.txt b/forge-gui/res/cardsfolder/e/elenda_the_dusk_rose.txt
index 53e29365c81..9a35d846976 100644
--- a/forge-gui/res/cardsfolder/e/elenda_the_dusk_rose.txt
+++ b/forge-gui/res/cardsfolder/e/elenda_the_dusk_rose.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature Vampire Knight
 PT:1/1
 K:Lifelink
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create X 1/1 white Vampire creature tokens with lifelink, where X is Elenda's power.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME dies, create X 1/1 white Vampire creature tokens with lifelink, where X is NICKNAME's power.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ w_1_1_vampire_lifelink | TokenOwner$ You
 SVar:X:TriggeredCard$CardPower
 DeckHints:Type$Vampire
diff --git a/forge-gui/res/cardsfolder/g/gavony_unhallowed.txt b/forge-gui/res/cardsfolder/g/gavony_unhallowed.txt
index 7bb677aeab1..557de1297aa 100644
--- a/forge-gui/res/cardsfolder/g/gavony_unhallowed.txt
+++ b/forge-gui/res/cardsfolder/g/gavony_unhallowed.txt
@@ -3,5 +3,5 @@ ManaCost:3 B
 Types:Creature Zombie
 PT:2/4
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Whenever another creature you control dies, put a +1/+1 counter on Gavony Unhallowed.
diff --git a/forge-gui/res/cardsfolder/g/grakmaw_skyclave_ravager.txt b/forge-gui/res/cardsfolder/g/grakmaw_skyclave_ravager.txt
index 1ef3c141071..c7fad47d290 100644
--- a/forge-gui/res/cardsfolder/g/grakmaw_skyclave_ravager.txt
+++ b/forge-gui/res/cardsfolder/g/grakmaw_skyclave_ravager.txt
@@ -4,9 +4,9 @@ Types:Legendary Creature Hydra Horror
 PT:0/0
 K:etbCounter:P1P1:3
 SVar:WasKicked:Count$CardCounters.P1P1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other+counters_GE1_P1P1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control dies, if it had a +1/+1 counter on it, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create an X/X black and green Hydra creature token, where X is the number of +1/+1 counters on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other+counters_GE1_P1P1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control dies, if it had a +1/+1 counter on it, put a +1/+1 counter on NICKNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME dies, create an X/X black and green Hydra creature token, where X is the number of +1/+1 counters on NICKNAME.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ bg_x_x_hydra | TokenOwner$ TriggeredCardController | TokenPower$ X | TokenToughness$ X
 SVar:X:TriggeredCard$CardCounters.P1P1
 DeckHas:Ability$Counters|Token
diff --git a/forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt b/forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt
index f9d8b5a31c9..54def6ddba9 100644
--- a/forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt
+++ b/forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt
@@ -5,7 +5,7 @@ PT:3/3
 K:Trample
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, each player creates a 1/1 green Plant creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_plant | TokenOwner$ Player
-AI:RemoveDeck:Random
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.token | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature token dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1
+AI:RemoveDeck:Random
 Oracle:Trample\nAt the beginning of your end step, each player creates a 1/1 green Plant creature token.\nWhenever a creature token dies, put a +1/+1 counter on Grismold, the Dreadsower.
diff --git a/forge-gui/res/cardsfolder/h/havengul_vampire.txt b/forge-gui/res/cardsfolder/h/havengul_vampire.txt
index a032fe4b7a6..2ea35f55498 100644
--- a/forge-gui/res/cardsfolder/h/havengul_vampire.txt
+++ b/forge-gui/res/cardsfolder/h/havengul_vampire.txt
@@ -4,5 +4,5 @@ Types:Creature Vampire
 PT:2/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ DeathGift | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ DeathGift | TriggerDescription$ Whenever another creature dies, put a +1/+1 counter on CARDNAME.
-SVar:DeathGift:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:DeathGift:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Whenever Havengul Vampire deals combat damage to a player, put a +1/+1 counter on it.\nWhenever another creature dies, put a +1/+1 counter on Havengul Vampire.
diff --git a/forge-gui/res/cardsfolder/i/indebted_samurai.txt b/forge-gui/res/cardsfolder/i/indebted_samurai.txt
index 54985af48e1..c98fb3475a1 100644
--- a/forge-gui/res/cardsfolder/i/indebted_samurai.txt
+++ b/forge-gui/res/cardsfolder/i/indebted_samurai.txt
@@ -4,6 +4,6 @@ Types:Creature Human Samurai
 PT:2/3
 K:Bushido:1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Samurai.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever a Samurai you control dies, you may put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHints:Type$Samurai
 Oracle:Bushido 1 (Whenever this creature blocks or becomes blocked, it gets +1/+1 until end of turn.)\nWhenever a Samurai you control dies, you may put a +1/+1 counter on Indebted Samurai.
diff --git a/forge-gui/res/cardsfolder/k/kresh_the_bloodbraided.txt b/forge-gui/res/cardsfolder/k/kresh_the_bloodbraided.txt
index acbc24d2675..67d5018b47e 100644
--- a/forge-gui/res/cardsfolder/k/kresh_the_bloodbraided.txt
+++ b/forge-gui/res/cardsfolder/k/kresh_the_bloodbraided.txt
@@ -3,6 +3,6 @@ ManaCost:2 B R G
 Types:Legendary Creature Human Warrior
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature dies, you may put X +1/+1 counters on CARDNAME, where X is that creature's power.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
 SVar:X:TriggeredCard$CardPower
 Oracle:Whenever another creature dies, you may put X +1/+1 counters on Kresh the Bloodbraided, where X is that creature's power.
diff --git a/forge-gui/res/cardsfolder/l/lightning_coils.txt b/forge-gui/res/cardsfolder/l/lightning_coils.txt
index 2db804b8390..fbbb05a26c9 100644
--- a/forge-gui/res/cardsfolder/l/lightning_coils.txt
+++ b/forge-gui/res/cardsfolder/l/lightning_coils.txt
@@ -2,7 +2,7 @@ Name:Lightning Coils
 ManaCost:3
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+YouCtrl | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken creature you control dies, put a charge counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+counters_GE5_CHARGE | Execute$ DBRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if CARDNAME has five or more charge counters on it, remove all of them from it and create that many 3/1 red Elemental creature tokens with haste. Exile them at the beginning of the next end step.
 SVar:DBRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ All | RememberRemoved$ True | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ r_3_1_elemental_haste | AtEOT$ Exile | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/l/lumberknot.txt b/forge-gui/res/cardsfolder/l/lumberknot.txt
index 1456ac15374..d226b60b9e3 100644
--- a/forge-gui/res/cardsfolder/l/lumberknot.txt
+++ b/forge-gui/res/cardsfolder/l/lumberknot.txt
@@ -4,5 +4,5 @@ Types:Creature Treefolk
 PT:1/1
 K:Hexproof
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\nWhenever a creature dies, put a +1/+1 counter on Lumberknot.
diff --git a/forge-gui/res/cardsfolder/m/malakir_cullblade.txt b/forge-gui/res/cardsfolder/m/malakir_cullblade.txt
index 3b493a02ae2..74fe4961629 100644
--- a/forge-gui/res/cardsfolder/m/malakir_cullblade.txt
+++ b/forge-gui/res/cardsfolder/m/malakir_cullblade.txt
@@ -3,5 +3,5 @@ ManaCost:1 B
 Types:Creature Vampire Warrior
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature an opponent controls dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Whenever a creature an opponent controls dies, put a +1/+1 counter on Malakir Cullblade.
diff --git a/forge-gui/res/cardsfolder/m/malefic_scythe.txt b/forge-gui/res/cardsfolder/m/malefic_scythe.txt
index 7228ab749ff..75fed770d88 100644
--- a/forge-gui/res/cardsfolder/m/malefic_scythe.txt
+++ b/forge-gui/res/cardsfolder/m/malefic_scythe.txt
@@ -6,6 +6,6 @@ DeckHas:Ability$Counters
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each soul counter on CARDNAME.
 SVar:X:Count$CardCounters.SOUL
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EquippedBy | Execute$ TrigPutCounter | TriggerDescription$ Whenever equipped creature dies, put a soul counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SOUL | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ SOUL | CounterNum$ 1
 K:Equip:1
 Oracle:Malefic Scythe enters the battlefield with a soul counter on it.\nEquipped creature gets +1/+1 for each soul counter on Malefic Scythe.\nWhenever equipped creature dies, put a soul counter on Malefic Scythe.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/m/mausoleum_harpy.txt b/forge-gui/res/cardsfolder/m/mausoleum_harpy.txt
index eabb871ab3b..7d1cb9f28d4 100644
--- a/forge-gui/res/cardsfolder/m/mausoleum_harpy.txt
+++ b/forge-gui/res/cardsfolder/m/mausoleum_harpy.txt
@@ -5,5 +5,5 @@ PT:3/3
 K:Flying
 K:Ascend
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other+YouCtrl | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | Blessing$ True | TriggerDescription$ Whenever another creature you control dies, if you have the city's blessing, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying\nAscend (If you control ten or more permanents, you get the city's blessing for the rest of the game.)\nWhenever another creature you control dies, if you have the city's blessing, put a +1/+1 counter on Mausoleum Harpy.
diff --git a/forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt b/forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt
index 23f351179db..9058dadde00 100644
--- a/forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt
+++ b/forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt
@@ -8,5 +8,5 @@ T:Mode$ SearchedLibrary | ValidPlayer$ Player.Opponent | SearchOwnLibrary$ True
 SVar:TrigSac:DB$ Sacrifice | Defined$ TriggeredPlayer | SacValid$ Creature | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ TriggeredPlayer | LifeAmount$ 10
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ DeathGift | TriggerDescription$ Whenever another creature dies, put a +1/+1 counter on CARDNAME.
-SVar:DeathGift:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:DeathGift:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying, trample\nWhenever an opponent searches their library, that player sacrifices a creature and loses 10 life.\nWhenever another creature dies, put a +1/+1 counter on Ob Nixilis, Unshackled.
diff --git a/forge-gui/res/cardsfolder/p/predator_ooze.txt b/forge-gui/res/cardsfolder/p/predator_ooze.txt
index 61ba1c9600b..d24a46f18e0 100644
--- a/forge-gui/res/cardsfolder/p/predator_ooze.txt
+++ b/forge-gui/res/cardsfolder/p/predator_ooze.txt
@@ -5,7 +5,7 @@ PT:1/1
 K:Indestructible
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
 T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Counters
 Oracle:Indestructible\nWhenever Predator Ooze attacks, put a +1/+1 counter on it.\nWhenever a creature dealt damage by Predator Ooze this turn dies, put a +1/+1 counter on Predator Ooze.
diff --git a/forge-gui/res/cardsfolder/r/repentant_vampire.txt b/forge-gui/res/cardsfolder/r/repentant_vampire.txt
index 17571e62af9..7d4706eeb3d 100644
--- a/forge-gui/res/cardsfolder/r/repentant_vampire.txt
+++ b/forge-gui/res/cardsfolder/r/repentant_vampire.txt
@@ -4,7 +4,7 @@ Types:Creature Vampire
 PT:3/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 S:Mode$ Continuous | Affected$ Card.Self | SetColor$ White | AddAbility$ Destroy | Condition$ Threshold | Description$ Threshold — As long as seven or more cards are in your graveyard, CARDNAME is white and has "{T}: Destroy target black creature."
 SVar:Destroy:AB$ Destroy | Cost$ T | ValidTgts$ Creature.Black | TgtPrompt$ Select target black creature | SpellDescription$ Destroy target black creature.
 DeckHints:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/r/resplendent_griffin.txt b/forge-gui/res/cardsfolder/r/resplendent_griffin.txt
index 1fe8641bbb5..ec945d4e825 100644
--- a/forge-gui/res/cardsfolder/r/resplendent_griffin.txt
+++ b/forge-gui/res/cardsfolder/r/resplendent_griffin.txt
@@ -5,5 +5,5 @@ PT:2/2
 K:Flying
 K:Ascend
 T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | Blessing$ True | TriggerDescription$ Whenever CARDNAME attacks, if you have the city's blessing, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying\nAscend (If you control ten or more permanents, you get the city's blessing for the rest of the game.)\nWhenever Resplendent Griffin attacks, if you have the city's blessing, put a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/r/rising_populace.txt b/forge-gui/res/cardsfolder/r/rising_populace.txt
index aaec2d7a6c5..f707077bafd 100644
--- a/forge-gui/res/cardsfolder/r/rising_populace.txt
+++ b/forge-gui/res/cardsfolder/r/rising_populace.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Human
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature or planeswalker you control dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 Oracle:Whenever another creature or planeswalker you control dies, put a +1/+1 counter on Rising Populace.
diff --git a/forge-gui/res/cardsfolder/r/rockslide_elemental.txt b/forge-gui/res/cardsfolder/r/rockslide_elemental.txt
index 700cd8e9ee3..ef9d46d602b 100644
--- a/forge-gui/res/cardsfolder/r/rockslide_elemental.txt
+++ b/forge-gui/res/cardsfolder/r/rockslide_elemental.txt
@@ -4,5 +4,5 @@ Types:Creature Elemental
 PT:1/1
 K:First Strike
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever another creature dies, you may put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:First strike\nWhenever another creature dies, you may put a +1/+1 counter on Rockslide Elemental.
diff --git a/forge-gui/res/cardsfolder/r/rot_shambler.txt b/forge-gui/res/cardsfolder/r/rot_shambler.txt
index 9f38f708877..ecf05a86230 100644
--- a/forge-gui/res/cardsfolder/r/rot_shambler.txt
+++ b/forge-gui/res/cardsfolder/r/rot_shambler.txt
@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Creature Fungus
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Whenever another creature you control dies, put a +1/+1 counter on Rot Shambler.
diff --git a/forge-gui/res/cardsfolder/s/scavenger_drake.txt b/forge-gui/res/cardsfolder/s/scavenger_drake.txt
index 5e520da08df..70e0fbbe22c 100644
--- a/forge-gui/res/cardsfolder/s/scavenger_drake.txt
+++ b/forge-gui/res/cardsfolder/s/scavenger_drake.txt
@@ -4,5 +4,5 @@ Types:Creature Drake
 PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever another creature dies, you may put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying\nWhenever another creature dies, you may put a +1/+1 counter on Scavenger Drake.
diff --git a/forge-gui/res/cardsfolder/s/sengir_bats.txt b/forge-gui/res/cardsfolder/s/sengir_bats.txt
index 0845bed0f12..7bba9d438d4 100644
--- a/forge-gui/res/cardsfolder/s/sengir_bats.txt
+++ b/forge-gui/res/cardsfolder/s/sengir_bats.txt
@@ -4,5 +4,5 @@ Types:Creature Bat
 PT:1/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying\nWhenever a creature dealt damage by Sengir Bats this turn dies, put a +1/+1 counter on Sengir Bats.
diff --git a/forge-gui/res/cardsfolder/s/sengir_vampire.txt b/forge-gui/res/cardsfolder/s/sengir_vampire.txt
index 6f015009a6a..bb4d19d69ef 100644
--- a/forge-gui/res/cardsfolder/s/sengir_vampire.txt
+++ b/forge-gui/res/cardsfolder/s/sengir_vampire.txt
@@ -4,5 +4,5 @@ Types:Creature Vampire
 PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhenever a creature dealt damage by Sengir Vampire this turn dies, put a +1/+1 counter on Sengir Vampire.
diff --git a/forge-gui/res/cardsfolder/s/silumgar_scavenger.txt b/forge-gui/res/cardsfolder/s/silumgar_scavenger.txt
index cb4895c4ba4..e689d07e555 100644
--- a/forge-gui/res/cardsfolder/s/silumgar_scavenger.txt
+++ b/forge-gui/res/cardsfolder/s/silumgar_scavenger.txt
@@ -5,7 +5,7 @@ PT:2/3
 K:Flying
 K:Exploit
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control dies, put a +1/+1 counter on CARDNAME. It gains haste until end of turn if it exploited that creature.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf | SubAbility$ DBPump
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Haste | ConditionDefined$ TriggeredCard | ConditionPresent$ Card.exploited
 DeckHas:Ability$Counters
 Oracle:Flying\nExploit (When this creature enters the battlefield, you may sacrifice a creature.)\nWhenever another creature you control dies, put a +1/+1 counter on Silumgar Scavenger. It gains haste until end of turn if it exploited that creature.
diff --git a/forge-gui/res/cardsfolder/s/soulcatcher.txt b/forge-gui/res/cardsfolder/s/soulcatcher.txt
index 6dc5b69a069..f1b657b7d44 100644
--- a/forge-gui/res/cardsfolder/s/soulcatcher.txt
+++ b/forge-gui/res/cardsfolder/s/soulcatcher.txt
@@ -4,5 +4,5 @@ Types:Creature Bird Soldier
 PT:1/1
 K:Flying
 T:Mode$ ChangesZone | ValidCard$ Creature.withFlying | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature with flying dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying\nWhenever a creature with flying dies, put a +1/+1 counter on Soulcatcher.
diff --git a/forge-gui/res/cardsfolder/s/swarm_of_bloodflies.txt b/forge-gui/res/cardsfolder/s/swarm_of_bloodflies.txt
index fb8a0cdfbf4..27c822cdea1 100644
--- a/forge-gui/res/cardsfolder/s/swarm_of_bloodflies.txt
+++ b/forge-gui/res/cardsfolder/s/swarm_of_bloodflies.txt
@@ -5,5 +5,5 @@ PT:0/0
 K:Flying
 K:etbCounter:P1P1:2
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying\nSwarm of Bloodflies enters the battlefield with two +1/+1 counters on it.\nWhenever another creature dies, put a +1/+1 counter on Swarm of Bloodflies.
diff --git a/forge-gui/res/cardsfolder/t/trophy_hunter.txt b/forge-gui/res/cardsfolder/t/trophy_hunter.txt
index 1c2ff8884ec..9ceecc4d9e6 100644
--- a/forge-gui/res/cardsfolder/t/trophy_hunter.txt
+++ b/forge-gui/res/cardsfolder/t/trophy_hunter.txt
@@ -4,5 +4,5 @@ Types:Creature Human Archer
 PT:2/3
 A:AB$ DealDamage | Cost$ 1 G | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying. | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature with flying.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.withFlying+DamagedBy | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature with flying dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:{1}{G}: Trophy Hunter deals 1 damage to target creature with flying.\nWhenever a creature with flying dealt damage by Trophy Hunter this turn dies, put a +1/+1 counter on Trophy Hunter.
diff --git a/forge-gui/res/cardsfolder/u/unruly_mob.txt b/forge-gui/res/cardsfolder/u/unruly_mob.txt
index 56a848e249f..a3961200301 100644
--- a/forge-gui/res/cardsfolder/u/unruly_mob.txt
+++ b/forge-gui/res/cardsfolder/u/unruly_mob.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Human
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Whenever another creature you control dies, put a +1/+1 counter on Unruly Mob.
diff --git a/forge-gui/res/cardsfolder/v/vampiric_dragon.txt b/forge-gui/res/cardsfolder/v/vampiric_dragon.txt
index b660b0faec1..382244f745a 100644
--- a/forge-gui/res/cardsfolder/v/vampiric_dragon.txt
+++ b/forge-gui/res/cardsfolder/v/vampiric_dragon.txt
@@ -4,6 +4,6 @@ Types:Creature Vampire Dragon
 PT:5/5
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ DealDamage | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature.
 Oracle:Flying\nWhenever a creature dealt damage by Vampiric Dragon this turn dies, put a +1/+1 counter on Vampiric Dragon.\n{1}{R}: Vampiric Dragon deals 1 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/v/vein_drinker.txt b/forge-gui/res/cardsfolder/v/vein_drinker.txt
index 2d95abe32ee..29ace61760d 100644
--- a/forge-gui/res/cardsfolder/v/vein_drinker.txt
+++ b/forge-gui/res/cardsfolder/v/vein_drinker.txt
@@ -4,7 +4,7 @@ Types:Creature Vampire
 PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ DealDamage | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SubAbility$ DamageThis | SpellDescription$ CARDNAME deals damage equal to its power to target creature. That creature deals damage equal to its power to CARDNAME.
 SVar:DamageThis:DB$ DealDamage | Defined$ Self | DamageSource$ Targeted | NumDmg$ Y
 SVar:X:Count$CardPower
diff --git a/forge-gui/res/cardsfolder/v/village_cannibals.txt b/forge-gui/res/cardsfolder/v/village_cannibals.txt
index 089d3503d8a..efdd13ecf24 100644
--- a/forge-gui/res/cardsfolder/v/village_cannibals.txt
+++ b/forge-gui/res/cardsfolder/v/village_cannibals.txt
@@ -3,5 +3,5 @@ ManaCost:2 B
 Types:Creature Human
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Card.Other+Human | Execute$ TrigPutCounter | TriggerDescription$ Whenever another Human creature dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Whenever another Human creature dies, put a +1/+1 counter on Village Cannibals.
diff --git a/forge-gui/res/cardsfolder/v/vitalizing_cascade.txt b/forge-gui/res/cardsfolder/v/vitalizing_cascade.txt
index 2c558a36f2e..fdb1fdea18f 100644
--- a/forge-gui/res/cardsfolder/v/vitalizing_cascade.txt
+++ b/forge-gui/res/cardsfolder/v/vitalizing_cascade.txt
@@ -1,7 +1,7 @@
 Name:Vitalizing Cascade
 ManaCost:X G W
 Types:Instant
-A:SP$ GainLife | Cost$ X G W | Defined$ You | LifeAmount$ X | SubAbility$ DBGain3 | SpellDescription$ You gain X plus 3 life.
-SVar:DBGain3:DB$ GainLife | LifeAmount$ 3 | Defined$ You
+A:SP$ GainLife | Cost$ X G W | Defined$ You | LifeAmount$ Y | SpellDescription$ You gain X plus 3 life.
 SVar:X:Count$xPaid
+SVar:Y:SVar$X/Plus.3
 Oracle:You gain X plus 3 life.
diff --git a/forge-gui/res/cardsfolder/y/yahenni_undying_partisan.txt b/forge-gui/res/cardsfolder/y/yahenni_undying_partisan.txt
index 1b2e9245205..47d58e04fb7 100644
--- a/forge-gui/res/cardsfolder/y/yahenni_undying_partisan.txt
+++ b/forge-gui/res/cardsfolder/y/yahenni_undying_partisan.txt
@@ -4,6 +4,6 @@ Types:Legendary Creature Aetherborn Vampire
 PT:2/2
 K:Haste
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature an opponent controls dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ Pump | Cost$ Sac<1/Creature.Other/another creature> | Defined$ Self | KW$ Indestructible | SpellDescription$ CARDNAME gains indestructible until end of turn.
 Oracle:Haste\nWhenever a creature an opponent controls dies, put a +1/+1 counter on Yahenni, Undying Partisan.\nSacrifice another creature: Yahenni gains indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/z/zurgo_helmsmasher.txt b/forge-gui/res/cardsfolder/z/zurgo_helmsmasher.txt
index 9df9e6d2bb5..b789488437a 100644
--- a/forge-gui/res/cardsfolder/z/zurgo_helmsmasher.txt
+++ b/forge-gui/res/cardsfolder/z/zurgo_helmsmasher.txt
@@ -6,5 +6,5 @@ K:Haste
 S:Mode$ MustAttack | ValidCreature$ Card.Self | Description$ CARDNAME attacks each combat if able.
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ CARDNAME has indestructible as long as it's your turn.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Haste\nZurgo Helmsmasher attacks each combat if able.\nZurgo Helmsmasher has indestructible as long as it's your turn.\nWhenever a creature dealt damage by Zurgo Helmsmasher this turn dies, put a +1/+1 counter on Zurgo Helmsmasher.

From 0d517b37ab641e7152021b5cfb4dff124a3d95cb Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 1 Feb 2023 12:26:02 +0100
Subject: [PATCH 3/5] Slight tweak so it only uses old zone when LKI applies

---
 .../java/forge/game/replacement/ReplacementHandler.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
index 838e32b83b0..84ae152acf6 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
@@ -174,10 +174,11 @@ public class ReplacementHandler {
             @Override
             public boolean visit(Card crd) {
                 Card c = preList.get(crd);
-                Zone cardZone = game.getChangeZoneLKIInfo(c).getLastKnownZone();
+                Zone cardZone = game.getZoneOf(c);
+                Zone lkiZone = game.getChangeZoneLKIInfo(c).getLastKnownZone();
 
                 // only when not prelist
-                if (c == crd && cardZone.is(ZoneType.Battlefield) && event == ReplacementType.Moved && 
+                if (c == crd && lkiZone.is(ZoneType.Battlefield) && event == ReplacementType.Moved && 
                         runParams.containsKey(AbilityKey.LastStateBattlefield) && runParams.get(AbilityKey.LastStateBattlefield) != null) {
                     Card lastState = ((CardCollectionView) runParams.get(AbilityKey.LastStateBattlefield)).get(crd);
                     // no LKI found for this card so it shouldn't apply, this can happen during simultaneous zone changes
@@ -186,6 +187,7 @@ public class ReplacementHandler {
                     }
                     // use the LKI because it has the right RE from the state before the effect started
                     c = lastState;
+                    cardZone = lkiZone;
                 }
 
                 for (final ReplacementEffect replacementEffect : c.getReplacementEffects()) {

From 2e32943b3a6d1e4810e6628e7adc557d5ff38f5d Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 1 Feb 2023 14:32:55 +0100
Subject: [PATCH 4/5] Fix wrong property

---
 forge-gui/res/cardsfolder/a/altar_of_the_lost.txt           | 2 +-
 forge-gui/res/cardsfolder/p/phantom_carriage.txt            | 2 +-
 forge-gui/res/cardsfolder/q/quiet_speculation.txt           | 2 +-
 forge-gui/res/cardsfolder/r/rootcoil_creeper.txt            | 2 +-
 forge-gui/res/cardsfolder/r/runic_repetition.txt            | 2 +-
 forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt | 2 +-
 forge-gui/res/cardsfolder/t/tombfire.txt                    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt b/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
index 5f880fa6f2d..ea6370647c0 100644
--- a/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
+++ b/forge-gui/res/cardsfolder/a/altar_of_the_lost.txt
@@ -2,6 +2,6 @@ Name:Altar of the Lost
 ManaCost:3
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Spell.wasCastFromGraveyard+hasKeywordFlashback | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast spells with flashback from a graveyard.
+A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Spell.wasCastFromGraveyard+withFlashback | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast spells with flashback from a graveyard.
 AI:RemoveDeck:Random
 Oracle:Altar of the Lost enters the battlefield tapped.\n{T}: Add two mana in any combination of colors. Spend this mana only to cast spells with flashback from a graveyard.
diff --git a/forge-gui/res/cardsfolder/p/phantom_carriage.txt b/forge-gui/res/cardsfolder/p/phantom_carriage.txt
index 0f2fe8b892a..eb81b43d654 100644
--- a/forge-gui/res/cardsfolder/p/phantom_carriage.txt
+++ b/forge-gui/res/cardsfolder/p/phantom_carriage.txt
@@ -4,5 +4,5 @@ Types:Creature Spirit
 PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ PhantomSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card with flashback or disturb, put it into your graveyard, then shuffle.
-SVar:PhantomSearch:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | ChangeType$ Card.hasKeywordFlashback+YouOwn,Card.withDisturb+YouOwn
+SVar:PhantomSearch:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | ChangeType$ Card.withFlashback+YouOwn,Card.withDisturb+YouOwn
 Oracle:Flying\nWhen Phantom Carriage enters the battlefield, you may search your library for a card with flashback or disturb, put it into your graveyard, then shuffle.
diff --git a/forge-gui/res/cardsfolder/q/quiet_speculation.txt b/forge-gui/res/cardsfolder/q/quiet_speculation.txt
index a0dc17be3ae..bb7341111db 100644
--- a/forge-gui/res/cardsfolder/q/quiet_speculation.txt
+++ b/forge-gui/res/cardsfolder/q/quiet_speculation.txt
@@ -1,6 +1,6 @@
 Name:Quiet Speculation
 ManaCost:1 U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Graveyard | ValidTgts$ Player | ChangeType$ Card.hasKeywordFlashback | ChangeNum$ 3 | SpellDescription$ Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
+A:SP$ ChangeZone | Cost$ 1 U | Origin$ Library | Destination$ Graveyard | ValidTgts$ Player | ChangeType$ Card.withFlashback | ChangeNum$ 3 | SpellDescription$ Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
 AI:RemoveDeck:All
 Oracle:Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
diff --git a/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt b/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt
index ea9d5dcd26b..14c2f9dbd74 100644
--- a/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt
+++ b/forge-gui/res/cardsfolder/r/rootcoil_creeper.txt
@@ -4,6 +4,6 @@ Types:Creature Plant Horror
 PT:2/2
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | RestrictValid$ Spell.wasCastFromYourGraveyard | SpellDescription$ Add two mana of any one color. Spend this mana only to cast spells from your graveyard.
-A:AB$ ChangeZone | Cost$ G U T Exile<1/CARDNAME> | Origin$ Exile | Destination$ Hand | ValidTgts$ Card.hasKeywordFlashback+YouOwn | TgtPrompt$ Select target card with flashback you own in exile | SpellDescription$ Return target card with flashback you own in exile to your hand.
+A:AB$ ChangeZone | Cost$ G U T Exile<1/CARDNAME> | Origin$ Exile | Destination$ Hand | ValidTgts$ Card.withFlashback+YouOwn | TgtPrompt$ Select target card with flashback you own in exile | SpellDescription$ Return target card with flashback you own in exile to your hand.
 DeckHints:Ability$Graveyard & Keyword$Flashback
 Oracle:{T}: Add one mana of any color.\n{T}: Add two mana of any one color. Spend this mana only to cast spells from your graveyard.\n{G}{U}, {T}, Exile Rootcoil Creeper: Return target card with flashback you own in exile to your hand.
diff --git a/forge-gui/res/cardsfolder/r/runic_repetition.txt b/forge-gui/res/cardsfolder/r/runic_repetition.txt
index 4a08c6281c1..8e11928b800 100644
--- a/forge-gui/res/cardsfolder/r/runic_repetition.txt
+++ b/forge-gui/res/cardsfolder/r/runic_repetition.txt
@@ -1,6 +1,6 @@
 Name:Runic Repetition
 ManaCost:2 U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 U | Origin$ Exile | Destination$ Hand | TgtPrompt$ Select target exiled card with flashback you own | ValidTgts$ Card.YouOwn+hasKeywordFlashback | SpellDescription$ Return target exiled card with flashback you own to your hand.
+A:SP$ ChangeZone | Cost$ 2 U | Origin$ Exile | Destination$ Hand | TgtPrompt$ Select target exiled card with flashback you own | ValidTgts$ Card.YouOwn+withFlashback | SpellDescription$ Return target exiled card with flashback you own to your hand.
 AI:RemoveDeck:Random
 Oracle:Return target exiled card with flashback you own to your hand.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt b/forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt
index 69b3f3e9cb7..b0fb1da9c20 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-phantom_carriage.txt
@@ -4,5 +4,5 @@ Types:Creature Spirit
 PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ PhantomSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card with flashback or disturb, put it into your graveyard, then shuffle.
-SVar:PhantomSearch:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | ChangeType$ Card.hasKeywordFlashback+YouOwn,Card.withDisturb+YouOwn
+SVar:PhantomSearch:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | ChangeType$ Card.withFlashback+YouOwn,Card.withDisturb+YouOwn
 Oracle:Flying\nWhen Phantom Carriage enters the battlefield, you may search your library for a card with flashback or disturb, put it into your graveyard, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/tombfire.txt b/forge-gui/res/cardsfolder/t/tombfire.txt
index 62303d8d583..f0395070f30 100644
--- a/forge-gui/res/cardsfolder/t/tombfire.txt
+++ b/forge-gui/res/cardsfolder/t/tombfire.txt
@@ -1,6 +1,6 @@
 Name:Tombfire
 ManaCost:B
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ B | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.hasKeywordFlashback | SpellDescription$ Target player exiles all cards with flashback from their graveyard.
+A:SP$ ChangeZoneAll | Cost$ B | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.withFlashback | SpellDescription$ Target player exiles all cards with flashback from their graveyard.
 AI:RemoveDeck:Random
 Oracle:Target player exiles all cards with flashback from their graveyard.

From f78bb2c2d73cced784391eabd0d5bd4dcd8d779b Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 1 Feb 2023 16:11:08 +0100
Subject: [PATCH 5/5] Fix layer

---
 forge-gui/res/cardsfolder/m/mystic_reflection.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/m/mystic_reflection.txt b/forge-gui/res/cardsfolder/m/mystic_reflection.txt
index 3ae4e1e2627..79227d30640 100644
--- a/forge-gui/res/cardsfolder/m/mystic_reflection.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_reflection.txt
@@ -2,7 +2,7 @@ Name:Mystic Reflection
 ManaCost:1 U
 Types:Instant
 A:SP$ Effect | ValidTgts$ Creature.nonLegendary | TgtPrompt$ Choose target nonlegendary creature | RememberObjects$ Targeted | ReplacementEffects$ ReplaceETB | Triggers$ TrigRemove | SpellDescription$ Choose target nonlegendary creature. The next time one or more creatures or planeswalkers enter the battlefield this turn, they enter as copies of the chosen creature.
-SVar:ReplaceETB:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature,Planeswalker | ReplaceWith$ EnterAsCopy | ReplacementResult$ Updated | Description$ The next time one or more creatures or planeswalkers enter the battlefield this turn, they enter as copies of the chosen creature.
+SVar:ReplaceETB:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature,Planeswalker | ReplaceWith$ EnterAsCopy | Layer$ Copy | ReplacementResult$ Updated | Description$ The next time one or more creatures or planeswalkers enter the battlefield this turn, they enter as copies of the chosen creature.
 SVar:EnterAsCopy:DB$ Clone | Defined$ Remembered | CloneTarget$ ReplacedCard | SubAbility$ DBImprint
 SVar:DBImprint:DB$ Pump | ImprintCards$ ReplacedCard
 SVar:TrigRemove:Mode$ ChangesZoneAll | CheckSVar$ Z | Execute$ ExileSelf | Static$ True