From e5a7f5844c9696583c3a074b65ad5c14b03cdbcb Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Mon, 2 Oct 2017 06:53:14 +0000
Subject: [PATCH] - RemAIDeck update: next iteration

---
 forge-gui/res/cardsfolder/s/sage_of_fables.txt       | 6 ++++--
 forge-gui/res/cardsfolder/s/sands_of_delirium.txt    | 3 +--
 forge-gui/res/cardsfolder/s/sarcomite_myr.txt        | 1 -
 forge-gui/res/cardsfolder/s/scrib_nibblers.txt       | 3 +--
 forge-gui/res/cardsfolder/s/seeker_of_skybreak.txt   | 1 -
 forge-gui/res/cardsfolder/s/seers_vision.txt         | 1 -
 forge-gui/res/cardsfolder/s/semblance_anvil.txt      | 4 ++--
 forge-gui/res/cardsfolder/s/shivan_wurm.txt          | 2 +-
 forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt | 3 +--
 forge-gui/res/cardsfolder/s/silvergill_douser.txt    | 2 +-
 forge-gui/res/cardsfolder/s/sorcerous_sight.txt      | 2 +-
 forge-gui/res/cardsfolder/s/spell_syphon.txt         | 2 +-
 forge-gui/res/cardsfolder/s/stampeding_serow.txt     | 6 ++++--
 forge-gui/res/cardsfolder/s/stir_the_grave.txt       | 3 +--
 forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt   | 1 -
 forge-gui/res/cardsfolder/s/storm_sculptor.txt       | 3 ++-
 forge-gui/res/cardsfolder/s/stormfront_riders.txt    | 4 +++-
 forge-gui/res/cardsfolder/s/strata_scythe.txt        | 4 ++--
 forge-gui/res/cardsfolder/s/sudden_reclamation.txt   | 2 +-
 forge-gui/res/cardsfolder/s/sygg_river_guide.txt     | 2 +-
 20 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/forge-gui/res/cardsfolder/s/sage_of_fables.txt b/forge-gui/res/cardsfolder/s/sage_of_fables.txt
index 1d66860de8a..dc221fda307 100644
--- a/forge-gui/res/cardsfolder/s/sage_of_fables.txt
+++ b/forge-gui/res/cardsfolder/s/sage_of_fables.txt
@@ -5,7 +5,9 @@ PT:2/2
 R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Battlefield | ValidCard$ Creature.Wizard+Other+YouCtrl | ReplaceWith$ AddExtraCounter | Description$ Each other Wizard creature you control enters the battlefield with an additional +1/+1 counter on it.
 SVar:AddExtraCounter:AB$ PutCounter | Cost$ 0 | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToBattlefield
 SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
-A:AB$ Draw | Cost$ 2 SubCounter<1/P1P1/Creature.YouCtrl/Creature you Control> | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:RemAIDeck:True
+A:AB$ Draw | Cost$ 2 SubCounter<1/P1P1/Creature.YouCtrl/Creature you control> | NumCards$ 1 | SpellDescription$ Draw a card.
+DeckNeeds:Type$Wizard
+#TODO: The AI won't use the "draw a card" ability on this yet, needs some logic improvement. Otherwise, the AI uses this card fine
+#and it may be good in a Wizard-themed deck.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sage_of_fables.jpg
 Oracle:Each other Wizard creature you control enters the battlefield with an additional +1/+1 counter on it.\n{2}, Remove a +1/+1 counter from a creature you control: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/sands_of_delirium.txt b/forge-gui/res/cardsfolder/s/sands_of_delirium.txt
index 5e2aa7e3d92..38888e1721e 100644
--- a/forge-gui/res/cardsfolder/s/sands_of_delirium.txt
+++ b/forge-gui/res/cardsfolder/s/sands_of_delirium.txt
@@ -1,8 +1,7 @@
 Name:Sands of Delirium
 ManaCost:3
 Types:Artifact
