From 0d33400ec33632bc8a29ed1e7439c9e7af566250 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 9 Jan 2023 14:47:49 +0100
Subject: [PATCH 1/7] update

---
 .../cardsfolder/upcoming/archfiend_of_the_dross.txt | 13 +++++++++++++
 .../cardsfolder/upcoming/black_suns_twilight.txt    |  8 ++++++++
 .../res/cardsfolder/upcoming/conduit_of_worlds.txt  |  8 ++++++++
 .../cardsfolder/upcoming/encroaching_mycosynth.txt  |  5 +++++
 .../upcoming/geth_thane_of_contracts.txt            | 10 ++++++++++
 5 files changed, 44 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt b/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
new file mode 100644
index 00000000000..f10bff7d020
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
@@ -0,0 +1,13 @@
+Name:Archfiend of the Dross
+ManaCost:2 B
+Types:Creature Phyrexian Demon
+PT:6/6
+K:Flying
+K:etbCounter:OIL:4
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCtr | TriggerDescription$ At the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.
+SVar:TrigRemoveCtr:DB$ RemoveCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1 | SubAbility$ LoseGame
+SVar:LoseGame:DB$ LoseGame | Defined$ You | ConditionDefined$ Self | ConditionPresent$ Card.counters_EQ0_OIL
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature an opponent controls dies, its controller loses 2 life.
+SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ TriggeredCardController
+DeckHas:Ability$Counters
+Oracle:Flying\nArchfiend of the Dross enters the battlefield with four oil counters on it.\nAt the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.\nWhenever a creature an opponent controls dies, its controller loses 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
new file mode 100644
index 00000000000..99feb932ea9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
@@ -0,0 +1,8 @@
+Name:Black Sun's Twilight
+ManaCost:X B
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SubAbility$ DBReanimate | SpellDescription$ Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
+SVar:DBReanimate:DB$ ChangeZone | Origin$ Graveyard | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Destination$ Battlefield | TgtPrompt$ Choose target creature card with mana value X | ValidTgts$ Creature.YouOwn+cmcEQX
+SVar:X:Count$xPaid
+DeckNeeds:Ability$Graveyard
+Oracle:Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt b/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
new file mode 100644
index 00000000000..93693c82916
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
@@ -0,0 +1,8 @@
+Name:Conduit of Worlds
+ManaCost:2 G G
+Types:Artifact
+S:Mode$ Continuous | Affected$ Land.YouOwn | MayPlay$ True | AffectedZone$ Graveyard | Description$ You may play lands from your graveyard.
+S:Mode$ CantBeCast | ValidCard$ Card.nonArtifact | Caster$ Player | NumLimitEachTurn$ 1 | Description$ Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells.
+SVar:X:Count$ThisTurnCast_Creature.ActivePlayerCtrl
+DeckHints:Ability$Graveyard|Mill|Dredge
+Oracle:You may play lands from your graveyard.\n{T}: Choose target nonland permanent card in your graveyard. If you haven't cast a spell this turn, you may cast that card. If you do, you can't cast additional spells this turn. Activate only as a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt b/forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt
new file mode 100644
index 00000000000..e2437d02d45
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt
@@ -0,0 +1,5 @@
+Name:Encroaching Mycosynth
+ManaCost:3 U
+Types:Artifact
+S:Mode$ Continuous | Affected$ Permanent.nonLand+YouCtrl | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | AddType$ Artifact | Description$ Nonland permanents you control are artifacts in addition to their other types The same is true for permanent spells you control and nonland permanent cards you own that aren't on the battlefield.
+Oracle:Nonland permanents you control are artifacts in addition to their other types The same is true for permanent spells you control and nonland permanent cards you own that aren't on the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt b/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
new file mode 100644
index 00000000000..3575e78fd48
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
@@ -0,0 +1,10 @@
+Name:Geth, Thane of Contracts
+ManaCost:1 B B
+Types:Legendary Creature Phyrexian Zombie
+PT:3/4
+S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddPower$ -1 | AddToughness$ -1 | Description$ Other creatures you control get -1/-1.
+A:AB$ ChangeZone | Cost$ 1 B B T | Origin$ Graveyard | SorcerySpeed$ True | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SubAbility$ DBPump | SpellDescription$Return target creature card from your graveyard to the battlefield. It gains "If this creature would leave the battlefield, exile it instead of putting it anywhere else." Activate only as a sorcery. 
+SVar:DBPump:DB$ Pump | LeaveBattlefield$ Exile | Defined$ Targeted | Duration$ Permanent
+DeckHints:Ability$Graveyard|Mill|Dredge
+DeckHas:Ability$Graveyard
+Oracle:Other creatures you control get -1/-1.\n{1}{B}{B}, {T}: Return target creature card from your graveyard to the battlefield. It gains "If this creature would leave the battlefield, exile it instead of putting it anywhere else." Activate only as a sorcery.
\ No newline at end of file

