Merge branch 'counterGameCheck' into 'master'

Put Counter Effects check Game State Closes #548 See merge request core-developers/forge!568
2025-11-18 03:38:01 +00:00 · 2018-05-20 17:14:43 +00:00
parent fcc8a8f9ce 57af402bcf
commit 9aeed6ac31
43 changed files with 118 additions and 79 deletions
--- a/forge-gui/res/cardsfolder/a/aurification.txt
+++ b/forge-gui/res/cardsfolder/a/aurification.txt
@@ -2,7 +2,7 @@ Name:Aurification
 ManaCost:2 W W
 Types:Enchantment
 T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature deals damage to you, put a gold counter on it.
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSource | CounterType$ GOLD | CounterNum$ 1
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ GOLD | CounterNum$ 1
 S:Mode$ Continuous | Affected$ Creature.counters_GE1_GOLD | AddType$ Wall | AddKeyword$ Defender | Description$ Each creature with a gold counter on it is a Wall in addition to its other creature types and has defender. (Those creatures can't attack.)
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigRemove | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME leaves the battlefield, remove all gold counters from all creatures.
 SVar:TrigRemove:DB$ RemoveCounterAll | ValidCards$ Creature | CounterType$ GOLD | AllCounters$ True
--- a/forge-gui/res/cardsfolder/b/bogardan_phoenix.txt
+++ b/forge-gui/res/cardsfolder/b/bogardan_phoenix.txt
@@ -6,7 +6,7 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Exile | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBReturn | References$ X
 SVar:DBReturn:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBPutCounter | References$ X
-SVar:DBPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ DEATH | CounterNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X
+SVar:DBPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ DEATH | CounterNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X
 SVar:X:TriggeredCard$CardCounters.DEATH
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bogardan_phoenix.jpg
 Oracle:Flying\nWhen Bogardan Phoenix dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it.
--- a/forge-gui/res/cardsfolder/c/curse_of_predation.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_predation.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Player | AILogic$ Curse
 T:Mode$ Attacks | ValidCard$ Creature | Attacked$ Player.EnchantedBy | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature attacks enchanted player, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredAttacker | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_predation.jpg
 Oracle:Enchant player\nWhenever a creature attacks enchanted player, put a +1/+1 counter on it.
--- a/forge-gui/res/cardsfolder/c/curse_of_stalked_prey.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_stalked_prey.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | Cost$ 1 R| ValidTgts$ Player | AILogic$ Curse
 T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ Player.EnchantedBy | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature deals combat damage to enchanted player, put a +1/+1 counter on that creature.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_stalked_prey.jpg
 Oracle:Enchant player\nWhenever a creature deals combat damage to enchanted player, put a +1/+1 counter on that creature.
--- a/forge-gui/res/cardsfolder/d/durable_handicraft.txt
+++ b/forge-gui/res/cardsfolder/d/durable_handicraft.txt
@@ -2,7 +2,7 @@ Name:Durable Handicraft
 ManaCost:1 G
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature enters the battlefield under your control, you may pay {1}. If you do, put a +1/+1 counter on that creature.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 1 | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 1 | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ PutCounterAll | Cost$ 5 G Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/durable_handicraft.jpg
 Oracle:Whenever a creature enters the battlefield under your control, you may pay {1}. If you do, put a +1/+1 counter on that creature.\n{5}{G}, Sacrifice Durable Handicraft: Put a +1/+1 counter on each creature you control.
--- a/forge-gui/res/cardsfolder/e/epochrasite.txt
+++ b/forge-gui/res/cardsfolder/e/epochrasite.txt
@@ -5,7 +5,7 @@ PT:1/1
 K:etbCounter:P1P1:3:ValidCard$ Card.Self+wasNotCastFromHand:CARDNAME enters the battlefield with three +1/+1 counters on it if you didn't cast it from your hand.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it with three time counters on it and it gains suspend.
 SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ TIME | CounterNum$ 3 | SubAbility$ GiveSuspend
+SVar:DBPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ TIME | CounterNum$ 3 | SubAbility$ GiveSuspend
 SVar:GiveSuspend:DB$ Pump | Defined$ TriggeredCard | KW$ Suspend | PumpZone$ Exile | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/epochrasite.jpg
 Oracle:Epochrasite enters the battlefield with three +1/+1 counters on it if you didn't cast it from your hand.\nWhen Epochrasite dies, exile it with three time counters on it and it gains suspend. (At the beginning of your upkeep, remove a time counter. When the last is removed, cast this card without paying its mana cost. It has haste.)
--- a/forge-gui/res/cardsfolder/f/ferocity.txt
+++ b/forge-gui/res/cardsfolder/f/ferocity.txt
@@ -5,7 +5,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ AttackerBlocked | ValidCard$ Card.AttachedBy | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked, you may put a +1/+1 counter on it.
 T:Mode$ Blocks | ValidCard$ Card.AttachedBy | Execute$ TrigPutCounter2 | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever enchanted creature blocks or becomes blocked, you may put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredAttacker | CounterType$ P1P1 | CounterNum$ 1
-SVar:TrigPutCounter2:DB$PutCounter | Defined$ TriggeredBlocker | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter2:DB$PutCounter | Defined$ TriggeredBlockerLKICopy | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ferocity.jpg
 Oracle:Enchant creature\nWhenever enchanted creature blocks or becomes blocked, you may put a +1/+1 counter on it.
--- a/forge-gui/res/cardsfolder/f/freyalises_winds.txt
+++ b/forge-gui/res/cardsfolder/f/freyalises_winds.txt
@@ -2,7 +2,7 @@ Name:Freyalise's Winds
 ManaCost:2 G G
 Types:Enchantment
 T:Mode$ Taps | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a permanent becomes tapped, put a wind counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ WIND | CounterNum$ 1
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ WIND | CounterNum$ 1
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Permanent.counters_GE1_WIND | ReplaceWith$ RepRemoveCounter | UntapStep$ True | Description$ If a permanent with a wind counter on it would untap during its controller's untap step, remove all wind counters from it instead.
 SVar:RepRemoveCounter:DB$ RemoveCounter | Defined$ ReplacedCard | CounterType$ WIND | CounterNum$ All
 SVar:RemRandomDeck:True
--- a/forge-gui/res/cardsfolder/g/gleam_of_battle.txt
+++ b/forge-gui/res/cardsfolder/g/gleam_of_battle.txt
@@ -2,7 +2,7 @@ Name:Gleam of Battle
 ManaCost:4 R W
 Types:Enchantment
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPut | TriggerDescription$ Whenever a creature you control attacks, put a +1/+1 counter on it.
-SVar:TrigPut:DB$ PutCounter | Defined$ TriggeredAttacker | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPut:DB$ PutCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gleam_of_battle.jpg
--- a/forge-gui/res/cardsfolder/h/hydra_broodmaster.txt
+++ b/forge-gui/res/cardsfolder/h/hydra_broodmaster.txt
@@ -6,7 +6,7 @@ K:Monstrosity:X:X X G
 T:Mode$ BecomeMonstrous | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME becomes monstrous, create X X/X green Hydra creature tokens.
 SVar:TrigToken:DB$ Token | TokenAmount$ MonstrosityX | TokenName$ Hydra | TokenTypes$ Creature,Hydra | TokenOwner$ You | TokenColors$ Green | TokenPower$ MonstrosityX | TokenToughness$ MonstrosityX | TokenImage$ g x x hydra | References$ MonstrosityX
 SVar:X:Count$xPaid
-SVar:MonstrosityX:Count$MonstrosityMagnitude
+SVar:MonstrosityX:TriggerCount$MonstrosityAmount
 DeckHas:Ability$Counters & Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hydra_broodmaster.jpg
 Oracle:{X}{X}{G}: Monstrosity X. (If this creature isn't monstrous, put X +1/+1 counters on it and it becomes monstrous.)\nWhen Hydra Broodmaster becomes monstrous, create X X/X green Hydra creature tokens.
--- a/forge-gui/res/cardsfolder/j/juniper_order_ranger.txt
+++ b/forge-gui/res/cardsfolder/j/juniper_order_ranger.txt
@@ -3,8 +3,8 @@ ManaCost:3 G W
 Types:Creature Human Knight
 PT:2/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature enters the battlefield under your control, put a +1/+1 counter on that creature and a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$PutCounter | Defined$ Self.StrictlySelf | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/juniper_order_ranger.jpg
 Oracle:Whenever another creature enters the battlefield under your control, put a +1/+1 counter on that creature and a +1/+1 counter on Juniper Order Ranger.
--- a/forge-gui/res/cardsfolder/m/matopi_golem.txt
+++ b/forge-gui/res/cardsfolder/m/matopi_golem.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact Creature Golem
 PT:3/3
 A:AB$ Regenerate | Cost$ 1 | RegenerationTrigger$ TrigPutCounter | References$ TrigPutCounter | SpellDescription$ Regenerate CARDNAME. When it regenerates this way, put a -1/-1 counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ M1M1 | CounterNum$ 1 | SpellDescription$ When it regenerates this way, put a -1/-1 counter on it.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ M1M1 | CounterNum$ 1 | SpellDescription$ When it regenerates this way, put a -1/-1 counter on it.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/matopi_golem.jpg
 Oracle:{1}: Regenerate Matopi Golem. When it regenerates this way, put a -1/-1 counter on it.
--- a/forge-gui/res/cardsfolder/m/mephidross_vampire.txt
+++ b/forge-gui/res/cardsfolder/m/mephidross_vampire.txt
@@ -5,7 +5,7 @@ PT:3/4
 K:Flying
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddType$ Vampire | AddTrigger$ MephidrossPutCounter | AddSVar$ MephidrossCounters | Description$ Each creature you control is a Vampire in addition to its other types and has "Whenever this creature deals damage to a creature, put a +1/+1 counter on this creature."
 SVar:MephidrossPutCounter:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | Execute$ MephidrossCounters | TriggerDescription$ Whenever CARDNAME deals damage to a creature, put a +1/+1 counter on this creature.
-SVar:MephidrossCounters:DB$ PutCounter | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ 1
+SVar:MephidrossCounters:DB$ PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mephidross_vampire.jpg
 Oracle:Flying\nEach creature you control is a Vampire in addition to its other creature types and has "Whenever this creature deals damage to a creature, put a +1/+1 counter on this creature."
--- a/forge-gui/res/cardsfolder/m/mighty_emergence.txt
+++ b/forge-gui/res/cardsfolder/m/mighty_emergence.txt
@@ -2,7 +2,7 @@ Name:Mighty Emergence
 ManaCost:2 G
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE5+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature with power 5 or greater enters the battlefield under your control, you may put two +1/+1 counters on it.
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 2
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 2
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mighty_emergence.jpg
 Oracle:Whenever a creature with power 5 or greater enters the battlefield under your control, you may put two +1/+1 counters on it.
--- a/forge-gui/res/cardsfolder/m/mindbender_spores.txt
+++ b/forge-gui/res/cardsfolder/m/mindbender_spores.txt
@@ -5,7 +5,7 @@ PT:0/1
 K:Defender
 K:Flying
 T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ AddSpores | TriggerDescription$ Whenever CARDNAME blocks a creature, put four fungus counters on that creature. The creature gains "This creature doesn't untap during your untap step if it has a fungus counter on it" and "At the beginning of your upkeep, remove a fungus counter from this creature."
-SVar:AddSpores:DB$ PutCounter | CounterType$ FUNGUS | CounterNum$ 4 | Defined$ TriggeredAttacker | SubAbility$ AddFungalEffects
+SVar:AddSpores:DB$ PutCounter | CounterType$ FUNGUS | CounterNum$ 4 | Defined$ TriggeredAttackerLKICopy | SubAbility$ AddFungalEffects
 SVar:AddFungalEffects:DB$ Animate | Defined$ TriggeredAttacker | staticAbilities$ FungalFunk | Triggers$ TrigSporeUpkeep | sVars$ LoseSpores | Permanent$ True
 SVar:FungalFunk:Mode$ Continuous | Affected$ Card.Self+counters_GE1_FUNGUS | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ CARDNAME doesn't untap during your untap step if it has a fungus counter on it.
 SVar:TrigSporeUpkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ LoseSpores | TriggerDescription$ At the beginning of your upkeep, remove a fungus counter from CARDNAME.
--- a/forge-gui/res/cardsfolder/n/necropolis_regent.txt
+++ b/forge-gui/res/cardsfolder/n/necropolis_regent.txt
@@ -4,7 +4,7 @@ Types:Creature Vampire
 PT:6/5
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control deals combat damage to a player, put that many +1/+1 counters on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ X | References$ X
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ P1P1 | CounterNum$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necropolis_regent.jpg
 Oracle:Flying\nWhenever a creature you control deals combat damage to a player, put that many +1/+1 counters on it.
--- a/forge-gui/res/cardsfolder/o/obelisk_spider.txt
+++ b/forge-gui/res/cardsfolder/o/obelisk_spider.txt
@@ -4,7 +4,7 @@ Types:Creature Spider
 PT:1/4
 K:Reach
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, put a -1/-1 counter on that creature.
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredTarget | CounterType$ M1M1 | CounterNum$ 1
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredTargetLKICopy | CounterType$ M1M1 | CounterNum$ 1
 T:Mode$ CounterAddedOnce | ValidCard$ Creature | ValidSource$ Card.YouCtrl | CounterType$ M1M1 | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you put one or more -1/-1 counters on a creature, each opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
--- a/forge-gui/res/cardsfolder/o/olivia_mobilized_for_war.txt
+++ b/forge-gui/res/cardsfolder/o/olivia_mobilized_for_war.txt
@@ -5,9 +5,9 @@ PT:3/3
 K:Flying
 T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever another creature enters the battlefield under your control, you may discard a card. If you do, put a +1/+1 counter on that creature, it gains haste until end of turn, and it becomes a vampire in addition to its other types.
 SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$PutCounter | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBPump
+SVar:DBPutCounter:DB$PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ TriggeredCard | KW$ Haste | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ TriggeredCard | Types$ Vampire | Permanent$ True | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/olivia_mobilized_for_war.jpg
-Oracle:Flying\nWhenever another creature enters the battlefield under your control, you may discard a card. If you do, put a +1/+1 counter on that creature, it gains haste until end of turn, and it becomes a vampire in addition to its other types.
+Oracle:Flying\nWhenever another creature enters the battlefield under your control, you may discard a card. If you do, put a +1/+1 counter on that creature, it gains haste until end of turn, and it becomes a Vampire in addition to its other types.
--- a/forge-gui/res/cardsfolder/p/polukranos_world_eater.txt
+++ b/forge-gui/res/cardsfolder/p/polukranos_world_eater.txt
@@ -9,7 +9,7 @@ SVar:DBDmg:DB$ RepeatEach | RepeatSubAbility$ PolukranosFight | UseImprinted$ Tr
 SVar:PolukranosFight:DB$ DealDamage | DamageSource$ Imprinted | NumDmg$ Y | References$ Y | Defined$ Self | StackDescription$ None
 SVar:X:Count$xPaid
 SVar:Y:Imprinted$CardPower
-SVar:MonstrosityX:Count$MonstrosityMagnitude
+SVar:MonstrosityX:TriggerCount$MonstrosityAmount
 SVar:MaxTgts:Count$Valid Creature.OppCtrl
 SVar:MonstrosityAILogic:Polukranos
 DeckHas:Ability$Counters
--- a/forge-gui/res/cardsfolder/q/quagmire_lamprey.txt
+++ b/forge-gui/res/cardsfolder/q/quagmire_lamprey.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Fish
 PT:1/1
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME becomes blocked by a creature, put a -1/-1 counter on that creature.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredBlocker | CounterType$ M1M1 | CounterNum$ 1 | IsCurse$ True
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredBlockerLKICopy | CounterType$ M1M1 | CounterNum$ 1 | IsCurse$ True
 SVar:HasAttackEffect:Blocked
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quagmire_lamprey.jpg
 Oracle:Whenever Quagmire Lamprey becomes blocked by a creature, put a -1/-1 counter on that creature.
--- a/forge-gui/res/cardsfolder/r/rakish_heir.txt
+++ b/forge-gui/res/cardsfolder/r/rakish_heir.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Vampire
 PT:2/2
 T:Mode$ DamageDone | ValidSource$ Vampire.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Vampire you control deals combat damage to a player, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakish_heir.jpg
 Oracle:Whenever a Vampire you control deals combat damage to a player, put a +1/+1 counter on it.
--- a/forge-gui/res/cardsfolder/r/rite_of_passage.txt
+++ b/forge-gui/res/cardsfolder/r/rite_of_passage.txt
@@ -2,6 +2,6 @@ Name:Rite of Passage
 ManaCost:2 G
 Types:Enchantment
 T:Mode$ DamageDoneOnce | ValidTarget$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control is dealt damage, put a +1/+1 counter on it. (The damage is dealt before the counter is put on.)
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredTarget | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredTargetLKICopy | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rite_of_passage.jpg
 Oracle:Whenever a creature you control is dealt damage, put a +1/+1 counter on it. (The damage is dealt before the counter is put on.)
--- a/forge-gui/res/cardsfolder/s/salt_road_ambushers.txt
+++ b/forge-gui/res/cardsfolder/s/salt_road_ambushers.txt
@@ -4,7 +4,7 @@ Types:Creature Hound Warrior
 PT:3/3
 K:Megamorph:3 G G
 T:Mode$ TurnFaceUp | ValidCard$ Permanent.Creature+YouCtrl+Other | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever another permanent you control is turned face up, if it's a creature, put two +1/+1 counters on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 2 | ConditionDefined$ TriggeredCard | ConditionPresent$ Creature
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 2 | ConditionDefined$ TriggeredCard | ConditionPresent$ Creature
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/salt_road_ambushers.jpg
 Oracle:Whenever another permanent you control is turned face up, if it's a creature, put two +1/+1 counters on it.\nMegamorph {3}{G}{G} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its megamorph cost and put a +1/+1 counter on it.)
--- a/forge-gui/res/cardsfolder/s/shaman_of_the_great_hunt.txt
+++ b/forge-gui/res/cardsfolder/s/shaman_of_the_great_hunt.txt
@@ -6,6 +6,6 @@ K:Haste
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control deals combat damage to a player, put a +1/+1 counter on it.
 A:AB$ Draw | Cost$ 2 UG UG | NumCards$ X | References$ X | IsPresent$ Creature.YouCtrl+powerGE4 | PrecostDesc$ Ferocious — | SpellDescription$ Draw a card for each creature with power 4 or greater you control.
 SVar:X:Count$Valid Creature.powerGE4+YouCtrl
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ P1P1 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shaman_of_the_great_hunt.jpg
 Oracle:Haste\nWhenever a creature you control deals combat damage to a player, put a +1/+1 counter on it.\nFerocious — {2}{G/U}{G/U}: Draw a card for each creature you control with power 4 or greater.
--- a/forge-gui/res/cardsfolder/s/sigil_captain.txt
+++ b/forge-gui/res/cardsfolder/s/sigil_captain.txt
@@ -3,6 +3,6 @@ ManaCost:1 G W W
 Types:Creature Rhino Soldier
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerEQ1+toughnessEQ1+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature enters the battlefield under your control, if that creature is 1/1, put two +1/+1 counters on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 2
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sigil_captain.jpg
 Oracle:Whenever a creature enters the battlefield under your control, if that creature is 1/1, put two +1/+1 counters on it.
--- a/forge-gui/res/cardsfolder/s/skeleton_scavengers.txt
+++ b/forge-gui/res/cardsfolder/s/skeleton_scavengers.txt
@@ -4,7 +4,7 @@ Types:Creature Skeleton
 PT:0/0
 K:etbCounter:P1P1:1
 A:AB$ Regenerate | Cost$ X | CostDesc$ Pay {1} for each +1/+1 counter on CARDNAME: | References$ X,TrigPutCounter | RegenerationTrigger$ TrigPutCounter | SpellDescription$ Regenerate CARDNAME. When it regenerates this way, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ When it regenerates this way, put a +1/+1 counter on it.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ When it regenerates this way, put a +1/+1 counter on it.
 SVar:X:Count$CardCounters.P1P1
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skeleton_scavengers.jpg
--- a/forge-gui/res/cardsfolder/s/spirit_shackle.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_shackle.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ B B | ValidTgts$ Creature | AILogic$ Curse
 T:Mode$ Taps | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever enchanted creature becomes tapped, put a -0/-2 counter on it.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ M0M2 | CounterNum$ 1
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ M0M2 | CounterNum$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_shackle.jpg
 Oracle:Enchant creature\nWhenever enchanted creature becomes tapped, put a -0/-2 counter on it.
--- a/forge-gui/res/cardsfolder/s/stensia.txt
+++ b/forge-gui/res/cardsfolder/s/stensia.txt
@@ -2,11 +2,11 @@ Name:Stensia
 ManaCost:no cost
 Types:Plane Innistrad
 T:Mode$ DamageDone | ValidSource$ Creature.IsNotRemembered | ValidTarget$ Player | Execute$ TrigPutCounter | TriggerZones$ Command | TriggerDescription$ Whenever a creature deals damage to one or more players for the first time each turn, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ 1 | RememberCards$ True
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ P1P1 | CounterNum$ 1 | RememberCards$ True
 T:Mode$ Phase | Phase$ End of Turn | Execute$ DBCleanup | TriggerZones$ Command | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each creature you control gains "{T}: This creature deals 1 damage to target player" until end of turn.
-SVar:RolledChaos:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Abilities$ LVAbs | SpellDescription$ Until end of turn, creatures you control gain "{T}: This creature deals 1 damage to target player."
-SVar:LVAbs:AB$ DealDamage | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each creature you control gains "{T}: This creature deals 1 damage to target player or planeswalker" until end of turn.
+SVar:RolledChaos:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Abilities$ LVAbs | SpellDescription$ Until end of turn, creatures you control gain "{T}: This creature deals 1 damage to target player or planeswalker."
+SVar:LVAbs:AB$ DealDamage | Cost$ T | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stensia.jpg
-Oracle:Whenever a creature deals damage to one or more players for the first time each turn, put a +1/+1 counter on it.\nWhenever you roll {CHAOS}, each creature you control gains "{T}: This creature deals 1 damage to target player" until end of turn.
+Oracle:Whenever a creature deals damage to one or more players for the first time each turn, put a +1/+1 counter on it.\nWhenever you roll {CHAOS}, each creature you control gains "{T}: This creature deals 1 damage to target player or planeswalker" until end of turn.
--- a/forge-gui/res/cardsfolder/s/stensia_masquerade.txt
+++ b/forge-gui/res/cardsfolder/s/stensia_masquerade.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.attacking+YouCtrl | AddKeyword$ First Strike | Description$ Attacking creatures you control have first strike.
 T:Mode$ DamageDone | ValidSource$ Vampire.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Vampire you control deals combat damage to a player, put a +1/+1 counter on it.
-SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSource | CounterType$ P1P1 | CounterNum$ 1 
+SVar:TrigPutCounter:DB$PutCounter | Defined$ TriggeredSourceLKICopy | CounterType$ P1P1 | CounterNum$ 1
 K:Madness:2 R
 SVar:PlayMain1:TRUE
 DeckHints:Ability$Discard & Type$Vampire
--- a/forge-gui/res/cardsfolder/t/temporal_distortion.txt
+++ b/forge-gui/res/cardsfolder/t/temporal_distortion.txt
@@ -1,9 +1,9 @@
 Name:Temporal Distortion
 ManaCost:3 U U
 Types:Enchantment
-T:Mode$ Taps | ValidCard$ Creature,Land | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature or land becomes tapped, put an hourglass counter on it. Each permanent with an hourglass counter on it doesn't untap during its controller's untap step.
-SVar:TrigPutCounter:DB$ PutCounter | CounterType$ HOURGLASS | CounterNum$ 1 | Defined$ TriggeredCard
-S:Mode$ Continuous | Affected$ Permanent.counters_GE1_HOURGLASS | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step.
+T:Mode$ Taps | ValidCard$ Creature,Land | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature or land becomes tapped, put an hourglass counter on it.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ HOURGLASS | CounterNum$ 1 | Defined$ TriggeredCardLKICopy
+S:Mode$ Continuous | Affected$ Permanent.counters_GE1_HOURGLASS | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Each permanent with an hourglass counter on it doesn't untap during its controller's untap step.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, remove all hourglass counters from permanents that player controls.
 SVar:TrigRemoveCounter:DB$ RemoveCounterAll | CounterType$ HOURGLASS | AllCounters$ True | ValidCards$ Permanent.ActivePlayerCtrl
 SVar:RemRandomDeck:True
--- a/forge-gui/res/cardsfolder/w/woolly_razorback.txt
+++ b/forge-gui/res/cardsfolder/w/woolly_razorback.txt
@@ -5,7 +5,7 @@ PT:7/7
 K:etbCounter:ICE:3
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_ICE | AddKeyword$ Prevent all combat damage that would be dealt by CARDNAME. & Defender | Description$ As long as CARDNAME has an ice counter on it, prevent all combat damage it would deal and it has defender.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME blocks, remove an ice counter from it.
-SVar:TrigRemoveCounter:DB$ RemoveCounter | CounterType$ ICE | CounterNum$ 1 | Defined$ TriggeredBlocker
+SVar:TrigRemoveCounter:DB$ RemoveCounter | CounterType$ ICE | CounterNum$ 1 | Defined$ TriggeredBlockerLKICopy
 SVar:HasBlockEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/woolly_razorback.jpg
 Oracle:Woolly Razorback enters the battlefield with three ice counters on it.\nAs long as Woolly Razorback has an ice counter on it, prevent all combat damage it would deal and it has defender.\nWhenever Woolly Razorback blocks, remove an ice counter from it.