From eed448daeaf0bd7c6dc589515ec322cb6e0cd95e Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 22 Jul 2023 11:02:55 +0200
Subject: [PATCH 01/22] Create gollum_scheming_guide.txt

---
 .../upcoming/gollum_scheming_guide.txt        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
new file mode 100644
index 00000000000..7b08b53a18d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -0,0 +1,20 @@
+Name:Gollum, Scheming Guide
+ManaCost:1 B
+Types:Legendary Creature Halfling Horror
+PT:2/1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerDescription$ Whenever CARDNAME attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove NICKNAME from combat. Otherwise, you draw a card and NICKNAME can't be blocked this turn.
+SVar:TrigPeek:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 2 | SubAbility$ DBChoosePlayer
+SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
+SVar:DBChoose:DB$ GenericChoice | Choices$ ChooseLand,ChooseNonland | Defined$ You
+SVar:ChooseLand:DB$ GenericChoice | Defined$ Player.Chosen | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose land.
+SVar:ChooseNonland:DB$ GenericChoice | Defined$ Player.Chosen | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose nonland.
+SVar:GuessLand:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.
+SVar:GuesNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland.
+SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
+SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
+SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card and NICKNAME can't be blocked this turn.
+SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Description$ NICKNAME can't be blocked this turn.
+SVar:X:Count$RememberedSize
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.
\ No newline at end of file

From 0cfc6289a2e9bfe942a8400e4bf9e0343b4f95a7 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Wed, 26 Jul 2023 13:29:01 +0200
Subject: [PATCH 02/22] Update gollum_scheming_guide.txt

---
 .../res/cardsfolder/upcoming/gollum_scheming_guide.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 7b08b53a18d..6974ebace97 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -2,19 +2,19 @@ Name:Gollum, Scheming Guide
 ManaCost:1 B
 Types:Legendary Creature Halfling Horror
 PT:2/1
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerDescription$ Whenever CARDNAME attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove NICKNAME from combat. Otherwise, you draw a card and NICKNAME can't be blocked this turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove NICKNAME from combat. Otherwise, you draw a card and NICKNAME can't be blocked this turn.
 SVar:TrigPeek:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 2 | SubAbility$ DBChoosePlayer
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
 SVar:DBChoose:DB$ GenericChoice | Choices$ ChooseLand,ChooseNonland | Defined$ You
-SVar:ChooseLand:DB$ GenericChoice | Defined$ Player.Chosen | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose land.
-SVar:ChooseNonland:DB$ GenericChoice | Defined$ Player.Chosen | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose nonland.
+SVar:ChooseLand:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose land.
+SVar:ChooseNonland:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose nonland.
 SVar:GuessLand:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.
-SVar:GuesNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland.
+SVar:GuessNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland.
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card and NICKNAME can't be blocked this turn.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True
 Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.
\ No newline at end of file