-A:AB$ Mill | Cost$ X T | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Select target player | References$ X | SpellDescription$ Target player puts the top X cards of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ X T | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Select target player | References$ X | AILogic$ EndOfOppTurn | SpellDescription$ Target player puts the top X cards of his or her library into his or her graveyard.
 SVar:X:Count$xPaid
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sands_of_delirium.jpg
 Oracle:{X}, {T}: Target player puts the top X cards of his or her library into his or her graveyard.
diff --git a/forge-gui/res/cardsfolder/s/sarcomite_myr.txt b/forge-gui/res/cardsfolder/s/sarcomite_myr.txt
index 7839171c2e3..dd7e562d729 100644
--- a/forge-gui/res/cardsfolder/s/sarcomite_myr.txt
+++ b/forge-gui/res/cardsfolder/s/sarcomite_myr.txt
@@ -4,6 +4,5 @@ Types:Artifact Creature Myr
 PT:2/1
 A:AB$ Pump | Cost$ 2 | KW$ Flying | Defined$ Self | SpellDescription$ CARDNAME gains flying until end of turn.
 A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:RemAIDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card136212.jpg
 Oracle:{2}: Sarcomite Myr gains flying until end of turn.\n{2}, Sacrifice Sarcomite Myr: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/scrib_nibblers.txt b/forge-gui/res/cardsfolder/s/scrib_nibblers.txt
index a1905728603..ba48c375b9d 100644
--- a/forge-gui/res/cardsfolder/s/scrib_nibblers.txt
+++ b/forge-gui/res/cardsfolder/s/scrib_nibblers.txt
@@ -2,11 +2,10 @@ Name:Scrib Nibblers
 ManaCost:2 B
 Types:Creature Rat
 PT:1/1
-A:AB$ Mill | Cost$ T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | Destination$ Exile | RememberMilled$ True | SubAbility$ DBGainLife | SpellDescription$ Exile the top card of target player's library. If it's a land card, you gain 1 life.
+A:AB$ Mill | Cost$ T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | Destination$ Exile | RememberMilled$ True | SubAbility$ DBGainLife | AILogic$ EndOfOppTurn | SpellDescription$ Exile the top card of target player's library. If it's a land card, you gain 1 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scrib_nibblers.jpg
 Oracle:{T}: Exile the top card of target player's library. If it's a land card, you gain 1 life.\nLandfall — Whenever a land enters the battlefield under your control, you may untap Scrib Nibblers.
diff --git a/forge-gui/res/cardsfolder/s/seeker_of_skybreak.txt b/forge-gui/res/cardsfolder/s/seeker_of_skybreak.txt
index 3db69eac7cc..e69b93cbf70 100644
--- a/forge-gui/res/cardsfolder/s/seeker_of_skybreak.txt
+++ b/forge-gui/res/cardsfolder/s/seeker_of_skybreak.txt
@@ -3,6 +3,5 @@ ManaCost:1 G
 Types:Creature Elf
 PT:2/1
 A:AB$ Untap | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Untap target creature.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seeker_of_skybreak.jpg
 Oracle:{T}: Untap target creature.
diff --git a/forge-gui/res/cardsfolder/s/seers_vision.txt b/forge-gui/res/cardsfolder/s/seers_vision.txt
index 10b021d8274..6c2fde291d8 100644
--- a/forge-gui/res/cardsfolder/s/seers_vision.txt
+++ b/forge-gui/res/cardsfolder/s/seers_vision.txt
@@ -3,6 +3,5 @@ ManaCost:2 U B
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Opponent | AddKeyword$ Play with your hand revealed. | Description$ Your opponents play with their hands revealed.
 A:AB$ Discard | Cost$ Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player. | Mode$ RevealYouChoose | NumCards$ 1 | SorcerySpeed$ True | SpellDescription$ Look at target player's hand and choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seers_vision.jpg
 Oracle:Your opponents play with their hands revealed.\nSacrifice Seer's Vision: Look at target player's hand and choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/s/semblance_anvil.txt b/forge-gui/res/cardsfolder/s/semblance_anvil.txt