From f96a701f959cd1de096f83e5df5aacba56950ebf Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 9 Jan 2023 22:39:17 +0100
Subject: [PATCH 2/7] update

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

diff --git a/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt b/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
index 93693c82916..5ea058dd950 100644
--- a/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
+++ b/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
@@ -2,7 +2,10 @@ Name:Conduit of Worlds
 ManaCost:2 G G
 Types:Artifact
 S:Mode$ Continuous | Affected$ Land.YouOwn | MayPlay$ True | AffectedZone$ Graveyard | Description$ You may play lands from your graveyard.
-S:Mode$ CantBeCast | ValidCard$ Card.nonArtifact | Caster$ Player | NumLimitEachTurn$ 1 | Description$ Each player who has cast a nonartifact spell this turn can't cast additional nonartifact spells.
-SVar:X:Count$ThisTurnCast_Creature.ActivePlayerCtrl
+A:AB$ Pump | Cost$ T | Defined$ You | SorcerySpeed$ True | ValidTgts$ Permanent.nonLand+YouCtrl | PumpZone$ Graveyard | TargetPrompt$ Choose a creature card in your graveyard | RememberTargets$ True | SubAbility$ DBPlay | SpellDescription$ Choose target nonland permanent card in your graveyard. If you haven't cast a spell this turn, you may cast that card. If you do, you can't cast additional spells this turn. Activate only as a sorcery.
+SVar:DBPlay:DB$ Play | Defined$ Targeted | ValidSA$ Spell | ConditionCheckSVar$ X | CondtionSVarCompare$ EQ0 | RememberPlayed$ True | Optional$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | Name$ Conduit of Worlds's Effect | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | StaticAbilities$ STCantBeCast
+SVar:STCantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ You | Description$ You can't cast additional spells this turn.
+SVar:X:Count$ThisTurnCast_Spell.YouCtrl
 DeckHints:Ability$Graveyard|Mill|Dredge
 Oracle:You may play lands from your graveyard.\n{T}: Choose target nonland permanent card in your graveyard. If you haven't cast a spell this turn, you may cast that card. If you do, you can't cast additional spells this turn. Activate only as a sorcery.
\ No newline at end of file

From 3fe7bf64e117e06c1fa4b845553484875f6527c9 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Mon, 9 Jan 2023 23:01:33 +0100
Subject: [PATCH 3/7] update

---
 forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt | 2 +-
 forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt    | 2 +-
 forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt b/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
index f10bff7d020..97637f2ee56 100644
--- a/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
+++ b/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
@@ -6,7 +6,7 @@ K:Flying
 K:etbCounter:OIL:4
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCtr | TriggerDescription$ At the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.
 SVar:TrigRemoveCtr:DB$ RemoveCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1 | SubAbility$ LoseGame