From f050352be7b7520b334046f85eb1db556619d6df Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Wed, 26 Jul 2023 18:44:05 +0200
Subject: [PATCH 03/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 6974ebace97..0159cafa5fb 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -14,7 +14,7 @@ SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card and NICKNAME can't be blocked this turn.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable
-SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.Self | Description$ NICKNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True
-Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.
\ No newline at end of file
+Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.

From 202b8b391386f7bff0ef18740a43fbf3b5b83537 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Wed, 26 Jul 2023 18:48:54 +0200
Subject: [PATCH 04/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 0159cafa5fb..1b122cd8566 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -13,7 +13,7 @@ SVar:GuessNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card and NICKNAME can't be blocked this turn.
-SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable
+SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True

From 05528957b23737f4d445235dc76cac31ce74a82b Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Thu, 27 Jul 2023 16:25:33 +0200
Subject: [PATCH 05/22] Update gollum_scheming_guide.txt

---
 .../res/cardsfolder/upcoming/gollum_scheming_guide.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 1b122cd8566..07b307fd935 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -6,10 +6,12 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerZones$ Battl
 SVar:TrigPeek:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 2 | SubAbility$ DBChoosePlayer
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
 SVar:DBChoose:DB$ GenericChoice | Choices$ ChooseLand,ChooseNonland | Defined$ You
-SVar:ChooseLand:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose land.
-SVar:ChooseNonland:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose nonland.
-SVar:GuessLand:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.
-SVar:GuessNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland.
+SVar:ChooseLand:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ OppGuessLandYouLand,OppGuessNonlandYouland | SpellDescription$ Choose land.
+SVar:ChooseNonland:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ OppGuessLandYouNonland,OppGuessNonlandYouNonland | SpellDescription$ Choose nonland.
+SVar:OppGuessLandYouLand:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.(Your opponent has chosen land)
+SVar:OppGuessNonlandYouland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland. (Your opponent has chosen land)
+SVar:OppGuessLandYouNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.(Your opponent has chosen nonland)
+SVar:OppGuessNonlandYouNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland. (Your opponent has chosen nonland)
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card and NICKNAME can't be blocked this turn.

From 4911475e4a6ea2eb6cc58d4eaae01e38300e9527 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:04:10 +0200
Subject: [PATCH 06/22] Create sauron_the_necromancer.txt

---
 .../upcoming/sauron_the_necromancer.txt           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt b/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
new file mode 100644
index 00000000000..07e52a88e16
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
@@ -0,0 +1,15 @@
+Name:Sauron, the Necromancer
+ManaCost:3 B B
+Types:Legendary Creature Avatar Horror
+PT:4/4
+K:Menace
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, exile target creature card from your graveyard. Create a tapped and attacking token that's a copy of that card, except it's a 3/3 black Wraith with menace. At the beginning of the next end step, exile that token unless NICKNAME is your Ring-bearer.
+SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select target creature card in your graveyard | RememberChanged$ True | SubAbility$ DBCopy
+SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | TokenTapped$ True | TokenAttacking$ True | SetPower$ 3 | SetToughness$ 3 | SetColor$ Black | AtEOT$ Exile | AtEOTCondition$ X | SetCreatureTypes$ Wraith | PumpKeywords$ Menace | AtEOTDesc$ At the beginning of the next end step, exile that token unless Sauron is your Ring-bearer. | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$Valid Card.Self+!IsRingbearer
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Graveyard|Token & Type$Wraith
+DeckHints:Ability$Mill
+DeckHints:
+Oracle:Menace\nWhenever Sauron, the Necromancer attacks, exile target creature card from your graveyard. Create a tapped and attacking token that's a copy of that card, except it's a 3/3 black Wraith with menace. At the beginning of the next end step, exile that token unless Sauron is your Ring-bearer.
\ No newline at end of file

From 4987fcd775b7c915105d91f4a74add1bcd59f933 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:06:50 +0200
Subject: [PATCH 07/22] Update sauron_the_necromancer.txt

---
 forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt b/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
index 07e52a88e16..65fa57b4fc3 100644
--- a/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
@@ -11,5 +11,4 @@ SVar:X:Count$Valid Card.Self+!IsRingbearer
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Graveyard|Token & Type$Wraith
 DeckHints:Ability$Mill
-DeckHints:
 Oracle:Menace\nWhenever Sauron, the Necromancer attacks, exile target creature card from your graveyard. Create a tapped and attacking token that's a copy of that card, except it's a 3/3 black Wraith with menace. At the beginning of the next end step, exile that token unless Sauron is your Ring-bearer.
\ No newline at end of file

From d8909b3f72e9671d7d53737d6f7d638d2ea723cb Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Thu, 27 Jul 2023 20:11:09 +0200
Subject: [PATCH 08/22] Update sauron_the_necromancer.txt

---
 .../res/cardsfolder/upcoming/sauron_the_necromancer.txt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt b/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
index 65fa57b4fc3..27c4675e034 100644
--- a/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
@@ -4,11 +4,11 @@ Types:Legendary Creature Avatar Horror
 PT:4/4
 K:Menace
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, exile target creature card from your graveyard. Create a tapped and attacking token that's a copy of that card, except it's a 3/3 black Wraith with menace. At the beginning of the next end step, exile that token unless NICKNAME is your Ring-bearer.
-SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select target creature card in your graveyard | RememberChanged$ True | SubAbility$ DBCopy
-SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | TokenTapped$ True | TokenAttacking$ True | SetPower$ 3 | SetToughness$ 3 | SetColor$ Black | AtEOT$ Exile | AtEOTCondition$ X | SetCreatureTypes$ Wraith | PumpKeywords$ Menace | AtEOTDesc$ At the beginning of the next end step, exile that token unless Sauron is your Ring-bearer. | SubAbility$ DBCleanup
+SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select target creature card in your graveyard | RememberChanged$ True | SubAbility$ DBCopy
+SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | TokenTapped$ True | TokenAttacking$ True | SetPower$ 3 | SetToughness$ 3 | SetColor$ Black | AtEOT$ Exile | AtEOTCondition$ X | SetCreatureTypes$ Wraith | AddKeywords$ Menace | AtEOTDesc$ At the beginning of the next end step, exile that token unless Sauron is your Ring-bearer. | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Card.Self+!IsRingbearer
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Graveyard|Token & Type$Wraith
-DeckHints:Ability$Mill
+DeckHints:Ability$Mill|Discard
 Oracle:Menace\nWhenever Sauron, the Necromancer attacks, exile target creature card from your graveyard. Create a tapped and attacking token that's a copy of that card, except it's a 3/3 black Wraith with menace. At the beginning of the next end step, exile that token unless Sauron is your Ring-bearer.
\ No newline at end of file

From 136a4348039104260d5ecb687a6f23bfc70943c4 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 28 Jul 2023 07:26:52 +0200
Subject: [PATCH 09/22] update

---
 .../cardsfolder/upcoming/gollum_scheming_guide.txt   | 12 +++++-------
 .../cardsfolder/upcoming/sauron_the_necromancer.txt  |  5 +++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 07b307fd935..f298ee81556 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -5,13 +5,11 @@ PT:2/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove NICKNAME from combat. Otherwise, you draw a card and NICKNAME can't be blocked this turn.
 SVar:TrigPeek:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 2 | SubAbility$ DBChoosePlayer
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
-SVar:DBChoose:DB$ GenericChoice | Choices$ ChooseLand,ChooseNonland | Defined$ You
-SVar:ChooseLand:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ OppGuessLandYouLand,OppGuessNonlandYouland | SpellDescription$ Choose land.
-SVar:ChooseNonland:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ OppGuessLandYouNonland,OppGuessNonlandYouNonland | SpellDescription$ Choose nonland.
-SVar:OppGuessLandYouLand:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.(Your opponent has chosen land)
-SVar:OppGuessNonlandYouland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland. (Your opponent has chosen land)
-SVar:OppGuessLandYouNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.(Your opponent has chosen nonland)
-SVar:OppGuessNonlandYouNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland. (Your opponent has chosen nonland)
+SVar:DBChoose:DB$ GenericChoice | Choices$ ChooseLand,ChooseNonland | Defined$ You | ShowChoice$ ExceptSelf
+SVar:ChooseLand:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose land.
+SVar:ChooseNonland:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose nonland.
+SVar:GuessLand:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.
+SVar:GuessNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland.
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card and NICKNAME can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt b/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
index 27c4675e034..9a47deabf2f 100644
--- a/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sauron_the_necromancer.txt
@@ -5,9 +5,10 @@ PT:4/4
 K:Menace
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, exile target creature card from your graveyard. Create a tapped and attacking token that's a copy of that card, except it's a 3/3 black Wraith with menace. At the beginning of the next end step, exile that token unless NICKNAME is your Ring-bearer.
 SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select target creature card in your graveyard | RememberChanged$ True | SubAbility$ DBCopy
-SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | TokenTapped$ True | TokenAttacking$ True | SetPower$ 3 | SetToughness$ 3 | SetColor$ Black | AtEOT$ Exile | AtEOTCondition$ X | SetCreatureTypes$ Wraith | AddKeywords$ Menace | AtEOTDesc$ At the beginning of the next end step, exile that token unless Sauron is your Ring-bearer. | SubAbility$ DBCleanup
+SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | TokenTapped$ True | TokenAttacking$ True | SetPower$ 3 | SetToughness$ 3 | SetColor$ Black | AtEOT$ Exile | AtEOTCondition$ Y | SetCreatureTypes$ Wraith | AddKeywords$ Menace | AtEOTDesc$ At the beginning of the next end step, exile that token unless Sauron is your Ring-bearer. | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$Valid Card.Self+!IsRingbearer
+SVar:Y:Count$Compare X EQ0.1.0
+SVar:X:Count$Valid Card.Self+IsRingbearer
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Graveyard|Token & Type$Wraith
 DeckHints:Ability$Mill|Discard

From 0a36c688c80fd5d23b74fab6134a9c99592d0862 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 28 Jul 2023 15:25:43 +0200
Subject: [PATCH 10/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index f298ee81556..c142afb4b45 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Halfling Horror
 PT:2/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove NICKNAME from combat. Otherwise, you draw a card and NICKNAME can't be blocked this turn.
 SVar:TrigPeek:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 2 | SubAbility$ DBChoosePlayer
-SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
+SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
 SVar:DBChoose:DB$ GenericChoice | Choices$ ChooseLand,ChooseNonland | Defined$ You | ShowChoice$ ExceptSelf
 SVar:ChooseLand:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose land.
 SVar:ChooseNonland:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose nonland.

From efb6328e387eeb39654479730ca738559f11e157 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 28 Jul 2023 19:58:29 +0200
Subject: [PATCH 11/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index c142afb4b45..419efb7ebe8 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -5,11 +5,9 @@ PT:2/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove NICKNAME from combat. Otherwise, you draw a card and NICKNAME can't be blocked this turn.
 SVar:TrigPeek:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 2 | SubAbility$ DBChoosePlayer
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
-SVar:DBChoose:DB$ GenericChoice | Choices$ ChooseLand,ChooseNonland | Defined$ You | ShowChoice$ ExceptSelf
-SVar:ChooseLand:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose land.
-SVar:ChooseNonland:DB$ GenericChoice | Defined$ ChosenPlayer | Choices$ GuessLand,GuessNonland | SpellDescription$ Choose nonland.
-SVar:GuessLand:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.Land | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess land.
-SVar:GuessNonland:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.nonLand | RememberRevealed$ True | SubAbility$ DBBranch | SpellDescription$ Guess nonland.
+SVar:DBChoose:DB$ ChooseType | Type$ Card | ValidTypes$ Land,Nonland | Defined$ You | ShowChoice$ ExceptSelf | SubAbility$ DBChooseBis
+SVar:DBChooseBis:DB$ ChooseType | Defined$ ChosenPlayer | Type$ Card | ValidTypes$ Land,Nonland | SubAbility$ DBReveal
+SVar:DBReveal:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.ChosenType | RememberRevealed$ True | SubAbility$ DBBranch
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card and NICKNAME can't be blocked this turn.

From 8cb9d4f2b09f9d5e21b9a11d8b0ecb1ba8a9a54c Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 28 Jul 2023 20:00:46 +0200
Subject: [PATCH 12/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 419efb7ebe8..29bfabd6745 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -14,5 +14,5 @@ SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card an
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True | ClearChosenType$ True
 Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.

From 2c8e79236f5f376039e0fba48a8682591ad5fe82 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Fri, 28 Jul 2023 21:28:20 +0200
Subject: [PATCH 13/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 29bfabd6745..dfbe4a26e74 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -5,7 +5,7 @@ PT:2/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove NICKNAME from combat. Otherwise, you draw a card and NICKNAME can't be blocked this turn.
 SVar:TrigPeek:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 2 | SubAbility$ DBChoosePlayer
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
-SVar:DBChoose:DB$ ChooseType | Type$ Card | ValidTypes$ Land,Nonland | Defined$ You | ShowChoice$ ExceptSelf | SubAbility$ DBChooseBis
+SVar:DBChoose:DB$ ChooseType | Type$ Card | ValidTypes$ Land,Nonland | Defined$ You | SubAbility$ DBChooseBis
 SVar:DBChooseBis:DB$ ChooseType | Defined$ ChosenPlayer | Type$ Card | ValidTypes$ Land,Nonland | SubAbility$ DBReveal
 SVar:DBReveal:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.ChosenType | RememberRevealed$ True | SubAbility$ DBBranch
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup

From f773a791baabded55d2461e0126a475de6ae2196 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 29 Jul 2023 00:02:42 +0200
Subject: [PATCH 14/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index dfbe4a26e74..3a98225c2e7 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -10,7 +10,7 @@ SVar:DBChooseBis:DB$ ChooseType | Defined$ ChosenPlayer | Type$ Card | ValidType
 SVar:DBReveal:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.ChosenType | RememberRevealed$ True | SubAbility$ DBBranch
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
-SVar:Draw:DB$ Draw | SubAbility$ DBEffect | SpellDescription$ You draw a card and NICKNAME can't be blocked this turn.
+SVar:Draw:DB$ Draw | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize

From 47bb5e67e9efcc4ff3f4263f21d3e0426bde2bc1 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sat, 29 Jul 2023 00:24:33 +0200
Subject: [PATCH 15/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 3a98225c2e7..415f6733fef 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -14,5 +14,6 @@ SVar:Draw:DB$ Draw | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize
+SVar:MustAttack:True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True | ClearChosenType$ True
 Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.

From 0c912c946a505a3f2c58bf6c140616583a2bab93 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 30 Jul 2023 08:34:35 +0200
Subject: [PATCH 16/22] Update gollum_scheming_guide.txt

---
 .../res/cardsfolder/upcoming/gollum_scheming_guide.txt     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 415f6733fef..53d385e6b67 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -6,14 +6,15 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerZones$ Battl
 SVar:TrigPeek:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 2 | SubAbility$ DBChoosePlayer
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChoose
 SVar:DBChoose:DB$ ChooseType | Type$ Card | ValidTypes$ Land,Nonland | Defined$ You | SubAbility$ DBChooseBis
-SVar:DBChooseBis:DB$ ChooseType | Defined$ ChosenPlayer | Type$ Card | ValidTypes$ Land,Nonland | SubAbility$ DBReveal
-SVar:DBReveal:DB$ PeekandReveal | PeekAmount$ 1 | RevealValid$ Card.ChosenType | RememberRevealed$ True | SubAbility$ DBBranch
+SVar:DBChooseBis:DB$ ChooseType | Defined$ ChosenPlayer | Type$ Card | ValidTypes$ Land,Nonland | SubAbility$ DBBranch
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
+SVar:X:Count$ValidLibrary Card.TopLibrary+ChosenType
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize
 SVar:MustAttack:True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenPlayer$ True | ClearChosenType$ True
+SVar:HasAttackEffect :True
+SVar:DBCleanup:DB$ Cleanup | ClearChosenPlayer$ True | ClearChosenType$ True
 Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.

From 874c954c26d1a068541887987c20388698233b87 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 30 Jul 2023 08:35:29 +0200
Subject: [PATCH 17/22] Update gollum_scheming_guide.txt

---
 forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 53d385e6b67..7d5b20348fa 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -14,7 +14,6 @@ SVar:Draw:DB$ Draw | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize
-SVar:MustAttack:True
 SVar:HasAttackEffect :True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenPlayer$ True | ClearChosenType$ True
 Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.

From dfa1519823299a39189d9f604f29f00c1fd114bd Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 30 Jul 2023 09:49:19 +0200
Subject: [PATCH 18/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 7d5b20348fa..5398b4f3dda 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -14,6 +14,6 @@ SVar:Draw:DB$ Draw | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
 SVar:X:Count$RememberedSize
-SVar:HasAttackEffect :True
+SVar:HasAttackEffect:True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenPlayer$ True | ClearChosenType$ True
 Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.

From 9cb47cd293ea8fb5f33fda8521929fdcbd5ccdb4 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 30 Jul 2023 09:50:34 +0200
Subject: [PATCH 19/22] Update gollum_scheming_guide.txt


From c57dc6af3b8aae64d5fd9d89b88bc26805d705fe Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 30 Jul 2023 09:51:25 +0200
Subject: [PATCH 20/22] Update gollum_scheming_guide.txt

---
 forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 5398b4f3dda..33cf0f05e4f 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -13,7 +13,6 @@ SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
-SVar:X:Count$RememberedSize
 SVar:HasAttackEffect:True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenPlayer$ True | ClearChosenType$ True
 Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.

From cb5e05f8ad3669b47748db37b2df40fc7d0c829c Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 30 Jul 2023 09:54:17 +0200
Subject: [PATCH 21/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 33cf0f05e4f..367dcaf59a5 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -13,6 +13,6 @@ SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.EffectSource | Description$ NICKNAME can't be blocked this turn.
-SVar:HasAttackEffect:True
+SVar:HasAttackEffect:TRUE
 SVar:DBCleanup:DB$ Cleanup | ClearChosenPlayer$ True | ClearChosenType$ True
 Oracle:Whenever Gollum, Scheming Guide attacks, look at the top two cards of your library, put them back in any order, then choose land or nonland. An opponent guesses whether the top card of your library is the chosen kind. Reveal that card. If they guessed right, remove Gollum from combat. Otherwise, you draw a card and Gollum can't be blocked this turn.

From 8435afd50390740b28343d4a08befc8aba584ea5 Mon Sep 17 00:00:00 2001
From: Simisays <67333662+Simisays@users.noreply.github.com>
Date: Sun, 30 Jul 2023 10:27:28 +0200
Subject: [PATCH 22/22] Update gollum_scheming_guide.txt

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

diff --git a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
index 367dcaf59a5..9afefb824da 100644
--- a/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gollum_scheming_guide.txt
@@ -8,7 +8,7 @@ SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Opponent | Choice
 SVar:DBChoose:DB$ ChooseType | Type$ Card | ValidTypes$ Land,Nonland | Defined$ You | SubAbility$ DBChooseBis
 SVar:DBChooseBis:DB$ ChooseType | Defined$ ChosenPlayer | Type$ Card | ValidTypes$ Land,Nonland | SubAbility$ DBBranch
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RemoveCombat | FalseSubAbility$ Draw | SubAbility$ DBCleanup
-SVar:X:Count$ValidLibrary Card.TopLibrary+ChosenType
+SVar:X:Count$ValidLibrary Card.TopLibrary+ChosenType+YouOwn
 SVar:RemoveCombat:DB$ RemoveFromCombat | Defined$ Self
 SVar:Draw:DB$ Draw | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Unblockable | Duration$ UntilHostLeavesPlayOrEOT