Card: refactor hidden keywords into Table Structure

2025-11-17 11:18:01 +00:00 · 2021-09-12 15:48:34 +00:00
parent 83a7cc8a3e
commit bfc938be57
60 changed files with 424 additions and 420 deletions
--- a/forge-gui/res/cardsfolder/a/alpha_authority.txt
+++ b/forge-gui/res/cardsfolder/a/alpha_authority.txt
@@ -3,6 +3,6 @@ ManaCost:1 G
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Hexproof | AddHiddenKeyword$ CantBeBlockedByAmount GT1 | Description$ Enchanted creature has hexproof and can't be blocked by more than one creature.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/alpha_authority.jpg
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Hexproof | Description$ Enchanted creature has hexproof and can't be blocked by more than one creature.
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.EnchantedBy | Max$ 1 | Secondary$ True | Description$ Enchanted creature can't be blocked by more than one creature.
 Oracle:Enchant creature\nEnchanted creature has hexproof and can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/b/battlefront_krushok.txt
+++ b/forge-gui/res/cardsfolder/b/battlefront_krushok.txt
@@ -2,10 +2,9 @@ Name:Battlefront Krushok
 ManaCost:4 G
 Types:Creature Beast
 PT:3/4
-K:CantBeBlockedByAmount GT1
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddHiddenKeyword$ CantBeBlockedByAmount GT1 | Description$ Each creature you control with a +1/+1 counter on it can't be blocked by more than one creature.
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.YouCtrl+counters_GE1_P1P1 | Max$ 1 | Description$ Each creature you control with a +1/+1 counter on it can't be blocked by more than one creature.
 SVar:NonStackingEffect:True
 SVar:PlayMain1:TRUE
 DeckHints:Ability$Counters
-SVar:Picture:http://www.wizards.com/global/images/magic/general/battlefront_krushok.jpg
 Oracle:Battlefront Krushok can't be blocked by more than one creature.\nEach creature you control with a +1/+1 counter on it can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/b/biomancers_familiar.txt
+++ b/forge-gui/res/cardsfolder/b/biomancers_familiar.txt
@@ -3,6 +3,9 @@ ManaCost:G U
 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 mana in that cost 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 on it.
+A:AB$ Effect | Cost$ T | ValidTgts$ Creature | RememberObjects$ ThisTargetedCard | StaticAbilities$ StaticAllowAdapt | Triggers$ TriggerClearAdapt | 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 on it.
+SVar:StaticAllowAdapt:Mode$ CanAdapt | ValidCard$ Card.IsRemembered | Description$ Remembered adapts as though it had no +1/+1 counters on it.
+SVar:TriggerClearAdapt:Mode$ Adapt | ValidCard$ Card.IsRemembered | Execute$ ExileSelf | Static$ True
+SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 DeckHints:Keyword$Adapt
 Oracle:Activated abilities of creatures you control cost {2} less to activate. This effect can't reduce the mana in that cost 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 on it.
--- a/forge-gui/res/cardsfolder/b/bristling_boar.txt
+++ b/forge-gui/res/cardsfolder/b/bristling_boar.txt
@@ -1,6 +1,6 @@
 Name:Bristling Boar
 ManaCost:3 G
 Types:Creature Boar
-K:CantBeBlockedByAmount GT1
+PT:4/3
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 Oracle:Bristling Boar can't be blocked by more than one creature.
-PT:4/3
--- a/forge-gui/res/cardsfolder/c/challenger_troll.txt
+++ b/forge-gui/res/cardsfolder/c/challenger_troll.txt
@@ -2,7 +2,7 @@ Name:Challenger Troll
 ManaCost:4 G
 Types:Creature Troll
 PT:6/5
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+powerGE4 | AddHiddenKeyword$ CantBeBlockedByAmount GT1 | Description$ Each creature you control with power 4 or greater can't be blocked by more than one creature.
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.YouCtrl+powerGE4 | Max$ 1 | Description$ Each creature you control with power 4 or greater can't be blocked by more than one creature.
 SVar:PlayMain1:TRUE
 AI:RemoveDeck:Random
-Oracle:Each creature you control with power 4 or greater can't be blocked by more than one creature.
+Oracle:Each creature you control with power 4 or greater can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/c/charging_rhino.txt
+++ b/forge-gui/res/cardsfolder/c/charging_rhino.txt
@@ -2,6 +2,5 @@ Name:Charging Rhino
 ManaCost:3 G G
 Types:Creature Rhino
 PT:4/4
