- Added Fearsome Temper

.gitattributes

@@ -4438,6 +4438,7 @@ forge-gui/res/cardsfolder/f/favorable_destiny.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/f/favorable_winds.txt -text
 forge-gui/res/cardsfolder/f/favored_hoplite.txt -text
 forge-gui/res/cardsfolder/f/fear.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/f/fearsome_temper.txt -text
 forge-gui/res/cardsfolder/f/feast_of_blood.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/f/feast_of_flesh.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/f/feast_of_the_unicorn.txt svneol=native#text/plain

forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java

@@ -78,6 +78,9 @@ public class PumpEffect extends SpellAbilityEffect {
                 game.getUpkeep().addUntil(sa.getActivatingPlayer(), untilEOT);
             } else if (sa.hasParam("UntilHostLeavesPlay")) {
                 sa.getSourceCard().addLeavesPlayCommand(untilEOT);
+            } else if (sa.hasParam("UntilHostLeavesPlayOrEOT")) {
+                sa.getSourceCard().addLeavesPlayCommand(untilEOT);
+                game.getEndOfTurn().addUntil(untilEOT);
             } else if (sa.hasParam("UntilLoseControlOfHost")) {
                 sa.getSourceCard().addLeavesPlayCommand(untilEOT);
                 sa.getSourceCard().addChangeControllerCommand(untilEOT);
@@ -200,12 +203,16 @@ public class PumpEffect extends SpellAbilityEffect {
         tgts.addAll(tgtCards);
         tgts.addAll(tgtPlayers);
 
-        if (sa.hasParam("DefinedChosenKW")) {
+        if (sa.hasParam("DefinedKW")) {
-            if (sa.getParam("DefinedChosenKW").equals("Type")) {
+            String defined = sa.getParam("DefinedKW");
-                final String t = host.getChosenType();
+            String replaced = "";
-                for (int i = 0; i < keywords.size(); i++) {
+            if (defined.equals("ChosenType")) {
-                    keywords.set(i, keywords.get(i).replaceAll("ChosenType", t));
+                replaced = host.getChosenType();
-                }
+            } else if (defined.equals("CardUIDSource")) {
+                replaced = "CardUID_" + String.valueOf(host.getUniqueNumber());
+            }
+            for (int i = 0; i < keywords.size(); i++) {
+                keywords.set(i, keywords.get(i).replaceAll(defined, replaced));
             }
         }
         if (sa.hasParam("DefinedLandwalk")) {

forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java

@@ -49,7 +49,7 @@ public class SacrificeAllEffect extends SpellAbilityEffect {
         if (sa.hasParam("Defined")) {
             list = new ArrayList<Card>(AbilityUtils.getDefinedCards(sa.getSourceCard(), sa.getParam("Defined"), sa));
         } else {
-            list = game.getCardsIn(ZoneType.Battlefield);
+            list = AbilityUtils.filterListByType(game.getCardsIn(ZoneType.Battlefield), valid, sa);
         }
 
         final boolean remSacrificed = sa.hasParam("RememberSacrificed");
@@ -57,8 +57,6 @@ public class SacrificeAllEffect extends SpellAbilityEffect {
             card.clearRemembered();
         }
 
-        list = AbilityUtils.filterListByType(list, valid, sa);
-
         for (int i = 0; i < list.size(); i++) {
             if (game.getAction().sacrifice(list.get(i), sa) && remSacrificed) {
                 card.addRemembered(list.get(i));

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

@@ -1918,13 +1918,11 @@ public class Card extends GameEntity implements Comparable<Card> {
     public final String keywordsToText(final ArrayList<String> keywords) {
         final StringBuilder sb = new StringBuilder();
         final StringBuilder sbLong = new StringBuilder();
-        final StringBuilder sbMana = new StringBuilder();
 
         for (int i = 0; i < keywords.size(); i++) {
             String keyword = keywords.get(i);
             if (keyword.startsWith("Permanents don't untap during their controllers' untap steps")
                     || keyword.startsWith("PreventAllDamageBy")
-                    || keyword.startsWith("CantBlock")
                     || keyword.startsWith("CantEquip")
                     || keyword.startsWith("SpellCantTarget")) {
                 continue;
@@ -2020,8 +2018,6 @@ public class Card extends GameEntity implements Comparable<Card> {
             } else if (keyword.contains("At the beginning of your upkeep, ")
                     && keyword.contains(" unless you pay")) {
                 sbLong.append(keyword.toString()).append("\r\n");
-            } else if (keyword.toString().contains("tap: add ")) {
-                sbMana.append(keyword.toString()).append("\r\n");
             } else if (keyword.startsWith("Modular") || keyword.startsWith("Soulshift") || keyword.startsWith("Bloodthirst")
                     || keyword.startsWith("ETBReplacement") || keyword.startsWith("MayEffectFromOpeningHand")) {
                 continue;
@@ -2070,6 +2066,14 @@ public class Card extends GameEntity implements Comparable<Card> {
                     sbLong.append(getTextForKwCantBeBlockedByAmount(keyword));
                 else
                     sbLong.append(getTextForKwCantBeBlockedByType(keyword));
+            } else if (keyword.startsWith("CantBlock")) {
+                sbLong.append(this.getName()).append(" can't block ");
+                if (keyword.contains("CardUID")) {
+                    sbLong.append("CardID (").append(Integer.valueOf(keyword.split("CantBlockCardUID_")[1])).append(")");
+                } else {
+                    final String[] k = keyword.split(":");
+                    sbLong.append(k.length > 1 ? k[1] + ".\r\n" : "");
+                }
             } else if (keyword.equals("Unblockable")) {
                 sbLong.append(this.getName()).append(" can't be blocked.\r\n");
             }
@@ -2090,7 +2094,6 @@ public class Card extends GameEntity implements Comparable<Card> {
             sbLong.append("\r\n");
         }
         sb.append(sbLong);
-        sb.append(sbMana);
 
         return sb.toString();
     }

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

@@ -600,19 +600,6 @@ public class CombatUtil {
             return false;
         }
 
-//        if (blocker.hasStartOfKeyword("CARDNAME can't block ")) {
-//            for (final String kw : blocker.getKeyword()) {
-//                if (kw.startsWith("CARDNAME can't block ")) {
-//                    final String unblockableCard = kw.substring(21);
-//                    final int id = Integer.parseInt(unblockableCard.substring(unblockableCard.lastIndexOf("(") + 1,
-//                            unblockableCard.length() - 1));
-//                    if (attacker.getUniqueNumber() == id) {
-//                        return false;
-//                    }
-//                }
-//            }
-//        }
-
         // rare case:
         if (blocker.hasKeyword("Shadow")
                 && blocker.hasKeyword("CARDNAME can block creatures with shadow as though they didn't have shadow.")) {
@@ -645,10 +632,18 @@ public class CombatUtil {
         if (blocker.hasStartOfKeyword("CantBlock")) {
             final int keywordPosition = blocker.getKeywordPosition("CantBlock");
             final String parse = blocker.getKeyword().get(keywordPosition).toString();
-            final String[] k = parse.split(" ", 2);
+            if (parse.startsWith("CantBlockCardUID")) {
-            final String[] restrictions = k[1].split(",");
+                final String[] k = parse.split("_", 2);
-            if (attacker.isValid(restrictions, blocker.getController(), blocker)) {
+                if (attacker.getUniqueNumber() == Integer.parseInt(k[1])) {
-                return false;
+                    return false;
+                }
+            } else {
+                final String[] parse0 = parse.split(":");
+                final String[] k = parse0[0].split(" ", 2);
+                final String[] restrictions = k[1].split(",");
+                if (attacker.isValid(restrictions, blocker.getController(), blocker)) {
+                    return false;
+                }
             }
         }
 

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

@@ -3,6 +3,6 @@ ManaCost:1 G
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Hexproof & CantBeBlockedByAmount GT1 | Description$ Enchanted creature has hexproof and can't be blocked by more than one creature.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Hexproof | AddHiddenKeyword$ CantBeBlockedByAmount GT1 | Description$ Enchanted creature has hexproof and can't be blocked by more than one creature.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/alpha_authority.jpg
 Oracle:Enchant creature\nEnchanted creature has hexproof and can't be blocked by more than one creature.

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

@@ -2,11 +2,7 @@ Name:Auriok Siege Sled
 ManaCost:6
 Types:Artifact Creature Juggernaut
 PT:3/5
-A:AB$ Pump | Cost$ 1 | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBPump | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target artifact creature can't block CARDNAME this turn.
+A:AB$ Pump | Cost$ 1 | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature that can't block this creature this turn | IsCurse$ True | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target artifact creature can't block CARDNAME this turn.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN CantBeBlockedBy Creature.IsRemembered | StackDescription$ None
-T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ MustBlock | Cost$ 1 | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature to block this creature | SpellDescription$ Target artifact creature blocks CARDNAME this turn if able.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/auriok_siege_sled.jpg

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

@@ -2,7 +2,7 @@ Name:Boldwyr Intimidator
 ManaCost:5 R R
 Types:Creature Giant Warrior
 PT:5/5
-S:Mode$ Continuous | Affected$ Creature.Coward | AddKeyword$ CantBlock Creature.Warrior | Description$ Cowards can't block Warriors.
+S:Mode$ Continuous | Affected$ Creature.Coward | AddHiddenKeyword$ CantBlock Creature.Warrior:Warriors | Description$ Cowards can't block Warriors.
 A:AB$ Animate | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ Coward | RemoveCreatureTypes$ True | SpellDescription$ Target creature becomes a Coward until end of turn.
 A:AB$ Animate | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ Warrior | RemoveCreatureTypes$ True | SpellDescription$ Target creature becomes a Warrior until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boldwyr_intimidator.jpg

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

@@ -1,8 +1,7 @@
 Name:Brassclaw Orcs
 ManaCost:2 R
 Types:Creature Orc
-Text:CARDNAME can't block creatures with power 2 or greater.
 PT:3/2
-K:CantBlock Creature.powerGE2
+K:CantBlock Creature.powerGE2:creatures with power 2 or greater
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brassclaw_orcs.jpg
 Oracle:Brassclaw Orcs can't block creatures with power 2 or greater.

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

@@ -3,11 +3,7 @@ ManaCost:2 R G
 Types:Creature Viashino Berserker
 PT:2/2
 K:Bloodthirst 1
-A:AB$ Pump | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBPump | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
+A:AB$ Pump | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN CantBeBlockedBy Creature.IsRemembered | StackDescription$ None
-T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ MustBlock | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature that must block this creature this turn | SpellDescription$ Target creature blocks CARDNAME this turn if able.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/burning_tree_bloodscale.jpg

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

@@ -1,9 +1,8 @@
 Name:Cyclops Tyrant
 ManaCost:5 R
 Types:Creature Cyclops
-Text:CARDNAME can't block creatures with power 2 or less.
 PT:3/4
-K:CantBlock Creature.powerLE2
+K:CantBlock Creature.powerLE2:creatures with power 2 or less
 K:Intimidate
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cyclops_tyrant.jpg
 Oracle:Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.)\nCyclops Tyrant can't block creatures with power 2 or less.

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

@@ -2,11 +2,7 @@ Name:Duct Crawler
 ManaCost:R
 Types:Creature Insect
 PT:1/1
-A:AB$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBPump | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
+A:AB$ Pump | Cost$ 1 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN CantBeBlockedBy Creature.IsRemembered | StackDescription$ None
-T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/duct_crawler.jpg
 Oracle:{1}{R}: Target creature can't block Duct Crawler this turn.

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

@@ -3,6 +3,6 @@ ManaCost:R
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddKeyword$ CantBeBlockedBy Creature.withFlying | Description$ Enchanted creature gets +2/+0 and can't be blocked by creatures with flying.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddHiddenKeyword$ CantBeBlockedBy Creature.withFlying | Description$ Enchanted creature gets +2/+0 and can't be blocked by creatures with flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dust_corona.jpg
 Oracle:Enchant creature\nEnchanted creature gets +2/+0 and can't be blocked by creatures with flying.

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

@@ -0,0 +1,9 @@
+Name:Fearsome Temper
+ManaCost:2 R
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddAbility$ CantBlockFT | Description$ Enchanted creature gets +2/+2 and has "{2}{R}: Target creature can't block this creature this turn."
+SVar:CantBlockFT:AB$ Pump | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/fearsome_temper.jpg
+Oracle:Enchant creature\nEnchanted creature gets +2/+2 and has "{2}{R}: Target creature can't block this creature this turn."

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

@@ -1,8 +1,7 @@
 Name:Gibbering Hyenas
 ManaCost:2 G
 Types:Creature Hyena
-Text:CARDNAME can't block black creatures.
 PT:3/2
-K:CantBlock Creature.Black
+K:CantBlock Creature.Black:black creatures
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gibbering_hyenas.jpg
 Oracle:Gibbering Hyenas can't block black creatures.

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

@@ -1,10 +1,9 @@
 Name:Goblin Mutant
 ManaCost:2 R R
 Types:Creature Goblin Mutant
-Text:CARDNAME can't block creatures with power 3 or greater.
 PT:5/3
 K:Trample
 K:CARDNAME can't attack if defending player controls an untapped creature with power 3 or greater.
-K:CantBlock Creature.powerGE3
+K:CantBlock Creature.powerGE3:creatures with power 3 or greater
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_mutant.jpg
 Oracle:Trample\nGoblin Mutant can't attack if defending player controls an untapped creature with power 3 or greater.\nGoblin Mutant can't block creatures with power 3 or greater.

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

@@ -2,6 +2,6 @@ Name:Gruul Nodorog
 ManaCost:4 G G
 Types:Creature Beast
 PT:4/4
-A:AB$ Pump | Cost$ R | KW$ CantBeBlockedByAmount LT2 | SpellDescription$ CARDNAME can't be blocked this turn except by two or more creatures.
+A:AB$ Pump | Cost$ R | KW$ HIDDEN CantBeBlockedByAmount LT2 | SpellDescription$ CARDNAME can't be blocked this turn except by two or more creatures.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_nodorog.jpg
 Oracle:{R}: Gruul Nodorog can't be blocked this turn except by two or more creatures.

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

@@ -1,8 +1,7 @@
 Name:Hunted Ghoul
 ManaCost:B
 Types:Creature Zombie
-Text:CARDNAME can't block Humans.
 PT:1/2
-K:CantBlock Creature.Human
+K:CantBlock Creature.Human:Humans
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hunted_ghoul.jpg
 Oracle:Hunted Ghoul can't block Humans.

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

@@ -5,6 +5,6 @@ PT:2/2
 K:Cumulative upkeep:U
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCL | TriggerDescription$ At the beginning of your upkeep, choose a land type. CARDNAME gains landwalk of the chosen type until end of turn.
 SVar:TrigCL:AB$ ChooseType | Cost$ 0 | Defined$ You | Type$ Land | AILogic$ ChosenLandwalk | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | KW$ ChosenTypewalk | DefinedChosenKW$ Type
+SVar:DBPump:DB$ Pump | KW$ ChosenTypewalk | DefinedKW$ ChosenType
 SVar:Picture:http://www.wizards.com/global/images/magic/general/illusionary_presence.jpg
 Oracle:Cumulative upkeep {U} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nAt the beginning of your upkeep, choose a land type. Illusionary Presence gains landwalk of the chosen type until end of turn.

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

@@ -1,9 +1,8 @@
 Name:Ironclaw Buzzardiers
 ManaCost:2 R
 Types:Creature Orc Scout
-Text:CARDNAME can't block creatures with power 2 or greater.
 PT:2/2
-K:CantBlock Creature.powerGE2
+K:CantBlock Creature.powerGE2:creatures with power 2 or greater
 A:AB$ Pump | Cost$ R | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ironclaw_buzzardiers.jpg
 Oracle:Ironclaw Buzzardiers can't block creatures with power 2 or greater.\n{R}: Ironclaw Buzzardiers gains flying until end of turn.

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

@@ -3,7 +3,7 @@ ManaCost:R
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ -1 | AddHiddenKeyword$ CantBlock Creature.powerGEIronclawX | AddSVar$ IronclawX | Description$ Enchanted creature gets -0/-1 and can't block creatures with power equal to or greater than the enchanted creature's toughness.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ -1 | AddHiddenKeyword$ CantBlock Creature.powerGEIronclawX:creatures with power equal to or greater than the enchanted creature's toughness | AddSVar$ IronclawX | Description$ Enchanted creature gets -0/-1 and can't block creatures with power equal to or greater than the enchanted creature's toughness.
-SVar:IronclawX:Count$CardPower
+SVar:IronclawX:Count$CardToughness
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ironclaw_curse.jpg
 Oracle:Enchant creature\nEnchanted creature gets -0/-1.\nEnchanted creature can't block creatures with power equal to or greater than the enchanted creature's toughness.

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

@@ -1,8 +1,7 @@
 Name:Ironclaw Orcs
 ManaCost:1 R
 Types:Creature Orc
-Text:CARDNAME can't block creatures with power 2 or greater.
 PT:2/2
-K:CantBlock Creature.powerGE2
+K:CantBlock Creature.powerGE2:creatures with power 2 or greater
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ironclaw_orcs.jpg
 Oracle:Ironclaw Orcs can't block creatures with power 2 or greater.

forge-gui/res/cardsfolder/k/kruin_outlaw_terror_of_kruin_pass.txt

@@ -17,7 +17,7 @@ Colors:red
 Types:Creature Werewolf
 PT:3/3
 K:Double Strike
-S:Mode$ Continuous | Affected$ Werewolf.YouCtrl | AddKeyword$ CantBeBlockedByAmount LT2 | Description$ Each Werewolf you control can't be blocked except by two or more creatures.
+S:Mode$ Continuous | Affected$ Werewolf.YouCtrl | AddHiddenKeyword$ CantBeBlockedByAmount LT2 | Description$ Each Werewolf you control can't be blocked except by two or more creatures.
 T:Mode$Phase | Phase$ Upkeep | WerewolfUntransformCondition$ True | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of each upkeep, if a player cast two or more spells last turn, transform CARDNAME.
 SVar:TrigTransform:AB$SetState | Cost$ 0 | Defined$ Self | Mode$ Transform
 SVar:Picture:http://www.wizards.com/global/images/magic/general/terror_of_kruin_pass.jpg

forge-gui/res/cardsfolder/l/legion_loyalist.txt

@@ -4,7 +4,7 @@ Types:Creature Goblin Soldier
 PT:1/1
 K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | TriggerDescription$ Battalion - Whenever CARDNAME and at least two other creatures attack, creatures you control gain first strike and trample until end of turn and can't be blocked by creature tokens this turn.
-SVar:TrigPump:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ First Strike & Trample & CantBeBlockedBy Creature.token
+SVar:TrigPump:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ First Strike & Trample & HIDDEN CantBeBlockedBy Creature.token
 SVar:BattalionTest:Count$Valid Creature.attacking+Other
 SVar:Picture:http://www.wizards.com/global/images/magic/general/legion_loyalist.jpg
 Oracle:Haste\nBattalion - Whenever Legion Loyalist and at least two other creatures attack, creatures you control gain first strike and trample until end of turn and can't be blocked by creature tokens this turn.

forge-gui/res/cardsfolder/o/orcish_veteran.txt

@@ -1,9 +1,8 @@
 Name:Orcish Veteran
 ManaCost:2 R
 Types:Creature Orc
-Text:CARDNAME can't block white creatures with power 2 or greater.
 PT:2/2
-K:CantBlock Creature.White+powerGE2
+K:CantBlock Creature.White+powerGE2:white creatures with power 2 or greater
 A:AB$ Pump | Cost$ R | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_veteran.jpg
 Oracle:Orcish Veteran can't block white creatures with power 2 or greater.\n{R}: Orcish Veteran gains first strike until end of turn.

forge-gui/res/cardsfolder/o/orgg.txt

@@ -1,10 +1,9 @@
 Name:Orgg
 ManaCost:3 R R
 Types:Creature Orgg
-Text:CARDNAME can't block creatures with power 3 or greater.
 PT:6/6
 K:Trample
 K:CARDNAME can't attack if defending player controls an untapped creature with power 3 or greater.
-K:CantBlock Creature.powerGE3
+K:CantBlock Creature.powerGE3:creatures with power 3 or greater
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orgg.jpg
 Oracle:Trample\nOrgg can't attack if defending player controls an untapped creature with power 3 or greater.\nOrgg can't block creatures with power 3 or greater.

forge-gui/res/cardsfolder/p/pyreheart_wolf.txt

@@ -4,6 +4,6 @@ Types:Creature Wolf
 PT:1/1
 K:Undying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, each creature you control can't be blocked this turn except by two or more creatures.
-SVar:TrigPump:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ CantBeBlockedByAmount LT2
+SVar:TrigPump:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | KW$ HIDDEN CantBeBlockedByAmount LT2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pyreheart_wolf.jpg
 Oracle:Whenever Pyreheart Wolf attacks, each creature you control can't be blocked this turn except by two or more creatures.\nUndying (When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it.)

forge-gui/res/cardsfolder/s/sabertooth_alley_cat.txt

@@ -3,6 +3,6 @@ ManaCost:1 R R
 Types:Creature Cat
 PT:2/1
 K:CARDNAME attacks each turn if able.
-A:AB$ Pump | Cost$ 1 R | KW$ CantBeBlockedBy Creature.withoutDefender | SpellDescription$ Creatures without defender can't block CARDNAME this turn.
+A:AB$ Pump | Cost$ 1 R | KW$ HIDDEN CantBeBlockedBy Creature.withoutDefender | SpellDescription$ Creatures without defender can't block CARDNAME this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sabertooth_alley_cat.jpg
 Oracle:Sabertooth Alley Cat attacks each turn if able.\n{1}{R}: Creatures without defender can't block Sabertooth Alley Cat this turn.

forge-gui/res/cardsfolder/s/screeching_griffin.txt

@@ -3,11 +3,7 @@ ManaCost:3 W
 Types:Creature Griffin
 PT:2/2
 K:Flying
-A:AB$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBPump | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
+A:AB$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | IsCurse$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN CantBeBlockedBy Creature.IsRemembered | StackDescription$ None
-T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/screeching_griffin.jpg
 Oracle:Flying\n{R}: Target creature can't block Screeching Griffin this turn.

forge-gui/res/cardsfolder/s/searing_spear_askari.txt

@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Human Knight
 PT:2/2
 K:Flanking
-A:AB$ Pump | Cost$ 1 R | KW$ CantBeBlockedByAmount LT2 | SpellDescription$ CARDNAME can't be blocked except by two or more creatures this turn.
+A:AB$ Pump | Cost$ 1 R | KW$ HIDDEN CantBeBlockedByAmount LT2 | SpellDescription$ CARDNAME can't be blocked except by two or more creatures this turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/searing_spear_askari.jpg
 Oracle:Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)\n{1}{R}: Searing Spear Askari can't be blocked except by two or more creatures this turn.

forge-gui/res/cardsfolder/s/shrewd_hatchling.txt

@@ -3,11 +3,7 @@ ManaCost:3 UR
 Types:Creature Elemental
 PT:6/6
 K:etbCounter:M1M1:4
-A:AB$ Pump | Cost$ UR | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBPump | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
+A:AB$ Pump | Cost$ UR | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN CantBeBlockedBy Creature.IsRemembered | StackDescription$ None
-T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 T:Mode$ SpellCast | ValidCard$ Card.Red | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a red spell, remove a -1/-1 counter from CARDNAME.
 T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a blue spell, remove a -1/-1 counter from CARDNAME.
 SVar:TrigRemoveCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1

forge-gui/res/cardsfolder/s/sneaky_homunculus.txt

@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Creature Homunculus Illusion
 PT:1/1
 K:CantBeBlockedBy Creature.powerGE2
-K:CantBlock Creature.powerGE2
+K:CantBlock Creature.powerGE2:creatures with power 2 or greater
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sneaky_homunculus.jpg
 Oracle:Sneaky Homunculus can't block or be blocked by creatures with power 2 or greater.

forge-gui/res/cardsfolder/s/spin_engine.txt

@@ -2,11 +2,7 @@ Name:Spin Engine
 ManaCost:3
 Types:Artifact Creature Construct
 PT:3/1
-A:AB$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBPump | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
+A:AB$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | KW$ HIDDEN CantBlockCardUIDSource | DefinedKW$ CardUIDSource | UntilHostLeavesPlayOrEOT$ True | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN CantBeBlockedBy Creature.IsRemembered | StackDescription$ None
-T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spin_engine.jpg
 Oracle:{R}: Target creature can't block Spin Engine this turn.

forge-gui/res/cardsfolder/s/spitfire_handler.txt

@@ -1,9 +1,8 @@
 Name:Spitfire Handler
 ManaCost:1 R
 Types:Creature Goblin
-Text:CARDNAME can't block creatures with power greater than CARDNAME's power.
 PT:1/1
-K:CantBlock Creature.powerGTX
+K:CantBlock Creature.powerGTX:creatures with power greater than CARDNAME's power
 A:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:X:Count$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spitfire_handler.jpg

forge-gui/res/cardsfolder/s/sunweb.txt

@@ -1,10 +1,9 @@
 Name:Sunweb
 ManaCost:3 W
 Types:Creature Wall
-Text:CARDNAME can't block creatures with power 2 or less.
 PT:5/6
 K:Flying
 K:Defender
-K:CantBlock Creature.powerLE2
+K:CantBlock Creature.powerLE2:creatures with power 2 or less
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunweb.jpg
 Oracle:Defender (This creature can't attack.)\nFlying\nSunweb can't block creatures with power 2 or less.

forge-gui/res/cardsfolder/t/tower_of_coireall.txt

@@ -1,7 +1,7 @@
 Name:Tower of Coireall
 ManaCost:2
 Types:Artifact
-A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CantBeBlockedBy Creature.Wall | SpellDescription$ Target creature can't be blocked by Walls this turn.
+A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CantBeBlockedBy Creature.Wall | SpellDescription$ Target creature can't be blocked by Walls this turn.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tower_of_coireall.jpg
 Oracle:{T}: Target creature can't be blocked by Walls this turn.

forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys_avatar.txt

@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+1/-4
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CARDNAME can block an additional creature. | Description$ Each creature you control can block an additional creature each combat.
-S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AddKeyword$ CantBeBlockedByAmount LT2 | Description$ Each creature you control can't be blocked except by two or more creatures.
+S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CantBeBlockedByAmount LT2 | Description$ Each creature you control can't be blocked except by two or more creatures.
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/two_headed_giant_of_foriys_avatar.jpg
 Oracle:Each creature you control can block an additional creature each combat.\nEach creature you control can't be blocked except by two or more creatures.

forge-gui/res/cardsfolder/t/two_headed_sliver.txt

@@ -2,7 +2,7 @@ Name:Two-Headed Sliver
 ManaCost:1 R
 Types:Creature Sliver
 PT:1/1
-S:Mode$ Continuous | Affected$ Creature.Sliver | AddKeyword$ CantBeBlockedByAmount LT2 | Description$ All Sliver creatures have "This creature can't be blocked except by two or more creatures."
+S:Mode$ Continuous | Affected$ Creature.Sliver | AddHiddenKeyword$ CantBeBlockedByAmount LT2 | Description$ All Sliver creatures have "This creature can't be blocked except by two or more creatures."
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/two_headed_sliver.jpg
 Oracle:All Sliver creatures have "This creature can't be blocked except by two or more creatures."

forge-gui/res/cardsfolder/v/vortex_elemental.txt

@@ -2,12 +2,7 @@ Name:Vortex Elemental
 ManaCost:U
 Types:Creature Elemental
 PT:0/1
-A:AB$ ChangeZoneAll | Cost$ U | ChangeType$ Creature.blockedBySource,Creature.blockingSource | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ JellyBounceSelf | SpellDescription$ Put CARDNAME and each creature blocking or blocked by it on top of their owners' libraries, then those players shuffle their libraries.
+A:AB$ ChangeZoneAll | Cost$ U | ChangeType$ Card.Self,Creature.blockingSource,Creature.blockedBySource | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Shuffle$ True | SpellDescription$ Put CARDNAME and each creature blocking or blocked by it on top of their owners' libraries, then those players shuffle their libraries.
-SVar:JellyBounceSelf:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SubAbility$ WobbleOppJelly
-SVar:WobbleOppJelly:DB$ Shuffle | Defined$ RememberedOwner | SubAbility$ WobbleYourJelly | ConditionCheckSVar$ X | References$ X
-SVar:WobbleYourJelly:DB$ Shuffle | Defined$ You | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Amount
 A:AB$ MustBlock | Cost$ 3 U U | ValidTgts$ Creature | TgtPrompt$ Select target creature that must block this creature this turn | SpellDescription$ Target creature blocks CARDNAME this turn if able.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vortex_elemental.jpg

forge-gui/res/cardsfolder/z/zulaport_enforcer.txt

@@ -5,7 +5,7 @@ PT:1/1
 K:Level up:4
 K:maxLevel:3
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | SetToughness$ 3 | CheckSVar$ X | SVarCompare$ EQ1 | Description$ LEVEL 1-2 3/3
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | SetToughness$ 5 | AddKeyword$ CantBeBlockedBy Creature.nonBlack | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 3+ 5/5 CARDNAME can't be blocked except by black creatures
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | SetToughness$ 5 | AddHiddenKeyword$ CantBeBlockedBy Creature.nonBlack | CheckSVar$ Y | SVarCompare$ EQ1 | Description$ LEVEL 3+ 5/5 CARDNAME can't be blocked except by black creatures
 SVar:X:Count$Valid Card.Self+counters_GE1_LEVEL+counters_LT3_LEVEL
 SVar:Y:Count$Valid Card.Self+counters_GE3_LEVEL
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zulaport_enforcer.jpg