From a21488ee436667d20336d9277bbd2cbeb932fef0 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 6 Sep 2021 17:24:54 +0100
Subject: [PATCH 1/4] MID 06 Sep

---
 .../upcoming/bladestitched_skaab.txt          |  7 ++
 .../upcoming/curse_of_shaken_faith.txt        |  9 +++
 .../flame_channeler_embodiment_of_flame.txt   | 23 +++++++
 .../upcoming/liesa_forgotten_archangel.txt    | 12 ++++
 .../res/cardsfolder/upcoming/lunar_frenzy.txt |  6 ++
 .../cardsfolder/upcoming/ominous_roost.txt    |  8 +++
 .../Innistrad Midnight Hunt Commander.txt     |  8 +++
 .../res/editions/Innistrad Midnight Hunt.txt  | 68 +++++++++++++++++--
 8 files changed, 134 insertions(+), 7 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/curse_of_shaken_faith.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ominous_roost.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt b/forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt
new file mode 100644
index 00000000000..c504c29079c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt
@@ -0,0 +1,7 @@
+Name:Bladestitched Skaab
+ManaCost:U B
+Types:Creature Zombie Soldier
+PT:2/3
+S:Mode$ Continuous | Affected$ Zombie.Other+YouCtrl | AddPower$ 1 | Description$ Other Zombies you control get +1/+0.
+SVar:PlayMain1:TRUE
+Oracle:Other Zombies you control get +1/+0.
diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_shaken_faith.txt b/forge-gui/res/cardsfolder/upcoming/curse_of_shaken_faith.txt
new file mode 100644
index 00000000000..e120f6312c5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/curse_of_shaken_faith.txt
@@ -0,0 +1,9 @@
+Name:Curse of Shaken Faith
+ManaCost:1 R
+Types:Enchantment Aura Curse
+K:Enchant player
+A:SP$ Attach | Cost$ 1 R | ValidTgts$ Player | AILogic$ Curse
+T:Mode$ SpellCast | ValidActivatingPlayer$ Player.EnchantedBy | ActivatorThisTurnCast$ GT1 | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever enchanted player casts a spell other than the first spell they cast each turn or copies a spell, CARDNAME deals 2 damage to them.
+T:Mode$ SpellCopy | ValidActivatingPlayer$ Player.EnchantedBy | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigDamage | Secondary$ True | TriggerDescription$ Whenever enchanted player casts a spell other than the first spell they cast each turn or copies a spell, CARDNAME deals 2 damage to them.
+SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 2
+Oracle:Enchant player\nWhenever enchanted player casts a spell other than the first spell they cast each turn or copies a spell, Curse of Shaken Faith deals 2 damage to them.
diff --git a/forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt b/forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt
new file mode 100644
index 00000000000..38444548e84
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt
@@ -0,0 +1,23 @@
+Name:Flame Channeler
+ManaCost:1 R
+Types:Creature Human Wizard
+PT:2/2
+T:Mode$ DamageDoneOnce | ValidSource$ Spell.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ When a spell you control deals damage, transform CARDNAME.
+SVar:TrigTransform:DB$SetState | Defined$ Self | Mode$ Transform
+AlternateMode:DoubleFaced
+Oracle:When a spell you control deals damage, transform Flame Channeler.
+
+ALTERNATE
+
+Name:Embodiment of Flame
+ManaCost:no cost
+Colors:red
+Types:Creature Elemental Wizard
+PT:3/3
+T:Mode$ DamageDoneOnce | ValidSource$ Spell.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter| TriggerDescription$ Whenever a spell you control deals damage, put a flame counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ FLAME | CounterNum$ 1
+A:AB$ Dig | Cost$ 1 SubCounter<1/FLAME> | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | Defined$ You | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. You may play that card this turn.
+SVar:DBEffect:DB$ Effect | StaticAbilities$ EffSModeContinuous | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:EffSModeContinuous:Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered | MayPlay$ True | AffectedZone$ Exile | Description$ You may play that card this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Whenever a spell you control deals damage, put a flame counter on Embodiment of Flame.\n{1}, Remove a flame counter from Embodiment of Flame: Exile the top card of your library. You may play that card this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt b/forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt
new file mode 100644
index 00000000000..072638e6d83
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt
@@ -0,0 +1,12 @@
+Name:Liesa, Forgotten Archangel
+ManaCost:2 W W B
+Types:Legendary Creature Angel
+PT:4/5
+K:Flying
+K:Lifelink
+T:Mode$ ChangesZone | ValidCard$ Creature.Other+nonToken+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ DelTrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever another nontoken creature you control dies, return that card to its owner's hand at the beginning of the next end step.
+SVar:DelTrigReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | RememberObjects$ TriggeredNewCardLKICopy
+SVar:DBReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Graveyard | Destination$ Hand
+R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Creature.OppCtrl | ReplaceWith$ Exile | CheckSelfLKIZone$ True | Description$ If a creature an opponent controls would die, exile it instead.
+SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard
+Oracle:Flying, lifelink\nWhenever another nontoken creature you control dies, return that card to its owner's hand at the beginning of the next end step.\nIf a creature an opponent controls would die, exile it instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt b/forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt
new file mode 100644
index 00000000000..2f81422b17c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt
@@ -0,0 +1,6 @@
+Name:Lunar Frenzy
+ManaCost:X R
+Types:Instant
+A:SP$ Pump | Cost$ X R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature | NumAtt$ +X | KW$ First Strike & Trample | SpellDescription$ Target creature you control gets +X/+0 and gains first strike and trample until end of turn.
+SVar:X:Count$xPaid
+Oracle:Target creature you control gets +X/+0 and gains first strike and trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/ominous_roost.txt b/forge-gui/res/cardsfolder/upcoming/ominous_roost.txt
new file mode 100644
index 00000000000..987be725bc5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ominous_roost.txt
@@ -0,0 +1,8 @@
+Name:Ominous Roost
+ManaCost:2 U
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield or whenever you cast a spell from your graveyard, create a 1/1 blue Bird creature token with flying and "This creature can block only creatures with flying."
+T:Mode$ SpellCast | ValidCard$ Card.wasCastFromGraveyard | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield
+SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ u_1_1_bird_flying_blockflying
+DeckHas:Ability$Token
+Oracle:When Ominous Roost enters the battlefield or whenever you cast a spell from your graveyard, create a 1/1 blue Bird creature token with flying and "This creature can block only creatures with flying."
diff --git a/forge-gui/res/editions/Innistrad Midnight Hunt Commander.txt b/forge-gui/res/editions/Innistrad Midnight Hunt Commander.txt
index 1fe00e32f80..a278d392969 100644
--- a/forge-gui/res/editions/Innistrad Midnight Hunt Commander.txt	
+++ b/forge-gui/res/editions/Innistrad Midnight Hunt Commander.txt	
@@ -15,4 +15,12 @@ ScryfallCode=MIC
 35 R Curse of Obsession @Irvin Rodriguez
 36 R Visions of Ruin @Andrew Mar
 37 R Visions of Dominance @Andrew Mar