index 299072de408..f16e62132cb 100644
--- a/forge-gui/res/cardsfolder/s/semblance_anvil.txt
+++ b/forge-gui/res/cardsfolder/s/semblance_anvil.txt
@@ -7,7 +7,7 @@ S:Mode$ ReduceCost | ValidCard$ Card.sharesCardTypeWith Imprinted | Type$ Spell
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 SVar:NeedsToPlayVar:Y GE1
-SVar:Y:Count$ValidHand Permanent.nonLand
-SVar:RemAIDeck:True
+SVar:Y:Count$ValidHand Permanent.nonLand+YouOwn
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/semblance_anvil.jpg
 Oracle:Imprint — When Semblance Anvil enters the battlefield, you may exile a nonland card from your hand.\nSpells you cast that share a card type with the exiled card cost {2} less to cast.
diff --git a/forge-gui/res/cardsfolder/s/shivan_wurm.txt b/forge-gui/res/cardsfolder/s/shivan_wurm.txt
index b1a6516e02a..5e7922beece 100644
--- a/forge-gui/res/cardsfolder/s/shivan_wurm.txt
+++ b/forge-gui/res/cardsfolder/s/shivan_wurm.txt
@@ -5,6 +5,6 @@ PT:7/7
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a red or green creature you control to its owner's hand.
 SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Red+YouCtrl,Creature.Green+YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Creature.Red+YouCtrl+cmcLE4+inZoneBattlefield,Creature.Green+YouCtrl+cmcLE4+inZoneBattlefield
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shivan_wurm.jpg
 Oracle:Trample\nWhen Shivan Wurm enters the battlefield, return a red or green creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt b/forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt
index 020f9e4e0b3..d6e42e492b8 100644
--- a/forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt
+++ b/forge-gui/res/cardsfolder/s/sidisi_undead_vizier.txt
@@ -5,7 +5,6 @@ PT:4/6
 K:Deathtouch
 K:Exploit
 T:Mode$ Exploited | ValidCard$ Creature | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME exploits a creature, you may search your library for a card, put it into your hand, then shuffle your library.
-SVar:TrigSearch:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | ShuffleNonMandatory$ True
-SVar:RemAIDeck:True
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | ShuffleNonMandatory$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sidisi_undead_vizier.jpg
 Oracle:Deathtouch\nExploit (When this creature enters the battlefield, you may sacrifice a creature.)\nWhen Sidisi, Undead Vizier exploits a creature, you may search your library for a card, put it into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/s/silvergill_douser.txt b/forge-gui/res/cardsfolder/s/silvergill_douser.txt
index d6cd68bacc3..bf03d166cdc 100644
--- a/forge-gui/res/cardsfolder/s/silvergill_douser.txt
+++ b/forge-gui/res/cardsfolder/s/silvergill_douser.txt
@@ -4,6 +4,6 @@ Types:Creature Merfolk Wizard
 PT:1/1
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | NumAtt$ -X | References$ X | SpellDescription$ Target creature gets -X/-0 until end of turn, where X is the number of Merfolk and/or Faeries you control
 SVar:X:Count$Valid Merfolk.YouCtrl,Faerie.YouCtrl
-SVar:RemAIDeck:True
+DeckHints:Type$Merfolk|Faerie
 SVar:Picture:http://www.wizards.com/global/images/magic/general/silvergill_douser.jpg
 Oracle:{T}: Target creature gets -X/-0 until end of turn, where X is the number of Merfolk and/or Faeries you control.
diff --git a/forge-gui/res/cardsfolder/s/sorcerous_sight.txt b/forge-gui/res/cardsfolder/s/sorcerous_sight.txt
index 7e005ad7b57..65b87eb803a 100644
--- a/forge-gui/res/cardsfolder/s/sorcerous_sight.txt
+++ b/forge-gui/res/cardsfolder/s/sorcerous_sight.txt
@@ -3,6 +3,6 @@ ManaCost:U
 Types:Sorcery
 A:SP$ RevealHand | Cost$ U | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBDraw | SpellDescription$ Look at target opponent's hand.
 SVar:DBDraw:DB$Draw | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sorcerous_sight.jpg
 Oracle:Look at target opponent's hand.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/s/spell_syphon.txt b/forge-gui/res/cardsfolder/s/spell_syphon.txt