-SVar:LoseGame:DB$ LoseGame | Defined$ You | ConditionDefined$ Self | ConditionPresent$ Card.counters_EQ0_OIL
+SVar:LoseGame:DB$ LosesGame | Defined$ You | ConditionDefined$ Self | ConditionPresent$ Card.counters_EQ0_OIL
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature an opponent controls dies, its controller loses 2 life.
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ TriggeredCardController
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
index 99feb932ea9..09d2a65701f 100644
--- a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
+++ b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
@@ -2,7 +2,7 @@ Name:Black Sun's Twilight
 ManaCost:X B
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SubAbility$ DBReanimate | SpellDescription$ Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
-SVar:DBReanimate:DB$ ChangeZone | Origin$ Graveyard | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Destination$ Battlefield | TgtPrompt$ Choose target creature card with mana value X | ValidTgts$ Creature.YouOwn+cmcEQX
+SVar:DBReanimate:DB$ ChangeZone | Origin$ Graveyard | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.YouOwn+cmcLEX
 SVar:X:Count$xPaid
 DeckNeeds:Ability$Graveyard
 Oracle:Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt b/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
index 5ea058dd950..81744201136 100644
--- a/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
+++ b/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
@@ -2,9 +2,9 @@ Name:Conduit of Worlds
 ManaCost:2 G G
 Types:Artifact
 S:Mode$ Continuous | Affected$ Land.YouOwn | MayPlay$ True | AffectedZone$ Graveyard | Description$ You may play lands from your graveyard.
-A:AB$ Pump | Cost$ T | Defined$ You | SorcerySpeed$ True | ValidTgts$ Permanent.nonLand+YouCtrl | PumpZone$ Graveyard | TargetPrompt$ Choose a creature card in your graveyard | RememberTargets$ True | SubAbility$ DBPlay | SpellDescription$ Choose target nonland permanent card in your graveyard. If you haven't cast a spell this turn, you may cast that card. If you do, you can't cast additional spells this turn. Activate only as a sorcery.
+A:AB$ Pump | Cost$ T | Defined$ You | SorcerySpeed$ True | ValidTgts$ Permanent.nonLand+YouOwn | PumpZone$ Graveyard | TgtZone$ Graveyard | TgtPrompt$ Choose a creature card in your graveyard | ImprintTargets$ True | SubAbility$ DBPlay | SpellDescription$ Choose target nonland permanent card in your graveyard. If you haven't cast a spell this turn, you may cast that card. If you do, you can't cast additional spells this turn. Activate only as a sorcery.
 SVar:DBPlay:DB$ Play | Defined$ Targeted | ValidSA$ Spell | ConditionCheckSVar$ X | CondtionSVarCompare$ EQ0 | RememberPlayed$ True | Optional$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | Name$ Conduit of Worlds's Effect | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | StaticAbilities$ STCantBeCast
+SVar:DBEffect:DB$ Effect | Name$ Conduit of Worlds's Effect | ConditionDefined$ Remembered | ConditionPresent$ Card | StaticAbilities$ STCantBeCast
 SVar:STCantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ You | Description$ You can't cast additional spells this turn.
 SVar:X:Count$ThisTurnCast_Spell.YouCtrl
 DeckHints:Ability$Graveyard|Mill|Dredge

From 5feb79a0afa125c23e6234cfa96f233ba3d0720f Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Tue, 10 Jan 2023 10:31:56 +0100
Subject: [PATCH 4/7] update

---
 .../res/cardsfolder/upcoming/black_suns_twilight.txt  |  2 +-
 .../res/cardsfolder/upcoming/bloated_contaminator.txt | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
index 09d2a65701f..7ce74a1bbf4 100644
--- a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
+++ b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
@@ -2,7 +2,7 @@ Name:Black Sun's Twilight
 ManaCost:X B
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SubAbility$ DBReanimate | SpellDescription$ Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
-SVar:DBReanimate:DB$ ChangeZone | Origin$ Graveyard | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.YouOwn+cmcLEX
+SVar:DBReanimate:DB$ ChangeZone | Origin$ Graveyard | Chooser$ You | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.YouOwn+cmcLEX
 SVar:X:Count$xPaid
 DeckNeeds:Ability$Graveyard
 Oracle:Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt b/forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt
new file mode 100644
index 00000000000..463bfcd3d7d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt
@@ -0,0 +1,11 @@
+Name:Bloated Contaminator
+ManaCost:2 G
+Types:Creature Phyrexian Beast
+PT:4/4
+K:Trample
+K:Toxic:1
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigProliferate | TriggerDescription$ Whenever CARDNAME deals combat damage to a player or dies, proliferate.
+SVar:TrigProliferate:DB$ Proliferate
+DeckHas:Ability$Proliferate
+DeckHints:Type$Planeswalker & Ability$Counters
+Oracle:Trample\nToxic 1\nWhenever Bloated Contaminator deals combat damage to a player, proliferate.
\ No newline at end of file

From 09043d1c008e31efa4842a11485e4cdf7d504382 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Tue, 10 Jan 2023 10:33:01 +0100
Subject: [PATCH 5/7] Delete conduit_of_worlds.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt b/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
deleted file mode 100644
index 81744201136..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/conduit_of_worlds.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Name:Conduit of Worlds
-ManaCost:2 G G
-Types:Artifact
-S:Mode$ Continuous | Affected$ Land.YouOwn | MayPlay$ True | AffectedZone$ Graveyard | Description$ You may play lands from your graveyard.
-A:AB$ Pump | Cost$ T | Defined$ You | SorcerySpeed$ True | ValidTgts$ Permanent.nonLand+YouOwn | PumpZone$ Graveyard | TgtZone$ Graveyard | TgtPrompt$ Choose a creature card in your graveyard | ImprintTargets$ True | SubAbility$ DBPlay | SpellDescription$ Choose target nonland permanent card in your graveyard. If you haven't cast a spell this turn, you may cast that card. If you do, you can't cast additional spells this turn. Activate only as a sorcery.
-SVar:DBPlay:DB$ Play | Defined$ Targeted | ValidSA$ Spell | ConditionCheckSVar$ X | CondtionSVarCompare$ EQ0 | RememberPlayed$ True | Optional$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | Name$ Conduit of Worlds's Effect | ConditionDefined$ Remembered | ConditionPresent$ Card | StaticAbilities$ STCantBeCast
-SVar:STCantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ You | Description$ You can't cast additional spells this turn.
-SVar:X:Count$ThisTurnCast_Spell.YouCtrl
-DeckHints:Ability$Graveyard|Mill|Dredge
-Oracle:You may play lands from your graveyard.\n{T}: Choose target nonland permanent card in your graveyard. If you haven't cast a spell this turn, you may cast that card. If you do, you can't cast additional spells this turn. Activate only as a sorcery.
\ No newline at end of file

From 9fed4432a1250b043c25d14d8dd044f6a4ae0601 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Tue, 10 Jan 2023 12:18:49 +0100
Subject: [PATCH 6/7] update

---
 .../res/cardsfolder/upcoming/archfiend_of_the_dross.txt     | 4 ++--
 forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt  | 2 +-
 forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt | 2 +-
 .../res/cardsfolder/upcoming/encroaching_mycosynth.txt      | 4 ++--
 .../res/cardsfolder/upcoming/geth_thane_of_contracts.txt    | 6 ++++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt b/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
index 97637f2ee56..28f3a2241bd 100644
--- a/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
+++ b/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
@@ -4,10 +4,10 @@ Types:Creature Phyrexian Demon
 PT:6/6
 K:Flying
 K:etbCounter:OIL:4
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCtr | TriggerDescription$ At the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCtr | TriggerDescription$ At the beginning of your upkeep, remove an oil counter from CARDNAME. Then if it has no oil counters on it, you lose the game.
 SVar:TrigRemoveCtr:DB$ RemoveCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1 | SubAbility$ LoseGame
 SVar:LoseGame:DB$ LosesGame | Defined$ You | ConditionDefined$ Self | ConditionPresent$ Card.counters_EQ0_OIL
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature an opponent controls dies, its controller loses 2 life.
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ TriggeredCardController
 DeckHas:Ability$Counters
