From 14fa511c2825ad5e22220e70ee632fa6bb023dd0 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 19 Jun 2022 13:40:17 +0200
Subject: [PATCH] Extrinsic ETB tapped: fix for double triggers

---
 forge-gui/res/cardsfolder/a/archon_of_emeria.txt             | 4 ++--
 forge-gui/res/cardsfolder/a/ashlings_prerogative.txt         | 4 ++--
 forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt     | 4 ++--
 forge-gui/res/cardsfolder/b/blind_obedience.txt              | 4 ++--
 forge-gui/res/cardsfolder/d/due_respect.txt                  | 4 ++--
 forge-gui/res/cardsfolder/f/false_floor.txt                  | 4 ++--
 forge-gui/res/cardsfolder/f/frozen_aether.txt                | 4 ++--
 forge-gui/res/cardsfolder/i/imposing_sovereign.txt           | 4 ++--
 forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt            | 4 ++--
 forge-gui/res/cardsfolder/k/kismet.txt                       | 4 ++--
 forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt           | 4 ++--
 forge-gui/res/cardsfolder/m/manglehorn.txt                   | 4 ++--
 forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt         | 4 ++--
 forge-gui/res/cardsfolder/o/orb_of_dreams.txt                | 4 ++--
 .../res/cardsfolder/r/radiant_grace_radiant_restraints.txt   | 4 ++--
 .../reidane_god_of_the_worthy_valkmira_protectors_shield.txt | 4 ++--
 forge-gui/res/cardsfolder/r/root_maze.txt                    | 4 ++--
 forge-gui/res/cardsfolder/s/storyweave.txt                   | 2 +-
 forge-gui/res/cardsfolder/t/tenacious_pup.txt                | 5 ++---
 forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt        | 4 ++--
 forge-gui/res/cardsfolder/u/uphill_battle.txt                | 4 ++--
 forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt          | 4 ++--
 22 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/archon_of_emeria.txt b/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
index f88255abf7e..de161f526d8 100644
--- a/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
+++ b/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
@@ -4,8 +4,8 @@ Types:Creature Archon
 PT:2/3
 K:Flying
 S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player | NumLimitEachTurn$ 1 | Description$ Each player can't cast more than one spell each turn.
-R:Event$ Moved | ValidCard$ Land.OppCtrl+nonBasic | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Nonbasic lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Land.OppCtrl+nonBasic | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Nonbasic lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 Oracle:Flying\nEach player can't cast more than one spell each turn.\nNonbasic lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/a/ashlings_prerogative.txt b/forge-gui/res/cardsfolder/a/ashlings_prerogative.txt
index 23adf9a7dd6..3725af8ffe7 100644
--- a/forge-gui/res/cardsfolder/a/ashlings_prerogative.txt
+++ b/forge-gui/res/cardsfolder/a/ashlings_prerogative.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 K:ETBReplacement:Other:ChooseEvenOdd
 SVar:ChooseEvenOdd:DB$ ChooseEvenOdd | Defined$ You | ListTitle$ Choose ODD or EVEN | AILogic$ CMCInHand | SpellDescription$ As CARDNAME enters the battlefield, choose odd or even. (Zero is even.)
 S:Mode$ Continuous | Affected$ Creature.cmcChosenEvenOdd | AddKeyword$ Haste | Description$ Each creature with mana value of the chosen quality has haste.
-R:Event$ Moved | ValidCard$ Creature.cmcNotChosenEvenOdd | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Each creature without mana value of the chosen quality enters the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.cmcNotChosenEvenOdd | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Each creature without mana value of the chosen quality enters the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 AI:RemoveDeck:All
 Oracle:As Ashling's Prerogative enters the battlefield, choose odd or even. (Zero is even.)\nEach creature with mana value of the chosen quality has haste.\nEach creature without mana value of the chosen quality enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt b/forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt
index 8d2366920d5..bc16f8e6d51 100644
--- a/forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt
+++ b/forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt
@@ -1,8 +1,8 @@
 Name:Authority of the Consuls
 ManaCost:W
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature enters the battlefield under an opponent's control, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 Oracle:Creatures your opponents control enter the battlefield tapped.\nWhenever a creature enters the battlefield under an opponent's control, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/b/blind_obedience.txt b/forge-gui/res/cardsfolder/b/blind_obedience.txt
index 3cde7005734..18e57c9ad91 100644
--- a/forge-gui/res/cardsfolder/b/blind_obedience.txt
+++ b/forge-gui/res/cardsfolder/b/blind_obedience.txt
@@ -2,6 +2,6 @@ Name:Blind Obedience
 ManaCost:1 W
 Types:Enchantment
 K:Extort
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts and creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated  | ActiveZones$ Battlefield | Description$ Artifacts and creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Extort (Whenever you cast a spell, you may pay {W/B}. If you do, each opponent loses 1 life and you gain that much life.)\nArtifacts and creatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/d/due_respect.txt b/forge-gui/res/cardsfolder/d/due_respect.txt
index aa2e89462b8..2552ef3c9d5 100644
--- a/forge-gui/res/cardsfolder/d/due_respect.txt
+++ b/forge-gui/res/cardsfolder/d/due_respect.txt
@@ -2,7 +2,7 @@ Name:Due Respect
 ManaCost:1 W
 Types:Instant
 A:SP$ Effect | Cost$ 1 W | ReplacementEffects$ RepETB | SubAbility$ DBDraw | AILogic$ BeginningOfOppTurn | SpellDescription$ Permanents enter the battlefield tapped this turn.
-SVar:RepETB:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | ReplaceWith$ ETBTapped | Description$ Permanents enter the battlefield tapped this turn.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+SVar:RepETB:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | Description$ Permanents enter the battlefield tapped this turn.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:Permanents enter the battlefield tapped this turn.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/f/false_floor.txt b/forge-gui/res/cardsfolder/f/false_floor.txt
index d3205860dcf..290d4951a9a 100644
--- a/forge-gui/res/cardsfolder/f/false_floor.txt
+++ b/forge-gui/res/cardsfolder/f/false_floor.txt
@@ -2,7 +2,7 @@ Name:False Floor
 ManaCost:4
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-R:Event$ Moved | ValidCard$ Creature | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 A:AB$ ChangeZoneAll | Cost$ 2 T Exile<1/CARDNAME> | ChangeType$ Creature.untapped | Origin$ Battlefield | Destination$ Exile | SorcerySpeed$ True | SpellDescription$ Exile all untapped creatures. Activate only as a sorcery.
 Oracle:False Floor enters the battlefield tapped.\nCreatures enter the battlefield tapped.\n{2}, {T}, Exile False Floor: Exile all untapped creatures. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/f/frozen_aether.txt b/forge-gui/res/cardsfolder/f/frozen_aether.txt
index 90eb810c79e..d550ac8b69c 100644
--- a/forge-gui/res/cardsfolder/f/frozen_aether.txt
+++ b/forge-gui/res/cardsfolder/f/frozen_aether.txt
@@ -1,6 +1,6 @@
 Name:Frozen Aether
 ManaCost:3 U
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/i/imposing_sovereign.txt b/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
index 1940a17fdaf..5a1e10ab40d 100644
--- a/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
+++ b/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
@@ -2,6 +2,6 @@ Name:Imposing Sovereign
 ManaCost:1 W
 Types:Creature Human Noble
 PT:2/1
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Creatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt b/forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt
index 79496d433e9..c621977d26e 100644
--- a/forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt
+++ b/forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Dinosaur
 PT:2/3
 K:Flying
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Flying\nCreatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/k/kismet.txt b/forge-gui/res/cardsfolder/k/kismet.txt
index 357baf2a15c..b5221b5979f 100644
--- a/forge-gui/res/cardsfolder/k/kismet.txt
+++ b/forge-gui/res/cardsfolder/k/kismet.txt
@@ -1,6 +1,6 @@
 Name:Kismet
 ManaCost:3 W
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt b/forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt
index 63f37644f60..7c749174c5b 100644
--- a/forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt
+++ b/forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt
@@ -2,6 +2,6 @@ Name:Loxodon Gatekeeper
 ManaCost:2 W W
 Types:Creature Elephant Soldier
 PT:2/3
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/m/manglehorn.txt b/forge-gui/res/cardsfolder/m/manglehorn.txt
index ac3e1b19eca..fab058c759f 100644
--- a/forge-gui/res/cardsfolder/m/manglehorn.txt
+++ b/forge-gui/res/cardsfolder/m/manglehorn.txt
@@ -4,7 +4,7 @@ Types:Creature Beast
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target artifact.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Choose target artifact
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:PlayMain1:TRUE
 Oracle:When Manglehorn enters the battlefield, you may destroy target artifact.\nArtifacts your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt b/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
