From d2ae4756605960dab61542b43ca90c59d1301aad Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 20:35:25 +0200
Subject: [PATCH 1/9] Delete serra_paragon.txt

---
 .../res/cardsfolder/upcoming/serra_paragon.txt      | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/upcoming/serra_paragon.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt b/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt
deleted file mode 100644
index 2c2810364ba..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Name:Serra Paragon
-ManaCost:2 W W
-Types:Creature Angel
-PT:3/4
-K:Flying
-S:Mode$ Continuous | Affected$ Permanent.YouOwn+cmcLE3,Land.YouOwn| Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may play a land from your graveyard or cast a permanent spell with mana value 3 or less from your graveyard. If you do, it gains “When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life.”
-T:Mode$ SpellCast | ValidCard$ Dragon.wasCastFromYourGraveyard | ValidActivatingPlayer$ You | Execute$ DBAnimate | TriggerZones$ Battlefield | TriggerDescription$ 
-SVar:DBAnimate:DB$ Animate | Defined$ TriggeredCard | Duration$ Permanent | Triggers$ TrigDieExile
-SVar:TrigDieExile:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life
-SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
-DeckHas:Ability$Graveyard|Lifegain
-Oracle:Flying\nOnce during each of your turns, you may play a land from your graveyard or cast a permanent spell with mana value 3 or less from your graveyard. If you do, it gains “When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life.”
\ No newline at end of file

From 8623dba32eeb2c1eae4bd3567dc0ab39ff1b9167 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 20:36:13 +0200
Subject: [PATCH 2/9] Update sheoldreds_restoration.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt b/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
index 848f4e34aa2..1f37bf87c4a 100644
--- a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
@@ -9,4 +9,4 @@ SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescrip
 SVar:X:Targeted$CardManaCost
 SVar:Y:Count$TimesKicked
 DeckHas:Ability$Graveyard|Lifegain
-Oracle:Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card’s mana value. Otherwise, you lose that much life.Exile Sheoldred’s Restoration.
\ No newline at end of file
+Oracle:Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card's mana value. Otherwise, you lose that much life. Exile Sheoldred's Restoration.

From c6120f585cf20f635b9bb0c047aeb1e4bd8984d0 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 20:38:52 +0200
Subject: [PATCH 3/9] Update soul_of_windgrace.txt

---
 forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt b/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
index 73635b541a2..4c378dcfa24 100644
--- a/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
+++ b/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
@@ -2,11 +2,13 @@ Name:Soul of Windgrace
 ManaCost:1 B R G
 Types:Legendary Creature Cat Avatar
 PT:5/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME enters the battlefield, you may put a land card from a graveyard onto the battlefield tapped under your control.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Tapped$ True | TgtPrompt$ Select target land card in a graveyard | ValidTgts$ Land
 A:AB$ GainLife | Cost$ G Discard<1/Land> | LifeAmount$ 3 | SpellDescription$ Gain 3 Life
 A:AB$ Draw | Cost$ 1 R Discard<1/Land> | SpellDescription$ Draw a card.
 A:AB$ Pump | Cost$ 2 B Discard<1/Land> | KW$ Indestructible | SubAbility$ DBTap | SpellDescription$ CARDNAME gains indestructible until end of turn. Tap it.
 SVar:DBTap:DB$ Tap | Defined$ Self
-DeckHas:Ability$Lifegain|Discard & Keyword$Indestructible 
-Oracle:Whenever Soul of Windgrace enters the battlefield or attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.\n{G}, Discard a land card: You gain 3 life.\n{1}{R}, Discard a land card: Draw a card.\n{2}{B}, Discard a land card: Soul of Windgrace gains indestructible until end of turn. Tap it.
\ No newline at end of file
+DeckHas:Ability$Lifegain|Discard & Keyword$Indestructible
+SVar:HasAttackEffect:TRUE
+Oracle:Whenever Soul of Windgrace enters the battlefield or attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.\n{G}, Discard a land card: You gain 3 life.\n{1}{R}, Discard a land card: Draw a card.\n{2}{B}, Discard a land card: Soul of Windgrace gains indestructible until end of turn. Tap it.

