diff --git a/forge-gui/res/cardsfolder/upcoming/archway_angel.txt b/forge-gui/res/cardsfolder/upcoming/archway_angel.txt
index 5ce99821634..31341014650 100644
--- a/forge-gui/res/cardsfolder/upcoming/archway_angel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/archway_angel.txt
@@ -6,5 +6,6 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life for each Gate you control.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Gate.YouCtrl/Times.2
+DeckHas:Ability$LifeGain
 DeckHints:Type$Gate
 Oracle:Flying\nWhen Archway Angel enters the battlefield, you gain 2 life for each Gate you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/bankrupt_in_blood.txt b/forge-gui/res/cardsfolder/upcoming/bankrupt_in_blood.txt
index 030fc39d010..dbc1a820e3c 100644
--- a/forge-gui/res/cardsfolder/upcoming/bankrupt_in_blood.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bankrupt_in_blood.txt
@@ -2,4 +2,5 @@ Name:Bankrupt in Blood
 ManaCost:1 B
 Types:Sorcery
 A:SP$ Draw | Cost$ 1 B Sac<2/Creature> | NumCards$ 3 | SpellDescription$ Draw three cards.
+SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE2
 Oracle:As an additional cost to cast this spell, sacrifice two creatures.\nDraw three cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/basilica_bell_haunt.txt b/forge-gui/res/cardsfolder/upcoming/basilica_bell_haunt.txt
index 17d0b98bd48..86eaaed210b 100644
--- a/forge-gui/res/cardsfolder/upcoming/basilica_bell_haunt.txt
+++ b/forge-gui/res/cardsfolder/upcoming/basilica_bell_haunt.txt
@@ -5,4 +5,5 @@ PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each opponent discards a card and you gain 3 life.
 SVar:TrigDiscard:DB$ Discard | Defined$ Player.Opponent | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ GainLife
 SVar:GainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
+DeckHas:Ability$LifeGain
 Oracle:When Basilica Bell-Haunt enters the battlefield, each opponent discards a card and you gain 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/benthic_biomancer.txt b/forge-gui/res/cardsfolder/upcoming/benthic_biomancer.txt
index b89cc502a79..ade5b94d96b 100644
--- a/forge-gui/res/cardsfolder/upcoming/benthic_biomancer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/benthic_biomancer.txt
@@ -7,5 +7,6 @@ DeckHas:Ability$Counters
 T:Mode$ CounterAddedOnce | ValidCard$ Card.Self | TriggerZones$ Battlefield | CounterType$ P1P1 | Execute$ TrigDraw | TriggerDescription$ Whenever one or more +1/+1 counters are put on CARDNAME, draw a card, then discard a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
+DeckHas:Ability$Counters
 DeckHints:Ability$Counters
 Oracle:{1}{U}: Adapt 1. (If this creature has no +1/+1 counters on it, put a +1/+1 counter on it.)\nWhenever one or more +1/+1 counters are put on Benthic Biomancer, draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/biogenic_ooze.txt b/forge-gui/res/cardsfolder/upcoming/biogenic_ooze.txt
index 77e4c56bf1b..3a22d960a80 100644
--- a/forge-gui/res/cardsfolder/upcoming/biogenic_ooze.txt
+++ b/forge-gui/res/cardsfolder/upcoming/biogenic_ooze.txt
@@ -4,9 +4,9 @@ Types:Creature Ooze
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 2/2 green Ooze creature token.
 SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenScript$ g_2_2_ooze | LegacyImage$ g 2 2 ooze rna
-DeckHas:Ability$Token
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your end step, put a +1/+1 counter on each Ooze you control.
 SVar:TrigPutCounter:DB$PutCounterAll | ValidCards$ Ooze.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Artifact
 A:AB$ Token | Cost$ 1 G G G | TokenAmount$ 1 | TokenScript$ g_2_2_ooze | LegacyImage$ g 2 2 ooze rna | SpellDescription$ Create a 2/2 green Ooze creature token.
+DeckHas:Ability$Token & Ability$Counters
 Oracle:When Biogenic Ooze enters the battlefield, create a 2/2 green Ooze creature token.\nAt the beginning of your end step, put a +1/+1 counter on each Ooze you control.\n{1}{G}{G}{G}: Create a 2/2 green Ooze creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/biogenic_upgrade.txt b/forge-gui/res/cardsfolder/upcoming/biogenic_upgrade.txt
index 114b2864bfd..8442191a58f 100644
--- a/forge-gui/res/cardsfolder/upcoming/biogenic_upgrade.txt
+++ b/forge-gui/res/cardsfolder/upcoming/biogenic_upgrade.txt
@@ -3,4 +3,5 @@ ManaCost:4 G G
 Types:Sorcery
 A:SP$ PutCounter | Cost$ 4 G G | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute counters to | CounterType$ P1P1 | CounterNum$ 3 | TargetMin$ 1 | TargetMax$ 3 | DividedAsYouChoose$ 3 | SubAbility$ DBPump | SpellDescription$ Distribute three +1/+1 counters among one, two, or three target creatures, then double the number of +1/+1 counters on each of those creatures.
 SVar:DBPump:DB$ MultiplyCounter | Defined$ Targeted | CounterType$ P1P1
