From e704ee5aedd3a6589547b049e1f047bd289e86bf Mon Sep 17 00:00:00 2001
From: Adam Pantel <>
Date: Sun, 31 Jan 2021 22:17:16 -0500
Subject: [PATCH] Nissa, Rekindling Phoenix fixes

---
 forge-gui/res/cardsfolder/n/nissa_steward_of_elements.txt      | 3 ++-
 .../res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/n/nissa_steward_of_elements.txt b/forge-gui/res/cardsfolder/n/nissa_steward_of_elements.txt
index f159c4c9c02..37e6b753cee 100644
--- a/forge-gui/res/cardsfolder/n/nissa_steward_of_elements.txt
+++ b/forge-gui/res/cardsfolder/n/nissa_steward_of_elements.txt
@@ -6,6 +6,7 @@ SVar:X:Count$xPaid
 A:AB$ Scry | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | ScryNum$ 2 | SpellDescription$ Scry 2.
 A:AB$ Dig | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | DigNum$ 1 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Land,Creature.cmcLEY | ForceRevealToController$ True | PromptToSkipOptionalAbility$ True | References$ Y | AILogic$ AlwaysConfirm | OptionalAbilityPrompt$ Would you like to put the permanent onto the battlefield? | DestinationZone$ Battlefield | LibraryPosition2$ 0 | SpellDescription$ Look at the top card of your library. If it's a land card or a creature card with converted mana cost less than or equal to the number of loyalty counters on Nissa, Steward of Elements, you may put that card onto the battlefield.
 A:AB$ Untap | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Land.YouCtrl | TargetMin$ 0 | TargetMax$ 2 | RememberTargets$ True | SubAbility$ Animate | SpellDescription$ Untap up to two target lands you control. They become 5/5 Elemental creatures with flying and haste until end of turn. They're still lands.
-SVar:Animate:DB$ Animate | Defined$ Remembered | Power$ 5 | Toughness$ 5 | Types$ Creature,Elemental | Keywords$ Flying & Haste
+SVar:Animate:DB$ Animate | Defined$ Remembered | Power$ 5 | Toughness$ 5 | Types$ Creature,Elemental | Keywords$ Flying & Haste | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:Y:Count$CardCounters.LOYALTY
 Oracle:[+2]: Scry 2.\n[0]: Look at the top card of your library. If it's a land card or a creature card with converted mana cost less than or equal to the number of loyalty counters on Nissa, Steward of Elements, you may put that card onto the battlefield.\n[-6]: Untap up to two target lands you control. They become 5/5 Elemental creatures with flying and haste until end of turn. They're still lands.
diff --git a/forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt b/forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt
index f15d55a2806..bd3fc89b14a 100644
--- a/forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt
+++ b/forge-gui/res/tokenscripts/r_0_1_elemental_rekindling_phoenix.txt
@@ -5,6 +5,6 @@ Colors:red
 PT:0/1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ RekindlingPhoenixTrigSac | TriggerDescription$ At the beginning of your upkeep, sacrifice this creature and return target card named Rekindling Phoenix from your graveyard to the battlefield. It gains haste until end of turn.
 SVar:RekindlingPhoenixTrigSac:DB$ Sacrifice | SacValid$ Self | SubAbility$ RekindlingPhoenixDBChangeZone
-SVar:RekindlingPhoenixDBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Card.YouCtrl+namedRekindling Phoenix | TgtPrompt$ Choose target card named Rekindling Phoenix in your graveyard | SubAbility$ RekindlingPhoenixDBAnimate
+SVar:RekindlingPhoenixDBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Card.YouCtrl+namedRekindling Phoenix | ChangeNum$ 1 | TgtPrompt$ Choose target card named Rekindling Phoenix in your graveyard | SubAbility$ RekindlingPhoenixDBAnimate
 SVar:RekindlingPhoenixDBAnimate:DB$ Animate | Defined$ Targeted | Keywords$ Haste
 Oracle:At the beginning of your upkeep, sacrifice this creature and return target card named Rekindling Phoenix from your graveyard to the battlefield. It gains haste until end of turn.