From 5113dac947f5867767ea35103f5c0d0be4f3b3aa Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 20:39:39 +0200
Subject: [PATCH 4/9] Update sheoldreds_restoration.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt b/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
index 1f37bf87c4a..296c58df324 100644
--- a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
@@ -5,7 +5,7 @@ K:Kicker:2 W
 A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | SubAbility$ DBGainLife | TgtPrompt$ Select target creature to return from your graveyard |  TriggerDescription$ Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card's mana value. Otherwise, you lose that much life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | SubAbility$ DBLoseLife | Condition$ Kicked
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ EQ0 | SubAbility$ DBChange
-SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescription$ None
+SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile
 SVar:X:Targeted$CardManaCost
 SVar:Y:Count$TimesKicked
 DeckHas:Ability$Graveyard|Lifegain

From 248f251d805c2d8b0fb3565b63d5ce56c9acb0f0 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 21:55:47 +0200
Subject: [PATCH 5/9] Update shield_wall_sentinel.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt b/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
index fc4ea0702b7..fde00edd471 100644
--- a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
@@ -7,4 +7,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.withDefender | ChangeNum$ 1
 DeckNeeds:Type|Defender
 DeckHints:Type|Defender
-Oracle:DefenderWhen Shield-Wall Sentinel enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
+Oracle:Defender\nWhen Shield-Wall Sentinel enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.

From eea769ff5c1b05bd9c282d02d6345df7a409b248 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 22:16:33 +0200
Subject: [PATCH 6/9] Update shadow_prophecy.txt

---
 forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt b/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt
index 89f7d8f4de3..189c1e3d24f 100644
--- a/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt
@@ -1,9 +1,10 @@
 Name:Shadow Prophecy
 ManaCost:2 B
 Types:Instant
-A:SP$ Dig | DigNum$ X | ChangeNum$ 2 | SubAbility$ DBLoseLife | SpellDescription$ Domain — Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to two of them into your hand and the rest into your graveyard. You lose 2 life.
+A:SP$ Dig | DigNum$ X | ChangeNum$ 2 | SubAbility$ DBLoseLife | Optional$ True | DestinationZone2$ Graveyard | SpellDescription$ Domain — Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to two of them into your hand and the rest into your graveyard. You lose 2 life.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2
 SVar:X:Count$Domain
+DeckHas:Ability$Graveyard
 SVar:BuffedBy:Plains,Island,Swamp,Mountain,Forest
 AI:RemoveDeck:Random
 Oracle:Domain — Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to two of them into your hand and the rest into your graveyard. You lose 2 life.

From f88137974a26224b0fcf3564ff744abd8728195b Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 22:17:32 +0200
Subject: [PATCH 7/9] Update scout_the_wilderness.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt b/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
index 9ea2db9089c..345be0e56f9 100644
--- a/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
@@ -2,7 +2,7 @@ Name:Scout the Wilderness
 ManaCost:2 G
 Types:Sorcery
 K:Kicker:1 W
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
 SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_soldier | Condition$ Kicked
 DeckHints:Color$White
 DeckHas:Ability$Token

From f2d08f81bd5790872beaac6f310c6be7a264fbb4 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 22:19:03 +0200
Subject: [PATCH 8/9] Update shield_wall_sentinel.txt

---
 forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt b/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
index fde00edd471..ef7ba032c54 100644
--- a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
@@ -3,8 +3,7 @@ ManaCost:4
 Types:Artifact Creature Golem
 PT:1/3
 K:Defender
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | OptionalDecider$ You | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
 SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.withDefender | ChangeNum$ 1
-DeckNeeds:Type|Defender
-DeckHints:Type|Defender
+DeckNeeds:Keyword$Defender
 Oracle:Defender\nWhen Shield-Wall Sentinel enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.

From 540be0604c14719f024945e050508867288f3dea Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 5 Sep 2022 22:20:58 +0200
Subject: [PATCH 9/9] Update soul_of_windgrace.txt

---
 forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt b/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
index 4c378dcfa24..2e3527a823c 100644
--- a/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
+++ b/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
@@ -2,8 +2,8 @@ Name:Soul of Windgrace
 ManaCost:1 B R G
 Types:Legendary Creature Cat Avatar
 PT:5/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME enters the battlefield, you may put a land card from a graveyard onto the battlefield tapped under your control.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.
+T:Mode$ ChangesZone | Origin$ Any | OptionalDecider$ You | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME enters the battlefield, you may put a land card from a graveyard onto the battlefield tapped under your control.
+T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Tapped$ True | TgtPrompt$ Select target land card in a graveyard | ValidTgts$ Land
 A:AB$ GainLife | Cost$ G Discard<1/Land> | LifeAmount$ 3 | SpellDescription$ Gain 3 Life
 A:AB$ Draw | Cost$ 1 R Discard<1/Land> | SpellDescription$ Draw a card.