-K:CantBeBlockedByAmount GT1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/charging_rhino.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 Oracle:Charging Rhino can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/f/familiar_ground.txt
+++ b/forge-gui/res/cardsfolder/f/familiar_ground.txt
@@ -1,8 +1,7 @@
 Name:Familiar Ground
 ManaCost:2 G
 Types:Enchantment
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CantBeBlockedByAmount GT1 | Description$ Each creature you control can't be blocked by more than one creature.
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.YouCtrl | Max$ 1 | Description$ Each creature you control can't be blocked by more than one creature.
 SVar:NonStackingEffect:True
 SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/familiar_ground.jpg
 Oracle:Each creature you control can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/g/gorilla_berserkers.txt
+++ b/forge-gui/res/cardsfolder/g/gorilla_berserkers.txt
@@ -4,6 +4,5 @@ Types:Creature Ape Berserker
 PT:2/3
 K:Trample
 K:Rampage:2
-K:CantBeBlockedByAmount LT3
-SVar:Picture:http://www.wizards.com/global/images/magic/general/gorilla_berserkers.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.Self | Min$ 3 | Description$ CARDNAME can't be blocked except by three or more creatures.
 Oracle:Trample; rampage 2 (Whenever this creature becomes blocked, it gets +2/+2 until end of turn for each creature blocking it beyond the first.)\nGorilla Berserkers can't be blocked except by three or more creatures.
--- a/forge-gui/res/cardsfolder/g/guile.txt
+++ b/forge-gui/res/cardsfolder/g/guile.txt
@@ -2,11 +2,10 @@ Name:Guile
 ManaCost:3 U U U
 Types:Creature Elemental Incarnation
 PT:6/6
-K:CantBeBlockedByAmount LT3
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.Self | Min$ 3 | Description$ CARDNAME can't be blocked except by three or more creatures.
 R:Event$ Counter | ActiveZones$ Battlefield | ValidType$ Spell | ValidCause$ Card.YouCtrl | ReplaceWith$ DBRemove | Description$ If a spell or ability you control would counter a spell, instead exile that spell and you may play that card without paying its mana cost.
 SVar:DBRemove:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Stack | Destination$ Exile | Fizzle$ True | SubAbility$ DBPlay
 SVar:DBPlay:DB$ Play | Defined$ ReplacedCard | WithoutManaCost$ True | Optional$ True
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigShuffle | TriggerDescription$ When CARDNAME is put into a graveyard from anywhere, shuffle it into its owner's library.
 SVar:TrigShuffle:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | Shuffle$ True | Defined$ TriggeredCardLKICopy
-SVar:Picture:http://www.wizards.com/global/images/magic/general/guile.jpg
 Oracle:Guile can't be blocked except by three or more creatures.\nIf a spell or ability you control would counter a spell, instead exile that spell and you may play that card without paying its mana cost.\nWhen Guile is put into a graveyard from anywhere, shuffle it into its owner's library.
--- a/forge-gui/res/cardsfolder/h/huang_zhong_shu_general.txt
+++ b/forge-gui/res/cardsfolder/h/huang_zhong_shu_general.txt
@@ -2,6 +2,5 @@ Name:Huang Zhong, Shu General
 ManaCost:2 W W
 Types:Legendary Creature Human Soldier
 PT:2/3
-K:CantBeBlockedByAmount GT1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/huang_zhong_shu_general.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 Oracle:Huang Zhong, Shu General can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/h/hungering_hydra.txt
+++ b/forge-gui/res/cardsfolder/h/hungering_hydra.txt
@@ -2,7 +2,7 @@ Name:Hungering Hydra
 ManaCost:X G
 Types:Creature Hydra
 PT:0/0
-K:CantBeBlockedByAmount GT1
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 K:etbCounter:P1P1:X
 SVar:X:Count$xPaid
 T:Mode$ DamageDoneOnce | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME is dealt damage, put that many +1/+1 counters on CARDNAME.
--- a/forge-gui/res/cardsfolder/i/ironhoof_ox.txt
+++ b/forge-gui/res/cardsfolder/i/ironhoof_ox.txt
@@ -2,6 +2,5 @@ Name:Ironhoof Ox
 ManaCost:3 G G
 Types:Creature Ox
 PT:4/4