index 3f55ec051b6..e6d64ffdecf 100644
--- a/forge-gui/res/cardsfolder/s/spell_syphon.txt
+++ b/forge-gui/res/cardsfolder/s/spell_syphon.txt
@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ X | References$ X | SpellDescription$ Counter target spell unless its controller pays {1} for each blue permanent you control.
 SVar:X:Count$Valid Permanent.YouCtrl+Blue
-SVar:RemAIDeck:True
+DeckNeeds:Color$Blue
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spell_syphon.jpg
 Oracle:Counter target spell unless its controller pays {1} for each blue permanent you control.
diff --git a/forge-gui/res/cardsfolder/s/stampeding_serow.txt b/forge-gui/res/cardsfolder/s/stampeding_serow.txt
index 800748dcccd..eb83782bc17 100644
--- a/forge-gui/res/cardsfolder/s/stampeding_serow.txt
+++ b/forge-gui/res/cardsfolder/s/stampeding_serow.txt
@@ -4,7 +4,9 @@ Types:Creature Antelope Beast
 PT:5/4
 K:Trample
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigBounce | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, return a green creature you control to its owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature.Green+YouCtrl | ChangeNum$ 1 | Mandatory$ True | Hidden$ True
-SVar:RemAIDeck:True
+SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature.Green+YouCtrl | ChangeNum$ 1 | Mandatory$ True | Hidden$ True
+SVar:NeedsToPlayVar:Z GE2
+SVar:Z:Count$Valid Creature.Green+YouCtrl+inZoneBattlefield
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stampeding_serow.jpg
 Oracle:Trample\nAt the beginning of your upkeep, return a green creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/stir_the_grave.txt b/forge-gui/res/cardsfolder/s/stir_the_grave.txt
index 552a38ac1a2..f737b028832 100644
--- a/forge-gui/res/cardsfolder/s/stir_the_grave.txt
+++ b/forge-gui/res/cardsfolder/s/stir_the_grave.txt
@@ -1,8 +1,7 @@
 Name:Stir the Grave
 ManaCost:X B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ X B | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card with converted mana cost X or less from your graveyard to the battlefield.
+A:SP$ ChangeZone | Cost$ X B | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature in your graveyard | ValidTgts$ Creature.YouCtrl | References$ X | SpellDescription$ Return target creature card with converted mana cost X or less from your graveyard to the battlefield.
 SVar:X:Targeted$CardManaCost
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stir_the_grave.jpg
 Oracle:Return target creature card with converted mana cost X or less from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt b/forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt
index e3f8981ac22..b9ab6554039 100644
--- a/forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt
+++ b/forge-gui/res/cardsfolder/s/stoneforge_acolyte.txt
@@ -3,7 +3,6 @@ ManaCost:W
 Types:Creature Kor Artificer Ally
 PT:1/2
 A:AB$ Dig | Cost$ T tapXType<1/Ally> | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Equipment | PrecostDesc$ Cohort — | SpellDescription$ Look at the top four cards of your library. You may reveal an Equipment card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
-SVar:RemAIDeck:True
 DeckHints:Type$Ally
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stoneforge_acolyte.jpg
 Oracle:Cohort — {T}, Tap an untapped Ally you control: Look at the top four cards of your library. You may reveal an Equipment card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/s/storm_sculptor.txt b/forge-gui/res/cardsfolder/s/storm_sculptor.txt
index 031c626f40e..7cdd58ba8a4 100644
--- a/forge-gui/res/cardsfolder/s/storm_sculptor.txt
+++ b/forge-gui/res/cardsfolder/s/storm_sculptor.txt
@@ -5,6 +5,7 @@ PT:3/2
 K:Unblockable
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a creature you control to its owner's hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouCtrl
-SVar:RemAIDeck:True
+SVar:NeedsToPlay:Creature.YouCtrl+cmcLE3+inZoneBattlefield
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_sculptor.jpg
 Oracle:Storm Sculptor can't be blocked.\nWhen Storm Sculptor enters the battlefield, return a creature you control to its owner's hand.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/stormfront_riders.txt b/forge-gui/res/cardsfolder/s/stormfront_riders.txt
