Cleanup: Count$InYour[Zone], part 1 (#7324)

forge-gui/res/cardsfolder/a/aeon_chronicler.txt

@@ -7,6 +7,6 @@ K:Suspend:X:XMin1 X 3 U
 T:Mode$ CounterRemoved | ValidCard$ Card.Self | TriggerZones$ Exile | CounterType$ TIME | Execute$ TrigDraw | TriggerDescription$ Whenever a time counter is removed from CARDNAME while it's exiled, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You
 SVar:X:Count$xPaid
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:All
 Oracle:Aeon Chronicler's power and toughness are each equal to the number of cards in your hand.\nSuspend X—{X}{3}{U}. X can't be 0.\nWhenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card.

forge-gui/res/cardsfolder/a/akki_underling.txt

@@ -3,5 +3,5 @@ ManaCost:1 R
 Types:Creature Goblin Warrior
 PT:2/1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 1 | AddKeyword$ First Strike | CheckSVar$ X | SVarCompare$ GE7 | Description$ As long as you have seven or more cards in hand, CARDNAME gets +2/+1 and has first strike.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:As long as you have seven or more cards in hand, Akki Underling gets +2/+1 and has first strike.

forge-gui/res/cardsfolder/a/akuta_born_of_ash.txt

@@ -5,6 +5,6 @@ PT:3/2
 K:Haste
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | CheckSVar$ X | SVarCompare$ GTY | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may sacrifice a Swamp. If you do, return CARDNAME from your graveyard to the battlefield.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ Sac<1/Swamp> | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:PlayerCountOpponents$HighestCardsInHand
 Oracle:Haste\nAt the beginning of your upkeep, if you have more cards in hand than each opponent, you may sacrifice a Swamp. If you do, return Akuta, Born of Ash from your graveyard to the battlefield.

forge-gui/res/cardsfolder/a/alandra_sky_dreamer.txt

@@ -6,7 +6,7 @@ T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield
 SVar:TrigToken:DB$ Token | TokenScript$ u_2_2_drake_flying
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 5 | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you draw your fifth card each turn, CARDNAME and Drakes you control get +X/+X until end of turn, where X is the number of cards in your hand.
 SVar:TrigPump:DB$ PumpAll | ValidCards$ Card.Self,Drake.YouCtrl | NumAtt$ +X | NumDef$ +X
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:Random
 DeckHas:Ability$Token & Type$Drake
 DeckHints:Type$Drake

forge-gui/res/cardsfolder/a/alrund_god_of_the_cosmos_hakka_whispering_raven.txt

@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Legendary Creature God
 PT:1/1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ Z | AddToughness$ Z | Description$ NICKNAME gets +1/+1 for each card in your hand and each foretold card you own in exile.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:Count$ValidExile Card.foretold+YouOwn
 SVar:Z:SVar$X/Plus.Y
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChooseCardType | TriggerDescription$ At the beginning of your end step, choose a card type, then reveal the top two cards of your library. Put all cards of the chosen type revealed this way into your hand and the rest on the bottom of your library in any order.

forge-gui/res/cardsfolder/a/ancestors_chosen.txt

@@ -5,5 +5,5 @@ PT:4/4
 K:First Strike
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain 1 life for each card in your graveyard.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
-SVar:X:Count$InYourYard
+SVar:X:Count$ValidGraveyard Card.YouOwn
 Oracle:First strike (This creature deals combat damage before creatures without first strike.)\nWhen Ancestor's Chosen enters, you gain 1 life for each card in your graveyard.

forge-gui/res/cardsfolder/a/ancestral_tribute.txt

@@ -3,5 +3,5 @@ ManaCost:5 W W
 Types:Sorcery
 K:Flashback:9 W W W
 A:SP$ GainLife | LifeAmount$ X | SpellDescription$ You gain 2 life for each card in your graveyard.
-SVar:X:Count$InYourYard/Times.2
+SVar:X:Count$ValidGraveyard Card.YouOwn/Times.2
 Oracle:You gain 2 life for each card in your graveyard.\nFlashback {9}{W}{W}{W} (You may cast this card from your graveyard for its flashback cost. Then exile it.)

forge-gui/res/cardsfolder/a/ancient_excavation.txt

@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Draw | NumCards$ X | SubAbility$ DBDiscard | RememberDrawn$ AllReplaced | SpellDescription$ Draw cards equal to the number of cards in your hand, then discard a card for each card drawn this way.
 SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ Y | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:Remembered$Amount
 K:TypeCycling:Basic:2
 Oracle:Draw cards equal to the number of cards in your hand, then discard a card for each card drawn this way.\nBasic landcycling {2} ({2}, Discard this card: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.)

forge-gui/res/cardsfolder/a/anurid_scavenger.txt

@@ -6,5 +6,5 @@ K:Protection from black
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUpkeep | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you put a card from your graveyard on the bottom of your library.
 SVar:TrigUpkeep:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ PutCardToLibFromGrave<1/-1/Card>
 SVar:NeedsToPlayVar:Y GE3
-SVar:Y:Count$InYourYard
+SVar:Y:Count$ValidGraveyard Card.YouOwn
 Oracle:Protection from black\nAt the beginning of your upkeep, sacrifice Anurid Scavenger unless you put a card from your graveyard on the bottom of your library.

forge-gui/res/cardsfolder/a/apocalypse_demon.txt

@@ -6,5 +6,5 @@ K:Flying
 S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in your graveyard.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ At the beginning of your upkeep, tap CARDNAME unless you sacrifice another creature.
 SVar:TrigTap:DB$ Tap | UnlessCost$ Sac<1/Creature.Other/another creature> | UnlessPayer$ You | Defined$ Self
-SVar:X:Count$InYourYard
+SVar:X:Count$ValidGraveyard Card.YouOwn
 Oracle:Flying\nApocalypse Demon's power and toughness are each equal to the number of cards in your graveyard.\nAt the beginning of your upkeep, tap Apocalypse Demon unless you sacrifice another creature.

forge-gui/res/cardsfolder/a/archangels_light.txt

@@ -3,5 +3,5 @@ ManaCost:7 W
 Types:Sorcery
 A:SP$ GainLife | LifeAmount$ X | SubAbility$ DBShuffle | SpellDescription$ You gain 2 life for each card in your graveyard, then shuffle your graveyard into your library.
 SVar:DBShuffle:DB$ ChangeZoneAll | ChangeType$ Card.YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True
-SVar:X:Count$InYourYard/Times.2
+SVar:X:Count$ValidGraveyard Card.YouOwn/Times.2
 Oracle:You gain 2 life for each card in your graveyard, then shuffle your graveyard into your library.

forge-gui/res/cardsfolder/a/arm_mounted_anchor.txt

@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Equipment
 K:Equip:2:::ReduceCost$ Y:This ability costs {2} less to activate if you have one or fewer cards in hand
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Menace | Description$ Equipped creature gets +2/+2 and has menace.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:Count$Compare X LE1.2.0
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoot | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, draw two cards. Then discard two cards unless you discard a Pirate card.
 SVar:TrigLoot:DB$ Draw | NumCards$ 2 | SubAbility$ DBDiscard

forge-gui/res/cardsfolder/a/avatar_of_discord.txt

@@ -6,5 +6,5 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacSelf | TriggerDescription$ When CARDNAME enters, sacrifice it unless you discard two cards.
 SVar:DBSacSelf:DB$ Sacrifice | UnlessCost$ Discard<2/Card> | UnlessPayer$ You
 SVar:NeedsToPlayVar:Y GE3
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 Oracle:({B/R} can be paid with either {B} or {R}.)\nFlying\nWhen Avatar of Discord enters, sacrifice it unless you discard two cards.

forge-gui/res/cardsfolder/b/balance_of_power.txt

@@ -2,7 +2,7 @@ Name:Balance of Power
 ManaCost:3 U U
 Types:Sorcery
 A:SP$ Draw | NumCards$ Y | Defined$ You | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | SpellDescription$ If target opponent has more cards in hand than you, draw cards equal to the difference.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:TargetedPlayer$CardsInHand/Minus.X
 AI:RemoveDeck:All
 Oracle:If target opponent has more cards in hand than you, draw cards equal to the difference.

forge-gui/res/cardsfolder/b/balduvian_horde.txt

@@ -5,5 +5,5 @@ PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters, sacrifice it unless you discard a card at random.
 SVar:TrigSac:DB$ Sacrifice | SacValid$ Self | UnlessCost$ Discard<1/Random> | UnlessPayer$ You
 SVar:NeedsToPlayVar:Y GE2
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 Oracle:When Balduvian Horde enters, sacrifice it unless you discard a card at random.

forge-gui/res/cardsfolder/b/battalion_foot_soldier.txt

@@ -4,5 +4,5 @@ Types:Creature Human Soldier
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for any number of cards named Battalion Foot Soldier, reveal them, put them into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedBattalion Foot Soldier | ChangeNum$ X | ShuffleNonMandatory$ True
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn+namedBattalion Foot Soldier
 Oracle:When Battalion Foot Soldier enters, you may search your library for any number of cards named Battalion Foot Soldier, reveal them, put them into your hand, then shuffle.

forge-gui/res/cardsfolder/b/become_the_avalanche.txt

@@ -4,5 +4,5 @@ Types:Sorcery
 A:SP$ Draw | NumCards$ X | SubAbility$ DBPumpAll | SpellDescription$ Draw a card for each creature you control with power 4 or greater. Then creatures you control get +X/+X until end of turn, where X is the number of cards in your hand.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +Y | NumDef$ +Y
 SVar:X:Count$Valid Creature.powerGE4+YouCtrl
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 Oracle:Draw a card for each creature you control with power 4 or greater. Then creatures you control get +X/+X until end of turn, where X is the number of cards in your hand.

forge-gui/res/cardsfolder/b/behold_the_unspeakable_vision_of_the_unspeakable.txt

@@ -4,7 +4,7 @@ Types:Enchantment Saga
 K:Chapter:3:DBPump,DBDrawBranch,DBTransform
 SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouDontCtrl | NumAtt$ -2 | Duration$ UntilYourNextTurn | SpellDescription$ Creatures you don't control get -2/-0 until your next turn.
 SVar:DBDrawBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ LE1 | TrueSubAbility$ Draw4 | FalseSubAbility$ Scry2 | SpellDescription$ If you have one or fewer cards in hand, draw four cards. Otherwise, scry 2, then draw two cards.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Draw4:DB$ Draw | NumCards$ 4
 SVar:Scry2:DB$ Scry | ScryNum$ 2 | SubAbility$ Draw2
 SVar:Draw2:DB$ Draw | NumCards$ 2
@@ -25,5 +25,5 @@ PT:0/0
 K:Flying
 K:Trample
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each card in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:Flying, trample\nVision of the Unspeakable gets +1/+1 for each card in your hand.

forge-gui/res/cardsfolder/b/bilbo_birthday_celebrant.txt

@@ -6,7 +6,7 @@ R:Event$ GainLife | ActiveZones$ Battlefield | ValidPlayer$ You | ReplaceWith$ G
 SVar:GainLife:DB$ ReplaceEffect | VarName$ LifeGained | VarValue$ X
 SVar:X:ReplaceCount$LifeGained/Plus.1
 A:AB$ ChangeZone | Cost$ 2 W B G T Exile<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ Y | Shuffle$ True | CheckSVar$ Z | SVarCompare$ GE111 | SpellDescription$ Search your library for any number of creature cards, put them onto the battlefield, then shuffle. Activate only if you have 111 or more life.
-SVar:Y:Count$InYourLibrary.Creature
+SVar:Y:Count$ValidLibrary Creature.YouOwn
 SVar:Z:Count$YourLifeTotal
 Oracle:If you would gain life, you gain that much life plus 1 instead.\n{2}{W}{B}{G}, {T}, Exile Bilbo, Birthday Celebrant: Search your library for any number of creature cards, put them onto the battlefield, then shuffle. Activate only if you have 111 or more life.
 DeckHints:Ability$LifeGain

forge-gui/res/cardsfolder/b/blood_for_the_blood_god.txt

@@ -8,6 +8,6 @@ SVar:DBKhorne:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 8 | SubAbility
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | SpellDescription$ Exile CARDNAME.
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
 SVar:NeedsToPlayVar:Y LE3
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 DeckHas:Ability$Discard
 Oracle:This spell costs {1} less to cast for each creature that died this turn.\nDiscard your hand, then draw eight cards. Blood for the Blood God! deals 8 damage to each opponent. Exile Blood for the Blood God!.

forge-gui/res/cardsfolder/b/bob_bevy_of_beebles.txt

@@ -12,7 +12,7 @@ SVar:TrigCreate:DB$ Token | TokenAmount$ Amt | TokenScript$ u_1_1_beeble
 SVar:Loy:Count$CardCounters.LOYALTY
 SVar:Beeb:Count$Valid Beeble.YouCtrl
 K:The number of loyalty counters on CARDNAME is equal to the number of Beebles you control.
-SVar:NHand:Count$InYourHand
+SVar:NHand:Count$ValidHand Card.YouOwn
 A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Beeble | TgtPrompt$ Select up to X target Beebles | TargetMin$ 0 | TargetMax$ NHand | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | StackDescription$ SpellDescription | SpellDescription$ Up to X target Beebles can't be blocked this turn, where X is the number of cards in your hand.
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ These creatures can't be blocked this turn.
 A:AB$ Draw | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | SpellDescription$ Draw a card.

forge-gui/res/cardsfolder/b/body_of_knowledge.txt

@@ -6,7 +6,7 @@ S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$
 S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
 T:Mode$ DamageDoneOnce | ValidTarget$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME is dealt damage, draw that many cards.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Y
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:TriggerCount$DamageAmount
 SVar:HasCombatEffect:TRUE
 SVar:NeedsToPlayVar:X GE2

forge-gui/res/cardsfolder/b/body_of_research.txt

@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ Token | TokenScript$ gu_0_0_fractal | RememberTokens$ True | SpellDescription$ Create a 0/0 green and blue Fractal creature token. Put X +1/+1 counters on it, where X is the number of cards in your library. | SubAbility$ DBCounters
 SVar:DBCounters:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ X | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn
 DeckHas:Ability$Token|Counters
 DeckHints:Type$Instant|Sorcery
 Oracle:Create a 0/0 green and blue Fractal creature token. Put X +1/+1 counters on it, where X is the number of cards in your library.

forge-gui/res/cardsfolder/b/breakthrough.txt

@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ Draw | NumCards$ 4 | SubAbility$ DBBreakthroughDiscard | SpellDescription$ Draw four cards, then choose X cards in your hand and discard the rest from it.
 SVar:DBBreakthroughDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ BreakthroughZ
 SVar:X:Count$xPaid
-SVar:BreakthroughY:Count$InYourHand
+SVar:BreakthroughY:Count$ValidHand Card.YouOwn
 SVar:BreakthroughZ:SVar$BreakthroughY/Minus.X
 AI:RemoveDeck:All
 Oracle:Draw four cards, then choose X cards in your hand and discard the rest.

forge-gui/res/cardsfolder/b/brilliant_ultimatum.txt

@@ -4,6 +4,6 @@ Types:Sorcery
 A:SP$ Dig | Defined$ You | DigNum$ 5 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBTwoPiles | SpellDescription$ Exile the top five cards of your library. An opponent separates those cards into two piles. You may play lands and cast spells from one of those piles. If you cast a spell this way, you cast it without paying its mana cost.
 SVar:DBTwoPiles:DB$ TwoPiles | Defined$ You | DefinedCards$ Remembered | Separator$ Opponent | ChosenPile$ DBPlay
 SVar:DBPlay:DB$ Play | Defined$ Remembered | WithoutManaCost$ True | Optional$ True | Amount$ All
-SVar:Y:Count$InYourLibrary
+SVar:Y:Count$ValidLibrary Card.YouOwn
 SVar:NeedsToPlayVar:Y GE8
 Oracle:Exile the top five cards of your library. An opponent separates those cards into two piles. You may play lands and cast spells from one of those piles. If you cast a spell this way, you cast it without paying its mana cost.

forge-gui/res/cardsfolder/b/bulwark.txt

@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ PsychicSlap | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals X damage to target opponent, where X is the number of cards in your hand minus the number of cards in that player's hand.
 SVar:PsychicSlap:DB$ DealDamage | ValidTgts$ Opponent | NumDmg$ X
-SVar:A:Count$InYourHand
+SVar:A:Count$ValidHand Card.YouOwn
 SVar:B:Count$InTargetedHand
 SVar:X:SVar$A/Minus.B
 AI:RemoveDeck:All

forge-gui/res/cardsfolder/c/carnage_interpreter.txt

@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefi
 SVar:TrigDiscard:DB$ Discard | Mode$ Hand | SubAbility$ DBInvestigate
 SVar:DBInvestigate:DB$ Investigate | Num$ 4
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Menace | CheckSVar$ X | SVarCompare$ LE1 | Description$ As long as you have one or fewer cards in hand, CARDNAME gets +2/+2 and has menace.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 DeckHas:Ability$Discard|Token & Type$Clue|Artifact
 DeckHints:Ability$Discard
 Oracle:When Carnage Interpreter enters, discard your hand, then investigate four times. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nAs long as you have one or fewer cards in hand, Carnage Interpreter gets +2/+2 and has menace.

forge-gui/res/cardsfolder/c/castle_locthwain.txt

@@ -6,5 +6,5 @@ SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Swamp.Yo
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Draw | Cost$ 1 B B T | NumCards$ 1 | SpellDescription$ Draw a card, then you lose life equal to the number of cards in your hand. | SubAbility$ DBLoseLife | StackDescription$ SpellDescription
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | StackDescription$ None
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:Castle Locthwain enters tapped unless you control a Swamp.\n{T}: Add {B}.\n{1}{B}{B}, {T}: Draw a card, then you lose life equal to the number of cards in your hand.

forge-gui/res/cardsfolder/c/circular_logic.txt

@@ -3,5 +3,5 @@ ManaCost:2 U
 Types:Instant
 A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ Y | SpellDescription$ Counter target spell unless its controller pays {1} for each card in your graveyard.
 K:Madness:U
-SVar:Y:Count$InYourYard
+SVar:Y:Count$ValidGraveyard Card.YouOwn
 Oracle:Counter target spell unless its controller pays {1} for each card in your graveyard.\nMadness {U} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)