-K:CantBeBlockedByAmount GT1
-SVar:Picture:http://resources.wizards.com/magic/cards/p2/en-us/card6628.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 Oracle:Ironhoof Ox can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/k/kessig_prowler_sinuous_predator.txt
+++ b/forge-gui/res/cardsfolder/k/kessig_prowler_sinuous_predator.txt
@@ -1,36 +1,18 @@
 Name:Kessig Prowler
-
 ManaCost:G
-
 Types:Creature Werewolf Horror
-
 PT:2/1
-
 A:AB$SetState | Cost$ 4 G | Defined$ Self | Mode$ Transform | SpellDescription$ Transform CARDNAME.
-
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kessig_prowler.jpg
-
 AlternateMode:DoubleFaced
-
 Oracle:{4}{G}: Transform Kessig Prowler.


-
 ALTERNATE


-
 Name:Sinuous Predator
-
 ManaCost:no cost
-
 Types:Creature Eldrazi Werewolf
-
 PT:4/4
-
-K:CantBeBlockedByAmount GT1
-
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sinuous_predator.jpg
-
-Oracle:Sinuous Predator can't be blocked by more than one creature.
-
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
+Oracle:Sinuous Predator can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/k/krosan_vorine.txt
+++ b/forge-gui/res/cardsfolder/k/krosan_vorine.txt
@@ -3,6 +3,5 @@ ManaCost:3 G
 Types:Creature Cat Beast
 PT:3/2
 K:Provoke
-K:CantBeBlockedByAmount GT1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/krosan_vorine.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 Oracle:Provoke (Whenever this creature attacks, you may have target creature defending player controls untap and block it if able.)\nKrosan Vorine can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/n/norwood_riders.txt
+++ b/forge-gui/res/cardsfolder/n/norwood_riders.txt
@@ -2,6 +2,5 @@ Name:Norwood Riders
 ManaCost:3 G
 Types:Creature Elf
 PT:3/3
-K:CantBeBlockedByAmount GT1
-SVar:Picture:http://resources.wizards.com/magic/cards/p2/en-us/card6615.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 Oracle:Norwood Riders can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/o/outland_colossus.txt
+++ b/forge-gui/res/cardsfolder/o/outland_colossus.txt
@@ -3,7 +3,6 @@ ManaCost:3 G G
 Types:Creature Giant
 PT:6/6
 K:Renown:6