+DeckHas:Ability$Counters
 Oracle:Distribute three +1/+1 counters among one, two, or three target creatures, then double the number of +1/+1 counters on each of those creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/biomancers_familiar.txt b/forge-gui/res/cardsfolder/upcoming/biomancers_familiar.txt
index 30008a2e68c..416715d855c 100644
--- a/forge-gui/res/cardsfolder/upcoming/biomancers_familiar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/biomancers_familiar.txt
@@ -4,4 +4,5 @@ Types:Creature Mutant
 PT:2/2
 S:Mode$ ReduceCost | ValidCard$ Creature.YouCtrl | Type$ Ability | Amount$ 2 | MinMana$ 1 | AffectedZone$ Battlefield | Description$ Activated abilities of creatures you control cost {2} less to activate. This effect can't reduce the amount of mana an ability costs to activate to less than one mana.
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | KW$ HIDDEN CARDNAME adapts as though it had no +1/+1 counters | TgtPrompt$ Select target creature. | StackDescription$ SpellDescription | SpellDescription$ The next time target creature adapts this turn, it adapts as though it had no +1/+1 counters.
+DeckHints:Keyword$Adapt
 Oracle:Activated abilities of creatures you control cost 2 less to activate. This effect can't reduce the amount of mana an ability costs to activate to less than one mana.\n{T}: The next time target creature adapts this turn, it adapts as though it had no +1/+1 counters.
diff --git a/forge-gui/res/cardsfolder/upcoming/bolrac_clan_crusher.txt b/forge-gui/res/cardsfolder/upcoming/bolrac_clan_crusher.txt
index db9d08053b9..718fb27d827 100644
--- a/forge-gui/res/cardsfolder/upcoming/bolrac_clan_crusher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bolrac_clan_crusher.txt
@@ -4,4 +4,5 @@ Types:Creature Ogre Warrior
 PT:4/4
 A:AB$ DealDamage | Cost$ T SubCounter<1/P1P1/Creature.YouCtrl/a creature you control> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
 AI:RemoveDeck:Random
+DeckHints:Ability$Counters
 Oracle:{T}, Remove a +1/+1 counter from a creature you control: Bolrac-Clan Crusher deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/upcoming/burning_tree_vandal.txt b/forge-gui/res/cardsfolder/upcoming/burning_tree_vandal.txt
index 9220bc36cf7..664652dc71a 100644
--- a/forge-gui/res/cardsfolder/upcoming/burning_tree_vandal.txt
+++ b/forge-gui/res/cardsfolder/upcoming/burning_tree_vandal.txt
@@ -7,4 +7,5 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescripti
 SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | Optional$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Riot (This creature enters the battlefield with your choice of a +1/+ counter or haste.)\nWhenever Burning-Tree Vandal attacks, you may discard a card. If you do, draw a card.
+DeckHas:Ability$Counters
+Oracle:Riot (This creature enters the battlefield with your choice of a +1/+1 counter or haste.)\nWhenever Burning-Tree Vandal attacks, you may discard a card. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/carrion_imp.txt b/forge-gui/res/cardsfolder/upcoming/carrion_imp.txt
index aac9ac1c750..36b087eee06 100644
--- a/forge-gui/res/cardsfolder/upcoming/carrion_imp.txt
+++ b/forge-gui/res/cardsfolder/upcoming/carrion_imp.txt
@@ -8,4 +8,5 @@ SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTg
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
+DeckHas:Ability$LifeGain
 Oracle:Flying\nWhen Carrion Imp enters the battlefield, you may exile target creature card from a graveyard. If you do, you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/debtors_transport.txt b/forge-gui/res/cardsfolder/upcoming/debtors_transport.txt
index 0a9126dbfdb..8d3bd58b0d8 100644
--- a/forge-gui/res/cardsfolder/upcoming/debtors_transport.txt
+++ b/forge-gui/res/cardsfolder/upcoming/debtors_transport.txt
@@ -3,4 +3,5 @@ ManaCost:5 B
 Types:Creature Thrull
 PT:5/3
 K:Afterlife:2