+39 M Leinore, Autumn Sovereign @Fariba Khamseh
 40 R Wilhelt, the Rotcleaver @Chris Rallis
+69 M Avacyn's Memorial @Kasia 'Kafis' Zielińska
+70 R Visions of Glory @Alexander Mokhov
+71 R Visions of Duplicity @Alexander Mokhov
+72 R Visions of Dread @Andrew Mar
+73 R Curse of Obsession @Irvin Rodriguez
+74 R Visions of Ruin @Andrew Mar
+75 R Visions of Dominance @Andrew Mar
diff --git a/forge-gui/res/editions/Innistrad Midnight Hunt.txt b/forge-gui/res/editions/Innistrad Midnight Hunt.txt
index c9caba9f062..a598dfb6932 100644
--- a/forge-gui/res/editions/Innistrad Midnight Hunt.txt	
+++ b/forge-gui/res/editions/Innistrad Midnight Hunt.txt	
@@ -12,43 +12,81 @@ Prerelease=6 Boosters, 1 RareMythic+
 [cards]
 3 U Beloved Beggar @Francisco Miyara
 7 R Brutal Cathar @Karl Kopinski
+8 C Candlegrove Witch @Anna Christenson
 9 C Candletrap @Manuel Castañón
+12 C Celestus Sanctifier @Irina Nordsol
 17 M Enduring Angel @Irina Nordsol