index 3ae54a04a06..aae8fc9d9f3 100644
--- a/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
+++ b/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
@@ -6,8 +6,8 @@ SVar:DBDraw:DB$ Draw | NumCards$ Y | SubAbility$ DBStoreSVar | StackDescription$
 SVar:DBStoreSVar:DB$ StoreSVar | SVar$ XLands | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ PlayMoreLand | ReplacementEffects$ LandETB | SubAbility$ DBCleanup
 SVar:PlayMoreLand:Mode$ Continuous | Affected$ You | AdjustLandPlays$ XLands | EffectZone$ Command | Description$ You may play X additional lands this turn.
-SVar:LandETB:Event$ Moved | ValidCard$ Land.YouCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | Description$ Lands you control enter the battlefield tapped this turn.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+SVar:LandETB:Event$ Moved | ValidCard$ Land.YouCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | Description$ Lands you control enter the battlefield tapped this turn.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid
 SVar:Y:Count$RememberedSize
diff --git a/forge-gui/res/cardsfolder/o/orb_of_dreams.txt b/forge-gui/res/cardsfolder/o/orb_of_dreams.txt
index 686c3ff7b58..5e5055ecdcc 100644
--- a/forge-gui/res/cardsfolder/o/orb_of_dreams.txt
+++ b/forge-gui/res/cardsfolder/o/orb_of_dreams.txt
@@ -1,7 +1,7 @@
 Name:Orb of Dreams
 ManaCost:3
 Types:Artifact
-R:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Permanents enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Permanents enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 AI:RemoveDeck:Random
 Oracle:Permanents enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt b/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
index 263e24151d3..2ad3fdbc075 100644
--- a/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
+++ b/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
@@ -18,6 +18,6 @@ Colors:white
 Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | ValidTgts$ Player | AILogic$ Curse
-R:Event$ Moved | ValidCard$ Creature.EnchantedPlayerCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.EnchantedPlayerCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Creatures enchanted player controls enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt b/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
index c33244b7600..9319d9462d3 100644
--- a/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
+++ b/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature God
 PT:2/3
 K:Flying
 K:Vigilance
-R:Event$ Moved | ValidCard$ Land.Snow+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Snow lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Land.Snow+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Snow lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 S:Mode$ RaiseCost | ValidCard$ Card.nonCreature+cmcGE4 | Type$ Spell | Activator$ Opponent | Amount$ 2 | Description$ Noncreature spells your opponents cast with mana value 4 or greater cost {2} more to cast.
 AlternateMode:Modal
 Oracle:Flying, vigilance\nSnow lands your opponents control enter the battlefield tapped.\nNoncreature spells your opponents cast with mana value 4 or greater cost {2} more to cast.
diff --git a/forge-gui/res/cardsfolder/r/root_maze.txt b/forge-gui/res/cardsfolder/r/root_maze.txt
index f585e2996a1..8c677739676 100644
--- a/forge-gui/res/cardsfolder/r/root_maze.txt
+++ b/forge-gui/res/cardsfolder/r/root_maze.txt
@@ -1,7 +1,7 @@
 Name:Root Maze
 ManaCost:G
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Artifact,Land | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts and lands enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact,Land | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts and lands enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 AI:RemoveDeck:Random
 Oracle:Artifacts and lands enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/s/storyweave.txt b/forge-gui/res/cardsfolder/s/storyweave.txt
