Refactor K:Unblockable > Static (#1551)

* round 1

* round 2

* 10 more (Oct 1)

* attempt to add "Pump" to EffectAi

* more 10/4

* more/fixes 10/4

* more 10/4 (80 to go...)

* more 10/4 (70 to go...)

* 10/5 (60 to go...)

* more 10/5 (50 to go...)

* more 10/5 (40 to go...)

* more 10/5 (30 to go...)

* 10/6 (20 to go...)

* more 10/6 (10 to go...)

* more 10/6 (last of pump -> effect)

* more 10/6 (continuous kw static > cantblockby... 30 to go)

* more 10/6 (continuous > cantblockby... 20 to go)

* more 10/6 (continuous > cantblockby... 10 to go)

* last 10/6 (continuous > cantblockby)

* Final keyword cleanup?

* GameSimulationTest.testEquippedAbilities use Shroud instead of Unblockable

* fish token!

* CreatureEvaluator evaluate for unblockable

* AttachAi evaluate for unblockable

forge-ai/src/main/java/forge/ai/CreatureEvaluator.java

@@ -10,8 +10,10 @@ import forge.game.card.CounterEnumType;
 import forge.game.cost.CostPayEnergy;
 import forge.game.keyword.Keyword;
 import forge.game.spellability.SpellAbility;
+import forge.game.staticability.StaticAbility;
 import forge.game.staticability.StaticAbilityAssignCombatDamageAsUnblocked;
 import forge.game.staticability.StaticAbilityMustAttack;
+import forge.game.zone.ZoneType;
 
 import java.util.List;
 
@@ -60,9 +62,17 @@ public class CreatureEvaluator implements Function<Card, Integer> {
         if (c.hasKeyword(Keyword.HORSEMANSHIP)) {
             value += addValue(power * 10, "horses");
         }
-        if (c.hasKeyword("Unblockable")) {
+        boolean unblockable = false;
-            value += addValue(power * 10, "unblockable");
+        for (final Card ca : c.getGame().getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
-        } else {
+            for (final StaticAbility stAb : ca.getStaticAbilities()) {
+                if (stAb.applyAbility("CantBlockBy", c, null)) {
+                    value += addValue(power * 10, "unblockable");
+                    unblockable = true;
+                    break;
+                }
+            }
+        }
+        if (!unblockable) {
             if (StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(c)
                     || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(c, false)) {
                 value += addValue(power * 6, "thorns");

forge-ai/src/main/java/forge/ai/ability/AttachAi.java

@@ -661,8 +661,14 @@ public class AttachAi extends SpellAbilityAi {
             if (card.hasKeyword(Keyword.HORSEMANSHIP)) {
                 cardPriority += 40;
             }
-            if (card.hasKeyword("Unblockable")) {
+            //check if card is generally unblockable
-                cardPriority += 50;
+            for (final Card ca : card.getGame().getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
+                for (final StaticAbility stAb : ca.getStaticAbilities()) {
+                    if (stAb.applyAbility("CantBlockBy", card, null)) {
+                        cardPriority += 50;
+                        break;
+                    }
+                }
             }
             // Prefer "tap to deal damage"
             // TODO : Skip this one if triggers on combat damage only?
@@ -1551,7 +1557,7 @@ public class AttachAi extends SpellAbilityAi {
             }
         }
 
-        final boolean evasive = keyword.equals("Unblockable") || keyword.equals("Fear")
+        final boolean evasive = keyword.equals("Fear")
                 || keyword.equals("Intimidate") || keyword.equals("Shadow")
                 || keyword.equals("Flying") || keyword.equals("Horsemanship")
                 || keyword.endsWith("walk") || keyword.equals("All creatures able to block CARDNAME do so.");

forge-ai/src/main/java/forge/ai/ability/EffectAi.java

@@ -215,6 +215,10 @@ public class EffectAi extends SpellAbilityAi {
                 return topStack.getActivatingPlayer().isOpponentOf(ai) && topStack.getApi() == ApiType.GainLife;
             } else if (logic.equals("Fight")) {
                 return FightAi.canFightAi(ai, sa, 0, 0);
+            } else if (logic.equals("Pump")) {
+                if (SpellApiToAi.Converter.get(sa.getApi()).canPlayAIWithSubs(ai, sa)) {
+                    return true;
+                }
             } else if (logic.equals("Burn")) {
                 // for DamageDeal sub-abilities (eg. Wild Slash, Skullcrack)
                 SpellAbility burn = sa.getSubAbility();

forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java

@@ -196,7 +196,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
             return false;
         }
 
-        final boolean evasive = keyword.endsWith("Unblockable") || keyword.endsWith("Shadow");
+        final boolean evasive = keyword.endsWith("Shadow");
         // give evasive keywords to creatures that can or do attack
         if (evasive) {
             return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))

forge-game/src/main/java/forge/game/card/Card.java

@@ -1964,8 +1964,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
             if (keyword.startsWith("CantBeCounteredBy")) {
                 final String[] p = keyword.split(":");
                 sbLong.append(p[2]).append("\r\n");
-            } else if (keyword.equals("Unblockable")) {
-                sbLong.append(getName()).append(" can't be blocked.\r\n");
             } else if (keyword.startsWith("IfReach")) {
                 String[] k = keyword.split(":");
                 sbLong.append(getName()).append(" can block ")
@@ -2258,8 +2256,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
                         || keyword.startsWith("Class") || keyword.startsWith("Blitz")
                         || keyword.startsWith("Specialize") || keyword.equals("Ravenous")) {
                     // keyword parsing takes care of adding a proper description
-                } else if (keyword.equals("Unblockable")) {
-                    sbLong.append(getName()).append(" can't be blocked.\r\n");
                 } else if (keyword.startsWith("IfReach")) {
                     String[] k = keyword.split(":");
                     sbLong.append(getName()).append(" can block ")

forge-game/src/main/java/forge/game/combat/CombatUtil.java

@@ -573,10 +573,6 @@ public class CombatUtil {
             return true;
         }
 
-        if (attacker.hasKeyword("Unblockable")) {
-            return false;
-        }
-
         // Landwalk
         if (isUnblockableFromLandwalk(attacker, defender)) {
             return CardLists.getAmountOfKeyword(defender.getCreaturesInPlay(), "CARDNAME can block creatures with landwalk abilities as though they didn't have those abilities.") != 0;

forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java

@@ -128,12 +128,12 @@ public class GameSimulationTest extends SimulationTest {
         cloak.attachToEntity(bear, null);
         game.getPhaseHandler().devModeSet(PhaseType.MAIN1, p);
         game.getAction().checkStateEffects(true);
-        AssertJUnit.assertEquals(1, bear.getAmountOfKeyword("Unblockable"));
+        AssertJUnit.assertEquals(1, bear.getAmountOfKeyword("Shroud"));
 
         GameSimulator sim = createSimulator(game, p);
         Game simGame = sim.getSimulatedGameState();
         Card bearCopy = findCardWithName(simGame, bearCardName);
-        AssertJUnit.assertEquals(1, bearCopy.getAmountOfKeyword("Unblockable"));
+        AssertJUnit.assertEquals(1, bearCopy.getAmountOfKeyword("Shroud"));
     }
 
     @Test

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

@@ -2,5 +2,6 @@ Name:Access Tunnel
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Pump | Cost$ 3 T | ValidTgts$ Creature.powerLE3 | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature with power 3 or less can't be blocked this turn.
+A:AB$ Effect | Cost$ 3 T | ValidTgts$ Creature.powerLE3 | TgtPrompt$ Select target creature with power 3 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 3 or less can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:{T}: Add {C}.\n{3}, {T}: Target creature with power 3 or less can't be blocked this turn.

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

@@ -2,8 +2,9 @@ Name:Aether Figment
 ManaCost:1 U
 Types:Creature Illusion
 PT:1/1
-K:Unblockable
 K:Kicker:3
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 K:etbCounter:P1P1:2:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with two +1/+1 counters on it.
 SVar:WasKicked:Count$Kicked.1.0
+DeckHas:Ability$Counters
 Oracle:Kicker {3} (You may pay an additional {3} as you cast this spell.)\nAether Figment can't be blocked.\nIf Aether Figment was kicked, it enters the battlefield with two +1/+1 counters on it.

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

@@ -2,6 +2,7 @@ Name:Aether Tunnel
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump | SpellDescription$ Enchant creature
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 0 | AddKeyword$ Unblockable | Description$ Enchanted creature gets +1/+0 and can't be blocked.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | Description$ Enchanted creature gets +1/+0 and can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.EnchantedBy
 Oracle:Enchant creature\nEnchanted creature gets +1/+0 and can't be blocked.

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

@@ -5,7 +5,8 @@ PT:4/5
 A:AB$ ChangeZone | Cost$ U | Defined$ Self | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile CARDNAME. Return it to the battlefield under its owner's control at the beginning of the next end step.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | ConditionDefined$ Remembered | ConditionPresent$ Card | RememberObjects$ Remembered | TriggerDescription$ Return CARDNAME to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Battlefield
-A:AB$ Pump | Cost$ U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 A:AB$ Pump | Cost$ 1 | Defined$ Self | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn.
 A:AB$ Pump | Cost$ 1 | Defined$ Self | NumAtt$ -1 | NumDef$ +1 | SpellDescription$ CARDNAME gets -1/+1 until end of turn.
 Oracle:{U}: Exile Aetherling. Return it to the battlefield under its owner's control at the beginning of the next end step.\n{U}: Aetherling can't be blocked this turn.\n{1}: Aetherling gets +1/-1 until end of turn.\n{1}: Aetherling gets -1/+1 until end of turn.

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

@@ -2,5 +2,6 @@ Name:Agent of Horizons
 ManaCost:2 G
 Types:Creature Human Rogue
 PT:3/2
-A:AB$ Pump | Cost$ 2 U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ 2 U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 Oracle:{2}{U}: Agent of Horizons can't be blocked this turn.

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

@@ -2,8 +2,9 @@ Name:Alora, Merry Thief
 ManaCost:2 U
 Types:Legendary Creature Halfling Rogue
 PT:3/2
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. Return that creature to its owner's hand at the beginning of the next end step.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigUnblockable | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. Return that creature to its owner's hand at the beginning of the next end step.
-SVar:TrigPump:DB$ Pump | KW$ HIDDEN Unblockable | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBDelTrig
+SVar:TrigUnblockable:DB$ Effect | TgtPrompt$ Select up to one target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | SubAbility$ DBDelTrig
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:DBDelTrig:DB$ DelayedTrigger | ConditionDefined$ Targeted | ConditionPresent$ Card | Mode$ Phase | Phase$ End of Turn | RememberObjects$ Targeted | Execute$ TrigReturn | SpellDescription$ Return that creature to its owner's hand at the beginning of the next end step.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Hand
 K:Choose a Background

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

@@ -3,8 +3,9 @@ ManaCost:3 U
 Types:Legendary Creature Halfling Rogue
 PT:3/3
 K:Specialize:2
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigUnblockable | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand.
-SVar:TrigPump:DB$ Pump | KW$ HIDDEN Unblockable | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBDelTrig
+SVar:TrigUnblockable:DB$ Effect | TgtPrompt$ Select up to one target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | SubAbility$ DBDelTrig
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:DBDelTrig:DB$ DelayedTrigger | ConditionDefined$ Targeted | ConditionPresent$ Card | Mode$ Phase | Phase$ End of Turn | RememberObjects$ Targeted | Execute$ TrigReturn | TriggerDescription$ At the beginning of the next end step, return that creature to its owner's hand.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Hand
 AlternateMode:Specialize
@@ -16,8 +17,9 @@ Name:Alora, Cheerful Mastermind
 ManaCost:3 W U
 Types:Legendary Creature Halfling Rogue
 PT:4/4
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, create a 1/1 white Soldier creature token.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigUnblockable | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, create a 1/1 white Soldier creature token.
-SVar:TrigPump:DB$ Pump | KW$ HIDDEN Unblockable | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBDelTrig
+SVar:TrigUnblockable:DB$ Effect | TgtPrompt$ Select up to one target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | SubAbility$ DBDelTrig
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:DBDelTrig:DB$ DelayedTrigger | ConditionDefined$ Targeted | ConditionPresent$ Card | Mode$ Phase | Phase$ End of Turn | RememberObjects$ Targeted | Execute$ TrigReturn | TriggerDescription$ At the beginning of the next end step, return that creature to its owner's hand. If you do, create a 1/1 white Soldier creature token.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Hand | ForgetOtherRemembered$ True | RememberChanged$ True | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ w_1_1_soldier | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
@@ -31,8 +33,9 @@ Name:Alora, Cheerful Thief
 ManaCost:3 U U
 Types:Legendary Creature Halfling Rogue
 PT:4/4
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, a creature of your choice an opponent controls perpetually gets -1/-0.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigUnblockable | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, a creature of your choice an opponent controls perpetually gets -1/-0.
-SVar:TrigPump:DB$ Pump | KW$ HIDDEN Unblockable | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBDelTrig
+SVar:TrigUnblockable:DB$ Effect | TgtPrompt$ Select up to one target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | SubAbility$ DBDelTrig
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:DBDelTrig:DB$ DelayedTrigger | ConditionDefined$ Targeted | ConditionPresent$ Card | Mode$ Phase | Phase$ End of Turn | RememberObjects$ Targeted | Execute$ TrigReturn | TriggerDescription$ At the beginning of the next end step, return that creature to its owner's hand. If you do, a creature of your choice an opponent controls perpetually gets -1/-0.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Hand | ForgetOtherRemembered$ True | RememberChanged$ True | SubAbility$ DBChooseCard
 SVar:DBChooseCard:DB$ ChooseCard | ConditionDefined$ Remembered | ConditionPresent$ Card | Choices$ Creature.OppCtrl | Mandatory$ True | SubAbility$ DBCleanup
@@ -48,8 +51,9 @@ Name:Alora, Cheerful Assassin
 ManaCost:3 U B
 Types:Legendary Creature Halfling Rogue Assassin
 PT:4/4
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, each opponent loses 2 life.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigUnblockable | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, each opponent loses 2 life.
-SVar:TrigPump:DB$ Pump | KW$ HIDDEN Unblockable | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBDelTrig
+SVar:TrigUnblockable:DB$ Effect | TgtPrompt$ Select up to one target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | SubAbility$ DBDelTrig
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:DBDelTrig:DB$ DelayedTrigger | ConditionDefined$ Targeted | ConditionPresent$ Card | Mode$ Phase | Phase$ End of Turn | RememberObjects$ Targeted | Execute$ TrigReturn | TriggerDescription$ At the beginning of the next end step, return that creature to its owner's hand. If you do, each opponent loses 2 life.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Hand | ForgetOtherRemembered$ True | RememberChanged$ True | SubAbility$ DBDrain
 SVar:DBDrain:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 2 | ConditionDefined$ Remembered | ConditionPresent$ Card
@@ -61,8 +65,9 @@ Name:Alora, Cheerful Swashbuckler
 ManaCost:3 U R
 Types:Legendary Creature Halfling Rogue
 PT:4/4
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, create a Treasure token.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigUnblockable | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, create a Treasure token.
-SVar:TrigPump:DB$ Pump | KW$ HIDDEN Unblockable | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBDelTrig
+SVar:TrigUnblockable:DB$ Effect | TgtPrompt$ Select up to one target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | SubAbility$ DBDelTrig
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:DBDelTrig:DB$ DelayedTrigger | ConditionDefined$ Targeted | ConditionPresent$ Card | Mode$ Phase | Phase$ End of Turn | RememberObjects$ Targeted | Execute$ TrigReturn | TriggerDescription$ At the beginning of the next end step, return that creature to its owner's hand. If you do, create a Treasure token.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Hand | ForgetOtherRemembered$ True | RememberChanged$ True | SubAbility$ DBTreasure
 SVar:DBTreasure:DB$ Token | TokenScript$ c_a_treasure_sac | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
@@ -76,8 +81,9 @@ Name:Alora, Cheerful Scout
 ManaCost:3 G U
 Types:Legendary Creature Halfling Rogue Scout
 PT:4/4
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, it perpetually gets +1/+1.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigUnblockable | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, up to one target attacking creature can't be blocked this turn. At the beginning of the next end step, return that creature to its owner's hand. If you do, it perpetually gets +1/+1.
-SVar:TrigPump:DB$ Pump | KW$ HIDDEN Unblockable | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBDelTrig
+SVar:TrigUnblockable:DB$ Effect | TgtPrompt$ Select up to one target attacking creature | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ 1 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | SubAbility$ DBDelTrig
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:DBDelTrig:DB$ DelayedTrigger | ConditionDefined$ Targeted | ConditionPresent$ Card | Mode$ Phase | Phase$ End of Turn | RememberObjects$ Targeted | Execute$ TrigReturn | TriggerDescription$ At the beginning of the next end step, return that creature to its owner's hand. If you do, it perpetually gets +1/+1.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Battlefield | Destination$ Hand | ForgetOtherRemembered$ True | RememberChanged$ True | SubAbility$ DBPerpetual
 SVar:DBPerpetual:DB$ Effect | ConditionDefined$ Remembered | ConditionPresent$ Card | RememberObjects$ Remembered | StaticAbilities$ PerpetualP1P1 | Name$ Alora, Cheerful Scout's Perpetual Effect | Duration$ Permanent | SubAbility$ DBCleanup

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

@@ -2,5 +2,6 @@ Name:Amphin Pathmage
 ManaCost:3 U
 Types:Creature Salamander Wizard
 PT:3/2
-A:AB$ Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn.
+A:AB$ Effect | Cost$ 2 U | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:{2}{U}: Target creature can't be blocked this turn.

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

@@ -2,7 +2,8 @@ Name:Aquatic Incursion
 ManaCost:3 U
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 blue Merfolk creature tokens with hexproof.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ u_1_1_merfolk_hexproof | TokenOwner$ You
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ u_1_1_merfolk_hexproof
-A:AB$ Pump | Cost$ 3 U | ValidTgts$ Merfolk | TgtPrompt$ Select target Merfolk | KW$ HIDDEN Unblockable | SpellDescription$ Target Merfolk can't be blocked this turn.
+A:AB$ Effect | Cost$ 3 U | ValidTgts$ Merfolk | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target Merfolk can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 DeckHints:Type$Merfolk
 Oracle:When Aquatic Incursion enters the battlefield, create two 1/1 blue Merfolk creature tokens with hexproof. (They can't be the targets of spells or abilities your opponents control.)\n{3}{U}: Target Merfolk can't be blocked this turn.

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

@@ -2,9 +2,10 @@ Name:Aqueous Form
 ManaCost:U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ Unblockable | AddSVar$ AE | Description$ Enchanted creature can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.EnchantedBy | Description$ Enchanted creature can't be blocked.
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ DBScry | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature attacks, scry 1.
 SVar:DBScry:DB$ Scry | ScryNum$ 1
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddSVar$ AE
 SVar:AE:SVar:HasAttackEffect:TRUE
 Oracle:Enchant creature\nEnchanted creature can't be blocked.\nWhenever enchanted creature attacks, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)

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

@@ -2,5 +2,6 @@ Name:Artful Dodge
 ManaCost:U
 Types:Sorcery
 K:Flashback:U
-A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn.
+A:SP$ Effect | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature can't be blocked this turn. Draw a card.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:Target creature can't be blocked this turn.\nFlashback {U} (You may cast this card from your graveyard for its flashback cost. Then exile it.)

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

@@ -2,5 +2,6 @@ Name:Ashiok's Skulker
 ManaCost:4 U
 Types:Creature Nightmare
 PT:3/5
-A:AB$ Pump | Cost$ 3 U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ 3 U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 Oracle:{3}{U}: Ashiok's Skulker can't be blocked this turn.

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

@@ -3,9 +3,8 @@ ManaCost:3 W U
 Types:Legendary Creature Human Artificer
 PT:2/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME attacks, look at the top four cards of your library. You may put any number of artifact cards with mana value less than or equal to NICKNAME's power from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | Defined$ You | DigNum$ 4 | ChangeValid$ Artifact.cmcLEY | AnyNumber$ True | Tapped$ True | RestRandomOrder$ True | DestinationZone$ Battlefield
+SVar:TrigDig:DB$ Dig | DigNum$ 4 | ChangeValid$ Artifact.cmcLEY | AnyNumber$ True | Tapped$ True | RestRandomOrder$ True | DestinationZone$ Battlefield
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ GE3 | Description$ NICKNAME can't be blocked as long as defending player controls three or more artifacts.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Artifact.DefenderCtrl | PresentCompare$ GE3 | Description$ NICKNAME can't be blocked as long as defending player controls three or more artifacts.
-SVar:X:Count$Valid Artifact.DefenderCtrl
 SVar:Y:Count$CardPower
-DeckNeeds:Type$Artifact
+DeckHints:Type$Artifact
 Oracle:Whenever Ayesha Tanaka, Armorer attacks,look at the top four cards of your library. You may put any number of artifact cards with mana value less than or equal to Ayesha's power from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order.\nAyesha can't be blocked as long as defending player controls three or more artifacts.

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

@@ -2,7 +2,7 @@ Name:Azorius Herald
 ManaCost:2 W
 Types:Creature Spirit
 PT:2/1
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 4 life.
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | ManaNotSpent$ U | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless {U} was spent to cast it.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4

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

@@ -4,6 +4,6 @@ Types:Creature Eldrazi Drone
 PT:1/4
 K:Devoid
 K:Ingest
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 DeckHints:Type$Processor
 Oracle:Devoid (This card has no color.)\nIngest (Whenever this creature deals combat damage to a player, that player exiles the top card of their library.)\nBenthic Infiltrator can't be blocked.

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

@@ -20,6 +20,7 @@ ManaCost:no cost
 Colors:blue
 Types:Creature Serpent
 PT:4/4
-A:AB$ Pump | Cost$ Sac<2/Island> | Defined$ Self | KW$ HIDDEN Unblockable | StackDescription$ SpellDescription | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ Sac<2/Island> | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 DeckHas:Ability$Sacrifice
 Oracle:Sacrifice two Islands: Biolume Serpent can't be blocked this turn.

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

@@ -3,5 +3,5 @@ ManaCost:1 U
 Types:Creature Phyrexian Human Rogue
 PT:1/1
 K:Infect
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)\nBlighted Agent can't be blocked.

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

@@ -2,5 +2,6 @@ Name:Blockade Runner
 ManaCost:3 U
 Types:Creature Merfolk
 PT:2/2
-A:AB$ Pump | Cost$ U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 Oracle:{U}: Blockade Runner can't be blocked this turn.

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

@@ -2,6 +2,8 @@ Name:Bloodmist Infiltrator
 ManaCost:2 B
 Types:Creature Vampire
 PT:3/1
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, you may sacrifice another creature. If you do, CARDNAME can't be blocked this turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ Whenever CARDNAME attacks, you may sacrifice another creature. If you do, CARDNAME can't be blocked this turn.
-SVar:TrigPump:AB$ Pump | Cost$ Sac<1/Creature.Other/another creature> | Defined$ Self | KW$ HIDDEN Unblockable
+SVar:TrigUnblockable:AB$ Effect | Cost$ Sac<1/Creature.Other/another creature> | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
+SVar:HasAttackEffect:TRUE
 Oracle:Whenever Bloodmist Infiltrator attacks, you may sacrifice another creature. If you do, Bloodmist Infiltrator can't be blocked this turn.

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

@@ -13,7 +13,8 @@ SVar:Loy:Count$CardCounters.LOYALTY
 SVar:Beeb:Count$Valid Beeble.YouCtrl
 K:The number of loyalty counters on CARDNAME is equal to the number of Beebles you control.
 SVar:NHand:Count$InYourHand
-A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Beeble | TargetMin$ 0 | TargetMax$ NHand | KW$ HIDDEN Unblockable | TgtPrompt$ Select target creature | SpellDescription$ Up to X target Beebles can't be blocked this turn, where X is the number of cards in your hand.
+A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Beeble | TgtPrompt$ Select up to X target Beebles | TargetMin$ 0 | TargetMax$ NHand | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | StackDescription$ SpellDescription | SpellDescription$ Up to X target Beebles can't be blocked this turn, where X is the number of cards in your hand.
-A:AB$ Draw | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 1 | Defined$ You | SpellDescription$ Draw a card.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ These creatures can't be blocked this turn.
-DeckHas:Ability$Token
+A:AB$ Draw | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | SpellDescription$ Draw a card.
+DeckHas:Ability$Token & Type$Beeble
 Oracle:As B.O.B. enters the battlefield, create four 1/1 blue Beeble creature tokens.\nThe number of loyalty counters on B.O.B. is equal to the number of Beebles you control. (Create or sacrifice Beebles whenever B.O.B. gains or loses loyalty.)\n[+1]: Up to X target Beebles can't be blocked this turn, where X is the number of cards in your hand.\n[-1]: Draw a card.

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

@@ -5,7 +5,8 @@ PT:1/1
 T:Mode$ SpellCast | ValidCard$ Card.BorderColorSilver | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a silver-bordered spell, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 T:Mode$ SpellCast | ValidCard$ Card.BorderColorBlack | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUnblock | TriggerDescription$ Whenever you cast a black-bordered spell, CARDNAME can't be blocked this turn.
-SVar:TrigUnblock:DB$ Pump | Defined$ Self | KW$ HIDDEN Unblockable
+SVar:TrigUnblock:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 T:Mode$ SpellCast | ValidCard$ Card.BorderColorWhite | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDS | TriggerDescription$ Whenever you cast a white-bordered spell, Border Guardian gains double strike until end of turn.
 SVar:TrigDS:DB$ Pump | Defined$ Self | KW$ Double Strike
 DeckHas:Ability$Counters

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

@@ -2,6 +2,5 @@ Name:Bouncing Beebles
 ManaCost:2 U
 Types:Creature Beeble
 PT:2/2
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can't be blocked as long as defending player controls an artifact.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Artifact.DefenderCtrl | Description$ CARDNAME can't be blocked as long as defending player controls an artifact.
-SVar:X:Count$Valid Artifact.DefenderCtrl
 Oracle:Bouncing Beebles can't be blocked as long as defending player controls an artifact.

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

@@ -1,5 +1,7 @@
 Name:Break Through the Line
 ManaCost:1 R
 Types:Enchantment
-A:AB$ Pump | Cost$ R | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | KW$ Haste & HIDDEN Unblockable | SpellDescription$ Target creature with power 2 or less gains haste until end of turn and can't be blocked this turn.
+A:AB$ Pump | Cost$ R | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | KW$ Haste | SubAbility$ DBUnblockable | StackDescription$ {c:Targeted} gains haste until end of turn and can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less gains haste until end of turn and can't be blocked this turn.
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:{R}: Target creature with power 2 or less gains haste until end of turn and can't be blocked this turn.

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

@@ -2,6 +2,5 @@ Name:Bubbling Beebles
 ManaCost:4 U
 Types:Creature Beeble
 PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can't be blocked as long as defending player controls an enchantment.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Enchantment.DefenderCtrl | Description$ CARDNAME can't be blocked as long as defending player controls an enchantment.
-SVar:X:Count$Valid Enchantment.DefenderCtrl
 Oracle:Bubbling Beebles can't be blocked as long as defending player controls an enchantment.

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

@@ -4,6 +4,7 @@ Types:Creature Human Rogue
 PT:3/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | AttackDifferentPlayers$ True | TriggerDescription$ Whenever CARDNAME and another creature attack different players, CARDNAME can't be blocked this combat.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigEffect | AttackDifferentPlayers$ True | TriggerDescription$ Whenever CARDNAME and another creature attack different players, CARDNAME can't be blocked this combat.
-SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ HIDDEN Unblockable | Duration$ UntilEndOfCombat
+SVar:TrigEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ STUnblockable | Duration$ UntilEndOfCombat | ExileOnMoved$ Battlefield
+SVar:STUnblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this combat.
 Oracle:When Canal Courier enters the battlefield, you become the monarch.\nWhenever Canal Courier and another creature attack different players, Canal Courier can't be blocked this combat.

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

@@ -2,7 +2,8 @@ Name:Cephalid Facetaker
 ManaCost:2 U
 Types:Creature Cephalid Rogue
 PT:1/4
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigClone | TriggerDescription$ At the beginning of combat on your turn, you may have CARDNAME become a copy of another target creature until end of turn, except it's 1/4 and has "This creature can't be blocked."
-SVar:TrigClone:DB$ Clone | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | SetPower$ 1 | SetToughness$ 4 | AddKeywords$ Unblockable | AILogic$ CloneBestCreature | Duration$ UntilEndOfTurn
+SVar:TrigClone:DB$ Clone | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | SetPower$ 1 | SetToughness$ 4 | AddStaticAbilities$ Unblockable | AILogic$ CloneBestCreature | Duration$ UntilEndOfTurn
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ This creature can't be blocked.
 Oracle:Cephalid Facetaker can't be blocked.\nAt the beginning of combat on your turn, you may have Cephalid Facetaker become a copy of another target creature until end of turn, except it's 1/4 and has "This creature can't be blocked."

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

@@ -2,7 +2,10 @@ Name:Cephalid Inkshrouder
 ManaCost:2 U
 Types:Creature Cephalid
 PT:2/1
-A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ Shroud & HIDDEN Unblockable | SpellDescription$ CARDNAME gains shroud until end of turn and can't be blocked this turn. (A creature with shroud can't be the target of spells or abilities.)
+A:AB$ Pump | Cost$ Discard<1/Card> | KW$ Shroud | SubAbility$ DBUnblockable | StackDescription$ CARDNAME gains shroud until end of turn and can't be blocked this turn. | SpellDescription$ CARDNAME gains shroud until end of turn and can't be blocked this turn. (A creature with shroud can't be the target of spells or abilities.)
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 AI:RemoveDeck:Random
-SVar:AIPreference:DiscardCost$Card.cmcEQ1,Card.cmcEQ2
+SVar:AIPreference:DiscardCost$Card.cmcLE2
+DeckHas:Ability$Discard
 Oracle:Discard a card: Cephalid Inkshrouder gains shroud until end of turn and can't be blocked this turn. (A creature with shroud can't be the target of spells or abilities.)

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

@@ -2,6 +2,8 @@ Name:Cephalid Pathmage
 ManaCost:2 U
 Types:Creature Cephalid Wizard
 PT:1/2
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
-A:AB$ Pump | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn.
+A:AB$ Effect | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature | RememberObjects$ Targeted | StaticAbilities$ STUnblockable | SpellDescription$ Target creature can't be blocked this turn.
+SVar:STUnblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+DeckHas:Ability$Sacrifice
 Oracle:Cephalid Pathmage can't be blocked.\n{T}, Sacrifice Cephalid Pathmage: Target creature can't be blocked this turn.

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

@@ -3,6 +3,6 @@ ManaCost:B
 Types:Creature Shapeshifter
 PT:1/1
 K:Changeling
-K:CARDNAME can't block.
+S:Mode$ CantBlockBy | ValidBlocker$ Creature.Self | Description$ CARDNAME can't block and can't be blocked.
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self
 Oracle:Changeling (This card is every creature type.)\nChangeling Outcast can't block and can't be blocked.

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

@@ -2,6 +2,6 @@ Name:Cloak of Mists
 ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ Unblockable | Description$ Enchanted creature can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.EnchantedBy | Description$ Enchanted creature can't be blocked.
 Oracle:Enchant creature\nEnchanted creature can't be blocked.

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

@@ -2,5 +2,6 @@ Name:Coralhelm Guide
 ManaCost:1 U
 Types:Creature Merfolk Scout Ally
 PT:2/1
-A:AB$ Pump | Cost$ 4 U | ValidTgts$ Creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn. | TgtPrompt$ Select target creature.
+A:AB$ Effect | Cost$ 4 U | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:{4}{U}: Target creature can't be blocked this turn.

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

@@ -2,5 +2,5 @@ Name:Covert Operative
 ManaCost:4 U
 Types:Creature Human Wizard
 PT:3/2
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 Oracle:Covert Operative can't be blocked.

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

@@ -2,5 +2,6 @@ Name:Crafty Pathmage
 ManaCost:2 U
 Types:Creature Human Wizard
 PT:1/1
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.powerLE2 | KW$ HIDDEN Unblockable | SpellDescription$ Target creature with power 2 or less can't be blocked this turn. | TgtPrompt$ Select target creature with power 2 or less.
+A:AB$ Effect | Cost$ T | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:{T}: Target creature with power 2 or less can't be blocked this turn.

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

@@ -2,6 +2,9 @@ Name:Cunning Survivor
 ManaCost:1 U
 Types:Creature Human Warrior
 PT:1/3
-T:Mode$ Discarded | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cycle or discard a card, CARDNAME gets +1/+0 until end of turn.
+T:Mode$ Discarded | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cycle or discard a card, CARDNAME gets +1/+0 until end of turn and can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | KW$ HIDDEN Unblockable
+SVar:TrigPump:DB$ Pump | NumAtt$ +1 | SubAbility$ DBUnblockable
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
+DeckHints:Ability$Discard
 Oracle:Whenever you cycle or discard a card, Cunning Survivor gets +1/+0 until end of turn and can't be blocked this turn.

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

@@ -2,7 +2,9 @@ Name:Daring Saboteur
 ManaCost:1 U
 Types:Creature Human Pirate
 PT:2/1
-A:AB$ Pump | Cost$ 2 U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ 2 U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoot | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card. If you do, discard a card.
 SVar:TrigLoot:AB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1 | Cost$ Draw<1/You>
+DeckHas:Ability$Discard
 Oracle:{2}{U}: Daring Saboteur can't be blocked this turn.\nWhenever Daring Saboteur deals combat damage to a player, you may draw a card. If you do, discard a card.

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

@@ -6,7 +6,9 @@ T:Mode$ SpellCastOrCopy | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ Yo
 SVar:TrigToken:DB$ Token | TokenScript$ gu_0_0_fractal | RememberTokens$ True | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ TriggeredStackInstance$CardManaCostLKI | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-A:AB$ Pump | Cost$ 3 U | KW$ HIDDEN Unblockable | TgtPrompt$ Select target creature token | ValidTgts$ Creature.token | SpellDescription$ Target creature token can't be blocked this turn.
+A:AB$ Effect | Cost$ 3 U | ValidTgts$ Creature.token | TgtPrompt$ Select target creature token | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature token can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 DeckHas:Ability$Token|Counters
+DeckHints:Ability$Token
 DeckNeeds:Type$Instant|Sorcery
 Oracle:Magecraft — Whenever you cast or copy an instant or sorcery spell, create a 0/0 green and blue Fractal creature token. Put X +1/+1 counters on it, where X is that spell's mana value.\n{3}{U}: Target creature token can't be blocked this turn.

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

@@ -2,7 +2,7 @@ Name:Deep-Sea Kraken
 ManaCost:7 U U U
 Types:Creature Kraken
 PT:6/6
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 K:Suspend:9:2 U
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | Execute$ TrigRemoveCounter | TriggerZones$ Exile | IsPresent$ Card.Self+suspended | PresentZone$ Exile | TriggerDescription$ Whenever an opponent casts a spell, if CARDNAME is suspended, remove a time counter from it.
 SVar:TrigRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ TIME | CounterNum$ 1

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

@@ -2,6 +2,6 @@ Name:Deepchannel Mentor
 ManaCost:5 U
 Types:Creature Merfolk Rogue
 PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Blue+YouCtrl | AddHiddenKeyword$ Unblockable | Description$ Blue creatures you control can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Blue+YouCtrl | Description$ Blue creatures you control can't be blocked.
 SVar:PlayMain1:TRUE
 Oracle:Blue creatures you control can't be blocked.

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

@@ -5,6 +5,7 @@ PT:4/4
 K:Devoid
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control deals combat damage to an opponent, you may draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
-A:AB$ Pump | Cost$ 3 C | ValidTgts$ Creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn. | TgtPrompt$ Select target creature.
+A:AB$ Effect | Cost$ 3 C | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 DeckHints:Ability$Mana.Colorless
 Oracle:Devoid (This card has no color.)\nWhenever a creature you control deals combat damage to a player, you may draw a card.\n{3}{C}: Target creature can't be blocked this turn. ({C} represents colorless mana.)

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

@@ -3,7 +3,10 @@ ManaCost:U B
 Types:Creature Nightmare
 PT:2/1
 T:Mode$ ChangesZoneAll | ValidCards$ Card.YouOwn | Origin$ Library | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever one or more cards are put into your graveyard from your library, CARDNAME gets +1/+1 until end of turn and can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ HIDDEN Unblockable
+SVar:TrigPump:DB$ Pump | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBUnblockable
-A:AB$ Mill | Cost$ 1 U B | Defined$ You | NumCards$ 1 | SpellDescription$ Mill a card.
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
-DeckHas:Ability$Graveyard
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
+A:AB$ Mill | Cost$ 1 U B | SpellDescription$ Mill a card.
+DeckHas:Ability$Mill
+DeckHints:Ability$Mill
 Oracle:Whenever one or more cards are put into your graveyard from your library, Devourer of Memory gets +1/+1 until end of turn and can't be blocked this turn.\n{1}{U}{B}: Mill a card.

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

@@ -2,6 +2,6 @@ Name:Dimir Infiltrator
 ManaCost:U B
 Types:Creature Spirit
 PT:1/3
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 K:Transmute:1 U B
 Oracle:Dimir Infiltrator can't be blocked.\nTransmute {1}{U}{B} ({1}{U}{B}, Discard this card: Search your library for a card with the same mana value as this card, reveal it, put it into your hand, then shuffle. Transmute only as a sorcery.)

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

@@ -2,5 +2,7 @@ Name:Distortion Strike
 ManaCost:U
 Types:Sorcery
 K:Rebound
-A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | KW$ HIDDEN Unblockable | SpellDescription$ Target creature gets +1/+0 until end of turn and can't be blocked this turn.
+A:SP$ Pump | ValidTgts$ Creature | NumAtt$ 1 | SubAbility$ DBUnblockable | StackDescription$ {c:Targeted} gets +1/+0 until end of turn and can't be blocked this turn. | SpellDescription$ Target creature gets +1/+0 until end of turn and can't be blocked this turn.
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:Target creature gets +1/+0 until end of turn and can't be blocked this turn.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)

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

@@ -3,5 +3,6 @@ ManaCost:4 U U
 Types:Creature Crab Horror
 PT:5/5
 K:Ward:2
-A:AB$ Pump | Cost$ 3 U U | Defined$ Self | KW$ HIDDEN Unblockable | IsPresent$ Card.YouOwn | PresentZone$ Exile | SpellDescription$ CARDNAME can't be blocked this turn. Activate only if you own a card in exile.
+A:AB$ Effect | Cost$ 3 U U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | IsPresent$ Card.YouOwn | PresentZone$ Exile | StackDescription$ CARDNAME can't be blocked this turn. | SpellDescription$ CARDNAME can't be blocked this turn. Activate only if you own a card in exile.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\n{3}{U}{U}: Dreadlight Monstrosity can't be blocked this turn. Activate only if you own a card in exile.

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

@@ -2,6 +2,5 @@ Name:Dream Prowler
 ManaCost:2 U U
 Types:Creature Illusion
 PT:1/5
-S:Mode$ Continuous | Affected$ Card.Self+attacking | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ EQ1 | Description$ CARDNAME can't be blocked as long as it's attacking alone.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self+attacking | IsPresent$ Card.Other+attacking | PresentCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as it's attacking alone.
-SVar:X:Count$Valid Card.attacking
 Oracle:Dream Prowler can't be blocked as long as it's attacking alone.

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

@@ -2,8 +2,9 @@ Name:Drownyard Amalgam
 ManaCost:4 U
 Types:Creature Zombie Horror
 PT:3/6
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, target player mills three cards.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, target player mills three cards. (They put the top three cards of their library into their graveyard.)
-SVar:TrigMill:DB$ Mill | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Select target player
+SVar:TrigMill:DB$ Mill | NumCards$ 3 | ValidTgts$ Player
-A:AB$ Pump | Cost$ 2 U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn. | StackDescription$ SpellDescription
+A:AB$ Effect | Cost$ 2 U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
-DeckHas:Ability$Token
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
+DeckHas:Ability$Mill
 Oracle:When Drownyard Amalgam enters the battlefield, target player mills three cards. (They put the top three cards of their library into their graveyard.)\n{2}{U}: Drownyard Amalgam can't be blocked this turn.

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

@@ -2,5 +2,6 @@ Name:Dwarven Nomad
 ManaCost:2 R
 Types:Creature Dwarf Nomad
 PT:1/1
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.powerLE2 | KW$ HIDDEN Unblockable | SpellDescription$ Target creature with power 2 or less can't be blocked this turn. | TgtPrompt$ Select target creature with power 2 or less.
+A:AB$ Effect | Cost$ T | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:{T}: Target creature with power 2 or less can't be blocked this turn.

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

@@ -2,5 +2,6 @@ Name:Dwarven Warriors
 ManaCost:2 R
 Types:Creature Dwarf Warrior
 PT:1/1
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.powerLE2 | KW$ HIDDEN Unblockable | SpellDescription$ Target creature with power 2 or less can't be blocked this turn. | TgtPrompt$ Select target creature with power 2 or less.
+A:AB$ Effect | Cost$ T | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:{T}: Target creature with power 2 or less can't be blocked this turn.

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

@@ -2,7 +2,7 @@ Name:Elusive Krasis
 ManaCost:1 G U
 Types:Creature Fish Mutant
 PT:0/4
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 K:Evolve
 DeckHas:Ability$Counters
 Oracle:Elusive Krasis can't be blocked.\nEvolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)

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

@@ -3,6 +3,8 @@ ManaCost:1 U
 Types:Creature Human Monk
 PT:1/3
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, CARDNAME gets +1/+0 until end of turn and can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME gets +1/+0 until end of turn and can't be blocked this turn.
+SVar:TrigPump:DB$ Pump | NumAtt$ +1 | SubAbility$ DBUnblockable
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 SVar:BuffedBy:Card.nonLand+nonCreature
 Oracle:Whenever you cast a noncreature spell, Elusive Spellfist gets +1/+0 until end of turn and can't be blocked this turn.

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

@@ -18,8 +18,8 @@ Types:Creature Elemental
 PT:0/1
 K:Hexproof
 K:Indestructible
-K:CARDNAME can't block.
+S:Mode$ CantBlockBy | ValidBlocker$ Creature.Self | Description$ CARDNAME can't block and can't be blocked.
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self
 T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, you may pay {2}{B}. If you do, transform it.
 SVar:TrigTransform:AB$SetState | Cost$ 2 B | Defined$ Self | Mode$ Transform
 Oracle:Hexproof, indestructible\nInsidious Mist can't block and can't be blocked.\nWhenever Insidious Mist attacks and isn't blocked, you may pay {2}{B}. If you do, transform it.

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

@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Legendary Enchantment Creature God
 PT:5/7
 K:Indestructible
-S:Mode$ Continuous | Affected$ Card.Self | RemoveType$ Creature | CheckSVar$ X | SVarCompare$ LT5 | Description$ As long as your devotion to black is less than 5, CARDNAME isn't a creature. (Each {B} in the mana costs of permanents you control counts towards your devotion to black.)
+S:Mode$ Continuous | Affected$ Card.Self | RemoveType$ Creature | CheckSVar$ X | SVarCompare$ LT5 | Description$ As long as your devotion to black is less than 5, NICKNAME isn't a creature. (Each {B} in the mana costs of permanents you control counts towards your devotion to black.)
 SVar:X:Count$Devotion.Black
 S:Mode$ CantGainLife | ValidPlayer$ Player.Opponent | Description$ Your opponents can't gain life.
 A:AB$ Draw | Cost$ 1 B PayLife<2> | NumCards$ 1 | SpellDescription$ Draw a card.

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

@@ -2,6 +2,6 @@ Name:Escape Artist
 ManaCost:1 U
 Types:Creature Human Wizard
 PT:1/1
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 A:AB$ ChangeZone | Cost$ U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 Oracle:Escape Artist can't be blocked.\n{U}, Discard a card: Return Escape Artist to its owner's hand.

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

@@ -2,6 +2,8 @@ Name:Ethereal Usher
 ManaCost:5 U
 Types:Creature Spirit
 PT:2/3
-A:AB$ Pump | Cost$ U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn.
+A:AB$ Effect | Cost$ U T | ValidTgts$ Creature | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 K:Transmute:1 U U
+DeckHas:Ability$Discard
 Oracle:{U}, {T}: Target creature can't be blocked this turn.\nTransmute {1}{U}{U} ({1}{U}{U}, Discard this card: Search your library for a card with the same mana value as this card, reveal it, put it into your hand, then shuffle. Transmute only as a sorcery.)

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

@@ -2,7 +2,7 @@ Name:Etrata, the Silencer
 ManaCost:2 U B
 Types:Legendary Creature Vampire Assassin
 PT:3/5
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, exile target creature that player controls and put a hit counter on that card. That player loses the game if they own three or more exiled cards with hit counters on them. NICKNAME's owner shuffles NICKNAME into their library.
 SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Creature.ControlledBy TriggeredTarget | TgtPrompt$ Exile target creature that player controls | Origin$ Battlefield | Destination$ Exile | WithCountersType$ HIT | SubAbility$ DBLose
 SVar:DBLose:DB$ LosesGame | Defined$ TriggeredTarget | ConditionCheckSVar$ CheckExile | ConditionSVarCompare$ GE3 | SubAbility$ DBShuffle

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

@@ -37,7 +37,8 @@ SVar:DBAnimateU:DB$ Animate | Defined$ ChosenCard | Colors$ Blue | OverwriteColo
 SVar:NoRegen:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPump13 | SpellDescription$ A creature chosen at random can't be regenerated this turn.
 SVar:DBPump13:DB$ Pump | Defined$ ChosenCard | KW$ HIDDEN CARDNAME can't be regenerated. | SubAbility$ DBCleanup
 SVar:LilSneak:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPump14 | RememberChosen$ True | SpellDescription$ If a creature chosen at random has power 2 or less, it is unblockable this turn.
-SVar:DBPump14:DB$ Pump | ConditionDefined$ Remembered | ConditionPresent$ Card.powerLE2 | Defined$ Remembered | KW$ HIDDEN Unblockable | SubAbility$ DBCleanup
+SVar:DBPump14:DB$ Effect | ConditionDefined$ Remembered | ConditionPresent$ Card.powerLE2 | RememberObjects$ Remembered | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SubAbility$ DBCleanup
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:M2M0:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBPump15 | SpellDescription$ A creature chosen at random gets -2/-0 until end of turn.
 SVar:DBPump15:DB$ Pump | Defined$ ChosenCard | NumAtt$ -2 | SubAbility$ DBCleanup
 SVar:ToHand:DB$ ChooseCard | Choices$ Creature | AtRandom$ True | SubAbility$ DBChangeZone16 | SpellDescription$ Return a creature chosen at random to its owner's hand.

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

@@ -2,7 +2,7 @@ Name:Ferropede
 ManaCost:3
 Types:Artifact Creature Insect
 PT:1/1
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may remove a counter from target permanent.
 SVar:TrigRemoveCounter:DB$ RemoveCounter | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | CounterType$ Any | CounterNum$ 1
 Oracle:Ferropede can't be blocked.\nWhenever Ferropede deals combat damage to a player, you may remove a counter from target permanent.

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

@@ -3,6 +3,7 @@ ManaCost:1 U
 Types:Enchantment Creature Spirit
 PT:1/1
 K:Bestow:5 U
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ Unblockable | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1 and can't be blocked.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddStaticAbility$ Unblockable | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1 and can't be blocked.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Creature.Self
 Oracle:Bestow {5}{U} (If you cast this card for its bestow cost, it's an Aura spell with enchant creature. It becomes a creature again if it's not attached to a creature.)\nFlitterstep Eidolon can't be blocked.\nEnchanted creature gets +1/+1 and can't be blocked.

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

@@ -2,5 +2,6 @@ Name:Frilled Sea Serpent
 ManaCost:4 U U
 Types:Creature Serpent
 PT:4/6
-A:AB$ Pump | Cost$ 5 U U | Defined$ Self | KW$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ 5 U U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 Oracle:{5}{U}{U}: Frilled Sea Serpent can't be blocked this turn.

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

@@ -2,5 +2,7 @@ Name:Frostpeak Yeti
 ManaCost:3 U
 Types:Snow Creature Yeti
 PT:3/3
-A:AB$ Pump | Cost$ 1 S | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ 1 S | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | StackDescription$ CARDNAME can't be blocked this turn. | SpellDescription$ CARDNAME can't be blocked this turn. ({S} can be paid with one mana from a snow source.)
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
+DeckHints:Type$Snow
 Oracle:{1}{S}: Frostpeak Yeti can't be blocked this turn. ({S} can be paid with one mana from a snow source.)

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

@@ -2,6 +2,7 @@ Name:Futurist Operative
 ManaCost:3 U
 Types:Creature Human Ninja
 PT:3/4
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddType$ Human & Citizen | RemoveCreatureTypes$ True | AddHiddenKeyword$ Unblockable | IsPresent$ Card.Self+tapped | Description$ As long as CARDNAME is tapped, it is a Human Citizen with base power and toughness 1/1 and it can't be blocked.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 1 | SetToughness$ 1 | AddType$ Human & Citizen | RemoveCreatureTypes$ True | IsPresent$ Card.Self+tapped | Description$ As long as CARDNAME is tapped, it is a Human Citizen with base power and toughness 1/1 and it can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Card.Self+tapped
 A:AB$ Untap | Cost$ 2 U | SpellDescription$ Untap CARDNAME.
 Oracle:As long as Futurist Operative is tapped, it is a Human Citizen with base power and toughness 1/1 and it can't be blocked.\n{2}{U}: Untap Futurist Operative.

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

@@ -2,10 +2,10 @@ Name:Gateway Sneak
 ManaCost:2 U
 Types:Creature Vedalken Rogue
 PT:1/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Gate.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a Gate enters the battlefield under your control, CARDNAME can't be blocked this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Gate.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigUnblockable | TriggerDescription$ Whenever a Gate enters the battlefield under your control, CARDNAME can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:TrigUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
-SVar:PlayMain1:TRUE
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, draw a card.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:TrigDraw:DB$ Draw
 DeckHints:Type$Gate
 Oracle:Whenever a Gate enters the battlefield under your control, Gateway Sneak can't be blocked this turn.\nWhenever Gateway Sneak deals combat damage to a player, draw a card.

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

@@ -3,7 +3,8 @@ ManaCost:5 U U
 Types:Creature Serpent
 PT:5/6
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each artifact you control.
-A:AB$ Pump | Cost$ 5 U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ 5 U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 SVar:X:Count$Valid Artifact.YouCtrl
 DeckHints:Type$Artifact
 Oracle:This spell costs {1} less to cast for each artifact you control.\n{5}{U}: Gearseeker Serpent can't be blocked this turn.

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

@@ -2,7 +2,7 @@ Name:Ghastlord of Fugue
 ManaCost:UB UB UB UB UB
 Types:Creature Spirit Avatar
 PT:4/4
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigChangeZone | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player reveals their hand. You choose a card from it. That player exiles that card.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TriggeredTarget | Chooser$ You | ChangeType$ Card | ChangeNum$ 1
 Oracle:Ghastlord of Fugue can't be blocked.\nWhenever Ghastlord of Fugue deals combat damage to a player, that player reveals their hand. You choose a card from it. That player exiles that card.

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

@@ -1,6 +1,7 @@
 Name:Ghostform
 ManaCost:1 U
 Types:Sorcery
-A:SP$ Pump | Cost$ 1 U | ValidTgts$ Creature | KW$ HIDDEN Unblockable | AILogic$ Pump | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select up to two target creatures | SpellDescription$ Up to two target creatures can't be blocked this turn.
+A:AB$ Effect | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | TargetMin$ 0 | TargetMax$ 2 | RememberObjects$ Targeted | ForgetOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ SpellDescription | SpellDescription$ Up to two target creatures can't be blocked this turn.
-AI:RemoveDeck:All
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ These creatures can't be blocked this turn.
+SVar:PlayMain1:TRUE
 Oracle:Up to two target creatures can't be blocked this turn.

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

@@ -3,10 +3,11 @@ ManaCost:1 U
 Types:Creature Spirit Rogue
 PT:2/1
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw1 | TriggerDescription$ Whenever CARDNAME becomes untapped, you may pay {2}. If you do, draw a card.
-SVar:TrigDraw1:AB$ Draw | Cost$ 2 | Defined$ You | NumCards$ 1
+SVar:TrigDraw1:AB$ Draw | Cost$ 2
 T:Mode$ SpellCast | ValidCard$ Card.wasNotCastFromTheirHand | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw2 | TriggerDescription$ Whenever an opponent casts a spell from anywhere other than their hand, draw a card.
-SVar:TrigDraw2:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:TrigDraw2:DB$ Draw
 SVar:AIPreference:DiscardCost$Card.cmcLE2
+A:AB$ Effect | Cost$ Discard<1/Card> | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | StackDescription$ SpellDescription | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 DeckHas:Ability$Discard
-A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
 Oracle:Whenever Ghostly Pilferer becomes untapped, you may pay {2}. If you do, draw a card.\nWhenever an opponent casts a spell from anywhere other than their hand, draw a card.\nDiscard a card: Ghostly Pilferer can't be blocked this turn.

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

@@ -3,6 +3,6 @@ ManaCost:1
 Types:Artifact
 S:Mode$ IgnoreHexproof | Activator$ You | ValidEntity$ Creature.OppCtrl | Description$ Creatures your opponents control with hexproof can be the targets of spells and abilities you control as though they didn't have hexproof.
 A:AB$ PumpAll | Cost$ 3 Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl | KW$ Hexproof | SubAbility$ GSEffect | SpellDescription$ Creatures you control gain hexproof until end of turn and can't be blocked this turn.
-SVar:GSEffect:DB$ Effect | Name$ Glaring Spotlight Effect | StaticAbilities$ KWPump
+SVar:GSEffect:DB$ Effect | StaticAbilities$ Unblockable
-SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddHiddenKeyword$ Unblockable | Description$ Creatures you control can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Creature.YouCtrl | Description$ Creatures you control can't be blocked this turn.
 Oracle:Creatures your opponents control with hexproof can be the targets of spells and abilities you control as though they didn't have hexproof.\n{3}, Sacrifice Glaring Spotlight: Creatures you control gain hexproof until end of turn and can't be blocked this turn.

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

@@ -4,6 +4,10 @@ Types:Artifact Creature Golem
 PT:3/4
 K:Cycling:WU
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME gets +1/+1 until end of turn and can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | KW$ HIDDEN Unblockable
+SVar:TrigPump:DB$ Pump | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBUnblockable
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 SVar:BuffedBy:Artifact
+DeckHas:Ability$Discard
+DeckHints:Type$Artifact
 Oracle:Whenever another artifact enters the battlefield under your control, Glassdust Hulk gets +1/+1 until end of turn and can't be blocked this turn.\nCycling {W/U} ({W/U}, Discard this card: Draw a card.)

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

@@ -2,11 +2,11 @@ Name:Goblin Sappers
 ManaCost:1 R
 Types:Creature Goblin
 PT:1/1
-A:AB$ Pump | Cost$ R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ HIDDEN Unblockable | SubAbility$ DelTrigBoth | RememberObjects$ Self | RememberTargets$ True | SpellDescription$ Target creature you control can't be blocked this turn. Destroy it and Goblin Sappers at end of combat.
+A:AB$ Effect | Cost$ R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SubAbility$ DelTrigBoth | StackDescription$ {c:Targeted} can't be blocked this turn. Destroy it and CARDNAME at end of combat. | SpellDescription$ Target creature you control can't be blocked this turn. Destroy it and CARDNAME at end of combat.
-A:AB$ Pump | Cost$ R R R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ HIDDEN Unblockable | SubAbility$ DelTrigFriend | RememberTargets$ True | SpellDescription$ Target creature you control can't be blocked this turn. Destroy it at end of combat.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
-SVar:DelTrigFriend:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy it at end of combat. | RememberObjects$ Remembered | SubAbility$ DBCleanup
+A:AB$ Effect | Cost$ R R R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SubAbility$ DelTrigFriend | StackDescription$ {c:Targeted} can't be blocked this turn. Destroy it at end of combat. | SpellDescription$ Target creature you control can't be blocked this turn. Destroy it at end of combat.
+SVar:DelTrigFriend:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | RememberObjects$ Targeted | Execute$ TrigDestroy | TriggerDescription$ Destroy it at end of combat.
 SVar:TrigDestroy:DB$ Destroy | Defined$ DelayTriggerRememberedLKI
-SVar:DelTrigBoth:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | Execute$ TrigDestroy | TriggerDescription$ Destroy it and CARDNAME at end of combat. | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:DelTrigBoth:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | RememberObjects$ Self,Targeted | Execute$ TrigDestroy | TriggerDescription$ Destroy it and CARDNAME at end of combat.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
 Oracle:{R}{R}, {T}: Target creature you control can't be blocked this turn. Destroy it and Goblin Sappers at end of combat.\n{R}{R}{R}{R}, {T}: Target creature you control can't be blocked this turn. Destroy it at end of combat.

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

@@ -3,6 +3,7 @@ ManaCost:2 R
 Types:Creature Goblin Rogue
 PT:2/2
 K:Haste
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.Other+powerLE2 | TgtPrompt$ Select another target creature with power 2 or less. | KW$ HIDDEN Unblockable | SpellDescription$ Another target creature with power 2 or less can't be blocked this turn.
+A:AB$ Effect | Cost$ T | ValidTgts$ Creature.Other+powerLE2 | TgtPrompt$ Select another target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Another target creature with power 2 or less can't be blocked this turn.
-AI:RemoveDeck:All
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+AI:RemoveDeck:Random
 Oracle:Haste (This creature can attack and {T} as soon as it comes under your control.)\n{T}: Another target creature with power 2 or less can't be blocked this turn.

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

@@ -2,5 +2,6 @@ Name:Goblin Tunneler
 ManaCost:1 R
 Types:Creature Goblin Rogue
 PT:1/1
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less. | KW$ HIDDEN Unblockable | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
+A:AB$ Effect | Cost$ T | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:{T}: Target creature with power 2 or less can't be blocked this turn.

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

@@ -2,6 +2,6 @@ Name:Graxiplon
 ManaCost:5 U
 Types:Creature Beast
 PT:3/4
-S:Mode$ Continuous | Affected$ Card.Self+attacking | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ LT3 | Description$ CARDNAME can't be blocked unless defending player controls three or more creatures that share a creature type.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | CheckSVar$ X | SVarCompare$ LT3 | Description$ CARDNAME can't be blocked unless defending player controls three or more creatures that share a creature type.
 SVar:X:Count$MostProminentCreatureType Creature.DefenderCtrl
 Oracle:Graxiplon can't be blocked unless defending player controls three or more creatures that share a creature type.

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

@@ -2,6 +2,6 @@ Name:Gudul Lurker
 ManaCost:U
 Types:Creature Salamander
 PT:1/1
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 K:Megamorph:U
 Oracle:Gudul Lurker can't be blocked.\nMegamorph {U} (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.)

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

@@ -4,6 +4,7 @@ Types:Creature Orc Rogue
 PT:1/1
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ Pump | Cost$ 3 U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ Cunning Action — CARDNAME can't be blocked this turn.
+A:AB$ Effect | PrecostDesc$ Cunning Action — | Cost$ 3 U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 DeckHas:Ability$Counters
 Oracle:Whenever Guild Thief deals combat damage to a player, put a +1/+1 counter on it.\nCunning Action — {3}{U}: Guild Thief can't be blocked this turn.

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

@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Spirit
 PT:3/3
 K:Disturb:3 U
-S:Mode$ Continuous | Affected$ Card.Self+attacking | AddHiddenKeyword$ Unblockable | IsPresent$ Card.Other+attacking | PresentCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as it's attacking alone.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self+attacking | IsPresent$ Card.Other+attacking | PresentCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as it's attacking alone.
 DeckHas:Ability$Graveyard
 AlternateMode:DoubleFaced
 Oracle:Gutter Skulker can't be blocked as long as it's attacking alone.\nDisturb {3}{U} (You may cast this card from your graveyard transformed for its disturb cost.)
@@ -15,8 +15,8 @@ ManaCost:no cost
 Colors:blue
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Pump
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy+attacking | AddHiddenKeyword$ Unblockable | IsPresent$ Card.attacking | PresentCompare$ EQ1 | Description$ Enchanted creature can't be blocked as long as it's attacking alone.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.EnchantedBy+attacking | IsPresent$ Card.attacking | PresentCompare$ EQ1 | Description$ Enchanted creature can't be blocked as long as it's attacking alone.
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Graveyard | ReplaceWith$ Exile | Description$ If CARDNAME would be put into a graveyard from anywhere, exile it instead.
 SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
 Oracle:Enchant creature\nEnchanted creature can't be blocked as long as it's attacking alone.\nIf Gutter Shortcut would be put into a graveyard from anywhere, exile it instead.

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

@@ -4,6 +4,7 @@ Types:Creature Human Rogue
 PT:1/1
 K:Level up:2 U
 SVar:maxLevel:3
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 2 | SetToughness$ 2 | AddHiddenKeyword$ Unblockable | IsPresent$ Card.Self+counters_GE1_LEVEL+counters_LE2_LEVEL | Description$ LEVEL 1-2 2/2 CARDNAME can't be blocked
+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$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | AddKeyword$ Shroud | AddHiddenKeyword$ Unblockable | IsPresent$ Card.Self+counters_GE3_LEVEL | Description$ LEVEL 3+ 3/3 CARDNAME can't be blocked and has Shroud
+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.
 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.

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

@@ -5,5 +5,6 @@ PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control an Island.
 SVar:X:Count$Valid Island.YouCtrl
 SVar:BuffedBy:Island
-A:AB$ Pump | Cost$ 1 U | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+A:AB$ Effect | Cost$ 1 U | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 Oracle:Harbor Bandit gets +1/+1 as long as you control an Island.\n{1}{U}: Harbor Bandit can't be blocked this turn.

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

@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Illusion
 PT:2/1
 K:Vigilance
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can't be blocked as long as you've cast an instant or sorcery spell this turn.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can't be blocked as long as you've cast an instant or sorcery spell this turn.
 SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl
 SVar:BuffedBy:Instant,Sorcery
 DeckHints:Type$Instant|Sorcery

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

@@ -2,7 +2,5 @@ Name:Hazy Homunculus
 ManaCost:1 U
 Types:Creature Homunculus Illusion
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can't be blocked as long as defending player controls an untapped land.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Land.DefenderCtrl+untapped | Description$ CARDNAME can't be blocked as long as defending player controls an untapped land.
-SVar:X:Count$Valid Land.DefenderCtrl+untapped
-AI:RemoveDeck:All
 Oracle:Hazy Homunculus can't be blocked as long as defending player controls an untapped land.

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

@@ -1,8 +1,9 @@
 Name:Hearth Charm
 ManaCost:R
 Types:Instant
-A:SP$ Charm | Cost$ R | Choices$ DBDestroy,DBPumpAll,DBPump | CharmNum$ 1
+A:SP$ Charm | Choices$ DBDestroy,DBPumpAll,DBUnblockable
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature | SpellDescription$ Destroy target artifact creature.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking | NumAtt$ +1 | SpellDescription$ Attacking creatures get +1/+0 until end of turn.
-SVar:DBPump:DB$ Pump | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | KW$ HIDDEN Unblockable | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
+SVar:DBUnblockable:DB$ Effect | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:Choose one —\n• Destroy target artifact creature.\n• Attacking creatures get +1/+0 until end of turn.\n• Target creature with power 2 or less can't be blocked this turn.

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

@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Legendary Enchantment Creature God
 PT:5/6
 K:Indestructible
-S:Mode$ Continuous | Affected$ Card.Self | RemoveType$ Creature | CheckSVar$ X | SVarCompare$ LT5 | Description$ As long as your devotion to white is less than 5, CARDNAME isn't a creature. (Each {W} in the mana costs of permanents you control counts towards your devotion to white.)
+S:Mode$ Continuous | Affected$ Card.Self | RemoveType$ Creature | CheckSVar$ X | SVarCompare$ LT5 | Description$ As long as your devotion to white is less than 5, NICKNAME isn't a creature. (Each {W} in the mana costs of permanents you control counts towards your devotion to white.)
 SVar:X:Count$Devotion.White
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddKeyword$ Vigilance | Description$ Other creatures you control have vigilance.
 A:AB$ Token | Cost$ 2 W W | TokenAmount$ 1 | TokenScript$ w_2_1_e_cleric | TokenOwner$ You | SpellDescription$ Create a 2/1 white Cleric enchantment creature token.

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

@@ -2,5 +2,6 @@ Name:Herald of Secret Streams
 ManaCost:3 U
 Types:Creature Merfolk Warrior
 PT:2/3
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddHiddenKeyword$ Unblockable | Description$ Creatures you control with +1/+1 counters on them can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.YouCtrl+counters_GE1_P1P1 | Description$ Creatures you control with +1/+1 counters on them can't be blocked.
+DeckNeeds:Ability$Counters
 Oracle:Creatures you control with +1/+1 counters on them can't be blocked.

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

@@ -5,6 +5,7 @@ PT:3/4
 K:Ninjutsu:2 U U
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigSearch | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may search your library for a Ninja card, reveal it, put it into your hand, then shuffle.
 SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Ninja | ChangeNum$ 1 | ShuffleNonMandatory$ True
-A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature.Ninja | KW$ HIDDEN Unblockable | SpellDescription$ Target Ninja creature can't be blocked this turn. | TgtPrompt$ Select target Ninja creature
+A:AB$ Effect | Cost$ 2 | ValidTgts$ Creature.Ninja | TgtPrompt$ Select target Ninja creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target Ninja creature can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 DeckHints:Type$Ninja
 Oracle:Ninjutsu {2}{U}{U} ({2}{U}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nWhenever Higure, the Still Wind deals combat damage to a player, you may search your library for a Ninja card, reveal it, put it into your hand, then shuffle.\n{2}: Target Ninja creature can't be blocked this turn.

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

@@ -2,7 +2,7 @@ Name:Hooded Horror
 ManaCost:4 B
 Types:Creature Horror
 PT:4/4
-S:Mode$ Continuous | Affected$ Card.Self+attacking | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ EQY | Description$ CARDNAME can't be blocked as long as defending player controls the most creatures or is tied for the most.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self+attacking | CheckSVar$ X | SVarCompare$ EQY | Description$ CARDNAME can't be blocked as long as defending player controls the most creatures or is tied for the most.
 SVar:X:Count$Valid Creature.DefenderCtrl
 SVar:Y:PlayerCountPlayers$HighestValid Creature.YouCtrl
 Oracle:Hooded Horror can't be blocked as long as defending player controls the most creatures or is tied for the most.

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

@@ -2,7 +2,8 @@ Name:Hot Soup
 ManaCost:1
 Types:Artifact Equipment
 K:Equip:3
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ HotSoupDestroy | AddHiddenKeyword$ Unblockable | Description$ Equipped creature can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.EquippedBy | Description$ Equipped creature can't be blocked.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ HotSoupDestroy
 SVar:HotSoupDestroy:SVar:DestroyWhenDamaged:True
 T:Mode$ DamageDoneOnce | ValidTarget$ Creature.EquippedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When equipped creature is dealt damage, destroy it.
 SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTargetLKICopy

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

@@ -2,7 +2,7 @@ Name:Hunted Phantasm
 ManaCost:1 U U
 Types:Creature Spirit
 PT:4/6
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, target opponent creates five 1/1 red Goblin creature tokens.
 SVar:TrigToken:DB$ Token | TokenAmount$ 5 | TokenScript$ r_1_1_goblin | ValidTgts$ Opponent | TokenOwner$ Targeted
 Oracle:Hunted Phantasm can't be blocked.\nWhen Hunted Phantasm enters the battlefield, target opponent creates five 1/1 red Goblin creature tokens.

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

@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Legendary Creature Human Rogue Wizard
 PT:2/1
 K:Specialize:5::This ability costs {3} less to activate if there are two or more instant and/or sorcery cards in your graveyard.:ReduceCost$ X
-S:Mode$ Continuous | Affected$ Card.Self+attacking | AddHiddenKeyword$ Unblockable | IsPresent$ Card.Other+attacking | PresentCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as it's attacking alone.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self+attacking | IsPresent$ Card.Other+attacking | PresentCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as it's attacking alone.
 SVar:X:Count$Compare Y GE2.3.0
 SVar:Y:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
 DeckHas:Ability$Discard
@@ -17,7 +17,7 @@ Name:Imoen, Honorable Trickster
 ManaCost:1 W U
 Types:Legendary Creature Human Rogue Wizard
 PT:3/2
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ DamageDone | ValidSource$ Card.Self | OptionalDecider$ You | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, you may exile an instant or sorcery card from your graveyard. If you do, put a +1/+1 counter on each creature you control.
 SVar:TrigCounter:AB$ PutCounterAll | Cost$ ExileFromGrave<1/Instant;Sorcery/instant or sorcery> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
@@ -30,7 +30,7 @@ Name:Imoen, Wily Trickster
 ManaCost:1 U U
 Types:Legendary Creature Human Rogue Wizard
 PT:3/2
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigImmTrigger | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, you may exile an instant or sorcery card from your graveyard. When you do, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigImmTrigger:AB$ ImmediateTrigger | Cost$ ExileFromGrave<1/Instant;Sorcery/instant or sorcery> | Execute$ TrigTap | Secondary$ True | TriggerDescription$ When you do, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPromopt$ Select target creature an opponent controls | SubAbility$ DBPump
@@ -44,7 +44,7 @@ Name:Imoen, Occult Trickster
 ManaCost:1 U B
 Types:Legendary Creature Human Rogue Wizard
 PT:3/2
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ DamageDone | ValidSource$ Card.Self | OptionalDecider$ You | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, you may exile an instant or sorcery card from your graveyard. If you do, create a 2/2 black Zombie creature token.
 SVar:TrigToken:AB$ Token | Cost$ ExileFromGrave<1/Instant;Sorcery/instant or sorcery> | TokenScript$ b_2_2_zombie
 DeckHas:Ability$Token & Type$Zombie
@@ -57,7 +57,7 @@ Name:Imoen, Chaotic Trickster
 ManaCost:1 U R
 Types:Legendary Creature Human Rogue Wizard
 PT:3/2
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, you may exile an instant or sorcery card from your graveyard. If you do, NICKNAME deals 2 damage to each opponent.
 SVar:TrigDamage:AB$ DealDamage | Cost$ ExileFromGrave<1/Instant;Sorcery/instant or sorcery> | Defined$ Opponent | NumDmg$ 2
 DeckHints:Ability$Graveyard & Type$Instant|Sorcery
@@ -69,7 +69,7 @@ Name:Imoen, Wise Trickster
 ManaCost:1 G U
 Types:Legendary Creature Human Rogue Wizard
 PT:3/2
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 T:Mode$ DamageDone | ValidSource$ Card.Self | OptionalDecider$ You | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, you may exile an instant or sorcery card from your graveyard. If you do, draw a card and you may play an additional land this turn.
 SVar:TrigDraw:AB$ Draw | Cost$ ExileFromGrave<1/Instant;Sorcery/instant or sorcery> | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Exploration

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

@@ -3,7 +3,9 @@ ManaCost:1 U
 Types:Creature Human Wizard
 PT:1/3
 T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | CheckSVar$ YouCastThisTurn | SVarCompare$ EQ2 | NoResolvingCheck$ True | TriggerDescription$ Whenever you cast your second spell each turn, CARDNAME gets +2/+0 until end of turn and can't be blocked this turn.
-SVar:TrigPump:DB$ Pump | NumAtt$ +2 | KW$ HIDDEN Unblockable | Defined$ Self
+SVar:TrigPump:DB$ Pump | NumAtt$ +2 | SubAbility$ DBUnblockable
+SVar:DBUnblockable:DB$ Effect | RememberObjects$ Self | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
 SVar:YouCastThisTurn:Count$ThisTurnCast_Card.YouCtrl
 SVar:BuffedBy:Card
 Oracle:Whenever you cast your second spell each turn, Incursion Specialist gets +2/+0 until end of turn and can't be blocked this turn.

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

@@ -1,5 +1,6 @@
 Name:Infiltrate
 ManaCost:U
 Types:Instant
-A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn.
+A:SP$ Effect | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 Oracle:Target creature can't be blocked this turn.

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

@@ -2,6 +2,6 @@ Name:Inkfathom Infiltrator
 ManaCost:UB UB
 Types:Creature Merfolk Rogue
 PT:2/1
-K:CARDNAME can't block.
+S:Mode$ CantBlockBy | ValidBlocker$ Creature.Self | Description$ CARDNAME can't block and can't be blocked.
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self
 Oracle:Inkfathom Infiltrator can't block and can't be blocked.

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

@@ -3,5 +3,5 @@ ManaCost:1 U
 Types:Creature Human Rogue
 PT:1/1
 K:Hexproof
-K:Unblockable
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
 Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\nInvisible Stalker can't be blocked.

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

@@ -4,8 +4,9 @@ Types:Legendary Planeswalker Jace
 Loyalty:4
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw your second card each turn, put a +1/+1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | SpellDescription$ Draw a card.
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | StaticAbilities$ Unblockable | SpellDescription$ Creatures you control can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Creature.YouCtrl | Description$ Creatures you control can't be blocked this turn.
 AI:RemoveDeck:Random
 DeckHas:Ability$Counters
-A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 1 | Defined$ You | SpellDescription$ Draw a card.
-A:AB$ PumpAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | KW$ HIDDEN Unblockable | SpellDescription$ Creatures you control can't be blocked this turn.
 Oracle:Whenever you draw your second card each turn, put a +1/+1 counter on target creature you control.\n[+1]: Draw a card.\n[-7]: Creatures you control can't be blocked this turn.

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

@@ -2,6 +2,8 @@ Name:Jace's Sentinel
 ManaCost:1 U
 Types:Creature Merfolk Warrior
 PT:1/3
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | AddPower$ 1 | IsPresent$ Planeswalker.Jace+YouCtrl | Description$ As long as you control a Jace planeswalker, CARDNAME gets +1/+0 and can't be blocked.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | IsPresent$ Planeswalker.Jace+YouCtrl | Description$ As long as you control a Jace planeswalker, CARDNAME gets +1/+0 and can't be blocked.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Planeswalker.Jace+YouCtrl
 SVar:BuffedBy:Jace
+DeckNeeds:Type$Jace
 Oracle:As long as you control a Jace planeswalker, Jace's Sentinel gets +1/+0 and can't be blocked.

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

@@ -2,9 +2,8 @@ Name:Jeskai Infiltrator
 ManaCost:2 U
 Types:Creature Human Monk
 PT:2/3
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as you control no other creatures.
+S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | IsPresent$ Creature.YouCtrl+Other | PresentCompare$ EQ0 | Description$ CARDNAME can't be blocked as long as you control no other creatures.
-SVar:X:Count$Valid Creature.YouCtrl+Other
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ When CARDNAME deals combat damage to a player, exile it and the top card of your library in a face-down pile, shuffle that pile, then manifest those cards. (To manifest a card, put it onto the battlefield face down as a 2/2 creature. You may turn it face up at any time for its mana cost if it is a creature card.)
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, exile it and the top card of your library in a face-down pile, shuffle that pile, then manifest those cards. (To manifest a card, put it onto the battlefield face down as a 2/2 creature. You may turn it face up at any time for its mana cost if it is a creature card.)
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBExileTopCard
 SVar:DBExileTopCard:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | ExileFaceDown$ True | SubAbility$ DBManifest
 SVar:DBManifest:DB$ Manifest | Amount$ 2 | Defined$ Remembered | Shuffle$ True