+20 U Gavony Dawnguard @Micah Epstein
+23 C Hedgewitch's Mask @Ovidio Cartagena
+30 C Ritual Guardian @Denman Rooke
+36 C Sungold Barrage @Leanna Crossan
 40 C Unruly Mob @Ryan Pancoast
 42 C Baithook Angler @Uriah Voth
 44 C Consider @Zezhou Chen
+49 U Dissipate @David Palumbo
 65 U Ominous Roost @Josu Hernaiz
+71 M Poppet Stitcher @Simon Dominic
 73 C Secrets of the Key @Alix Branwyn
+76 R Sludge Monster @Svetlin Velinov
 79 C Stormrider Spirit @Lake Hurwitz
 81 R Triskaidekaphile @Slawomir Maniak
 84 C Arrogant Outlaw @Aurore Folny
 91 R Champion of the Perished @Kekai Kotaki
+94 R Curse of Leeches @Uriah Voth
 95 C Defenestrate @Darek Zabrocki
 101 U Foul Play @Campbell White
+103 R Gisa, Glorious Resurrector @Yongjae Choi
+104 R Graveyard Trespasser @Chris Rallis
+106 C Hobbling Zombie @Josh Hass
 107 U Infernal Grasp @Naomi Baker
 108 R Jadar, Ghoulcaller of Nephalia @Yongjae Choi
 130 C Brimstone Vandal @Andreas Zafiratos
-134 R Curse of Shaken Faith
+134 R Curse of Shaken Faith @Campbell White
 138 C Famished Foragers @Lorenzo Mastroianni
 140 C Festival Crasher @Milivoj Ćeran
-142 R Giestflame Reservoir @Anna Christenson
+141 U Flame Channeler @Véronique Meignaud
+142 R Geistflame Reservoir @Anna Christenson
+144 C Immolation @Olena Richards
 146 R Light Up the Night @Wei Wei
+147 U Lunar Frenzy @Alix Branwyn
 154 U Play with Fire @Svetlin Velinov
 163 C Tavern Ruffian @Zoltan Boros
-164 C Thermo-Alchemist @Raymond Swanland
+164 U Thermo-Alchemist @Raymond Swanland
 165 U Village Watch @Nestor Ossandon Leal
+166 U Voldaren Ambusher @Evyn Fong
+168 R Augur of Autumn @Billy Christian
 175 C Candlelit Cavalry @Viko Menezes
+176 U Clear Shot @Craig J Spearing
+178 U Contortionist Troupe @Jesper Ejsing
 180 C Dawnhart Rejuvenator @Darren Tan
+182 U Defend the Celestus @Andrey Kuzinskiy
 188 C Howl of the Hunt @Josu Hernaiz
 189 C Might of the Old Ways @Zezhou Chen
 192 C Pestilent Wolf @Oriana Menendez
+197 R Saryth, the Viper's Fang @Igor Kieryluk
 199 C Snarling Wolf @Ilse Gort
+205 U Turn the Earth @Alayna Danner
+206 R Unnatural Growth @Svetlin Velinov
 208 M Wrenn and Seven @Heonhwa Choe
 211 M Arlinn, the Pack's Hope @Anna Steinbauer