-Oracle:Flying\nArchfiend of the Dross enters the battlefield with four oil counters on it.\nAt the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.\nWhenever a creature an opponent controls dies, its controller loses 2 life.
+Oracle:Flying\nArchfiend of the Dross enters the battlefield with four oil counters on it.\nAt the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.\nWhenever a creature an opponent controls dies, its controller loses 2 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
index 7ce74a1bbf4..ed024929696 100644
--- a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
+++ b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
@@ -2,7 +2,7 @@ Name:Black Sun's Twilight
 ManaCost:X B
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SubAbility$ DBReanimate | SpellDescription$ Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
-SVar:DBReanimate:DB$ ChangeZone | Origin$ Graveyard | Chooser$ You | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.YouOwn+cmcLEX
+SVar:DBReanimate:DB$ ChangeZone | Origin$ Graveyard | Chooser$ You | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Destination$ Battlefield | Hidden$ True | Tapped$ True | ChangeType$ Creature.YouOwn+cmcLEX
 SVar:X:Count$xPaid
 DeckNeeds:Ability$Graveyard
 Oracle:Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt b/forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt
index 463bfcd3d7d..4a0380de4c7 100644
--- a/forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bloated_contaminator.txt
@@ -4,7 +4,7 @@ Types:Creature Phyrexian Beast
 PT:4/4
 K:Trample
 K:Toxic:1
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigProliferate | TriggerDescription$ Whenever CARDNAME deals combat damage to a player or dies, proliferate.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigProliferate | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, proliferate.
 SVar:TrigProliferate:DB$ Proliferate
 DeckHas:Ability$Proliferate
 DeckHints:Type$Planeswalker & Ability$Counters
diff --git a/forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt b/forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt
index e2437d02d45..85295a2d0c1 100644
--- a/forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt
+++ b/forge-gui/res/cardsfolder/upcoming/encroaching_mycosynth.txt
@@ -1,5 +1,5 @@
 Name:Encroaching Mycosynth
 ManaCost:3 U
 Types:Artifact
-S:Mode$ Continuous | Affected$ Permanent.nonLand+YouCtrl | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | AddType$ Artifact | Description$ Nonland permanents you control are artifacts in addition to their other types The same is true for permanent spells you control and nonland permanent cards you own that aren't on the battlefield.
-Oracle:Nonland permanents you control are artifacts in addition to their other types The same is true for permanent spells you control and nonland permanent cards you own that aren't on the battlefield.
\ No newline at end of file
+S:Mode$ Continuous | Affected$ Permanent.nonLand+YouCtrl | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | AddType$ Artifact | Description$ Nonland permanents you control are artifacts in addition to their other types. The same is true for permanent spells you control and nonland permanent cards you own that aren't on the battlefield.
+Oracle:Nonland permanents you control are artifacts in addition to their other types. The same is true for permanent spells you control and nonland permanent cards you own that aren't on the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt b/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
index 3575e78fd48..9ee4b2d15f7 100644
--- a/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
+++ b/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
@@ -3,8 +3,10 @@ ManaCost:1 B B
 Types:Legendary Creature Phyrexian Zombie
 PT:3/4
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddPower$ -1 | AddToughness$ -1 | Description$ Other creatures you control get -1/-1.
-A:AB$ ChangeZone | Cost$ 1 B B T | Origin$ Graveyard | SorcerySpeed$ True | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SubAbility$ DBPump | SpellDescription$Return target creature card from your graveyard to the battlefield. It gains "If this creature would leave the battlefield, exile it instead of putting it anywhere else." Activate only as a sorcery. 
-SVar:DBPump:DB$ Pump | LeaveBattlefield$ Exile | Defined$ Targeted | Duration$ Permanent
+A:AB$ ChangeZone | Cost$ 1 B B T | Origin$ Graveyard | SorcerySpeed$ True | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SubAbility$ DBAnimate | SpellDescription$ Return target creature card from your graveyard to the battlefield. It gains "If this creature would leave the battlefield, exile it instead of putting it anywhere else." Activate only as a sorcery. 
+SVar:DBAnimate:DB$ Animate | Replacements$ ReplaceLeaves | Defined$ Targeted | Duration$ Permanent
+SVar:ReplaceLeaves:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ Exile | Description$ If this creature would leave the battlefield, exile it instead.
+SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard
 DeckHints:Ability$Graveyard|Mill|Dredge
 DeckHas:Ability$Graveyard
 Oracle:Other creatures you control get -1/-1.\n{1}{B}{B}, {T}: Return target creature card from your graveyard to the battlefield. It gains "If this creature would leave the battlefield, exile it instead of putting it anywhere else." Activate only as a sorcery.