+DeckHas:Ability$Token
 Oracle:Afterlife 2 (When this creature dies, create two 1/1 white and black Spirit creature tokens with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/dovins_automaton.txt b/forge-gui/res/cardsfolder/upcoming/dovins_automaton.txt
index b29eabea4d9..73cdd072ab3 100644
--- a/forge-gui/res/cardsfolder/upcoming/dovins_automaton.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dovins_automaton.txt
@@ -4,4 +4,5 @@ Types:Artifact Creature Homunculus
 PT:3/3
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Vigilance | IsPresent$ Planeswalker.Dovin+YouCtrl | Description$ As long as you control a planeswalker planeswalker, CARDNAME gets +2/+2 and has vigilance. (Attacking doesn't cause it to tap.)
 SVar:BuffedBy:Dovin
+DeckNeeds:Type$Dovin
 Oracle:As long as you control a Dovin planeswalker, Dovin's Automaton gets +2/+2 and has vigilance. (Attacking doesn't cause it to tap.)
diff --git a/forge-gui/res/cardsfolder/upcoming/essence_capture.txt b/forge-gui/res/cardsfolder/upcoming/essence_capture.txt
index 773fd657405..d0e6ca8574e 100644
--- a/forge-gui/res/cardsfolder/upcoming/essence_capture.txt
+++ b/forge-gui/res/cardsfolder/upcoming/essence_capture.txt
@@ -3,4 +3,5 @@ ManaCost:U U
 Types:Instant
 A:SP$ Counter | Cost$ U U | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Creature | SubAbility$ DBPutCounter | SpellDescription$ Counter target creature spell. Put a +1/+1 counter on up to one target creature you control.
 SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you control | ValidTgts$ Creature.YouCtrl
+DeckHas:Ability$Counters
 Oracle:Counter target creature spell. Put a +1/+1 counter on up to one target creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/frenzied_arynx.txt b/forge-gui/res/cardsfolder/upcoming/frenzied_arynx.txt
index b9169b6b113..8a927f26105 100644
--- a/forge-gui/res/cardsfolder/upcoming/frenzied_arynx.txt
+++ b/forge-gui/res/cardsfolder/upcoming/frenzied_arynx.txt
@@ -5,4 +5,5 @@ PT:3/3
 K:Riot
 K:Trample
 A:AB$ Pump | Cost$ 4 R G | NumAtt$ +3 | SpellDescription$ CARDNAME gets +3/+0 until end of turn.
+DeckHas:Ability$Counters
 Oracle:Riot (This creature enters the battlefield with your choice of a +1/+1 counter or haste.)\nTrample\n{4}{R}{G}: Frenzied Arynx gets +3/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/galloping_lizrog.txt b/forge-gui/res/cardsfolder/upcoming/galloping_lizrog.txt
index 5ad3b047aeb..14e378503ef 100644
--- a/forge-gui/res/cardsfolder/upcoming/galloping_lizrog.txt
+++ b/forge-gui/res/cardsfolder/upcoming/galloping_lizrog.txt
@@ -8,4 +8,6 @@ SVar:TrigRemoveCounters:DB$ RemoveCounter | ValidSource$ Creature.YouCtrl+counte
 SVar:DBPutCounters:DB$PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedNumber/Twice
+DeckHints:Ability$Counters
+DeckHas:Ability$Counters
 Oracle:Trample\nWhen Galloping Lizrog enters the battlefield, you may remove any number of +1/+1 counters from among creatures you control. If you do, put twice that many +1/+1 counters on Galloping Lizrog.
diff --git a/forge-gui/res/cardsfolder/upcoming/gateway_sneak.txt b/forge-gui/res/cardsfolder/upcoming/gateway_sneak.txt
index d161e4fe77d..3372e39cc3d 100644
--- a/forge-gui/res/cardsfolder/upcoming/gateway_sneak.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gateway_sneak.txt
@@ -7,4 +7,5 @@ SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescripti
 SVar:PlayMain1:TRUE
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, draw a card.
 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1
+DeckHints:Type$Gate
 Oracle:Whenever a Gate enters the battlefield under your control, Gateway Sneak can't be blocked this turn.\nWhenever Gateway Sneak deals combat damage to a player, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/ghor_clan_wrecker.txt b/forge-gui/res/cardsfolder/upcoming/ghor_clan_wrecker.txt
index 06d74a0cde7..8bdaf370a7a 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghor_clan_wrecker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghor_clan_wrecker.txt
@@ -4,4 +4,5 @@ Types:Creature Human Warrior
 PT:2/2
 K:Riot
 K:Menace
+DeckHas:Ability$Counters
 Oracle:Riot (This creature enters the battlefield with your choice of a +1/1+ counter or haste.)\nMenace (This creature can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/upcoming/growth_chamber_guardian.txt b/forge-gui/res/cardsfolder/upcoming/growth_chamber_guardian.txt
index ab2115fc759..b8a29fe6bdf 100644
--- a/forge-gui/res/cardsfolder/upcoming/growth_chamber_guardian.txt
+++ b/forge-gui/res/cardsfolder/upcoming/growth_chamber_guardian.txt
@@ -3,8 +3,8 @@ ManaCost:1 G
 Types:Creature Elf Crab Warrior
 PT:2/2
 K:Adapt:2:2 G
-DeckHas:Ability$Counters
 T:Mode$ CounterAddedOnce | ValidCard$ Card.Self | TriggerZones$ Battlefield | CounterType$ P1P1 | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ Whenever one or more +1/+1 counters are put on CARDNAME, you may search your library for a card named CARDNAME, reveal it, put it into your hand, then shuffle your library.
 SVar:TrigSearch:DB$ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedGrowth-Chamber Guardian | ChangeNum$ 1 | ShuffleNonMandatory$ True
 DeckHints:Name$Growth-Chamber Guardian
+DeckHas:Ability$Counters
 Oracle:{2}{G}: Adapt 2. (If this creature has no +1/+1 counters on it, put two +1/+1 counters on it.)\nWhenever one or more +1/+1 counters are put on Growth-Chamber Guardian, you may search your library for a card named Growth-Chamber Guardian, reveal it, put it into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/upcoming/gruul_beastmaster.txt b/forge-gui/res/cardsfolder/upcoming/gruul_beastmaster.txt
index 5f6eaa8441c..37c4d689b4c 100644
--- a/forge-gui/res/cardsfolder/upcoming/gruul_beastmaster.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gruul_beastmaster.txt
@@ -6,4 +6,5 @@ K:Riot
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target creature you control gets +X/+0 until end of turn, where X is CARDNAME's power.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | NumAtt$ X | References$ X
 SVar:X:Count$CardPower
+DeckHas:Ability$Counters
 Oracle:Riot (This creature enters the battlefield with your choice of a +1/+1 counter or haste.)\nWhenever Gruul Beastmaster attacks, another target creature you control gets +X/+0 until end of turn, where X is Gruul Beastmaster's power.
diff --git a/forge-gui/res/cardsfolder/upcoming/gruul_spellbreaker.txt b/forge-gui/res/cardsfolder/upcoming/gruul_spellbreaker.txt
index 00c298d8fa4..7b88ab891f8 100644
--- a/forge-gui/res/cardsfolder/upcoming/gruul_spellbreaker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gruul_spellbreaker.txt
@@ -5,4 +5,5 @@ PT:3/3
 K:Riot
 K:Trample
 S:Mode$ Continuous | Affected$ You,Card.Self | AddKeyword$ Hexproof | Condition$ PlayerTurn | Description$ As long as it's your turn, you and CARDNAME have hexproof.
+DeckHas:Ability$Counters
 Oracle:Riot (This creature enters the battlefield with your choice of a +1/+1 counter or haste.)\nTrample\nAs long as it's your turn, you and Gruul Spellbreaker have hexproof.
diff --git a/forge-gui/res/cardsfolder/upcoming/hydroid_krasis.txt b/forge-gui/res/cardsfolder/upcoming/hydroid_krasis.txt
index 390597eb9c5..8abcd05c671 100644
--- a/forge-gui/res/cardsfolder/upcoming/hydroid_krasis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hydroid_krasis.txt
@@ -10,4 +10,5 @@ K:Trample
 K:etbCounter:P1P1:X
 SVar:X:Count$xPaid
 SVar:HalfXDown:Count$xPaid/HalfDown
+DeckHas:Ability$Counters
 Oracle:When you cast this spell, you gain half X life and draw half X cards. Round down each time.\nFlying, trample\nHydroid Krasis enters the battlefield with X +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/upcoming/impassioned_orator.txt b/forge-gui/res/cardsfolder/upcoming/impassioned_orator.txt
index 6be0f322e46..75673f392b0 100644
--- a/forge-gui/res/cardsfolder/upcoming/impassioned_orator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/impassioned_orator.txt
@@ -4,4 +4,5 @@ Types:Creature Human Cleric
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever another creature enters the battlefield under your control, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$LifeGain
 Oracle:Whenever another creature enters the battlefield under your control, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/imperious_oligarch.txt b/forge-gui/res/cardsfolder/upcoming/imperious_oligarch.txt
index 13e0bc6549e..b6b2a3f6b1b 100644
--- a/forge-gui/res/cardsfolder/upcoming/imperious_oligarch.txt
+++ b/forge-gui/res/cardsfolder/upcoming/imperious_oligarch.txt
@@ -4,4 +4,5 @@ Types:Creature Human Cleric
 PT:2/1
 K:Vigilance
 K:Afterlife:1
+DeckHas:Ability$Token
 Oracle:Vigilance\nAfterlife 1 (When this creature dies, create a 1/1 white and black Spirit creature token with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_sorrows.txt b/forge-gui/res/cardsfolder/upcoming/knight_of_sorrows.txt
index 6170bdcd29d..4e38776c875 100644
--- a/forge-gui/res/cardsfolder/upcoming/knight_of_sorrows.txt
+++ b/forge-gui/res/cardsfolder/upcoming/knight_of_sorrows.txt
@@ -4,4 +4,5 @@ Types:Creature Human Knight
 PT:3/3
 K:CARDNAME can block an additional creature each combat.
 K:Afterlife:1
+DeckHas:Ability$Token
 Oracle:Knight of Sorrows can block an additional creature each combat.\nAfterlife 1 (When this creature dies, create a 1/1 white and black Spirit creature token with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt b/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt
index cb4c548f5ad..cf506cad0c6 100644
--- a/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt
+++ b/forge-gui/res/cardsfolder/upcoming/knight_of_the_last_breath.txt
@@ -5,5 +5,6 @@ PT:4/4
 A:AB$ Token | Cost$ 3 Sac<1/Creature.nonToken+Other/another creature> | TokenAmount$ 1 | TokenScript$ wb_1_1_spirit_flying | TokenOwner$ You | SpellDescription$ Create a 1/1 white and black Spirit creature token with flying.
 SVar:RemRandomDeck:True
 K:Afterlife:3
+SVar:AIPreference:SacCost$Creature.cmcLE1
 DeckHas:Ability$Token
 Oracle:{3}, Sacrifice another nontoken creature: Create a 1/1 white and black Spirit creature token with flying.\nAfterlife 3 (When this creature dies, create three 1/1 white and black Spirit creature tokens with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/ministrant_of_obligation.txt b/forge-gui/res/cardsfolder/upcoming/ministrant_of_obligation.txt
index 37c661d8fd9..1aa49d93582 100644
--- a/forge-gui/res/cardsfolder/upcoming/ministrant_of_obligation.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ministrant_of_obligation.txt
@@ -3,4 +3,5 @@ ManaCost:2 W
 Types:Creature Human Cleric
 PT:2/1
 K:Afterlife:2
+DeckHas:Ability$Token
 Oracle:Afterlife 2 (When this creature dies, create two 1/1 white and black Spirit creature token with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/orzhov_enforcer.txt b/forge-gui/res/cardsfolder/upcoming/orzhov_enforcer.txt
index aad9953f605..d4c7e20517c 100644
--- a/forge-gui/res/cardsfolder/upcoming/orzhov_enforcer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/orzhov_enforcer.txt
@@ -4,4 +4,5 @@ Types:Creature Human Rogue
 PT:1/2
 K:Deathtouch
 K:Afterlife:1
+DeckHas:Ability$Token
 Oracle:Deathtouch\nAfterlife 1 (When this creature dies, create a 1/1 white and black Spirit creature token with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/orzhov_racketeers.txt b/forge-gui/res/cardsfolder/upcoming/orzhov_racketeers.txt
index 2a3425bba32..b8baf0da911 100644
--- a/forge-gui/res/cardsfolder/upcoming/orzhov_racketeers.txt
+++ b/forge-gui/res/cardsfolder/upcoming/orzhov_racketeers.txt
@@ -5,4 +5,5 @@ PT:3/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards a card.
 SVar:TrigDiscard:DB$Discard | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 K:Afterlife:2
+DeckHas:Ability$Token
 Oracle:Whenever Orzhov Racketeers deals combat damage to a player, that player discards a card.\nAfterlife 2 (When this creature dies, create two 1/1 white and black Spirit creature tokens with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/pitiless_pontiff.txt b/forge-gui/res/cardsfolder/upcoming/pitiless_pontiff.txt
index 6034e8121d5..a70767c291e 100644
--- a/forge-gui/res/cardsfolder/upcoming/pitiless_pontiff.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pitiless_pontiff.txt
@@ -3,4 +3,5 @@ ManaCost:W B
 Types:Creature Vampire Cleric
 PT:2/2
 A:AB$ Pump | Cost$ 1 Sac<1/Creature.Other/another creature> | KW$ Deathtouch & Indestructible | SpellDescription$ CARDNAME gains deathtouch and indestructible until end of turn.
+SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE2
 Oracle:{1}, Sacrifice another creature: Pitiless Pontiff gains deathtouch and indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/plaza_of_harmony.txt b/forge-gui/res/cardsfolder/upcoming/plaza_of_harmony.txt
index 8606fbf3076..fed983c4ae9 100644
--- a/forge-gui/res/cardsfolder/upcoming/plaza_of_harmony.txt
+++ b/forge-gui/res/cardsfolder/upcoming/plaza_of_harmony.txt
@@ -3,7 +3,8 @@ ManaCost:
 Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Gate.YouCtrl | PresentCompare$ GE2 | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Gates, gain 3 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
-DeckHints:Type$Gate
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Gate.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type a Gate you control could produce.
+DeckHints:Type$Gate
+DeckHas:Ability$LifeGain
 Oracle:When Plaza of Harmony enters the battlefield, if you control two or more Gates, you gain 3 life.\n{T}: Add {C}.\n{T}: Add one mana of any type a Gate you control could produce.
diff --git a/forge-gui/res/cardsfolder/upcoming/prime_speaker_vannifar.txt b/forge-gui/res/cardsfolder/upcoming/prime_speaker_vannifar.txt
index d64c9413ae4..7c7c423cf6c 100644
--- a/forge-gui/res/cardsfolder/upcoming/prime_speaker_vannifar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/prime_speaker_vannifar.txt
@@ -2,6 +2,8 @@ Name:Prime Speaker Vannifar
 ManaCost:2 G U
 Types:Legendary Creature Elf Ooze Wizard
 PT:2/4
-A:AB$ ChangeZone | Cost$ T Sac<1/Creature.Other/another creature> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | References$ X | ChangeNum$ 1 | SorcerySpeed$ True | SpellDescription$ Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery.
+A:AB$ ChangeZone | Cost$ T Sac<1/Creature.Other/another creature> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | References$ X | ChangeNum$ 1 | SorcerySpeed$ True | AILogic$ SacAndUpgrade | SpellDescription$ Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery.
 SVar:X:Sacrificed$CardManaCost/Plus.1
+# AI Preference is needed to make the AI consider the ability. Further constraints are defined by AILogic SacAndUpgrade.
+SVar:AIPreference:SacCost$Creature
 Oracle:{T}, Sacrifice another creature: Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/prying_eyes.txt b/forge-gui/res/cardsfolder/upcoming/prying_eyes.txt
index 5b3987a99bb..49800163899 100644
--- a/forge-gui/res/cardsfolder/upcoming/prying_eyes.txt
+++ b/forge-gui/res/cardsfolder/upcoming/prying_eyes.txt
@@ -3,4 +3,5 @@ ManaCost:4 U U
 Types:Instant
 A:SP$ Draw | Cost$ 4 U U | NumCards$ 4 | SpellDescription$ Draw four cards, then discard two cards.| SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 2 | Mode$ TgtChoose
+DeckHas:Ability$Discard
 Oracle:Draw four cards, then discard two cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_rendhorn.txt b/forge-gui/res/cardsfolder/upcoming/rampaging_rendhorn.txt
index dcdbf63e0db..26083cd1ba7 100644
--- a/forge-gui/res/cardsfolder/upcoming/rampaging_rendhorn.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rampaging_rendhorn.txt
@@ -3,4 +3,5 @@ ManaCost:4 G
 Types:Creature Beast
 PT:4/4
 K:Riot
+DeckHas:Ability$Counters
 Oracle:Riot (This creature enters the battlefield with your choice of a +1/+1 counter or haste.)
diff --git a/forge-gui/res/cardsfolder/upcoming/ravager_wurm.txt b/forge-gui/res/cardsfolder/upcoming/ravager_wurm.txt
index ab0c81cd716..dc241c32c6f 100644
--- a/forge-gui/res/cardsfolder/upcoming/ravager_wurm.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ravager_wurm.txt
@@ -7,4 +7,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigCharm:DB$ Charm | MinCharmNum$ 0 | CharmNum$ 1 | Choices$ DBFight,DBDestroy 
 SVar:DBFight:DB$ Fight | Defined$ TriggeredCardLKICopy | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control | SpellDescription$ CARDNAME fights target creature you don't control.
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Land.hasNonManaActivatedAbility | TgtPrompt$ Select target land with an activated ability that isn't a mana ability | SpellDescription$ Destroy target land with an activated ability that iasn't a mana ability.
+DeckHas:Ability$Counters
 Oracle:Riot (This creature enters the battlefield with your choice of a +1/+1 counter or haste.)\nWhen Ravager Wurm enters the battlefield, choose up to one -\n- Ravager Wurm fights target creature you don't control.\n- Destroy target land with an activated ability that isn't a mana ability.
diff --git a/forge-gui/res/cardsfolder/upcoming/rhythm_of_the_wild.txt b/forge-gui/res/cardsfolder/upcoming/rhythm_of_the_wild.txt
index 0a239df820f..8370ea9cb9e 100644
--- a/forge-gui/res/cardsfolder/upcoming/rhythm_of_the_wild.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rhythm_of_the_wild.txt
@@ -4,4 +4,5 @@ Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Stack | AddHiddenKeyword$ CARDNAME can't be countered. | Description$ Creature spells you control can't be countered.
 S:Mode$ Continuous | Affected$ Creature.nonToken+YouCtrl | AddKeyword$ Riot| Description$ Nontoken creatures you control have riot. (They enter the battlefield with your choice of a +1/+1 counter or haste.)
 SVar:PlayMain1:TRUE
+DeckHas:Ability$Counters
 Oracle:Creature spells you control can't be countered.\nNontoken creatures you control have riot. (They enter the battlefield with your choice of a +1/+1 counter or haste.)
diff --git a/forge-gui/res/cardsfolder/upcoming/senate_guildmage.txt b/forge-gui/res/cardsfolder/upcoming/senate_guildmage.txt
index ba151e35c78..850a1c0edcb 100644
--- a/forge-gui/res/cardsfolder/upcoming/senate_guildmage.txt
+++ b/forge-gui/res/cardsfolder/upcoming/senate_guildmage.txt
@@ -5,4 +5,5 @@ PT:2/2
 A:AB$ GainLife | Cost$ W T | LifeAmount$ 2 | SpellDescription$ You gain 2 life.
 A:AB$ Draw | Cost$ U T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
+DeckHas:Ability$LifeGain & Ability$Discard
 Oracle:{W}, {T}: You gain 2 life.\n{U}, {T}: Draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/seraph_of_the_scales.txt b/forge-gui/res/cardsfolder/upcoming/seraph_of_the_scales.txt
index 1981a8f9eea..503d4c5a9c7 100644
--- a/forge-gui/res/cardsfolder/upcoming/seraph_of_the_scales.txt
+++ b/forge-gui/res/cardsfolder/upcoming/seraph_of_the_scales.txt
@@ -6,4 +6,5 @@ K:Flying
 A:AB$ Pump | Cost$ W | Defined$ Self | KW$ Vigilance | SpellDescription$ CARDNAME gains vigilance until end of turn.
 A:AB$ Pump | Cost$ B | Defined$ Self | KW$ Deathtouch | SpellDescription$ CARDNAME gains deathtouch until end of turn.
 K:Afterlife:2
+DeckHas:Ability$Token
 Oracle:Flying\n{W}: Seraph of the Scales gains vigilance until end of turn.\n{B}: Seraph of the Scales gains deathtouch until end of turn.\nAfterlife 2 (When this creature dies, create two 1/1 white and black Spirit creature tokens with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/spawn_of_mayhem.txt b/forge-gui/res/cardsfolder/upcoming/spawn_of_mayhem.txt
index 68d9c1d232e..3d4b5725ea0 100644
--- a/forge-gui/res/cardsfolder/upcoming/spawn_of_mayhem.txt
+++ b/forge-gui/res/cardsfolder/upcoming/spawn_of_mayhem.txt
@@ -9,4 +9,5 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | E
 SVar:TrigDmgOpp:DB$DealDamage | Defined$ Player | NumDmg$ 1 | SubAbility$ DBCounter
 SVar:DBCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ LE10 | References$ X
 SVar:X:Count$YourLifeTotal
+DeckHas:Ability$Counters
 Oracle:Spectacle {1}{B}{B} (You may cast this spell for its spectacle cost rather than its mana cost if an opponent lost life this turn.)\nFlying, trample\nAt the beginning of your upkeep, Spawn of Mayhem deals 1 damage to each player. Then if you have 10 or less life, put a +1/+1 counter on Spawn of Mayhem.
diff --git a/forge-gui/res/cardsfolder/upcoming/sphinxs_insight.txt b/forge-gui/res/cardsfolder/upcoming/sphinxs_insight.txt
index ecd8f6980d0..1803de4d01f 100644
--- a/forge-gui/res/cardsfolder/upcoming/sphinxs_insight.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sphinxs_insight.txt
@@ -3,4 +3,5 @@ ManaCost:2 W U
 Types:Instant
 A:SP$ Draw | Cost$ 2 W U | NumCards$ 2 | SubAbility$ DBLife | StackDescription$ SpellDescription | SpellDescription$ Draw two cards.
 SVar:DBLife:DB$ GainLife | LifeAmount$ 2 | ConditionPlayerTurn$ True | ConditionPhases$ Main1,Main2 | SpellDescription$ Addendum - If you cast this spell during your main phase, you gain 2 life.
+DeckHas:Ability$LifeGain
 Oracle:Draw two cards.\nAddendum - If you cast this spell during your main phase, you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/sylvan_brushstrider.txt b/forge-gui/res/cardsfolder/upcoming/sylvan_brushstrider.txt
index a2465c1048c..306d762121e 100644
--- a/forge-gui/res/cardsfolder/upcoming/sylvan_brushstrider.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sylvan_brushstrider.txt
@@ -4,4 +4,5 @@ Types:Creature Beast
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life.
 SVar:TrigGainLife:DB$GainLife | LifeAmount$ 2
+DeckHas:Ability$LifeGain
 Oracle:When Sylvan Brushstrider enters the battlefield, you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/syndicate_messenger.txt b/forge-gui/res/cardsfolder/upcoming/syndicate_messenger.txt
index 521a64a8c12..7104e1360ce 100644
--- a/forge-gui/res/cardsfolder/upcoming/syndicate_messenger.txt
+++ b/forge-gui/res/cardsfolder/upcoming/syndicate_messenger.txt
@@ -4,4 +4,5 @@ Types:Creature Bird
 PT:2/3
 K:Flying
 K:Afterlife:1
+DeckHas:Ability$Token
 Oracle:Flying\nAfterlife 1 (When this creature dies, create a 1/1 white and black Spirit creature token with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/territorial_boar.txt b/forge-gui/res/cardsfolder/upcoming/territorial_boar.txt
index f69ee6029e3..f69e2c574e6 100644
--- a/forge-gui/res/cardsfolder/upcoming/territorial_boar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/territorial_boar.txt
@@ -5,4 +5,5 @@ PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE4+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature with power 4 or greater enters the battlefield under your control, CARDNAME gets +1/+1 and gains vigilance until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance
 SVar:RemRandomDeck:True
+SVar:BuffedBy:Creature.powerGE4
 Oracle:Whenever a creature with power 4 or greater enters the battlefield under your control, Territorial Boar gets +1/+1 and gains vigilance until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/teysa_karlov.txt b/forge-gui/res/cardsfolder/upcoming/teysa_karlov.txt
index 081b84cd822..cc63eea3839 100644
--- a/forge-gui/res/cardsfolder/upcoming/teysa_karlov.txt
+++ b/forge-gui/res/cardsfolder/upcoming/teysa_karlov.txt
@@ -4,4 +4,5 @@ Types:Legendary Creature Human Advisor
 PT:2/4
 S:Mode$ Continuous | Affected$ You | AddKeyword$ Dieharmonicon | Description$ If a creature dying causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.
 S:Mode$ Continuous | Affected$ Creature.token+YouCtrl | AddKeyword$ Vigilance & Lifelink | Description$ Creature tokens you control have vigilance and lifelink.
+DeckHints:Ability$Token
 Oracle:If a creature dying causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.\nCreature tokens you control have vigilance and lifelink.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_haunt_of_hightower.txt b/forge-gui/res/cardsfolder/upcoming/the_haunt_of_hightower.txt
index d696d6175e7..e05e9dca861 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_haunt_of_hightower.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_haunt_of_hightower.txt
@@ -9,4 +9,5 @@ SVar:TrigDiscard:DB$Discard | Defined$ DefendingPlayer | NumCards$ 1 | Mode$ Tgt
 SVar:HasAttackEffect:TRUE
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.nonToken+OppOwn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 Oracle:Flying, lifelink\nWhenever The Haunt of Hightower attacks, defending player discards a card.\nWhenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on The Haunt of Hightower.
diff --git a/forge-gui/res/cardsfolder/upcoming/tithe_taker.txt b/forge-gui/res/cardsfolder/upcoming/tithe_taker.txt
index 5de300d42f5..1f4f33dae51 100644
--- a/forge-gui/res/cardsfolder/upcoming/tithe_taker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tithe_taker.txt
@@ -4,4 +4,5 @@ Types:Creature Human Soldier
 PT:2/1
 K:Afterlife:1
 S:Mode$ RaiseCost | ValidCard$ Card | Activator$ Opponent | ValidSpell$ Spell,Activated.nonManaAbility | Amount$ 1 | Condition$ PlayerTurn | Description$ During your turn, spells your opponents cast cost {1} more to cast and abilities your opponents activate cost {1} more to activate unless they're mana abilities.
+DeckHas:Ability$Token
 Oracle:During your turn, spells your opponents cast cost {1} more to cast and abilities your opponents activate cost {1} more to activate unless they're mana abilities.\nAfterlife 1 (When this creature dies, create a 1/1 white and black Spirit creature token with flying.)
diff --git a/forge-gui/res/cardsfolder/upcoming/trollbred_guardian.txt b/forge-gui/res/cardsfolder/upcoming/trollbred_guardian.txt
index 9c2718c5365..3f26c51e769 100644
--- a/forge-gui/res/cardsfolder/upcoming/trollbred_guardian.txt
+++ b/forge-gui/res/cardsfolder/upcoming/trollbred_guardian.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Creature Troll Frog Warrior
 PT:5/5
 K:Adapt:2:2 G
-DeckHas:Ability$Counters
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddKeyword$ Trample | Description$ Each creature you control with a +1/+1 counter on it has trample.
+DeckHas:Ability$Counters
 DeckHints:Ability$Counters
 Oracle:{2}{G}: Adapt 2. (If this creature has no +1/+1 counters on it, put two +1/+1 counters on it.)\nEach creature you control with a +1/+1 counter on it has trample.
diff --git a/forge-gui/res/cardsfolder/upcoming/undercity_scavenger.txt b/forge-gui/res/cardsfolder/upcoming/undercity_scavenger.txt
index 0ff05038a8a..c4a94a280cd 100644
--- a/forge-gui/res/cardsfolder/upcoming/undercity_scavenger.txt
+++ b/forge-gui/res/cardsfolder/upcoming/undercity_scavenger.txt
@@ -6,4 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ Sac<1/Creature.Other/another creature> | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBScry
 SVar:DBScry:DB$ Scry | ScryNum$ 2 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE3
+DeckHas:Ability$Counters
 Oracle:When Undercity Scavenger enters the battlefield, you may sacrifice another creature. If you do, put two +1/+1 counters on Undercity Scavenger, then scry 2.
diff --git a/forge-gui/res/cardsfolder/upcoming/undercitys_embrace.txt b/forge-gui/res/cardsfolder/upcoming/undercitys_embrace.txt
index 95ffb7eb091..528da6b040d 100644
--- a/forge-gui/res/cardsfolder/upcoming/undercitys_embrace.txt
+++ b/forge-gui/res/cardsfolder/upcoming/undercitys_embrace.txt
@@ -3,4 +3,5 @@ ManaCost:2 B
 Types:Instant
 A:SP$ Sacrifice | Cost$ 2 B | ValidTgts$ Opponent | SacValid$ Creature | SacMessage$ Creature | SubAbility$ DBGainLife | SpellDescription$ Target opponent sacrifices a creature. If you control a creature with power 4 or greater, you gain 4 life. | StackDescription$ SpellDescription
 SVar:DBGainLife:DB$ GainLife | Defined$ You | ConditionPresent$ Creature.YouCtrl+powerGE4 | ConditionCompare$ GE1 | StackDescription$ If you control a creature with power 4 or greater, you gain 4 life.
+DeckHas:Ability$LifeGain
 Oracle:Target opponent sacrifices a creature. If you control a creature with power 4 or greater, you gain 4 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/vindictive_vampire.txt b/forge-gui/res/cardsfolder/upcoming/vindictive_vampire.txt
index 2c9ce3a3068..7c2d3869b9a 100644
--- a/forge-gui/res/cardsfolder/upcoming/vindictive_vampire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vindictive_vampire.txt
@@ -5,4 +5,5 @@ PT:2/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever another creature you control dies, CARDNAME deals 1 damage to each opponent and you gain 1 life.
 SVar:TrigDealDamage:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$LifeGain
 Oracle:Whenever another creature you control dies, Vindictive Vampire deals 1 damage to each opponent and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/wrecking_beast.txt b/forge-gui/res/cardsfolder/upcoming/wrecking_beast.txt
index c365de7a507..2acd7514fc7 100644
--- a/forge-gui/res/cardsfolder/upcoming/wrecking_beast.txt
+++ b/forge-gui/res/cardsfolder/upcoming/wrecking_beast.txt
@@ -4,4 +4,5 @@ Types:Creature Beast
 PT:6/6
 K:Riot
 K:Trample
-Oracle:Riot (This creature enters the battlefield with your choice of a +1/1+ counter or haste.)\nTrample
+DeckHas:Ability$Counters
+Oracle:Riot (This creature enters the battlefield with your choice of a +1/+1 counter or haste.)\nTrample
diff --git a/forge-gui/res/cardsfolder/upcoming/zhur_taa_goblin.txt b/forge-gui/res/cardsfolder/upcoming/zhur_taa_goblin.txt
index a136ca50236..fcb4f5e13a9 100644
--- a/forge-gui/res/cardsfolder/upcoming/zhur_taa_goblin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zhur_taa_goblin.txt
@@ -3,4 +3,5 @@ ManaCost:R G
 Types:Creature Goblin Berserker
 PT:2/2
 K:Riot
+DeckHas:Ability$Counters
 Oracle:Riot (This creature enters the battlefield with your choice of a +1/+1 counter or haste.)