forge-gui/res/cardsfolder/c/commence_the_endgame.txt

@@ -4,7 +4,7 @@ Types:Instant
 R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
 A:SP$ Draw | NumCards$ 2 | SpellDescription$ Draw two cards, then amass Zombies X, where X is the number of cards in your hand. (Put X +1/+1 counters on an Army you control. If you don't control one, create a 0/0 black Zombie Army creature token first.) | SubAbility$ DBAmass
 SVar:DBAmass:DB$ Amass | Type$ Zombie | Num$ X
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 DeckHas:Ability$Amass|Counters|Token
 DeckHints:Ability$Amass & Type$Zombie
 Oracle:This spell can't be countered.\nDraw two cards, then amass Zombies X, where X is the number of cards in your hand. (Put X +1/+1 counters on an Army you control. If you don't control one, create a 0/0 black Zombie Army creature token first.)

forge-gui/res/cardsfolder/c/countervailing_winds.txt

@@ -3,5 +3,5 @@ ManaCost:2 U
 Types:Instant
 A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ Y | SpellDescription$ Counter target spell unless its controller pays {1} for each card in your graveyard.
 K:Cycling:2
-SVar:Y:Count$InYourYard
+SVar:Y:Count$ValidGraveyard Card.YouOwn
 Oracle:Counter target spell unless its controller pays {1} for each card in your graveyard.\nCycling {2} ({2}, Discard this card: Draw a card.)