+212 U Bladestitched Skaab @Dave Kendall
+214 U Corpse Cobble @Ravenna Tran
+215 R Croaking Counterpart @Yeong-Hao Han
+218 U Devoted Grafkeeper @Raoul Vitale
+220 U Diregraf Rebirth @Irina Nordsol
+221 U Faithful Mending @Caroline Gariba
+222 U Fleshtaker @Kev Walker
 224 R Galvanic Iteration @Johann Bodin
+225 R Ghoulcaller's Harvest @Anna Steinbauer
 229 U Join the Dance @Raoul Vitale
+231 U Kessig Naturalist @Johan Grenier
+232 R Liesa, Forgotten Archangel @Dmitry Burmak
+236 R Rite of Harmony @Rovina Cai
 240 M Sigarda, Champion of Light @Howard Lyon
 246 R Tovolar, Dire Overlord @Chris Rahn
+249 U Vampire Socialite @Suzanne Helmigh
+252 R The Celestus @Jonas De Ro
+257 R Pithing Needle @Ovidio Cartagena
 260 R Deserted Beach @Jonas De Ro
 263 R Haunted Ridge @Jonas De Ro
 265 R Overgrown Farmland @Jonas De Ro
@@ -65,24 +103,39 @@ Prerelease=6 Boosters, 1 RareMythic+
 276 L Forest @Alayna Danner
 277 L Forest @Dan Mumford
 278 M Wrenn and Seven @Bram Sels
-279 M Arlinn, the Pack's Hope @Eric Deschamps
 281 R Deserted Beach @Piotr Dura
 282 R Haunted Ridge @Piotr Dura
 283 R Overgrown Farmland @Donato Giancola
 284 R Rockfall Vale @Piotr Dura
 285 R Shipwreck Marsh @Steven Belledin
+286 R Brutal Cathar @Steve Ellis
+287 C Candlegrove Witch @Brigitte Roka
+290 R Graveyard Trespasser @Tyler Crook
 296 C Tavern Ruffian @Michael Walsh
 297 U Village Watch @Andrea De Dominicis
-304 R Saryth, the Viper's Fang
+301 C Dawnhart Rejuvenator @Cabrol
+304 R Saryth, the Viper's Fang @Tyler Crook
 307 M Arlinn, the Pack's Hope @Emma Rios
+310 U Kessig Naturalist @Rafael Albuquerque
 311 R Tovolar, Dire Overlord @Michael Walsh
+314 R Gisa, Glorious Resurrector @Cabrol
 315 R Jadar, Ghoulcaller of Nephalia @DZO
+319 R Liesa, Forgotten Archangel @Evan Cagle
 323 M Sigarda, Champion of Light @N.C. Winters
-355 R Giestflame Reservoir @Anna Christenson
+326 R Curse of Silence @Irina Nordsol
+327 M Enduring Angel @Irina Nordsol
+344 R Champion of the Perished @Kekai Kotaki
+345 R Curse of Leeches @Uriah Voth
+355 R Geistflame Reservoir @Anna Christenson
 356 R Light Up the Night @Wei Wei
+365 R Unnatural Growth @Svetlin Velinov
 368 R Can't Stay Away @Milivoj Ćeran
+369 R Croaking Counterpart @Yeong-Hao Han
 371 R Galvanic Iteration @Johann Bodin
-374 R Rite of Harmony
+372 R Ghoulcaller's Harvest @Anna Steinbauer
+374 R Rite of Harmony @Rovina Cai
+377 R The Celestus @Jonas De Ro
+378 R Pithing Needle @Ovidio Cartagena
 380 L Plains @Andreas Rocha
 381 L Island @Andreas Rocha
 382 L Swamp @Kasia 'Kafis' Zielińska
@@ -90,6 +143,7 @@ Prerelease=6 Boosters, 1 RareMythic+
 384 L Forest @Andreas Rocha
 385 R Champion of the Perished @Daarken
 386 R Triskaidekaphile @Mathias Kollros