index 095b7200b45..a29dd49688f 100644
--- a/forge-gui/res/cardsfolder/s/stormfront_riders.txt
+++ b/forge-gui/res/cardsfolder/s/stormfront_riders.txt
@@ -8,6 +8,8 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Hand | ValidCard$ Card.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Hand | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature is returned to your hand from the battlefield, create a 1/1 white Soldier creature token.
 SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 soldier PLC
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Creature.YouCtrl | ChangeNum$ 2 | Mandatory$ True
-SVar:RemAIDeck:True
+SVar:NeedsToPlayVar:Z GE2
+SVar:Z:Count$Valid Creature.YouCtrl+cmcLE4+inZoneBattlefield
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormfront_riders.jpg
 Oracle:Flying\nWhen Stormfront Riders enters the battlefield, return two creatures you control to their owner's hand.\nWhenever Stormfront Riders or another creature is returned to your hand from the battlefield, create a 1/1 white Soldier creature token.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/strata_scythe.txt b/forge-gui/res/cardsfolder/s/strata_scythe.txt
index 709906d1876..586f34a4039 100644
--- a/forge-gui/res/cardsfolder/s/strata_scythe.txt
+++ b/forge-gui/res/cardsfolder/s/strata_scythe.txt
@@ -4,10 +4,10 @@ Types:Artifact Equipment
 K:Equip 3
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigExile | TriggerDescription$ Imprint — When CARDNAME enters the battlefield, search your library for a land card, exile it, then shuffle your library.
 SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Imprint$ True | Origin$ Library | Destination$ Exile | ChangeType$ Land | ChangeNum$ 1
-S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each land on the battlefield with the same name as the exiled card.
+S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X | References$ X | Description$ Equipped creature gets +1/+1 for each land on the battlefield with the same name as the exiled card.
 SVar:X:Count$Valid Land.sharesNameWith Imprinted
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/strata_scythe.jpg
 Oracle:Imprint — When Strata Scythe enters the battlefield, search your library for a land card, exile it, then shuffle your library.\nEquipped creature gets +1/+1 for each land on the battlefield with the same name as the exiled card.\nEquip {3}
diff --git a/forge-gui/res/cardsfolder/s/sudden_reclamation.txt b/forge-gui/res/cardsfolder/s/sudden_reclamation.txt
index e4785c00a66..a255f64d280 100644
--- a/forge-gui/res/cardsfolder/s/sudden_reclamation.txt
+++ b/forge-gui/res/cardsfolder/s/sudden_reclamation.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Mill | Cost$ 3 G | NumCards$ 4 | Defined$ You | SubAbility$ DBChangeZone1 | SpellDescription$ Put the top four cards of your library into your graveyard, then return a creature card and a land card from your graveyard to your hand.
 SVar:DBChangeZone1:DB$ ChangeZone | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouOwn | ChangeNum$ 1 | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBChangeZone2
 SVar:DBChangeZone2:DB$ ChangeZone | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouOwn | ChangeNum$ 1 | Origin$ Graveyard | Destination$ Hand
-SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
 DeckHas:Ability$Graveyard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sudden_reclamation.jpg
 Oracle:Put the top four cards of your library into your graveyard, then return a creature card and a land card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/s/sygg_river_guide.txt b/forge-gui/res/cardsfolder/s/sygg_river_guide.txt
index 424c7f0697d..8362fa840bd 100644
--- a/forge-gui/res/cardsfolder/s/sygg_river_guide.txt
+++ b/forge-gui/res/cardsfolder/s/sygg_river_guide.txt
@@ -4,6 +4,6 @@ Types:Legendary Creature Merfolk Wizard
 PT:2/2
 K:Islandwalk
 A:AB$ Protection | Cost$ 1 W | ValidTgts$ Merfolk.YouCtrl | TgtPrompt$ Select target Merfolk you control | Gains$ Choice | Choices$ AnyColor | SpellDescription$ Target Merfolk you control gains protection from the color of your choice until end of turn.
-SVar:RemAIDeck:True
+DeckHints:Type$Merfolk
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sygg_river_guide.jpg
 Oracle:Islandwalk\n{1}{W}: Target Merfolk you control gains protection from the color of your choice until end of turn.