From 8ecf334c507cca59b96550ed593fb3182c9a85b4 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 3 Jun 2023 12:41:56 +0200
Subject: [PATCH 1/3] update

---
 .../cardsfolder/upcoming/gimli_counter_of_kills.txt  |  9 +++++++++
 forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt    |  8 ++++++++
 forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt   |  7 +++++++
 .../cardsfolder/upcoming/grond_the_gatebreaker.txt   |  8 ++++++++
 .../cardsfolder/upcoming/lotho_corrupt_shirriff.txt  |  9 +++++++++
 forge-gui/res/cardsfolder/upcoming/many_partings.txt |  7 +++++++
 .../res/cardsfolder/upcoming/mines_of_moria.txt      | 11 +++++++++++
 .../res/cardsfolder/upcoming/moria_marauder.txt      | 12 ++++++++++++
 forge-gui/res/cardsfolder/upcoming/rivendell.txt     |  9 +++++++++
 .../upcoming/shadowfax_lord_of_horses.txt            | 12 ++++++++++++
 10 files changed, 92 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/grond_the_gatebreaker.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/lotho_corrupt_shirriff.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/many_partings.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/mines_of_moria.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/moria_marauder.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/rivendell.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt b/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
new file mode 100644
index 00000000000..e3e290f9c8a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
@@ -0,0 +1,9 @@
+Name:Gimli, Counter of Kills
+ManaCost:3 R
+Types:Legendary Creature — Dwarf Warrior
+PT:4/3
+K:Trample
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature an opponent controls dies, Gimli, Counter of Kills deals 1 damage to that creature's controller.
+SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredCardController | NumDmg$ 1
+Whenever a creature an opponent controls dies, CARDNAME deals 1 damage to that creature's controller.
+Oracle:Trample\nWhenever a creature an opponent controls dies, Gimli, Counter of Kills deals 1 damage to that creature's controller.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt b/forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt
new file mode 100644
index 00000000000..96eb4d9c4e2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt
@@ -0,0 +1,8 @@
+Name:Gimli's Axe
+ManaCost:2 R
+Types:Artifact Equipment
+K:Equip:2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | Description$ Equipped creature gets +3/+0.
+S:Mode$ Continuous | Affected$ Card.EquippedBy+Legendary | AddKeyword$ Menace | Description$ As long as equipped creature is legendary, it has menace. (It can't be blocked except by two or more creatures.)
+DeckHints:Type$Legendary
+Oracle:Equipped creature gets +3/+0.As long as equipped creature is legendary, it has menace. (It can't be blocked except by two or more creatures.)\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt b/forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt
new file mode 100644
index 00000000000..5edcd0cecaa
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt
@@ -0,0 +1,7 @@
+Name:Gimli's Fury
+ManaCost:1 R
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +2 | SubAbility$ DBPump | SpellDescription$ Target creature gets +3/+2 until end of turn. If it's legendary, it also gains trample until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Lifelink | ConditionDefined$ Targeted | ConditionPresent$ Legendary
+DeckHints:Type$Legendary
+Oracle:Target creature gets +3/+2 until end of turn. If it's legendary, it also gains trample until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/grond_the_gatebreaker.txt b/forge-gui/res/cardsfolder/upcoming/grond_the_gatebreaker.txt
new file mode 100644
index 00000000000..84db34abd27
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/grond_the_gatebreaker.txt
@@ -0,0 +1,8 @@
+Name:Grond, the Gatebreaker
+ManaCost:3 B
+Types:Legendary Artifact Vehicle
+PT:5/5
+K:Trample
+S:Mode$ Continuous | Affected$ Card.Self | IsPresent$ Army.YouCtrl | Condition$ PlayerTurn | AddType$ Artifact & Creature | RemoveCardTypes$ True | Description$ As long as it's your turn and you control an Army, CARDNAME is an artifact creature.
+K:Crew:3
+Oracle:Trample\nAs long as it's your turn and you control an Army, Grond, the Gatebreaker is an artifact creature.\nCrew 3 (Tap any number of creatures you control with total power 3 or more: This Vehicle becomes an artifact creature until end of turn.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/lotho_corrupt_shirriff.txt b/forge-gui/res/cardsfolder/upcoming/lotho_corrupt_shirriff.txt
new file mode 100644
index 00000000000..5e6655af49d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/lotho_corrupt_shirriff.txt
@@ -0,0 +1,9 @@
+Name:Lotho, Corrupt Shirriff
+ManaCost:W B
+Types:Legendary Creature Halfling Rogue
+PT:2/1
+T:Mode$ SpellCast | ValidActivatingPlayer$ Player | ActivatorThisTurnCast$ EQ2 | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a player casts their second spell each turn, you lose 1 life and create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 1 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenScript$ c_a_treasure_sac
+DeckHas:Ability$Token & Type$Artifact|Treasure
+Oracle:Whenever a player casts their second spell each turn, you lose 1 life and create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/many_partings.txt b/forge-gui/res/cardsfolder/upcoming/many_partings.txt
new file mode 100644
index 00000000000..d98605a708e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/many_partings.txt
@@ -0,0 +1,7 @@
+Name:Many Partings
+ManaCost:G
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ pellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+SVar:DBToken:DB$ Token | TokenScript$ c_a_food_sac
+DeckHas:Ability$Token|LifeGain|Sacrifice & Type$Artifact|Food
+Oracle:Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/upcoming/mines_of_moria.txt b/forge-gui/res/cardsfolder/upcoming/mines_of_moria.txt
new file mode 100644
index 00000000000..2ef3fbca526
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mines_of_moria.txt
@@ -0,0 +1,11 @@
+Name:Mines of Moria
+ManaCost:no cost
+Types:Legendary Land
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Creature.Legendary+YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a legendary creature.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
+A:AB$ Token | Cost$ 3 R T ExileFromGrave<3/Card/cards> | TokenScript$ c_a_treasure_sac | TokenAmount$ 2 | SpellDescription$ Create two Treasure tokens.
+DeckHas:Ability$Token & Type$Artifact|Treasure
+DeckHints:Ability$Graveyard
+DeckHints:Type$Legendary
+Oracle:Mines of Moria enters the battlefield tapped unless you control a legendary creature.\n{T}: Add {R}.\n{3}{R}, {T}, Exile three cards from your graveyard: Create two Treasure tokens.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/moria_marauder.txt b/forge-gui/res/cardsfolder/upcoming/moria_marauder.txt
new file mode 100644
index 00000000000..d2703bf6d0b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/moria_marauder.txt
@@ -0,0 +1,12 @@
+Name:Moria Marauder
+ManaCost:R R
+Types:Creature Goblin Warrior
+PT:1/1
+K:Double strike
+T:Mode$ DamageDone | ValidSource$ Goblin.YouCtrl,Orc.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Goblin or Orc you control deals combat damage to a player, exile the top card of your library. You may play that card this turn.
+SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | Description$ Exile the top card of your library. You may play that card this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHints:Type$Goblin|Orc
+Oracle:Double strike\nWhenever a Goblin or Orc you control deals combat damage to a player, exile the top card of your library. You may play that card this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/rivendell.txt b/forge-gui/res/cardsfolder/upcoming/rivendell.txt
new file mode 100644
index 00000000000..da0160cd5e2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rivendell.txt
@@ -0,0 +1,9 @@
+Name:Rivendell
+ManaCost:no cost
+Types:Legendary Land
+K:ETBReplacement:Other:LandTapped
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Creature.Legendary+YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a legendary creature.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+A:AB$ Scry | Cost$ 1 U T | ScryNum$ 2 | IsPresent$ Creature.Legendary+YouCtrl | SpellDescription$ Scry 2. Activate only if you control a legendary creature.
+DeckHints:Type$Legendary
+Oracle:The Shire enters the battlefield tapped unless you control a legendary creature.\n{T}: Add {G}.\n{1}{G}, {T}, Tap an untapped creature you control: Create a Food token.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt b/forge-gui/res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt
new file mode 100644
index 00000000000..21225acd723
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt
@@ -0,0 +1,12 @@
+Name:Shadowfax, Lord of Horses
+ManaCost:3 R W
+Types:Legendary Creature Horse
+PT:4/4
+S:Mode$ Continuous | Affected$ Horse.YouCtrl | AddKeyword$ Haste | Description$ Horses you control have haste. (They can attack and {T} as soon as they come under your control.)
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may put a creature card with lesser power from your hand onto the battlefield tapped and attacking.
+SVar:TrigChangeZone:DB$ ChangeZone | ChangeType$ Creature.YouCtrl+powerLTX | Origin$ Hand | Destination$ Battlefield | TgtPrompt$ Select target creature card with lesser power that Shadowfax in your hand
+SVar:X:Count$CardPower
+SVar:HasAttackEffect:TRUE
+SVar:PlayMain1:TRUE
+DeckHints:Type$Horse
+Oracle:Horses you control have haste. (They can attack and {T} as soon as they come under your control.)\nWhenever Shadowfax, Lord of Horses attacks, you may put a creature card with lesser power from your hand onto the battlefield tapped and attacking.
\ No newline at end of file

From ac3174b756b67282a606672fa59d146775b944ce Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 3 Jun 2023 12:42:35 +0200
Subject: [PATCH 2/3] Update gimli_counter_of_kills.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt b/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
index e3e290f9c8a..f42aad407c4 100644
--- a/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Legendary Creature — Dwarf Warrior
 PT:4/3
 K:Trample
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature an opponent controls dies, Gimli, Counter of Kills deals 1 damage to that creature's controller.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature an opponent controls dies, CARDNAME deals 1 damage to that creature's controller.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredCardController | NumDmg$ 1
 Whenever a creature an opponent controls dies, CARDNAME deals 1 damage to that creature's controller.
-Oracle:Trample\nWhenever a creature an opponent controls dies, Gimli, Counter of Kills deals 1 damage to that creature's controller.
\ No newline at end of file
+Oracle:Trample\nWhenever a creature an opponent controls dies, Gimli, Counter of Kills deals 1 damage to that creature's controller.

From 09a853abb0ad9147f3a22a368007ff6f49f644d2 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 3 Jun 2023 14:59:42 +0200
Subject: [PATCH 3/3] update

---
 forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt  | 3 +--
 forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt              | 2 +-
 forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt             | 2 +-
 forge-gui/res/cardsfolder/upcoming/many_partings.txt           | 2 +-
 forge-gui/res/cardsfolder/upcoming/moria_marauder.txt          | 2 +-
 .../res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt      | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt b/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
index f42aad407c4..ab038f34b7a 100644
--- a/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gimli_counter_of_kills.txt
@@ -1,9 +1,8 @@
 Name:Gimli, Counter of Kills
 ManaCost:3 R
-Types:Legendary Creature — Dwarf Warrior
+Types:Legendary Creature Dwarf Warrior
 PT:4/3
 K:Trample
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature an opponent controls dies, CARDNAME deals 1 damage to that creature's controller.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredCardController | NumDmg$ 1
-Whenever a creature an opponent controls dies, CARDNAME deals 1 damage to that creature's controller.
 Oracle:Trample\nWhenever a creature an opponent controls dies, Gimli, Counter of Kills deals 1 damage to that creature's controller.
diff --git a/forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt b/forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt
index 96eb4d9c4e2..ead86cf1071 100644
--- a/forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gimlis_axe.txt
@@ -5,4 +5,4 @@ K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | Description$ Equipped creature gets +3/+0.
 S:Mode$ Continuous | Affected$ Card.EquippedBy+Legendary | AddKeyword$ Menace | Description$ As long as equipped creature is legendary, it has menace. (It can't be blocked except by two or more creatures.)
 DeckHints:Type$Legendary
-Oracle:Equipped creature gets +3/+0.As long as equipped creature is legendary, it has menace. (It can't be blocked except by two or more creatures.)\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
+Oracle:Equipped creature gets +3/+0.\nAs long as equipped creature is legendary, it has menace. (It can't be blocked except by two or more creatures.)\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt b/forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt
index 5edcd0cecaa..c4043150c4f 100644
--- a/forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gimlis_fury.txt
@@ -2,6 +2,6 @@ Name:Gimli's Fury
 ManaCost:1 R
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +2 | SubAbility$ DBPump | SpellDescription$ Target creature gets +3/+2 until end of turn. If it's legendary, it also gains trample until end of turn.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Lifelink | ConditionDefined$ Targeted | ConditionPresent$ Legendary
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Trample | ConditionDefined$ Targeted | ConditionPresent$ Legendary
 DeckHints:Type$Legendary
 Oracle:Target creature gets +3/+2 until end of turn. If it's legendary, it also gains trample until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/many_partings.txt b/forge-gui/res/cardsfolder/upcoming/many_partings.txt
index d98605a708e..f51fdc39d29 100644
--- a/forge-gui/res/cardsfolder/upcoming/many_partings.txt
+++ b/forge-gui/res/cardsfolder/upcoming/many_partings.txt
@@ -1,7 +1,7 @@
 Name:Many Partings
 ManaCost:G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ pellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 SVar:DBToken:DB$ Token | TokenScript$ c_a_food_sac
 DeckHas:Ability$Token|LifeGain|Sacrifice & Type$Artifact|Food
 Oracle:Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/upcoming/moria_marauder.txt b/forge-gui/res/cardsfolder/upcoming/moria_marauder.txt
index d2703bf6d0b..abbdd6411dd 100644
--- a/forge-gui/res/cardsfolder/upcoming/moria_marauder.txt
+++ b/forge-gui/res/cardsfolder/upcoming/moria_marauder.txt
@@ -6,7 +6,7 @@ K:Double strike
 T:Mode$ DamageDone | ValidSource$ Goblin.YouCtrl,Orc.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Goblin or Orc you control deals combat damage to a player, exile the top card of your library. You may play that card this turn.
 SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | Description$ Exile the top card of your library. You may play that card this turn.
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Exile the top card of your library. You may play that card this turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHints:Type$Goblin|Orc
 Oracle:Double strike\nWhenever a Goblin or Orc you control deals combat damage to a player, exile the top card of your library. You may play that card this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt b/forge-gui/res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt
index 21225acd723..749a2aa91da 100644
--- a/forge-gui/res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shadowfax_lord_of_horses.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Horse
 PT:4/4
 S:Mode$ Continuous | Affected$ Horse.YouCtrl | AddKeyword$ Haste | Description$ Horses you control have haste. (They can attack and {T} as soon as they come under your control.)
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may put a creature card with lesser power from your hand onto the battlefield tapped and attacking.
-SVar:TrigChangeZone:DB$ ChangeZone | ChangeType$ Creature.YouCtrl+powerLTX | Origin$ Hand | Destination$ Battlefield | TgtPrompt$ Select target creature card with lesser power that Shadowfax in your hand
+SVar:TrigChangeZone:DB$ ChangeZone | ChangeType$ Creature.YouCtrl+powerLTX | Origin$ Hand | Tapped$ True | Attacking$ True | Destination$ Battlefield | TgtPrompt$ Select target creature card with lesser power that Shadowfax in your hand
 SVar:X:Count$CardPower
 SVar:HasAttackEffect:TRUE
 SVar:PlayMain1:TRUE