+387 U Gavony Dawnguard @Micah Epstein
 388 C Consider @Zezhou Chen
 389 U Infernal Grasp @Naomi Baker
 390 U Play with Fire @Svetlin Velinov

From 3e122fa76efb9d9c8ad29f17484ebdf44f64f362 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 6 Sep 2021 17:26:55 +0100
Subject: [PATCH 2/4] MID 06 Sep

---
 forge-gui/res/editions/Innistrad Midnight Hunt.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/editions/Innistrad Midnight Hunt.txt b/forge-gui/res/editions/Innistrad Midnight Hunt.txt
index a598dfb6932..e55a568fb39 100644
--- a/forge-gui/res/editions/Innistrad Midnight Hunt.txt	
+++ b/forge-gui/res/editions/Innistrad Midnight Hunt.txt	
@@ -103,6 +103,7 @@ Prerelease=6 Boosters, 1 RareMythic+
 276 L Forest @Alayna Danner
 277 L Forest @Dan Mumford
 278 M Wrenn and Seven @Bram Sels
+279 M Arlinn, the Pack's Hope @Eric Deschamps
 281 R Deserted Beach @Piotr Dura
 282 R Haunted Ridge @Piotr Dura
 283 R Overgrown Farmland @Donato Giancola

From f6ff8ca38cd26699c472c848e016d85e217bb465 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 6 Sep 2021 18:30:14 +0100
Subject: [PATCH 3/4] fixes

---
 .../res/cardsfolder/upcoming/bladestitched_skaab.txt      | 1 +
 .../upcoming/flame_channeler_embodiment_of_flame.txt      | 5 +++--
 .../cardsfolder/upcoming/liesa_forgotten_archangel.txt    | 1 +
 forge-gui/res/cardsfolder/upcoming/ominous_roost.txt      | 3 ++-
 .../res/tokenscripts/u_1_1_bird_flying_blockflying.txt    | 8 ++++++++
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 forge-gui/res/tokenscripts/u_1_1_bird_flying_blockflying.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt b/forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt
index c504c29079c..ba992ded9e4 100644
--- a/forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bladestitched_skaab.txt
@@ -4,4 +4,5 @@ Types:Creature Zombie Soldier
 PT:2/3
 S:Mode$ Continuous | Affected$ Zombie.Other+YouCtrl | AddPower$ 1 | Description$ Other Zombies you control get +1/+0.
 SVar:PlayMain1:TRUE
+DeckHints:Type$Zombie
 Oracle:Other Zombies you control get +1/+0.
diff --git a/forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt b/forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt
index 38444548e84..7316c44bd99 100644
--- a/forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt
+++ b/forge-gui/res/cardsfolder/upcoming/flame_channeler_embodiment_of_flame.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Human Wizard
 PT:2/2
 T:Mode$ DamageDoneOnce | ValidSource$ Spell.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ When a spell you control deals damage, transform CARDNAME.
-SVar:TrigTransform:DB$SetState | Defined$ Self | Mode$ Transform
+SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 AlternateMode:DoubleFaced
 Oracle:When a spell you control deals damage, transform Flame Channeler.
 
@@ -14,10 +14,11 @@ ManaCost:no cost
 Colors:red
 Types:Creature Elemental Wizard
 PT:3/3
-T:Mode$ DamageDoneOnce | ValidSource$ Spell.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter| TriggerDescription$ Whenever a spell you control deals damage, put a flame counter on CARDNAME.
+T:Mode$ DamageDoneOnce | ValidSource$ Spell.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a spell you control deals damage, put a flame counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ FLAME | CounterNum$ 1
 A:AB$ Dig | Cost$ 1 SubCounter<1/FLAME> | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | Defined$ You | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. You may play that card this turn.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ EffSModeContinuous | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup
 SVar:EffSModeContinuous:Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered | MayPlay$ True | AffectedZone$ Exile | Description$ You may play that card this turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters
 Oracle:Whenever a spell you control deals damage, put a flame counter on Embodiment of Flame.\n{1}, Remove a flame counter from Embodiment of Flame: Exile the top card of your library. You may play that card this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt b/forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt
index 072638e6d83..afced2169c9 100644
--- a/forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/liesa_forgotten_archangel.txt
@@ -9,4 +9,5 @@ SVar:DelTrigReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execu
 SVar:DBReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Graveyard | Destination$ Hand
 R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Creature.OppCtrl | ReplaceWith$ Exile | CheckSelfLKIZone$ True | Description$ If a creature an opponent controls would die, exile it instead.
 SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard
+DeckHas:Ability$LifeGain
 Oracle:Flying, lifelink\nWhenever another nontoken creature you control dies, return that card to its owner's hand at the beginning of the next end step.\nIf a creature an opponent controls would die, exile it instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/ominous_roost.txt b/forge-gui/res/cardsfolder/upcoming/ominous_roost.txt
index 987be725bc5..57bf9117227 100644
--- a/forge-gui/res/cardsfolder/upcoming/ominous_roost.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ominous_roost.txt
@@ -2,7 +2,8 @@ Name:Ominous Roost
 ManaCost:2 U
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield or whenever you cast a spell from your graveyard, create a 1/1 blue Bird creature token with flying and "This creature can block only creatures with flying."
-T:Mode$ SpellCast | ValidCard$ Card.wasCastFromGraveyard | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield
+T:Mode$ SpellCast | ValidCard$ Card.wasCastFromGraveyard | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or whenever you cast a spell from your graveyard, create a 1/1 blue Bird creature token with flying and "This creature can block only creatures with flying."
 SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ u_1_1_bird_flying_blockflying
 DeckHas:Ability$Token
+DeckHints:Ability$Graveyard
 Oracle:When Ominous Roost enters the battlefield or whenever you cast a spell from your graveyard, create a 1/1 blue Bird creature token with flying and "This creature can block only creatures with flying."
diff --git a/forge-gui/res/tokenscripts/u_1_1_bird_flying_blockflying.txt b/forge-gui/res/tokenscripts/u_1_1_bird_flying_blockflying.txt
new file mode 100644
index 00000000000..abfebbbacb6
--- /dev/null
+++ b/forge-gui/res/tokenscripts/u_1_1_bird_flying_blockflying.txt
@@ -0,0 +1,8 @@
+Name:Bird
+ManaCost:no cost
+Types:Creature Bird
+Colors:blue
+PT:1/1
+K:Flying
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.withoutFlying | ValidBlocker$ Creature.Self | Description$ This creature can block only creatures with flying.
+Oracle:Flying\nThis creature can block only creatures with flying.

From 2537cf4cd7bab0c01d04514091aa99c05987c64d Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 6 Sep 2021 18:43:52 +0100
Subject: [PATCH 4/4] lunar frenzy fix

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

diff --git a/forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt b/forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt
index 2f81422b17c..59fd2c0539c 100644
--- a/forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lunar_frenzy.txt
@@ -1,6 +1,6 @@
 Name:Lunar Frenzy
 ManaCost:X R
 Types:Instant
-A:SP$ Pump | Cost$ X R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature | NumAtt$ +X | KW$ First Strike & Trample | SpellDescription$ Target creature you control gets +X/+0 and gains first strike and trample until end of turn.
+A:SP$ Pump | Cost$ X R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature | NumAtt$ +X | KW$ First Strike & Trample | StackDescription$ {c:Targeted} gets +X/+0 and gains first strike and trample until end of turn. | SpellDescription$ Target creature you control gets +X/+0 and gains first strike and trample until end of turn.
 SVar:X:Count$xPaid
 Oracle:Target creature you control gets +X/+0 and gains first strike and trample until end of turn.