index 16ba45fe97b..b584e9b2d27 100644
--- a/forge-gui/res/cardsfolder/s/storyweave.txt
+++ b/forge-gui/res/cardsfolder/s/storyweave.txt
@@ -5,7 +5,7 @@ A:SP$ Charm | Choices$ P1P1,Lore
 SVar:P1P1:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature you control.
 SVar:Lore:DB$ PutCounter | ValidTgts$ Saga.YouCtrl | TgtPrompt$ Select target Saga you control | CounterType$ LORE | CounterNum$ 2 | SubAbility$ DBEffect | SpellDescription$ Put two lore counters on target Saga you control. The next time one or more enchantment creatures enter the battlefield under your control this turn, each enters with two additional +1/+1 counters on it.
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ ReplaceETB | Triggers$ TrigRemove
-SVar:ReplaceETB:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature.Enchantment | ReplaceWith$ DBPutP1P1
+SVar:ReplaceETB:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature.Enchantment | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated
 SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 2 | SubAbility$ DBImprint
 SVar:DBImprint:DB$ Pump | ImprintCards$ ReplacedCard
 SVar:TrigRemove:Mode$ ChangesZoneAll | CheckSVar$ Z | Execute$ ExileSelf | Static$ True
diff --git a/forge-gui/res/cardsfolder/t/tenacious_pup.txt b/forge-gui/res/cardsfolder/t/tenacious_pup.txt
index 981c17ee6ec..17dc6c49442 100644
--- a/forge-gui/res/cardsfolder/t/tenacious_pup.txt
+++ b/forge-gui/res/cardsfolder/t/tenacious_pup.txt
@@ -6,9 +6,8 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 | SubAbility$ DBDelayedTrigger
 SVar:DBDelayedTrigger:DB$ DelayedTrigger | Execute$ TrigAddAPI | Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerDescription$ When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
 SVar:TrigAddAPI:DB$ Effect | RememberObjects$ TriggeredCard | ForgetOnMoved$ Stack | ReplacementEffects$ ReplaceEnter
-SVar:ReplaceEnter:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ AddExtraCounter | Description$ That creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
-SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterTypes$ P1P1,Trample,Vigilance | CounterNum$ 1  | SubAbility$ ToBattlefield
-SVar:ToBattlefield:DB$ InternalEtbReplacement | SubAbility$ DBExile
+SVar:ReplaceEnter:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ AddExtraCounter | ReplacementResult$ Updated | Description$ That creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterTypes$ P1P1,Trample,Vigilance | CounterNum$ 1  | SubAbility$ DBExile
 SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 DeckHas:Ability$LifeGain|Counters
 Oracle:When Tenacious Pup enters the battlefield, you gain 1 life. When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
diff --git a/forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt b/forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt
index 96551192ac6..50d8e9e0865 100644
--- a/forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt
+++ b/forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Legendary Creature Human Soldier
 PT:3/2
 K:First Strike
-R:Event$ Moved | ValidCard$ Creature.OppCtrl,Land.nonBasic+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures and nonbasic lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl,Land.nonBasic+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures and nonbasic lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:First strike\nCreatures and nonbasic lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/u/uphill_battle.txt b/forge-gui/res/cardsfolder/u/uphill_battle.txt
index aa869020ccc..94a4a176e27 100644
--- a/forge-gui/res/cardsfolder/u/uphill_battle.txt
+++ b/forge-gui/res/cardsfolder/u/uphill_battle.txt
@@ -1,6 +1,6 @@
 Name:Uphill Battle
 ManaCost:2 R
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures played by your opponents enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures played by your opponents enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Creatures played by your opponents enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt b/forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt
index 1ecb1cf2c6a..d76cac36bba 100644
--- a/forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt
+++ b/forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt
@@ -3,8 +3,8 @@ ManaCost:3 R R
 Types:Legendary Creature Phyrexian Praetor
 PT:4/4
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Haste | Description$ Creatures you control have haste.
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Creature
 Oracle:Creatures you control have haste.\nCreatures your opponents control enter the battlefield tapped.