forge-gui/res/cardsfolder/c/cowed_by_wisdom.txt

@@ -5,5 +5,5 @@ K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ CantAttackUnless | ValidCard$ Creature.AttachedBy | Cost$ Y | Description$ Enchanted creature can't attack or block unless its controller pays {1} for each card in your hand.
 S:Mode$ CantBlockUnless | ValidCard$ Creature.AttachedBy | Cost$ Y
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 Oracle:Enchant creature\nEnchanted creature can't attack or block unless its controller pays {1} for each card in your hand.

forge-gui/res/cardsfolder/c/credit_voucher.txt

@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Hand | Destination$ Library | Shuffle$ True | ChangeType$ Card | ChangeNum$ X | RememberChanged$ True | SubAbility$ DBDraw | SpellDescription$ Shuffle any number of cards from your hand into your library, then draw that many cards.
 SVar:DBDraw:DB$ Draw | NumCards$ Y | SubAbility$ DBCleanup
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:Remembered$Amount
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:Random

forge-gui/res/cardsfolder/d/damia_sage_of_stone.txt

@@ -6,6 +6,6 @@ K:Deathtouch
 R:Event$ BeginPhase | ActiveZones$ Battlefield | ValidPlayer$ You | Phase$ Draw | Skip$ True | Description$ Skip your draw step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ LT7 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, if you have fewer than seven cards in hand, draw cards equal to the difference.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Difference
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Difference:Number$7/Minus.X
 Oracle:Deathtouch\nSkip your draw step.\nAt the beginning of your upkeep, if you have fewer than seven cards in hand, draw cards equal to the difference.

forge-gui/res/cardsfolder/d/dark_suspicions.txt

@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, that player loses X life, where X is the number of cards in that player's hand minus the number of cards in your hand.
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ TriggeredPlayer
-SVar:A:Count$InYourHand
+SVar:A:Count$ValidHand Card.YouOwn
 SVar:B:TriggeredPlayer$CardsInHand
 SVar:X:SVar$B/Minus.A
 Oracle:At the beginning of each opponent's upkeep, that player loses X life, where X is the number of cards in that player's hand minus the number of cards in your hand.

forge-gui/res/cardsfolder/d/deadbridge_chant.txt

@@ -7,7 +7,7 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigChoose | Trigger
 SVar:TrigChoose:DB$ ChooseCard | ChoiceZone$ Graveyard | AtRandom$ True | Choices$ Card.YouOwn | SubAbility$ DBChange
 SVar:DBChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ ChosenCard | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ GE1 | SubAbility$ DBChange2
 SVar:DBChange2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ ChosenCard | ConditionDefined$ ChosenCard | ConditionPresent$ Creature | ConditionCompare$ EQ0
-SVar:Y:Count$InYourLibrary
+SVar:Y:Count$ValidLibrary Card.YouOwn
 SVar:NeedsToPlayVar:Y GE15
 DeckHas:Ability$Graveyard
 Oracle:When Deadbridge Chant enters, mill ten cards.\nAt the beginning of your upkeep, choose a card at random in your graveyard. If it's a creature card, put it onto the battlefield. Otherwise, put it into your hand.

forge-gui/res/cardsfolder/d/death_of_a_thousand_stings.txt

@@ -4,7 +4,7 @@ Types:Instant Arcane
 A:SP$ LoseLife | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 1 life and you gain 1 life.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | CheckSVar$ X | SVarCompare$ GTY | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may return CARDNAME from your graveyard to your hand.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:PlayerCountOpponents$HighestCardsInHand
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 Oracle:Target player loses 1 life and you gain 1 life.\nAt the beginning of your upkeep, if you have more cards in hand than each opponent, you may return Death of a Thousand Stings from your graveyard to your hand.

forge-gui/res/cardsfolder/d/deathmask_nezumi.txt

