diff --git a/forge-gui/res/cardsfolder/b/beastbreaker_of_bala_ged.txt b/forge-gui/res/cardsfolder/b/beastbreaker_of_bala_ged.txt
index 0ab899e9379..2dd1f6eb1e2 100644
--- a/forge-gui/res/cardsfolder/b/beastbreaker_of_bala_ged.txt
+++ b/forge-gui/res/cardsfolder/b/beastbreaker_of_bala_ged.txt
@@ -5,5 +5,5 @@ PT:2/2
 K:Level up:2 G
 SVar:maxLevel:4
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE3_LEVEL | PresentCompare$ EQ1 | Description$ LEVEL 1-3 4/4
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddKeyword$ Trample | IsPresent$ Card.Self+counters_GE4_LEVEL | PresentCompare$ EQ1 | Description$ LEVEL 4+ 6/6 CARDNAME has Trample
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddKeyword$ Trample | IsPresent$ Card.Self+counters_GE4_LEVEL | PresentCompare$ EQ1 | Description$ LEVEL 4+ 6/6 Trample
 Oracle:Level up {2}{G} ({2}{G}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-3\n4/4\nLEVEL 4+\n6/6\nTrample
diff --git a/forge-gui/res/cardsfolder/b/brimstone_mage.txt b/forge-gui/res/cardsfolder/b/brimstone_mage.txt
index 88bbc27a23f..95bf5bb3358 100644
--- a/forge-gui/res/cardsfolder/b/brimstone_mage.txt
+++ b/forge-gui/res/cardsfolder/b/brimstone_mage.txt
@@ -4,8 +4,8 @@ Types:Creature Human Shaman
 PT:2/2
 K:Level up:3 R
 SVar:maxLevel:3
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 3 | AddAbility$ Ping | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL | Description$ LEVEL 1-2 2/3 CARDNAME gets {T}: CARDNAME deals 1 damage to any target.
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 4 | AddAbility$ Bolt | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ 2/4 CARDNAME gets {T}: CARDNAME deals 3 damage to any target.
-SVar:Ping:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
-SVar:Bolt:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 3 | AddAbility$ Ping | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL | Description$ LEVEL 1-2 2/3 {T}: CARDNAME deals 1 damage to any target.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 4 | AddAbility$ Bolt | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ 2/4 {T}: CARDNAME deals 3 damage to any target.
+SVar:Ping:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | Secondary$ True | SpellDescription$ CARDNAME deals 1 damage to any target.
+SVar:Bolt:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | Secondary$ True | SpellDescription$ CARDNAME deals 3 damage to any target.
 Oracle:Level up {3}{R} ({3}{R}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-2\n2/3\n{T}: Brimstone Mage deals 1 damage to any target.\nLEVEL 3+\n2/4\n{T}: Brimstone Mage deals 3 damage to any target.
diff --git a/forge-gui/res/cardsfolder/c/coralhelm_commander.txt b/forge-gui/res/cardsfolder/c/coralhelm_commander.txt
index eeed54e2952..805155c5498 100644
--- a/forge-gui/res/cardsfolder/c/coralhelm_commander.txt
+++ b/forge-gui/res/cardsfolder/c/coralhelm_commander.txt
@@ -4,8 +4,8 @@ Types:Creature Merfolk Soldier
 PT:2/2
 K:Level up:1
 SVar:maxLevel:4
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE2_LEVEL+counters_LE3_LEVEL | PresentCompare$ EQ1 | Description$ LEVEL 2-3 3/3 CARDNAME has Flying
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Flying | AddStaticAbility$ SBoost | IsPresent$ Card.Self+counters_GE4_LEVEL | PresentCompare$ EQ1 | Description$ LEVEL 4+ Flying 4/4 CARDNAME has Flying, Other Merfolk you control get +1/+1
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE2_LEVEL+counters_LE3_LEVEL | PresentCompare$ EQ1 | Description$ LEVEL 2-3 3/3 Flying
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Flying | AddStaticAbility$ SBoost | IsPresent$ Card.Self+counters_GE4_LEVEL | PresentCompare$ EQ1 | Description$ LEVEL 4+ 4/4 Flying,,,Other Merfolk creatures you control get +1/+1.
 SVar:SBoost:Mode$ Continuous | Affected$ Creature.Merfolk+YouCtrl+Other | AddPower$ 1 | AddToughness$ 1 | IsPresent$ Card.Self+counters_GE4_LEVEL | PresentCompare$ EQ1
 DeckHints:Type$Merfolk
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/d/dire_fleet_captain.txt b/forge-gui/res/cardsfolder/d/dire_fleet_captain.txt
index 37bb4500619..131e9223c64 100644
--- a/forge-gui/res/cardsfolder/d/dire_fleet_captain.txt
+++ b/forge-gui/res/cardsfolder/d/dire_fleet_captain.txt
@@ -6,4 +6,5 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X
 SVar:X:Count$Valid Pirate.attacking+Other
 DeckHints:Type$Pirate
+SVar:HasAttackEffect:TRUE
 Oracle:Whenever Dire Fleet Captain attacks, it gets +1/+1 until end of turn for each other attacking Pirate.
diff --git a/forge-gui/res/cardsfolder/e/echo_mage.txt b/forge-gui/res/cardsfolder/e/echo_mage.txt
index a0ab3d1be7b..cbc17bf6228 100644
--- a/forge-gui/res/cardsfolder/e/echo_mage.txt
+++ b/forge-gui/res/cardsfolder/e/echo_mage.txt
@@ -4,8 +4,9 @@ Types:Creature Human Wizard
 PT:2/3
 K:Level up:1 U
 SVar:maxLevel:4
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 4 | AddAbility$ CopyOnce | IsPresent$ Card.Self+counters_GE2_LEVEL+counters_LT4_LEVEL | Description$ LEVEL 2-3 2/4 CARDNAME gets U U,tap: Copy target instant or sorcery spell. You may choose new targets for the copy.
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 5 | AddAbility$ CopyTwice | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 2/5 CARDNAME gets U U,tap:Copy target instant or sorcery spell twice. You may choose new targets for the copies.
-SVar:CopyOnce:AB$ CopySpellAbility | Cost$ U U T | ValidTgts$ Instant,Sorcery | AILogic$ OnceIfViable | MayChooseTarget$ True | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy.
-SVar:CopyTwice:AB$ CopySpellAbility | Cost$ U U T | ValidTgts$ Instant,Sorcery | Amount$ 2 | AILogic$ OnceIfViable | MayChooseTarget$ True | SpellDescription$ Copy target instant or sorcery spell twice. You may choose new targets for the copies.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 4 | AddAbility$ CopyOnce | IsPresent$ Card.Self+counters_GE2_LEVEL+counters_LT4_LEVEL | Description$ LEVEL 2-3 2/4 {U}{U}, {T}: Copy target instant or sorcery spell. You may choose new targets for the copy.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 5 | AddAbility$ CopyTwice | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 2/5 {U}{U}, {T}: Copy target instant or sorcery spell twice. You may choose new targets for the copies.
+SVar:CopyOnce:AB$ CopySpellAbility | Cost$ U U T | ValidTgts$ Instant,Sorcery | AILogic$ OnceIfViable | MayChooseTarget$ True | Secondary$ True | SpellDescription$ Copy target instant or sorcery spell. You may choose new targets for the copy.
+SVar:CopyTwice:AB$ CopySpellAbility | Cost$ U U T | ValidTgts$ Instant,Sorcery | Amount$ 2 | AILogic$ OnceIfViable | MayChooseTarget$ True | Secondary$ True | SpellDescription$ Copy target instant or sorcery spell twice. You may choose new targets for the copies.
+DeckNeeds:Type$Instant|Sorcery
 Oracle:Level up {1}{U} ({1}{U}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 2-3\n2/4\n{U}{U}, {T}: Copy target instant or sorcery spell. You may choose new targets for the copy.\nLEVEL 4+\n2/5\n{U}{U}, {T}: Copy target instant or sorcery spell twice. You may choose new targets for the copies.
diff --git a/forge-gui/res/cardsfolder/e/enclave_cryptologist.txt b/forge-gui/res/cardsfolder/e/enclave_cryptologist.txt
index b045f0d12b7..88d31048bf7 100644
--- a/forge-gui/res/cardsfolder/e/enclave_cryptologist.txt
+++ b/forge-gui/res/cardsfolder/e/enclave_cryptologist.txt
@@ -4,9 +4,9 @@ Types:Creature Merfolk Wizard
 PT:0/1
 K:Level up:1 U
 SVar:maxLevel:3
-S:Mode$ Continuous | Affected$ Card.Self | AddAbility$ Loot | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL | Description$ LEVEL 1-2 CARDNAME has {T}: Draw a card, then discard a card.
-S:Mode$ Continuous | Affected$ Card.Self | AddAbility$ Draw | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ CARDNAME has {T}: Draw a card.
-SVar:Loot:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
-SVar:Draw:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card.
+S:Mode$ Continuous | Affected$ Card.Self | AddAbility$ Loot | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL | Description$ LEVEL 1-2 {T}: Draw a card, then discard a card.
+S:Mode$ Continuous | Affected$ Card.Self | AddAbility$ Draw | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ {T}: Draw a card.
+SVar:Loot:AB$ Draw | Cost$ T | Secondary$ True | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
+SVar:Draw:AB$ Draw | Cost$ T | Secondary$ True | SpellDescription$ Draw a card.
 SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
 Oracle:Level up {1}{U} ({1}{U}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-2\n0/1\n{T}: Draw a card, then discard a card.\nLEVEL 3+\n0/1\n{T}: Draw a card.
diff --git a/forge-gui/res/cardsfolder/g/guul_draz_assassin.txt b/forge-gui/res/cardsfolder/g/guul_draz_assassin.txt
index 4909e966466..8d39d4f20ac 100644
--- a/forge-gui/res/cardsfolder/g/guul_draz_assassin.txt
+++ b/forge-gui/res/cardsfolder/g/guul_draz_assassin.txt
@@ -4,8 +4,8 @@ Types:Creature Vampire Assassin
 PT:1/1
 K:Level up:1 B
 SVar:maxLevel:4
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 2 | AddAbility$ LowLvl | IsPresent$ Card.Self+counters_GE2_LEVEL+counters_LE3_LEVEL | Description$ LEVEL 2-3 2/2 CARDNAME has {B}, {T}: Target creature gets -2/-2 until end of turn.
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddAbility$ HighLvl | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 4/4 CARDNAME has {B}, {T}: Target creature gets -4/-4 until end of turn.
-SVar:LowLvl:AB$ Pump | Cost$ B T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
-SVar:HighLvl:AB$ Pump | Cost$ B T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True | SpellDescription$ Target creature gets -4/-4 until end of turn.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 2 | AddAbility$ LowLvl | IsPresent$ Card.Self+counters_GE2_LEVEL+counters_LE3_LEVEL | Description$ LEVEL 2-3 2/2 {B}, {T}: Target creature gets -2/-2 until end of turn.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddAbility$ HighLvl | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 4/4 {B}, {T}: Target creature gets -4/-4 until end of turn.
+SVar:LowLvl:AB$ Pump | Cost$ B T | ValidTgts$ Creature | Secondary$ True | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
+SVar:HighLvl:AB$ Pump | Cost$ B T | ValidTgts$ Creature | Secondary$ True | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True | SpellDescription$ Target creature gets -4/-4 until end of turn.
 Oracle:Level up {1}{B} ({1}{B}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 2-3\n2/2\n{B}, {T}: Target creature gets -2/-2 until end of turn.\nLEVEL 4+\n4/4\n{B}, {T}: Target creature gets -4/-4 until end of turn.
diff --git a/forge-gui/res/cardsfolder/h/hada_spy_patrol.txt b/forge-gui/res/cardsfolder/h/hada_spy_patrol.txt
index 03f05f96df5..2182467a115 100644
--- a/forge-gui/res/cardsfolder/h/hada_spy_patrol.txt
+++ b/forge-gui/res/cardsfolder/h/hada_spy_patrol.txt
@@ -6,5 +6,5 @@ K:Level up:2 U
 SVar:maxLevel:3
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 2 | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL | Description$ LEVEL 1-2 2/2 CARDNAME can't be blocked.
 S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Card.Self+counters_GE1_LEVEL
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | AddKeyword$ Shroud | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ 3/3 Shroud (This creature can't be the target of spells or abilities.) CARDNAME can't be blocked.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | AddKeyword$ Shroud | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ 3/3 Shroud (This creature can't be the target of spells or abilities.),,,CARDNAME can't be blocked.
 Oracle:Level up {2}{U} ({2}{U}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-2\n2/2\nHada Spy Patrol can't be blocked.\nLEVEL 3+\n3/3\nShroud (This creature can't be the target of spells or abilities.)\nHada Spy Patrol can't be blocked.
diff --git a/forge-gui/res/cardsfolder/h/halimar_wavewatch.txt b/forge-gui/res/cardsfolder/h/halimar_wavewatch.txt
index f39e0bdb425..82ac2126f33 100644
--- a/forge-gui/res/cardsfolder/h/halimar_wavewatch.txt
+++ b/forge-gui/res/cardsfolder/h/halimar_wavewatch.txt
@@ -5,5 +5,5 @@ PT:0/3
 K:Level up:2
 SVar:maxLevel:5
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 0 | SetToughness$ 6 | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE4_LEVEL | Description$ LEVEL 1-4 0/6
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddKeyword$ Islandwalk | IsPresent$ Card.Self+counters_GE5_LEVEL | Description$ LEVEL 5+ 6/6 CARDNAME has Islandwalk (This creature can't be blocked as long as defending player controls an Island.)
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddKeyword$ Islandwalk | IsPresent$ Card.Self+counters_GE5_LEVEL | Description$ LEVEL 5+ 6/6 Islandwalk
 Oracle:Level up {2} ({2}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-4\n0/6\nLEVEL 5+\n6/6\nIslandwalk (This creature can't be blocked as long as defending player controls an Island.)
diff --git a/forge-gui/res/cardsfolder/h/hedron_field_purists.txt b/forge-gui/res/cardsfolder/h/hedron_field_purists.txt
index 16d6eb3a483..1c135f10fb3 100644
--- a/forge-gui/res/cardsfolder/h/hedron_field_purists.txt
+++ b/forge-gui/res/cardsfolder/h/hedron_field_purists.txt
@@ -4,10 +4,10 @@ Types:Creature Human Cleric
 PT:0/3
 K:Level up:2 W
 SVar:maxLevel:5
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 4 | AddReplacementEffects$ RDamage1 | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE4_LEVEL | Description$ LEVEL 1-4 1/4 If a source would deal damage to you or a creature you control prevent 1 of that damage.
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 5 | AddReplacementEffects$ RDamage2 | IsPresent$ Card.Self+counters_GE5_LEVEL | Description$ LEVEL 5+ 2/5 If a source would deal damage to you or a creature you control prevent 2 of that damage.
-SVar:RDamage1:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You,Creature.YouCtrl | ReplaceWith$ DBReplace1 | PreventionEffect$ True | Secondary$ True | Description$ If a source would deal damage to you or a creature you control prevent 1 of that damage.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 4 | AddReplacementEffects$ RDamage1 | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE4_LEVEL | Description$ LEVEL 1-4 1/4 If a source would deal damage to you or a creature you control, prevent 1 of that damage.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 5 | AddReplacementEffects$ RDamage2 | IsPresent$ Card.Self+counters_GE5_LEVEL | Description$ LEVEL 5+ 2/5 If a source would deal damage to you or a creature you control, prevent 2 of that damage.
+SVar:RDamage1:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You,Creature.YouCtrl | ReplaceWith$ DBReplace1 | PreventionEffect$ True | Secondary$ True | Description$ If a source would deal damage to you or a creature you control, prevent 1 of that damage.
 SVar:DBReplace1:DB$ ReplaceDamage | Amount$ 1
-SVar:RDamage2:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You,Creature.YouCtrl | ReplaceWith$ DBReplace2 | PreventionEffect$ True | Secondary$ True | Description$ If a source would deal damage to you or a creature you control prevent 2 of that damage.
+SVar:RDamage2:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You,Creature.YouCtrl | ReplaceWith$ DBReplace2 | PreventionEffect$ True | Secondary$ True | Description$ If a source would deal damage to you or a creature you control, prevent 2 of that damage.
 SVar:DBReplace2:DB$ ReplaceDamage | Amount$ 2
 Oracle:Level up {2}{W} ({2}{W}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-4\n1/4\nIf a source would deal damage to you or a creature you control, prevent 1 of that damage.\nLEVEL 5+\n2/5\nIf a source would deal damage to you or a creature you control, prevent 2 of that damage.
diff --git a/forge-gui/res/cardsfolder/h/hexdrinker.txt b/forge-gui/res/cardsfolder/h/hexdrinker.txt
index add0e72da2a..3ca80e47a74 100644
--- a/forge-gui/res/cardsfolder/h/hexdrinker.txt
+++ b/forge-gui/res/cardsfolder/h/hexdrinker.txt
@@ -4,6 +4,6 @@ Types:Creature Snake
 PT:2/1
 K:Level up:1
 SVar:maxLevel:8
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Protection:Instant:Protection from instants | IsPresent$ Card.Self+counters_GE3_LEVEL+counters_LT8_LEVEL | Description$ LEVEL 3-7 4/4 CARDNAME has Protection from Instants
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddKeyword$ Protection from everything | IsPresent$ Card.Self+counters_GE8_LEVEL | Description$ LEVEL 8+ 6/6 CARDNAME has Protection from everything
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Protection:Instant:Protection from instants | IsPresent$ Card.Self+counters_GE3_LEVEL+counters_LT8_LEVEL | Description$ LEVEL 3-7 4/4 Protection from instants
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddKeyword$ Protection from everything | IsPresent$ Card.Self+counters_GE8_LEVEL | Description$ LEVEL 8+ 6/6 Protection from everything
 Oracle:Level up {1} ({1}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 3-7\n4/4\nProtection from instants\nLEVEL 8+\n6/6\nProtection from everything
diff --git a/forge-gui/res/cardsfolder/i/ikiral_outrider.txt b/forge-gui/res/cardsfolder/i/ikiral_outrider.txt
index e3d0a3f3f45..36a3a6cefce 100644
--- a/forge-gui/res/cardsfolder/i/ikiral_outrider.txt
+++ b/forge-gui/res/cardsfolder/i/ikiral_outrider.txt
@@ -4,6 +4,6 @@ Types:Creature Human Soldier
 PT:1/2
 K:Level up:4
 SVar:maxLevel:4
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 6 | AddKeyword$ Vigilance | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE3_LEVEL | Description$ LEVEL 1-3 2/6 CARDNAME has Vigilance
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 10 | AddKeyword$ Vigilance | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 3/10 CARDNAME has Vigilance
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 6 | AddKeyword$ Vigilance | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE3_LEVEL | Description$ LEVEL 1-3 2/6 Vigilance
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 10 | AddKeyword$ Vigilance | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 3/10 Vigilance
 Oracle:Level up {4} ({4}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-3\n2/6\nVigilance\nLEVEL 4+\n3/10\nVigilance
diff --git a/forge-gui/res/cardsfolder/j/joraga_treespeaker.txt b/forge-gui/res/cardsfolder/j/joraga_treespeaker.txt
index 65127812b0a..49256f92e50 100644
--- a/forge-gui/res/cardsfolder/j/joraga_treespeaker.txt
+++ b/forge-gui/res/cardsfolder/j/joraga_treespeaker.txt
@@ -4,8 +4,9 @@ Types:Creature Elf Druid
 PT:1/1
 K:Level up:1 G
 SVar:maxLevel:5
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 2 | AddAbility$ ABMana | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE4_LEVEL | Description$ LEVEL 1-4 1/2 CARDNAME has "{T}: Add {G}{G}."
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 4 | AddStaticAbility$ SMana | IsPresent$ Card.Self+counters_GE5_LEVEL | Description$ LEVEL 5+ 1/4 Elves you control have "{T}: Add {G}{G}."
-SVar:SMana:Mode$ Continuous | Affected$ Card.Elf+YouCtrl | AddAbility$ ABMana | Secondary$ True | Description$ Elves you control have "{T}: Add {G}{G}."
-SVar:ABMana:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 2 | AddAbility$ ABMana | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE4_LEVEL | Description$ LEVEL 1-4 1/2 {T}: Add {G}{G}.
+SVar:ABMana:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | Secondary$ True | SpellDescription$ Add {G}{G}.
+S:Mode$ Continuous | Affected$ Elf.YouCtrl | SetPower$ 1 | SetToughness$ 4 | AddAbility$ L5Mana | IsPresent$ Card.Self+counters_GE5_LEVEL | Description$ LEVEL 5+ 1/4 Elves you control have "{T}: Add {G}{G}."
+SVar:L5Mana:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
+DeckHints:Type$Elf
 Oracle:Level up {1}{G} ({1}{G}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-4\n1/2\n{T}: Add {G}{G}.\nLEVEL 5+\n1/4\nElves you control have "{T}: Add {G}{G}."
diff --git a/forge-gui/res/cardsfolder/k/kargan_dragonlord.txt b/forge-gui/res/cardsfolder/k/kargan_dragonlord.txt
index 76905fa023e..4f080599467 100644
--- a/forge-gui/res/cardsfolder/k/kargan_dragonlord.txt
+++ b/forge-gui/res/cardsfolder/k/kargan_dragonlord.txt
@@ -4,7 +4,7 @@ Types:Creature Human Warrior
 PT:2/2
 K:Level up:R
 SVar:maxLevel:8
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE4_LEVEL+counters_LE7_LEVEL | Description$ LEVEL 4-7 4/4 CARDNAME has Flying
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 8 | SetToughness$ 8 | AddKeyword$ Flying & Trample | AddAbility$ Pump | IsPresent$ Card.Self+counters_GE8_LEVEL | Description$ LEVEL 8+ 8/8 CARDNAME has Flying and Trample and R: CARDNAME gets +1/+0 until end of turn.
-SVar:Pump:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE4_LEVEL+counters_LE7_LEVEL | Description$ LEVEL 4-7 4/4 Flying
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 8 | SetToughness$ 8 | AddKeyword$ Flying & Trample | AddAbility$ Pump | IsPresent$ Card.Self+counters_GE8_LEVEL | Description$ LEVEL 8+ 8/8 Flying, trample,,,{R}: CARDNAME gets +1/+0 until end of turn.
+SVar:Pump:AB$ Pump | Cost$ R | Secondary$ True | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 Oracle:Level up {R} ({R}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 4-7\n4/4\nFlying\nLEVEL 8+\n8/8\nFlying, trample\n{R}: Kargan Dragonlord gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/k/kazandu_tuskcaller.txt b/forge-gui/res/cardsfolder/k/kazandu_tuskcaller.txt
index ad243b32539..c5dcf943881 100644
--- a/forge-gui/res/cardsfolder/k/kazandu_tuskcaller.txt
+++ b/forge-gui/res/cardsfolder/k/kazandu_tuskcaller.txt
@@ -6,6 +6,6 @@ K:Level up:1 G
 SVar:maxLevel:6
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddAbility$ TokenLow | IsPresent$ Card.Self+counters_GE2_LEVEL+counters_LE5_LEVEL | Description$ LEVEL 2-5 1/1 {T}: Create a 3/3 green Elephant creature token.
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddAbility$ TokenHigh | IsPresent$ Card.Self+counters_GE6_LEVEL | Description$ LEVEL 6+ 1/1 {T}: Create two 3/3 green Elephant creature tokens.
-SVar:TokenLow:AB$ Token | Cost$ T | TokenAmount$ 1 | TokenScript$ g_3_3_elephant | TokenOwner$ You | SpellDescription$ Create a 3/3 green Elephant creature token.
-SVar:TokenHigh:AB$ Token | Cost$ T | TokenAmount$ 2 | TokenScript$ g_3_3_elephant | TokenOwner$ You | SpellDescription$ Create two 3/3 green Elephant creature tokens.
+SVar:TokenLow:AB$ Token | Cost$ T | TokenScript$ g_3_3_elephant | Secondary$ True | SpellDescription$ Create a 3/3 green Elephant creature token.
+SVar:TokenHigh:AB$ Token | Cost$ T | TokenAmount$ 2 | TokenScript$ g_3_3_elephant | Secondary$ True | SpellDescription$ Create two 3/3 green Elephant creature tokens.
 Oracle:Level up {1}{G} ({1}{G}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 2-5\n1/1\n{T}: Create a 3/3 green Elephant creature token.\nLEVEL 6+\n1/1\n{T}: Create two 3/3 green Elephant creature tokens.
diff --git a/forge-gui/res/cardsfolder/k/knight_of_cliffhaven.txt b/forge-gui/res/cardsfolder/k/knight_of_cliffhaven.txt
index 0e48f1e29bb..855c85dc61e 100644
--- a/forge-gui/res/cardsfolder/k/knight_of_cliffhaven.txt
+++ b/forge-gui/res/cardsfolder/k/knight_of_cliffhaven.txt
@@ -4,6 +4,6 @@ Types:Creature Kor Knight
 PT:2/2
 K:Level up:3
 SVar:maxLevel:4
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 3 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE3_LEVEL | Description$ LEVEL 1-3 2/3 CARDNAME has Flying
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Flying & Vigilance | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 4/4 CARDNAME has Flying and Vigilance
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 3 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE3_LEVEL | Description$ LEVEL 1-3 2/3 Flying
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Flying & Vigilance | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 4/4 Flying, vigilance
 Oracle:Level up {3} ({3}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-3\n2/3\nFlying\nLEVEL 4+\n4/4\nFlying, vigilance
diff --git a/forge-gui/res/cardsfolder/l/lighthouse_chronologist.txt b/forge-gui/res/cardsfolder/l/lighthouse_chronologist.txt
index fd49dbd81a3..9ccd471d98b 100644
--- a/forge-gui/res/cardsfolder/l/lighthouse_chronologist.txt
+++ b/forge-gui/res/cardsfolder/l/lighthouse_chronologist.txt
@@ -6,6 +6,6 @@ K:Level up:U
 SVar:maxLevel:7
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 4 | IsPresent$ Card.Self+counters_GE4_LEVEL+counters_LE6_LEVEL | Description$ LEVEL 4-6 2/4
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 5 | AddTrigger$ TriggerExtraTurn | IsPresent$ Card.Self+counters_GE7_LEVEL | Description$ LEVEL 7+ 3/5 At the beginning of each end step, if it's not your turn, take an extra turn after this one.
-SVar:TriggerExtraTurn:Mode$ Phase | Phase$ End of Turn | NotPlayerTurn$ True | Execute$ TrigExtraTurn | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each end step, if it's not your turn, take an extra turn after this one.
+SVar:TriggerExtraTurn:Mode$ Phase | Phase$ End of Turn | NotPlayerTurn$ True | Execute$ TrigExtraTurn | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ At the beginning of each end step, if it's not your turn, take an extra turn after this one.
 SVar:TrigExtraTurn:DB$ AddTurn | NumTurns$ 1
 Oracle:Level up {U} ({U}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 4-6\n2/4\nLEVEL 7+\n3/5\nAt the beginning of each end step, if it's not your turn, take an extra turn after this one.
diff --git a/forge-gui/res/cardsfolder/l/lord_of_shatterskull_pass.txt b/forge-gui/res/cardsfolder/l/lord_of_shatterskull_pass.txt
index 980adcdcd7a..985b821c781 100644
--- a/forge-gui/res/cardsfolder/l/lord_of_shatterskull_pass.txt
+++ b/forge-gui/res/cardsfolder/l/lord_of_shatterskull_pass.txt
@@ -5,7 +5,8 @@ PT:3/3
 K:Level up:1 R
 SVar:maxLevel:6
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE5_LEVEL | Description$ LEVEL 1-5 6/6
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddTrigger$ TriggerDamage | IsPresent$ Card.Self+counters_GE6_LEVEL | Description$ LEVEL 6+ 6/6 Whenever CARDNAME attacks, it deals 6 damage to each creature defending player controls.
-SVar:TriggerDamage:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, it deals 6 damage to each creature defending player controls.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddTrigger$ TriggerDamage | AddSVar$ AE | IsPresent$ Card.Self+counters_GE6_LEVEL | Description$ LEVEL 6+ 6/6 Whenever CARDNAME attacks, it deals 6 damage to each creature defending player controls.
+SVar:TriggerDamage:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks, it deals 6 damage to each creature defending player controls.
 SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature.ControlledBy TriggeredDefendingPlayer | NumDmg$ 6
+SVar:AE:SVar:HasAttackEffect:TRUE
 Oracle:Level up {1}{R} ({1}{R}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-5\n6/6\nLEVEL 6+\n6/6\nWhenever Lord of Shatterskull Pass attacks, it deals 6 damage to each creature defending player controls.
diff --git a/forge-gui/res/cardsfolder/n/null_champion.txt b/forge-gui/res/cardsfolder/n/null_champion.txt
index 9e1179fcc75..d521485de0d 100644
--- a/forge-gui/res/cardsfolder/n/null_champion.txt
+++ b/forge-gui/res/cardsfolder/n/null_champion.txt
@@ -5,6 +5,6 @@ PT:1/1
 K:Level up:3
 SVar:maxLevel:4
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 2 | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE3_LEVEL | Description$ LEVEL 1-3 4/2
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 7 | SetToughness$ 3 | AddAbility$ Regen | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 7/3 CARDNAME has "{B}: Regenerate CARDNAME."
-SVar:Regen:AB$ Regenerate | Cost$ B | SpellDescription$ Regenerate CARDNAME.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 7 | SetToughness$ 3 | AddAbility$ Regen | IsPresent$ Card.Self+counters_GE4_LEVEL | Description$ LEVEL 4+ 7/3 {B}: Regenerate CARDNAME.
+SVar:Regen:AB$ Regenerate | Cost$ B | Secondary$ True | SpellDescription$ Regenerate CARDNAME.
 Oracle:Level up {3} ({3}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-3\n4/2\nLEVEL 4+\n7/3\n{B}: Regenerate Null Champion.
diff --git a/forge-gui/res/cardsfolder/s/skywatcher_adept.txt b/forge-gui/res/cardsfolder/s/skywatcher_adept.txt
index eea04b9ce0e..fdb83296a4a 100644
--- a/forge-gui/res/cardsfolder/s/skywatcher_adept.txt
+++ b/forge-gui/res/cardsfolder/s/skywatcher_adept.txt
@@ -4,6 +4,6 @@ Types:Creature Merfolk Wizard
 PT:1/1
 K:Level up:3
 SVar:maxLevel:3
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 2 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL | Description$ LEVEL 1-2 2/2 CARDNAME has Flying
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 2 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ 4/2 CARDNAME has Flying
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 2 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL | Description$ LEVEL 1-2 2/2 Flying
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | SetToughness$ 2 | AddKeyword$ Flying | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ 4/2 Flying
 Oracle:Level up {3} ({3}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-2\n2/2\nFlying\nLEVEL 3+\n4/2\nFlying
diff --git a/forge-gui/res/cardsfolder/t/transcendent_master.txt b/forge-gui/res/cardsfolder/t/transcendent_master.txt
index 663eee0d22e..4918f8cdc4e 100644
--- a/forge-gui/res/cardsfolder/t/transcendent_master.txt
+++ b/forge-gui/res/cardsfolder/t/transcendent_master.txt
@@ -6,4 +6,5 @@ K:Level up:1
 SVar:maxLevel:12
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 6 | SetToughness$ 6 | AddKeyword$ Lifelink | IsPresent$ Card.Self+counters_GE6_LEVEL+counters_LE11_LEVEL | Description$ LEVEL 6-11 6/6 Lifelink
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 9 | SetToughness$ 9 | AddKeyword$ Indestructible & Lifelink | IsPresent$ Card.Self+counters_GE12_LEVEL | Description$ LEVEL 12+ 9/9 Lifelink, indestructible
+DeckHas:Ability$LifeGain
 Oracle:Level up {1} ({1}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 6-11\n6/6\nLifelink\nLEVEL 12+\n9/9\nLifelink, indestructible
diff --git a/forge-gui/res/cardsfolder/z/zulaport_enforcer.txt b/forge-gui/res/cardsfolder/z/zulaport_enforcer.txt
index 7f3f1d8350d..998c9917774 100644
--- a/forge-gui/res/cardsfolder/z/zulaport_enforcer.txt
+++ b/forge-gui/res/cardsfolder/z/zulaport_enforcer.txt
@@ -5,6 +5,6 @@ PT:1/1
 K:Level up:4
 SVar:maxLevel:3
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LT3_LEVEL | Description$ LEVEL 1-2 3/3
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | SetToughness$ 5 | IsPresent$ Card.Self+counters_GE3_LEVEL | AddStaticAbility$ SCantBlock | Description$ LEVEL 3+ 5/5 CARDNAME can't be blocked except by black creatures
-SVar:SCantBlock:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.nonBlack | Secondary$ True | Description$ CARDNAME can't be blocked except by black creatures
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | SetToughness$ 5 | IsPresent$ Card.Self+counters_GE3_LEVEL | AddStaticAbility$ SCantBlock | Description$ LEVEL 3+ 5/5 CARDNAME can't be blocked except by black creatures.
+SVar:SCantBlock:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.nonBlack | Secondary$ True | Description$ CARDNAME can't be blocked except by black creatures.
 Oracle:Level up {4} ({4}: Put a level counter on this. Level up only as a sorcery.)\nLEVEL 1-2\n3/3\nLEVEL 3+\n5/5\nZulaport Enforcer can't be blocked except by black creatures.