\ No newline at end of file

From dd3423572898429e1498ef5c1c50b62a568b875a Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Tue, 10 Jan 2023 18:31:17 +0100
Subject: [PATCH 7/7] update

---
 forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt  | 1 +
 forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt     | 2 +-
 forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt b/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
index 28f3a2241bd..f4a204470e0 100644
--- a/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
+++ b/forge-gui/res/cardsfolder/upcoming/archfiend_of_the_dross.txt
@@ -10,4 +10,5 @@ SVar:LoseGame:DB$ LosesGame | Defined$ You | ConditionDefined$ Self | ConditionP
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature an opponent controls dies, its controller loses 2 life.
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ TriggeredCardController
 DeckHas:Ability$Counters
+AI:RemoveDeck:Random
 Oracle:Flying\nArchfiend of the Dross enters the battlefield with four oil counters on it.\nAt the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.\nWhenever a creature an opponent controls dies, its controller loses 2 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
index ed024929696..d55498242ce 100644
--- a/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
+++ b/forge-gui/res/cardsfolder/upcoming/black_suns_twilight.txt
@@ -4,5 +4,5 @@ Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SubAbility$ DBReanimate | SpellDescription$ Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
 SVar:DBReanimate:DB$ ChangeZone | Origin$ Graveyard | Chooser$ You | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Destination$ Battlefield | Hidden$ True | Tapped$ True | ChangeType$ Creature.YouOwn+cmcLEX
 SVar:X:Count$xPaid
-DeckNeeds:Ability$Graveyard
+DeckHas:Ability$Graveyard
 Oracle:Up to one target creature gets -X/-X until end of turn. If X is 5 or more, return a creature card with mana value X or less from your graveyard to the battlefield tapped.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt b/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
index 9ee4b2d15f7..fc68119799d 100644
--- a/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
+++ b/forge-gui/res/cardsfolder/upcoming/geth_thane_of_contracts.txt
@@ -7,6 +7,6 @@ A:AB$ ChangeZone | Cost$ 1 B B T | Origin$ Graveyard | SorcerySpeed$ True | Dest
 SVar:DBAnimate:DB$ Animate | Replacements$ ReplaceLeaves | Defined$ Targeted | Duration$ Permanent
 SVar:ReplaceLeaves:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ Exile | Description$ If this creature would leave the battlefield, exile it instead.
 SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard
-DeckHints:Ability$Graveyard|Mill|Dredge
+DeckHints:Ability$Graveyard|Mill|Dredge|Sacrifice
 DeckHas:Ability$Graveyard
 Oracle:Other creatures you control get -1/-1.\n{1}{B}{B}, {T}: Return target creature card from your graveyard to the battlefield. It gains "If this creature would leave the battlefield, exile it instead of putting it anywhere else." Activate only as a sorcery.
\ No newline at end of file