@@ -3,5 +3,5 @@ ManaCost:2 B
 Types:Creature Rat Shaman
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 1 | AddKeyword$ Fear | CheckSVar$ X | SVarCompare$ GE7 | Description$ As long as you have seven or more cards in hand, CARDNAME gets +2/+1 and has fear.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:As long as you have seven or more cards in hand, Deathmask Nezumi gets +2/+1 and has fear. (It can't be blocked except by artifact creatures and/or black creatures.)

forge-gui/res/cardsfolder/d/deep_sea_terror.txt

@@ -3,6 +3,6 @@ ManaCost:4 U U
 Types:Creature Serpent
 PT:6/6
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LT7 | Description$ CARDNAME can't attack unless there are seven or more cards in your graveyard.
-SVar:X:Count$InYourYard
+SVar:X:Count$ValidGraveyard Card.YouOwn
 SVar:BuffedBy:Instant,Sorcery
 Oracle:Deep-Sea Terror can't attack unless there are seven or more cards in your graveyard.

forge-gui/res/cardsfolder/d/demonfire.txt

@@ -6,5 +6,5 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 S:Mode$ CantPreventDamage | ValidSource$ Spell.Self | EffectZone$ Stack | CheckSVar$ Y | SVarCompare$ EQ0 | Description$ Hellbent — If you have no cards in hand, this spell can't be countered and the damage can't be prevented.
 R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | CheckSVar$ Y | SVarCompare$ EQ0 | Secondary$ True | Description$ Hellbent — If you have no cards in hand, this spell can't be countered and the damage can't be prevented.
 SVar:X:Count$xPaid
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 Oracle:Demonfire deals X damage to any target. If a creature dealt damage this way would die this turn, exile it instead.\nHellbent — If you have no cards in hand, this spell can't be countered and the damage can't be prevented.

forge-gui/res/cardsfolder/d/demonic_lore.txt

@@ -5,7 +5,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 3
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your end step, you lose 2 life for each card in your hand.
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ X
-SVar:X:Count$InYourHand/Times.2
+SVar:X:Count$ValidHand Card.YouOwn/Times.2
 SVar:DonateMe:5
 Oracle:When Demonic Lore enters, draw three cards.\nAt the beginning of your end step, you lose 2 life for each card in your hand.
 AI:Remove:Random

forge-gui/res/cardsfolder/d/descendant_of_kiyomaro.txt

@@ -5,6 +5,6 @@ PT:2/3
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | AddTrigger$ TriggerGainLife | AddSVar$ KiyomaroGainLife | CheckSVar$ X | SVarCompare$ GTY | Description$ As long as you have more cards in hand than each opponent, CARDNAME gets +1/+2 and has "Whenever this creature deals combat damage, you gain 3 life."
 SVar:TriggerGainLife:Mode$ DamageDealtOnce | CombatDamage$ True | ValidSource$ Card.Self | Execute$ KiyomaroGainLife | TriggerDescription$ Whenever this creature deals combat damage, you gain 3 life.
 SVar:KiyomaroGainLife:DB$ GainLife | LifeAmount$ 3
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:PlayerCountOpponents$HighestCardsInHand
 Oracle:As long as you have more cards in hand than each opponent, Descendant of Kiyomaro gets +1/+2 and has "Whenever this creature deals combat damage, you gain 3 life."

forge-gui/res/cardsfolder/d/descendant_of_masumaro.txt

@@ -6,7 +6,7 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ SelectOpponent
 SVar:SelectOpponent:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ TrigRemoveCounter
 SVar:TrigRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ Y
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:TargetedPlayer$CardsInHand
 AI:RemoveDeck:All
 Oracle:At the beginning of your upkeep, put a +1/+1 counter on Descendant of Masumaro for each card in your hand, then remove a +1/+1 counter from Descendant of Masumaro for each card in target opponent's hand.

forge-gui/res/cardsfolder/d/descendant_of_soramaro.txt

@@ -3,5 +3,5 @@ ManaCost:3 U
 Types:Creature Human Wizard
 PT:2/3
 A:AB$ RearrangeTopOfLibrary | Cost$ 1 U | Defined$ You | NumCards$ X | SpellDescription$ Look at the top X cards of your library, where X is the number of cards in your hand, then put them back in any order.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:{1}{U}: Look at the top X cards of your library, where X is the number of cards in your hand, then put them back in any order.

forge-gui/res/cardsfolder/d/distant_memories.txt

@@ -8,5 +8,5 @@ SVar:DoNothing:DB$ Cleanup | SpellDescription$ No
 SVar:DBDraw:DB$ Draw | NumCards$ 3 | ConditionDefined$ Imprinted | ConditionZone$ Exile | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 SVar:NeedsToPlayVar:X LE4
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:Search your library for a card, exile it, then shuffle. Any opponent may have you put that card into your hand. If no player does, you draw three cards.

forge-gui/res/cardsfolder/d/diviners_portent.txt

@@ -6,5 +6,5 @@ SVar:DBDraw:DB$ Draw | NumCards$ X | SpellDescription$ 1—14 VERT Draw X cards.
 SVar:DBScry:DB$ Scry | ScryNum$ X | SubAbility$ DBDraw2 | SpellDescription$ 15+ VERT Scry X, then draw X cards.
 SVar:DBDraw2:DB$ Draw | NumCards$ X
 SVar:X:Count$xPaid
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 Oracle:Roll a d20 and add the number of cards in your hand.\n1—14 | Draw X cards.\n15+ | Scry X, then draw X cards.

forge-gui/res/cardsfolder/d/djeru_and_hazoret.txt

@@ -8,7 +8,7 @@ SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeNum$ 1 | Optional$ True | ChangeValid$
 SVar:DBEffect:DB$ Effect | StaticAbilities$ MayPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
 SVar:MayPlay:Mode$ Continuous | MayPlay$ True | MayPlayWithoutManaCost$ True | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | Description$ Until end of turn, you may cast this card without paying its mana cost.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:PlayMain1:TRUE
 SVar:HasAttackEffect:TRUE
 DeckNeeds:Type$Legendary

forge-gui/res/cardsfolder/d/doomsday.txt

@@ -6,7 +6,7 @@ SVar:DBChangeZone:DB$ ChangeZoneAll | Defined$ You | Origin$ Graveyard,Library |
 SVar:DBDig:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ X | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ Y | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn
 SVar:Y:Count$YourLifeTotal/HalfUp
 AI:RemoveDeck:All
 Oracle:Search your library and graveyard for five cards and exile the rest. Put the chosen cards on top of your library in any order. You lose half your life, rounded up.

forge-gui/res/cardsfolder/d/dread_slag.txt

@@ -4,7 +4,7 @@ Types:Creature Horror
 PT:9/9
 K:Trample
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -X | AddToughness$ -X | Description$ CARDNAME gets -4/-4 for each card in your hand.
-SVar:X:Count$InYourHand/Times.4
+SVar:X:Count$ValidHand Card.YouOwn/Times.4
 SVar:BuffedBy:Card
 SVar:NeedsToPlayVar:Y LE2
 SVar:Y:Count$CardsInYourHand

forge-gui/res/cardsfolder/d/dread_wanderer.txt

@@ -5,5 +5,5 @@ PT:2/1
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | SorcerySpeed$ True | CheckSVar$ X | SVarCompare$ LE1 | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate only as a sorcery and only if you have one or fewer cards in hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:Dread Wanderer enters tapped.\n{2}{B}: Return Dread Wanderer from your graveyard to the battlefield. Activate only as a sorcery and only if you have one or fewer cards in hand.

forge-gui/res/cardsfolder/d/duggan_private_detective.txt

@@ -3,7 +3,7 @@ ManaCost:2 G U
 Types:Legendary Creature Human Detective
 PT:*/*
 S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ NICKNAME's power and toughness are each equal to the number of cards in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ Whenever NICKNAME enters or attacks, investigate.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigInvestigate | Secondary$ True | TriggerDescription$ Whenever NICKNAME enters or attacks, investigate.
 SVar:TrigInvestigate:DB$ Investigate

forge-gui/res/cardsfolder/d/dwarven_recruiter.txt

@@ -4,7 +4,7 @@ Types:Creature Dwarf
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, search your library for any number of Dwarf cards, reveal them, then shuffle and put those cards on top in any order.
 SVar:TrigChangeZone:DB$ ChangeZone | ChangeNum$ X | ChangeType$ Dwarf | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | Reorder$ True
-SVar:X:Count$InYourLibrary.Dwarf
+SVar:X:Count$ValidLibrary Dwarf.YouOwn
 AI:RemoveDeck:All
 DeckNeeds:Type$Dwarf
 Oracle:When Dwarven Recruiter enters, search your library for any number of Dwarf cards, reveal them, then shuffle and put those cards on top in any order.

forge-gui/res/cardsfolder/e/eleven_the_mage.txt

@@ -8,7 +8,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerZones$ Battl
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1 | SubAbility$ DBPlay
 SVar:DBPlay:DB$ Play | ConditionCheckSVar$ HandSize | ConditionSVarCompare$ GE11 | Valid$ Card.YouOwn | ValidSA$ Instant,Sorcery | ValidZone$ Hand | WithoutManaCost$ True | Amount$ 1 | Controller$ You | Optional$ True
-SVar:HandSize:Count$InYourHand
+SVar:HandSize:Count$ValidHand Card.YouOwn
 K:Friends forever
 SVar:HasAttackEffect:TRUE
 DeckHints:Type$Instant|Sorcery

forge-gui/res/cardsfolder/e/empyrial_armor.txt

@@ -4,5 +4,5 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | Description$ Enchanted creature gets +1/+1 for each card in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:Enchant creature\nEnchanted creature gets +1/+1 for each card in your hand.

forge-gui/res/cardsfolder/e/empyrial_plate.txt

@@ -3,5 +3,5 @@ ManaCost:2
 Types:Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each card in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:Equipped creature gets +1/+1 for each card in your hand.\nEquip {2}

forge-gui/res/cardsfolder/e/endless_swarm.txt

@@ -3,7 +3,7 @@ ManaCost:5 G G G
 Types:Sorcery
 K:Epic
 A:SP$ Token | TokenAmount$ X | TokenScript$ g_1_1_snake | TokenOwner$ You | SpellDescription$ Create a 1/1 green Snake creature token for each card in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 # NOTE: The AI will not stop making land drops after casting this spell (so, random decks may also utilize manlands and other cards with activation cost already on the battlefield to the maximum effect)
 AI:RemoveDeck:Random
 Oracle:Create a 1/1 green Snake creature token for each card in your hand.\nEpic (For the rest of the game, you can't cast spells. At the beginning of each of your upkeeps, copy this spell except for its epic ability.)

forge-gui/res/cardsfolder/e/ensnaring_bridge.txt

@@ -2,7 +2,7 @@ Name:Ensnaring Bridge
 ManaCost:3
 Types:Artifact
 S:Mode$ CantAttack | ValidCard$ Creature.powerGTX | Description$ Creatures with power greater than the number of cards in your hand can't attack.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 # NOTE: The AI will not play around this effect, so it's only good in properly designed decks that circumvent the necessity to worry about the detrimental effect.
 AI:RemoveDeck:Random
 SVar:PreferredHandSize:0

forge-gui/res/cardsfolder/e/enter_the_infinite.txt

@@ -5,6 +5,6 @@ A:SP$ Draw | NumCards$ X | SubAbility$ DBTop | SpellDescription$ Draw cards equa
 SVar:DBTop:DB$ ChangeZone | Origin$ Hand | Destination$ Library | Hidden$ True | Mandatory$ True | ChangeType$ Card | ChangeNum$ 1 | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STHandSize | Duration$ UntilYourNextTurn
 SVar:STHandSize:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn
 AI:RemoveDeck:Random
 Oracle:Draw cards equal to the number of cards in your library, then put a card from your hand on top of your library. You have no maximum hand size until your next turn.

forge-gui/res/cardsfolder/e/epicenter.txt

@@ -4,5 +4,5 @@ Types:Sorcery
 A:SP$ Branch | ValidTgts$ Player | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE7 | TrueSubAbility$ ThreshWaste | FalseSubAbility$ WasteLand | SpellDescription$ Target player sacrifices a land. Threshold — Each player sacrifices all lands they control instead if seven or more cards are in your graveyard.
 SVar:WasteLand:DB$ Sacrifice | Defined$ Targeted | SacValid$ Land | SacMessage$ Land
 SVar:ThreshWaste:DB$ SacrificeAll | ValidCards$ Land
-SVar:X:Count$InYourYard
+SVar:X:Count$ValidGraveyard Card.YouOwn
 Oracle:Target player sacrifices a land.\nThreshold — Each player sacrifices all lands they control instead if seven or more cards are in your graveyard.

forge-gui/res/cardsfolder/e/exile_into_darkness.txt

@@ -3,7 +3,7 @@ ManaCost:4 B
 Types:Sorcery
 A:SP$ Sacrifice | ValidTgts$ Player | SacValid$ Creature.cmcLE3 | SacMessage$ creature with mana value 3 or less | SpellDescription$ Target player sacrifices a creature with mana value 3 or less.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | CheckSVar$ X | SVarCompare$ GTY | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may return CARDNAME from your graveyard to your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:PlayerCountOpponents$HighestCardsInHand
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
 Oracle:Target player sacrifices a creature with mana value 3 or less.\nAt the beginning of your upkeep, if you have more cards in hand than each opponent, you may return Exile into Darkness from your graveyard to your hand.

forge-gui/res/cardsfolder/e/extravagant_spirit.txt

@@ -5,6 +5,6 @@ PT:4/4
 K:Flying
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUpkeep | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you pay {1} for each card in your hand.
 SVar:TrigUpkeep:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ Y
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:All
 Oracle:Flying\nAt the beginning of your upkeep, sacrifice Extravagant Spirit unless you pay {1} for each card in your hand.

forge-gui/res/cardsfolder/f/fathom_trawl.txt

@@ -3,5 +3,5 @@ ManaCost:3 U U
 Types:Sorcery
 A:SP$ DigUntil | Amount$ 3 | Valid$ Card.nonLand+YouOwn | ValidDescription$ nonland | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | FoundDestination$ Hand | SpellDescription$ Reveal cards from the top of your library until you reveal three nonland cards. Put the nonland cards revealed this way into your hand, then put the rest of the revealed cards on the bottom of your library in any order.
 SVar:NeedsToPlayVar:AIHand LE4
-SVar:AIHand:Count$InYourHand
+SVar:AIHand:Count$ValidHand Card.YouOwn
 Oracle:Reveal cards from the top of your library until you reveal three nonland cards. Put the nonland cards revealed this way into your hand, then put the rest of the revealed cards on the bottom of your library in any order.

forge-gui/res/cardsfolder/f/fear_of_death.txt

@@ -6,7 +6,7 @@ A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill two cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | Description$ Enchanted creature gets -X/-0, where X is the number of cards in your graveyard.
-SVar:X:Count$InYourYard
+SVar:X:Count$ValidGraveyard Card.YouOwn
 DeckHas:Ability$Mill
 DeckHints:Ability$Graveyard
 Oracle:Enchant creature\nWhen Fear of Death enters, mill two cards. (Put the top two cards of your library into your graveyard.)\nEnchanted creature gets -X/-0, where X is the number of cards in your graveyard.

forge-gui/res/cardsfolder/f/festive_funeral.txt

@@ -2,5 +2,5 @@ Name:Festive Funeral
 ManaCost:4 B
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SpellDescription$ Target creature gets -X/-X until end of turn, where X is the number of cards in your graveyard.
-SVar:X:Count$InYourYard
+SVar:X:Count$ValidGraveyard Card.YouOwn
 Oracle:Target creature gets -X/-X until end of turn, where X is the number of cards in your graveyard.

forge-gui/res/cardsfolder/f/fires_of_victory.txt

@@ -4,5 +4,5 @@ Types:Instant
 K:Kicker:2 U
 A:SP$ Draw | NumCards$ 1 | Condition$ Kicked | ConditionDescription$ If this spell was kicked | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | SpellDescription$ If this spell was kicked, draw a card. CARDNAME deals damage to target creature or planeswalker equal to the number of cards in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:Kicker {2}{U} (You may pay an additional {2}{U} as you cast this spell.)\nIf this spell was kicked, draw a card. Fires of Victory deals damage to target creature or planeswalker equal to the number of cards in your hand.

forge-gui/res/cardsfolder/f/flubs_the_fool.txt

@@ -8,5 +8,5 @@ T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$
 SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ EQ0 | TrueSubAbility$ DBDraw | FalseSubAbility$ DBDiscard
 SVar:DBDraw:DB$ Draw
 SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:You may play an additional land on each of your turns.\nWhenever you play a land or cast a spell, draw a card if you have no cards in hand. Otherwise, discard a card.

forge-gui/res/cardsfolder/f/forbidden_crypt.txt

@@ -4,7 +4,7 @@ Types:Enchantment
 R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ You | ReplaceWith$ CheckLoseCondition | Description$ If you would draw a card, return a card from your graveyard to your hand instead. If you can't, you lose the game.
 SVar:CheckLoseCondition:DB$ LosesGame | Defined$ You | ConditionCheckSVar$ CardsInGrave | ConditionSVarCompare$ EQ0 | SubAbility$ ForbiddenPractice
 SVar:ForbiddenPractice:DB$ ChangeZone | Hidden$ True | Mandatory$ True | ChangeType$ Card.YouOwn | ChangeNum$ 1 | Origin$ Graveyard | Destination$ Hand
-SVar:CardsInGrave:Count$InYourYard
+SVar:CardsInGrave:Count$ValidGraveyard Card.YouOwn
 R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidCard$ Card.!token+YouOwn | ReplaceWith$ CryptExile | Description$ If a card would be put into your graveyard from anywhere, exile that card instead.
 SVar:CryptExile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
 SVar:NonStackingEffect:True

forge-gui/res/cardsfolder/g/gamble.txt

@@ -5,7 +5,7 @@ A:SP$ ChangeZone | Origin$ Library | NoShuffle$ True | Destination$ Hand | Chang
 SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ Random | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ Shuffle | Defined$ You
 SVar:NeedsToPlayVar:Z GE2
-SVar:Z:Count$InYourHand
+SVar:Z:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:Random
 DeckHas:Ability$Discard
 Oracle:Search your library for a card, put that card into your hand, discard a card at random, then shuffle.

forge-gui/res/cardsfolder/g/gathering_throng.txt

@@ -4,6 +4,6 @@ Types:Creature Human Citizen
 PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for any number of cards named Gathering Throng, reveal them, put them into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedGathering Throng | ChangeNum$ X | ShuffleNonMandatory$ True
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn+namedGathering Throng
 DeckHints:Name$Gathering Throng
 Oracle:When Gathering Throng enters, you may search your library for any number of cards named Gathering Throng, reveal them, put them into your hand, then shuffle.

forge-gui/res/cardsfolder/g/geralfs_masterpiece.txt

@@ -5,7 +5,7 @@ PT:7/7
 K:Flying
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -X | AddToughness$ -X | Description$ CARDNAME gets -1/-1 for each card in your hand.
 A:AB$ ChangeZone | Cost$ 3 U Discard<3/Card> | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | Tapped$ True | SpellDescription$ Return CARDNAME from your graveyard to the battlefield tapped.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:NeedsToPlayVar:X LE6
 SVar:BuffedBy:Card
 Oracle:Flying\nGeralf's Masterpiece gets -1/-1 for each card in your hand.\n{3}{U}, Discard three cards: Return Geralf's Masterpiece from your graveyard to the battlefield tapped.

forge-gui/res/cardsfolder/g/ghastly_demise.txt

@@ -3,5 +3,5 @@ ManaCost:B
 Types:Instant
 A:SP$ Destroy | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX | StackDescription$ SpellDescription | SpellDescription$ Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard.
 SVar:Y:Targeted$CardToughness
-SVar:X:Count$InYourYard
+SVar:X:Count$ValidGraveyard Card.YouOwn
 Oracle:Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard.

forge-gui/res/cardsfolder/g/goblin_recruiter.txt

@@ -4,7 +4,7 @@ Types:Creature Goblin
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, search your library for any number of Goblin cards, reveal them, then shuffle and put those cards on top in any order.
 SVar:TrigChangeZone:DB$ ChangeZone | ChangeNum$ X | ChangeType$ Goblin | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | Reorder$ True
-SVar:X:Count$InYourLibrary.Goblin
+SVar:X:Count$ValidLibrary Goblin.YouOwn
 DeckNeeds:Type$Goblin
 # TODO: The AI generally is able to use this card, but will basically place all of its goblins on top of the library in no specific order, which is not very smart. Might need some improvement before RemoveDeck is removed. Currently adding a restriction to at least only play it if the AI has enough lands out on the battlefield already.
 AI:RemoveDeck:All

forge-gui/res/cardsfolder/g/grim_strider.txt

@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Horror
 PT:6/6
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ -X | AddToughness$ -X | Description$ CARDNAME gets -1/-1 for each card in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:NeedsToPlayVar:X LE5
 SVar:BuffedBy:Card
 Oracle:Grim Strider gets -1/-1 for each card in your hand.

forge-gui/res/cardsfolder/g/grizzled_huntmaster.txt

@@ -9,8 +9,8 @@ SVar:ExileLib:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPla
 SVar:DBChooseSb:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Card.Creature+YouOwn | ChoiceZone$ Sideboard | SubAbility$ DBConjure
 SVar:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ ChosenCard | Zone$ Hand | Amount$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True | ClearChosenCard$ True
-SVar:NumInLib:Count$InYourLibrary
-SVar:NumInHand:Count$InYourHand
+SVar:NumInLib:Count$ValidLibrary Card.YouOwn+sharesNameWith Remembered
+SVar:NumInHand:Count$ValidHand Card.YouOwn+sharesNameWith Remembered
 SVar:X:Count$RememberedSize/Plus.Y
 SVar:Y:Count$ImprintedSize
 Oracle:When Grizzled Huntmaster enters, you may exile a creature card from your hand. If you do, search your hand and library for any number of cards with the same name, exile them, then shuffle. Choose a creature card you own from outside the game. Conjure a duplicate of that card into your hand for each card exiled from your hand this way.

forge-gui/res/cardsfolder/g/grozoth.txt

@@ -7,6 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.cmcEQ9 | ChangeNum$ X | ShuffleNonMandatory$ True
 A:AB$ Debuff | Cost$ 4 | Keywords$ Defender | Defined$ Self | SpellDescription$ CARDNAME loses defender until end of turn.
 K:Transmute:1 U U
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn+cmcEQ9
 AI:RemoveDeck:Random
 Oracle:Defender (This creature can't attack.)\nWhen Grozoth enters, you may search your library for any number of cards that have mana value 9, reveal them, put them into your hand, then shuffle.\n{4}: Grozoth loses defender until end of turn.\nTransmute {1}{U}{U} ({1}{U}{U}, Discard this card: Search your library for a card with the same mana value as this card, reveal it, put it into your hand, then shuffle. Transmute only as a sorcery.)

forge-gui/res/cardsfolder/g/guided_passage.txt

@@ -3,5 +3,5 @@ ManaCost:G U R
 Types:Sorcery
 A:SP$ PeekAndReveal | PeekAmount$ X | NoPeek$ True | SubAbility$ DBCreature | SpellDescription$ Reveal the cards in your library. An opponent chooses from among them a creature card, a land card, and a noncreature, nonland card. You put the chosen cards into your hand. Then shuffle.
 SVar:DBCreature:DB$ ChangeZone | ChangeType$ EACH Creature.YouOwn & Land.YouOwn & Card.nonCreature+nonLand+YouOwn | Mandatory$ True | Chooser$ Opponent | Origin$ Library | Destination$ Hand | Shuffle$ True
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn
 Oracle:Reveal the cards in your library. An opponent chooses from among them a creature card, a land card, and a noncreature, nonland card. You put the chosen cards into your hand. Then shuffle.

forge-gui/res/cardsfolder/h/hazoret_the_fervent.txt

@@ -5,6 +5,6 @@ PT:5/4
 K:Indestructible
 K:Haste
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ GE2 | Description$ CARDNAME can't attack or block unless you have one or fewer cards in hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 A:AB$ DealDamage | Cost$ 2 R Discard<1/Card> | NumDmg$ 2 | Defined$ Player.Opponent | SpellDescription$ CARDNAME deals 2 damage to each opponent.
 Oracle:Indestructible, haste\nHazoret the Fervent can't attack or block unless you have one or fewer cards in hand.\n{2}{R}, Discard a card: Hazoret deals 2 damage to each opponent.

forge-gui/res/cardsfolder/h/heartwarming_redemption.txt

@@ -6,7 +6,7 @@ SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | SubAbility$ DBGainLife
 SVar:X:Remembered$Amount/Plus.1
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ Y | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:All
 DeckHas:Ability$LifeGain
 Oracle:Discard all the cards in your hand, then draw that many cards plus one. You gain life equal to the number of cards in your hand.

forge-gui/res/cardsfolder/h/heightened_awareness.txt

@@ -6,5 +6,5 @@ SVar:TrigDiscard:DB$ Discard | Mode$ Hand | SpellDescription$ As CARDNAME enters
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your draw step, draw an additional card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 SVar:NeedsToPlayVar:Y LE2
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 Oracle:As Heightened Awareness enters, discard your hand.\nAt the beginning of your draw step, draw an additional card.

forge-gui/res/cardsfolder/i/idle_thoughts.txt

@@ -2,5 +2,5 @@ Name:Idle Thoughts
 ManaCost:3 U
 Types:Enchantment
 A:AB$ Draw | Cost$ 2 | NumCards$ 1 | AICheckSVar$ X | AISVarCompare$ EQ0 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SpellDescription$ Draw a card if you have no cards in hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:{2}: Draw a card if you have no cards in hand.

forge-gui/res/cardsfolder/i/infernal_tutor.txt

@@ -5,6 +5,6 @@ A:SP$ Reveal | RememberRevealed$ True | Defined$ You | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Remembered.sameName | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBChangeZone2
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ LT1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:All
 Oracle:Reveal a card from your hand. Search your library for a card with the same name as that card, reveal it, put it into your hand, then shuffle.\nHellbent — If you have no cards in hand, instead search your library for a card, put it into your hand, then shuffle.

forge-gui/res/cardsfolder/i/into_the_fire.txt

@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Sorcery
 A:SP$ Charm | Choices$ DamageAll,Tuck
 SVar:DamageAll:DB$ DamageAll | ValidCards$ Creature,Planeswalker,Battle | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to each creature, planeswalker, and battle.
-SVar:Tuck:DB$ ChangeZone | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | ChangeType$ Card | ChangeNum$ Count$InYourHand | RememberChanged$ True | SubAbility$ DBDraw | SpellDescription$ Put any number of cards from your hand on the bottom of your library, then draw that many cards plus one.
+SVar:Tuck:DB$ ChangeZone | Origin$ Hand | Destination$ Library | LibraryPosition$ -1 | ChangeType$ Card | ChangeNum$ Count$ValidHand Card.YouOwn | RememberChanged$ True | SubAbility$ DBDraw | SpellDescription$ Put any number of cards from your hand on the bottom of your library, then draw that many cards plus one.
 SVar:DBDraw:DB$ Draw | NumCards$ Count$RememberedSize/Plus.1 | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Choose one —\n• Into the Fire deals 2 damage to each creature, planeswalker, and battle.\n• Put any number of cards from your hand on the bottom of your library, then draw that many cards plus one.

forge-gui/res/cardsfolder/i/invincible_hymn.txt

@@ -2,5 +2,5 @@ Name:Invincible Hymn
 ManaCost:6 W W
 Types:Sorcery
 A:SP$ SetLife | Defined$ You | LifeAmount$ X | SpellDescription$ Count the number of cards in your library. Your life total becomes that number.
-SVar:X:Count$InYourLibrary.Card
+SVar:X:Count$ValidLibrary Card.YouOwn
 Oracle:Count the number of cards in your library. Your life total becomes that number.

forge-gui/res/cardsfolder/i/ivory_tower.txt

@@ -3,6 +3,6 @@ ManaCost:1
 Types:Artifact
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep, you gain X life, where X is the number of cards in your hand minus 4.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
-SVar:X:Count$InYourHand/Minus.4
+SVar:X:Count$ValidHand Card.YouOwn/Minus.4
 DeckHas:Ability$LifeGain
 Oracle:At the beginning of your upkeep, you gain X life, where X is the number of cards in your hand minus 4.

forge-gui/res/cardsfolder/i/iymrith_desert_doom.txt

@@ -7,6 +7,6 @@ S:Mode$ Continuous | Affected$ Card.Self+untapped | AddKeyword$ Ward:4 | Descrip
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, draw a card. Then if you have fewer than three cards in hand, draw cards equal to the difference.
 SVar:TrigDraw:DB$ Draw | SubAbility$ DBDrawMore
 SVar:DBDrawMore:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ LT3 | NumCards$ Difference
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Difference:Number$3/Minus.X
 Oracle:Flying\nIymrith, Desert Doom has ward {4} as long as it's untapped.\nWhenever Iymrith deals combat damage to a player, draw a card. Then if you have fewer than three cards in hand, draw cards equal to the difference.

forge-gui/res/cardsfolder/j/jace_wielder_of_mysteries.txt

@@ -8,6 +8,6 @@ A:AB$ Mill | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 2 | Va
 SVar:DBDraw:DB$ Draw | NumCards$ 1
 A:AB$ Draw | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | NumCards$ 7 | SubAbility$ WinGame | SpellDescription$ Draw seven cards. Then if your library has no cards in it, you win the game.
 SVar:WinGame:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn
 AI:RemoveDeck:Random
 Oracle:If you would draw a card while your library has no cards in it, you win the game instead.\n[+1]: Target player mills two cards. Draw a card.\n[-8]: Draw seven cards. Then if your library has no cards in it, you win the game.

forge-gui/res/cardsfolder/j/jin_gitaxias_the_great_synthesis.txt

@@ -8,7 +8,7 @@ SVar:DBDraw:DB$ Draw
 A:AB$ ChangeZone | Cost$ 3 U | CheckSVar$ X | SVarCompare$ GE7 | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn | SorcerySpeed$ True | StackDescription$ SpellDescription | SpellDescription$ Exile CARDNAME, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery and only if you have seven or more cards in hand.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | ForgetOtherRemembered$ True | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 DeckHints:Type$Phyrexian
 SVar:BuffedBy:Card.nonCreature+cmcGE3
 AlternateMode:DoubleFaced
@@ -29,5 +29,5 @@ SVar:DBCastAll:DB$ Play | Valid$ Card.nonLand+YouOwn | ValidSA$ Spell | ValidZon
 SVar:DBExileSelf:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturnSelf | RememberChanged$ True
 SVar:DBReturnSelf:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 Oracle:(As this saga enters and after your draw step, add a lore counter.)\nI — Draw cards equal to the number of cards in your hand. You have no maximum hand size for as long as you control The Great Synthesis.\nII — Return all non-Phyrexian creatures to their owners' hands.\nIII — You may cast any number of spells from your hand without paying their mana cost. Exile The Great Synthesis, then return it to the battlefield (front face up).

forge-gui/res/cardsfolder/j/jolrael_mwonvuli_recluse.txt

@@ -6,6 +6,6 @@ T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ g_2_2_cat
 DeckHas:Ability$Token
 A:AB$ AnimateAll | Cost$ 4 G G | ValidCards$ Creature.YouCtrl | Power$ X | Toughness$ X | SpellDescription$ Until end of turn, creatures you control have base power and toughness X/X, where X is the number of cards in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:All
 Oracle:Whenever you draw your second card each turn, create a 2/2 green Cat creature token.\n{4}{G}{G}: Until end of turn, creatures you control have base power and toughness X/X, where X is the number of cards in your hand.

forge-gui/res/cardsfolder/j/jolrael_voice_of_zhalfir.txt

@@ -6,7 +6,7 @@ T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefiel
 SVar:TrigAnimate:DB$ Animate | ValidTgts$ Land.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target land you control | Power$ X | Toughness$ X | Types$ Bird,Creature | Keywords$ Flying & Haste | Colors$ Green,Blue | OverwriteColors$ True
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl+Land | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a land creature you control deals combat damage to a player, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:BuffedBy:Land
 DeckHas:Type$Bird
 Oracle:At the beginning of combat on your turn, up to one target land you control becomes an X/X green and blue Bird creature with flying and haste until end of turn, where X is the number of cards in your hand. It's still a land.\nWhenever a land creature you control deals combat damage to a player, draw a card.

forge-gui/res/cardsfolder/j/jon_irenicus_the_exile.txt

@@ -6,7 +6,7 @@ T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefiel
 SVar:TrigBranch:DB$ Branch | ValidTgts$ Opponent | BranchConditionSVar$ X | BranchConditionSVarCompare$ GEY | TrueSubAbility$ Draw | FalseSubAbility$ Mill
 SVar:Draw:DB$ Draw
 SVar:Mill:DB$ Mill | Defined$ Opponent | NumCards$ 5
-SVar:X:Count$InYourLibrary
+SVar:X:Count$ValidLibrary Card.YouOwn
 SVar:Y:Count$InTargetedLibrary
 DeckHas:Ability$Mill
 Oracle:At the beginning of your end step, draw a card if your library has more cards in it than target opponent's library. Otherwise, each opponent mills five cards.

forge-gui/res/cardsfolder/j/jushi_apprentice_tomoya_the_revealer.txt

@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 PT:1/2
 A:AB$ Draw | Cost$ 2 U T | Defined$ You | NumCards$ 1 | SubAbility$ DBFlip | SpellDescription$ Draw a card. If you have nine or more cards in hand, flip CARDNAME.
 SVar:DBFlip:DB$ SetState | Defined$ Self | ConditionCheckSVar$ HandSize | ConditionSVarCompare$ GE9 | Mode$ Flip
-SVar:HandSize:Count$InYourHand
+SVar:HandSize:Count$ValidHand Card.YouOwn
 AlternateMode:Flip
 Oracle:{2}{U}, {T}: Draw a card. If you have nine or more cards in hand, flip Jushi Apprentice.
 
@@ -16,5 +16,5 @@ Colors:blue
 Types:Legendary Creature Human Wizard
 PT:2/3
 A:AB$ Draw | Cost$ 3 U U T | ValidTgts$ Player | NumCards$ X | SpellDescription$ Target player draws X cards, where X is the number of cards in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:{3}{U}{U}, {T}: Target player draws X cards, where X is the number of cards in your hand.

forge-gui/res/cardsfolder/k/kagemaro_first_to_suffer.txt

@@ -4,6 +4,6 @@ Types:Legendary Creature Demon Spirit
 PT:*/*
 S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in your hand.
 A:AB$ PumpAll | Cost$ B Sac<1/NICKNAME> | ValidCards$ Creature | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SpellDescription$ All creatures get -X/-X until end of turn, where X is the number of cards in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:All
 Oracle:Kagemaro, First to Suffer's power and toughness are each equal to the number of cards in your hand.\n{B}, Sacrifice Kagemaro: All creatures get -X/-X until end of turn, where X is the number of cards in your hand.

forge-gui/res/cardsfolder/k/kagemaros_clutch.txt

@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | AddToughness$ -X | Description$ Enchanted creature gets -X/-X, where X is the number of cards in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 AI:RemoveDeck:All
 Oracle:Enchant creature\nEnchanted creature gets -X/-X, where X is the number of cards in your hand.

forge-gui/res/cardsfolder/k/keeper_of_the_mind.txt

@@ -3,6 +3,6 @@ ManaCost:U U
 Types:Creature Human Wizard
 PT:1/2
 A:AB$ Draw | Cost$ U T | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent with at least two more cards in hand than you | CheckSVar$ X | SVarCompare$ GEY | Defined$ You | NumCards$ 1 | SpellDescription$ Choose target opponent who had at least two more cards in hand than you did as you activated this ability. Draw a card.
-SVar:X:Count$InOppHandCount
-SVar:Y:Count$InYourHand/Plus.2
+SVar:X:Count$ValidHand Card.OppOwn
+SVar:Y:Count$ValidHand Card.YouOwn/Plus.2
 Oracle:{U}, {T}: Choose target opponent who had at least two more cards in hand than you did as you activated this ability. Draw a card.

forge-gui/res/cardsfolder/k/kefnet_the_mindful.txt

@@ -5,7 +5,7 @@ PT:5/5
 K:Flying
 K:Indestructible
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ LE6 | Description$ CARDNAME can't attack or block unless you have seven or more cards in hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 A:AB$ Draw | Cost$ 3 U | NumCards$ 1 | Defined$ You | SubAbility$ DBChooseCard | SpellDescription$ Draw a card, then you may return a land you control to its owner's hand.
 SVar:DBChooseCard:DB$ ChooseCard | Choices$ Land.YouCtrl | ChoiceZone$ Battlefield | Amount$ 1 | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ ChosenCard | SubAbility$ DBCleanup

forge-gui/res/cardsfolder/k/kitsune_bonesetter.txt

@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Fox Cleric
 PT:0/1
 A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature | Amount$ 3 | TgtPrompt$ Select target creature | CheckSVar$ X | SVarCompare$ GTY | SpellDescription$ Prevent the next 3 damage that would be dealt to target creature this turn. Activate only if you have more cards in hand than each opponent.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:Y:PlayerCountOpponents$HighestCardsInHand
 Oracle:{T}: Prevent the next 3 damage that would be dealt to target creature this turn. Activate only if you have more cards in hand than each opponent.

forge-gui/res/cardsfolder/k/kitsune_loreweaver.txt

@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Fox Cleric
 PT:2/1
 A:AB$ Pump | Cost$ 1 W | NumDef$ +X | SpellDescription$ CARDNAME gets +0/+X until end of turn, where X is the number of cards in your hand.
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 Oracle:{1}{W}: Kitsune Loreweaver gets +0/+X until end of turn, where X is the number of cards in your hand.

forge-gui/res/cardsfolder/k/kiyomaro_first_to_stand.txt

@@ -6,6 +6,6 @@ S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Vigilance | CheckSVar$ X | SVarCompare$ GE4 | Description$ As long as you have four or more cards in hand, NICKNAME has vigilance.
 T:Mode$ DamageDealtOnce | ValidSource$ Card.Self | CheckSVar$ X | SVarCompare$ GE7 | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever NICKNAME deals damage, if you have seven or more cards in hand, you gain 7 life.
 SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ 7
-SVar:X:Count$InYourHand
+SVar:X:Count$ValidHand Card.YouOwn
 SVar:NeedsToPlayVar:X GE3
 Oracle:Kiyomaro, First to Stand's power and toughness are each equal to the number of cards in your hand.\nAs long as you have four or more cards in hand, Kiyomaro has vigilance.\nWhenever Kiyomaro deals damage, if you have seven or more cards in hand, you gain 7 life.

forge-gui/res/cardsfolder/k/kozilek_the_great_distortion.txt

@@ -4,7 +4,7 @@ Types:Legendary Creature Eldrazi
 PT:12/12
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDraw | CheckSVar$ Y | SVarCompare$ LT7 | TriggerDescription$ When you cast this spell, if you have fewer than seven cards in hand, draw cards equal to the difference.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Difference
-SVar:Y:Count$InYourHand
+SVar:Y:Count$ValidHand Card.YouOwn
 SVar:Difference:Number$7/Minus.Y
 K:Menace
 A:AB$ Counter | Cost$ Discard<1/Card.cmcEQX/card with mana value X> | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | AILogic$ Never | SpellDescription$ Counter target spell with mana value X.

forge-gui/res/cardsfolder/k/kroxa_and_kunoros.txt

@@ -10,7 +10,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | Secondary$
 SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ ExileFromGrave<5/Card> | Execute$ TrigReturn | SpellDescription$ When you do, return target creature card from your graveyard to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature to return from your graveyard
 SVar:NeedsToPlayVar:Z EQ6
-SVar:X:Count$InYourYard/LimitMax.6
+SVar:X:Count$ValidGraveyard Card.YouOwn/LimitMax.6
 SVar:Y:Count$ValidGraveyard Creature.YouOwn/LimitMax.1
 SVar:Z:SVar$X/Times.Y
 DeckHas:Ability$Graveyard|LifeGain