-K:CantBeBlockedByAmount GT1
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 DeckHas:Ability$Counters
-SVar:Picture:http://www.wizards.com/global/images/magic/general/outland_colossus.jpg
 Oracle:Renown 6 (When this creature deals combat damage to a player, if it isn't renowned, put six +1/+1 counters on it and it becomes renowned.)\nOutland Colossus can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/p/pathrazer_of_ulamog.txt
+++ b/forge-gui/res/cardsfolder/p/pathrazer_of_ulamog.txt
@@ -3,6 +3,5 @@ ManaCost:11
 Types:Creature Eldrazi
 PT:9/9
 K:Annihilator:3
-K:CantBeBlockedByAmount LT3
-SVar:Picture:http://www.wizards.com/global/images/magic/general/pathrazer_of_ulamog.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.Self | Min$ 3 | Description$ CARDNAME can't be blocked except by three or more creatures.
 Oracle:Annihilator 3 (Whenever this creature attacks, defending player sacrifices three permanents.)\nPathrazer of Ulamog can't be blocked except by three or more creatures.
--- a/forge-gui/res/cardsfolder/p/phyrexian_colossus.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_colossus.txt
@@ -4,7 +4,6 @@ Types:Artifact Creature Phyrexian Golem
 PT:8/8
 K:CARDNAME doesn't untap during your untap step.
 A:AB$ Untap | Cost$ PayLife<8> | SpellDescription$ Untap CARDNAME.
-K:CantBeBlockedByAmount LT3
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.Self | Min$ 3 | Description$ CARDNAME can't be blocked except by three or more creatures.
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_colossus.jpg
 Oracle:Phyrexian Colossus doesn't untap during your untap step.\nPay 8 life: Untap Phyrexian Colossus.\nPhyrexian Colossus can't be blocked except by three or more creatures.
--- a/forge-gui/res/cardsfolder/s/sonorous_howlbonder.txt
+++ b/forge-gui/res/cardsfolder/s/sonorous_howlbonder.txt
@@ -3,6 +3,6 @@ ManaCost:1 B/R B/R
 Types:Creature Human Warrior
 PT:2/2
 K:Menace
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+withMenace | AddHiddenKeyword$ CantBeBlockedByAmount LT3 | Description$ Each creature you control with menace can't be blocked except by three or more creatures.
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.YouCtrl+withMenace | Min$ 3 | Description$ Each creature you control with menace can't be blocked except by three or more creatures.
 SVar:PlayMain1:TRUE
 Oracle:Menace\nEach creature you control with menace can't be blocked except by three or more creatures.
--- a/forge-gui/res/cardsfolder/s/stalking_tiger.txt
+++ b/forge-gui/res/cardsfolder/s/stalking_tiger.txt
@@ -2,6 +2,5 @@ Name:Stalking Tiger
 ManaCost:3 G
 Types:Creature Cat
 PT:3/3
-K:CantBeBlockedByAmount GT1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stalking_tiger.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 Oracle:Stalking Tiger can't be blocked by more than one creature.
--- a/forge-gui/res/cardsfolder/s/sunder_shaman.txt
+++ b/forge-gui/res/cardsfolder/s/sunder_shaman.txt
@@ -2,7 +2,7 @@ Name:Sunder Shaman
 ManaCost:R R G G
 Types:Creature Giant Shaman
 PT:5/5
-K:CantBeBlockedByAmount GT1
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, destroy target artifact or enchantment that player controls.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact.ControlledBy TriggeredDefendingPlayer,Enchantment.ControlledBy TriggeredDefendingPlayer | TgtPrompt$ Select target artifact or enchantment that player controls.
 Oracle:Sunder Shaman can't be blocked by more than one creature.\nWhenever Sunder Shaman deals combat damage to a player, destroy target artifact or enchantment that player controls.
--- a/forge-gui/res/cardsfolder/t/tahngarth_first_mate.txt
+++ b/forge-gui/res/cardsfolder/t/tahngarth_first_mate.txt
@@ -2,7 +2,7 @@ Name:Tahngarth, First Mate
 ManaCost:2 R G
 Types:Legendary Creature Minotaur Warrior
 PT:5/5
-K:CantBeBlockedByAmount GT1
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 T:Mode$ AttackersDeclared | AttackingPlayer$ Player.Opponent | Execute$ TrigGainControl | TriggerZones$ Battlefield | OptionalDecider$ You | IsPresent$ Card.Self+tapped | TriggerDescription$ Whenever an opponent attacks with one or more creatures, if CARDNAME is tapped, you may have that opponent gain control of CARDNAME until end of combat. If you do, choose a player or planeswalker that opponent is attacking. CARDNAME is attacking that player or planeswalker.
 SVar:TrigGainControl:DB$ GainControl | Defined$ Self | NewController$ TriggeredAttackingPlayer | LoseControl$ EndOfCombat | Attacking$ Player.Defending | Chooser$ You | ChoosePlayerOrPlaneswalker$ True
 AI:RemoveDeck:All
--- a/forge-gui/res/cardsfolder/t/the_akroan_war.txt
+++ b/forge-gui/res/cardsfolder/t/the_akroan_war.txt
@@ -3,7 +3,9 @@ ManaCost:3 R
 Types:Enchantment Saga
 K:Saga:3:DBGainControl,DBAllAttack,DBDamageTapped
 SVar:DBGainControl:DB$ GainControl | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ LeavesPlay | SpellDescription$ Gain control of target creature for as long as CARDNAME remains on the battlefield.
-SVar:DBAllAttack:DB$ PumpAll | ValidCards$ Creature.OppCtrl | Duration$ UntilYourNextTurn | KW$ HIDDEN CARDNAME attacks each combat if able. | SpellDescription$ Until your next turn, creatures your opponents control attack each turn if able.
+
+# Refactor as Effect
+SVar:DBAllAttack:DB$ PumpAll | ValidCards$ Creature.OppCtrl | Duration$ UntilYourNextTurn | KW$ HIDDEN CARDNAME attacks each combat if able. | SpellDescription$ Until your next turn, creatures your opponents control attack each combat if able.
 SVar:DBDamageTapped:DB$ EachDamage | ValidCards$ Creature.tapped | NumDmg$ X | DamageDesc$ damage equal to its power | DefinedCards$ Self | SpellDescription$ Each tapped creature deals damage to itself equal to its power.
 SVar:X:Count$CardPower
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Gain control of target creature for as long as The Akroan War remains on the battlefield.\nII — Until your next turn, creatures your opponents control attack each combat if able.\nIII — Each tapped creature deals damage to itself equal to its power.
--- a/forge-gui/res/cardsfolder/u/underworld_cerberus.txt
+++ b/forge-gui/res/cardsfolder/u/underworld_cerberus.txt
@@ -2,7 +2,7 @@ Name:Underworld Cerberus
 ManaCost:3 B R
 Types:Creature Dog
 PT:6/6
-K:CantBeBlockedByAmount LT3
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.Self | Min$ 3 | Description$ CARDNAME can't be blocked except by three or more creatures.
 S:Mode$ CantTarget | AffectedZone$ Graveyard | Description$ Cards in graveyards can't be the targets of spells or abilities.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it and each player returns all creature cards from their graveyard to their hand.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBChangeZoneAll
--- a/forge-gui/res/cardsfolder/v/vigorspore_wurm.txt
+++ b/forge-gui/res/cardsfolder/v/vigorspore_wurm.txt
@@ -2,7 +2,7 @@ Name:Vigorspore Wurm
 ManaCost:5 G
 Types:Creature Wurm
 PT:6/4
-K:CantBeBlockedByAmount GT1
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Undergrowth - When CARDNAME enters the battlefield, target creature gains vigilance and gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | KW$ Vigilance
 SVar:X:Count$TypeInYourYard.Creature
--- a/forge-gui/res/cardsfolder/v/vorrac_battlehorns.txt
+++ b/forge-gui/res/cardsfolder/v/vorrac_battlehorns.txt
@@ -2,6 +2,6 @@ Name:Vorrac Battlehorns
 ManaCost:2
 Types:Artifact Equipment
 K:Equip:1
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Trample | AddHiddenKeyword$ CantBeBlockedByAmount GT1 | Description$ Equipped creature has trample and can't be blocked by more than one creature.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/vorrac_battlehorns.jpg
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Trample | Description$ Equipped creature has trample and can't be blocked by more than one creature.
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.EquippedBy | Max$ 1 | Secondary$ True | Description$ Equipped creature can't be blocked by more than one creature.
 Oracle:Equipped creature has trample and can't be blocked by more than one creature.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
--- a/forge-gui/res/cardsfolder/w/wolfriders_saddle.txt
+++ b/forge-gui/res/cardsfolder/w/wolfriders_saddle.txt
@@ -6,6 +6,7 @@ SVar:TrigToken:DB$ Token | LegacyImage$ g 2 2 wolf m20 | TokenAmount$ 1 | TokenS
 SVar:DBAttach:DB$ Attach | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Token
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ CantBeBlockedByAmount GT1 | Description$ Equipped creature gets +1/+1 and can't be blocked by more than one creature.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1 and can't be blocked by more than one creature.
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.EquippedBy | Max$ 1 | Secondary$ True | Description$ Equipped creature can't be blocked by more than one creature.
 K:Equip:3
 Oracle:When Wolfrider's Saddle enters the battlefield, create a 2/2 green Wolf creature token, then attach Wolfrider's Saddle to it.\nEquipped creature gets +1/+1 and can't be blocked by more than one creature.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
--- a/forge-gui/res/cardsfolder/y/yuan_shao_the_indecisive.txt
+++ b/forge-gui/res/cardsfolder/y/yuan_shao_the_indecisive.txt
@@ -3,6 +3,5 @@ ManaCost:4 R
 Types:Legendary Creature Human Soldier
 PT:2/3
 K:Horsemanship
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CantBeBlockedByAmount GT1 | Description$ Each creature you control can't be blocked by more than one creature.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/yuan_shao_the_indecisive.jpg
+S:Mode$ MinMaxBlocker | ValidCard$ Creature.YouCtrl | Max$ 1 | Description$ Each creature you control can't be blocked by more than one creature.
 Oracle:Horsemanship (This creature can't be blocked except by creatures with horsemanship.)\nEach creature you control can't be blocked by more than one creature.
--- a/forge-gui/res/lists/NonStackingKWList.txt
+++ b/forge-gui/res/lists/NonStackingKWList.txt
@@ -1,11 +1,7 @@
 All creatures able to block CARDNAME do so.
 Banding
-CantBeBlockedByAmount LT2
-CantBeBlockedByAmount LT3
 CARDNAME's activated abilities can't be activated.
-CARDNAME attacks each turn if able.
 CARDNAME attacks each combat if able.
-CARDNAME blocks each turn if able.
 CARDNAME blocks each combat if able.
 CARDNAME can attack as though it didn't have defender.
 CARDNAME can block any number of creatures.