From ba31f5bbedab310538107e16a93e3111c4309932 Mon Sep 17 00:00:00 2001
From: Indigo Dragon <Indigo Dragon@269b9781-a132-4a9b-9d4e-f004f1b56b58>
Date: Sun, 24 Sep 2017 12:33:45 +0000
Subject: [PATCH] Changed "CARDNAME can block an additional creature." to
 CARDNAME can block an additional creature each combat."

Notes: Possible weird interactions when giving a multiblock creature an additional block eg. Equipping a Night Market Guard with echo circlet. Further study required.

git-svn-id: http://svn.slightlymagic.net/forge/trunk@35739 269b9781-a132-4a9b-9d4e-f004f1b56b58
---
 forge-ai/src/main/java/forge/ai/AiAttackController.java   | 4 ++--
 forge-ai/src/main/java/forge/ai/ability/AttachAi.java     | 4 ++--
 forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java   | 2 +-
 forge-game/src/main/java/forge/game/card/CardView.java    | 8 ++++----
 .../src/main/java/forge/game/combat/CombatUtil.java       | 2 +-
 forge-gui/res/cardsfolder/a/act_of_heroism.txt            | 2 +-
 forge-gui/res/cardsfolder/a/anurid_swarmsnapper.txt       | 2 +-
 forge-gui/res/cardsfolder/b/brave_the_sands.txt           | 2 +-
 forge-gui/res/cardsfolder/c/cenns_tactician.txt           | 2 +-
 forge-gui/res/cardsfolder/c/coastline_chimera.txt         | 2 +-
 forge-gui/res/cardsfolder/e/echo_circlet.txt              | 2 +-
 forge-gui/res/cardsfolder/e/entourage_of_trest.txt        | 2 +-
 forge-gui/res/cardsfolder/f/foriysian_brigade.txt         | 2 +-
 forge-gui/res/cardsfolder/f/foriysian_interceptor.txt     | 2 +-
 forge-gui/res/cardsfolder/f/foriysian_totem.txt           | 2 +-
 forge-gui/res/cardsfolder/h/high_ground.txt               | 4 ++--
 forge-gui/res/cardsfolder/h/hundred_handed_one.txt        | 2 +-
 forge-gui/res/cardsfolder/i/ionas_blessing.txt            | 2 +-
 forge-gui/res/cardsfolder/k/kembas_legion.txt             | 2 +-
 forge-gui/res/cardsfolder/l/lairwatch_giant.txt           | 2 +-
 forge-gui/res/cardsfolder/l/luminous_guardian.txt         | 2 +-
 forge-gui/res/cardsfolder/m/mounted_archers.txt           | 2 +-
 forge-gui/res/cardsfolder/n/night_market_guard.txt        | 2 +-
 forge-gui/res/cardsfolder/s/selesnya_sagittars.txt        | 4 ++--
 forge-gui/res/cardsfolder/s/spike_tailed_ceratops.txt     | 2 +-
 .../t/tangleclaw_werewolf_fibrous_entangler.txt           | 5 ++---
 forge-gui/res/cardsfolder/t/trueheart_duelist.txt         | 4 ++--
 forge-gui/res/cardsfolder/t/two_headed_dragon.txt         | 2 +-
 .../res/cardsfolder/t/two_headed_giant_of_foriys.txt      | 2 +-
 .../cardsfolder/t/two_headed_giant_of_foriys_avatar.txt   | 6 +++---
 forge-gui/res/cardsfolder/v/vanguards_shield.txt          | 2 +-
 forge-gui/res/cardsfolder/y/yare.txt                      | 2 +-
 32 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java
index 4760c121..0c1eef8f 100644
--- a/forge-ai/src/main/java/forge/ai/AiAttackController.java
+++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java
@@ -479,7 +479,7 @@ public class AiAttackController {
 
         for (Card blocker : this.blockers) {
             if (blocker.hasKeyword("CARDNAME can block any number of creatures.")
-                    || blocker.hasKeyword("CARDNAME can block an additional ninety-nine creatures.")) {
+                    || blocker.hasKeyword("CARDNAME can block an additional ninety-nine creatures each combat.")) {
                 for (Card attacker : this.attackers) {
                     if (CombatUtil.canBlock(attacker, blocker)) {
                         remainingAttackers.remove(attacker);
@@ -495,7 +495,7 @@ public class AiAttackController {
             if (remainingAttackers.isEmpty() || maxBlockersAfterCrew == 0) {
                 break;
             }
-            if (blocker.hasKeyword("CARDNAME can block an additional creature.")) {
+            if (blocker.hasKeyword("CARDNAME can block an additional creature each combat.")) {
                 blockedAttackers.add(remainingAttackers.get(0));
                 remainingAttackers.remove(0);
                 maxBlockersAfterCrew--;
diff --git a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
index 87f0fbda..ad13fc53 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
@@ -1275,9 +1275,9 @@ public class AttachAi extends SpellAbilityAi {
             if (card.hasKeyword("Flying") || !CombatUtil.canBlock(card, true)) {
                 return false;
             }
-        } else if (keyword.endsWith("CARDNAME can block an additional creature.")) {
+        } else if (keyword.endsWith("CARDNAME can block an additional creature each combat.")) {
             if (!CombatUtil.canBlock(card, true) || card.hasKeyword("CARDNAME can block any number of creatures.")
-                    || card.hasKeyword("CARDNAME can block an additional ninety-nine creatures.")) {
+                    || card.hasKeyword("CARDNAME can block an additional ninety-nine creatures each combat.")) {
                 return false;
             }
         } else if (keyword.equals("CARDNAME can attack as though it didn't have defender.")) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java b/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
index f0bb47a0..fb5385d0 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
@@ -384,7 +384,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                     || !CombatUtil.canBlock(card)) {
                 return false;
             }
-        } else if (keyword.endsWith("CARDNAME can block an additional creature.")) {
+        } else if (keyword.endsWith("CARDNAME can block an additional creature each combat.")) {
             if (ph.isPlayerTurn(ai)
                     || !ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
                 return false;
diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java
index 24ae1390..1e924c9a 100644
--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -585,9 +585,9 @@ public class CardView extends GameEntityView {
             final StringBuilder ab = new StringBuilder();
             ab.append("CARDNAME can block an additional ");
             ab.append(blockAdditional);
-            ab.append(" creatures.");
-            nonAbilityText = nonAbilityText.replaceFirst("CARDNAME can block an additional creature.", ab.toString());
-            nonAbilityText = nonAbilityText.replaceAll("CARDNAME can block an additional creature.", "");
+            ab.append(" creatures each combat.");
+            nonAbilityText = nonAbilityText.replaceFirst("CARDNAME can block an additional creature each combat.", ab.toString());
+            nonAbilityText = nonAbilityText.replaceAll("CARDNAME can block an additional creature each combat.", "");
             nonAbilityText = nonAbilityText.replaceAll("\r\n\r\n\r\n", "");
         }
         if (!nonAbilityText.isEmpty()) {
@@ -982,7 +982,7 @@ public class CardView extends GameEntityView {
             set(TrackableProperty.HasInfect, c.hasKeyword("Infect", state));
             set(TrackableProperty.HasStorm, c.hasKeyword("Storm", state));
             set(TrackableProperty.HasTrample, c.hasKeyword("Trample", state));
-            set(TrackableProperty.BlockAdditional, c.getAmountOfKeyword("CARDNAME can block an additional creature.", state));
+            set(TrackableProperty.BlockAdditional, c.getAmountOfKeyword("CARDNAME can block an additional creature each combat.", state));
             updateAbilityText(c, state);
         }
 
diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
index 472d9532..c9822e5b 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
@@ -445,7 +445,7 @@ public class CombatUtil {
 
     public static int numberOfAdditionalCreaturesCanBlock(final Card blocker) {
         // If Wizards makes a few more of these, we should really just make a generic version
-        return blocker.getAmountOfKeyword("CARDNAME can block an additional creature.") +
+        return blocker.getAmountOfKeyword("CARDNAME can block an additional creature each combat.") +
                 blocker.getAmountOfKeyword("CARDNAME can block an additional ninety-nine creatures.") * 99 +
                 blocker.getAmountOfKeyword("CARDNAME can block an additional seven creatures each combat.") * 7;
     }
diff --git a/forge-gui/res/cardsfolder/a/act_of_heroism.txt b/forge-gui/res/cardsfolder/a/act_of_heroism.txt
index 9374797c..53f4e2a3 100644
--- a/forge-gui/res/cardsfolder/a/act_of_heroism.txt
+++ b/forge-gui/res/cardsfolder/a/act_of_heroism.txt
@@ -2,6 +2,6 @@ Name:Act of Heroism
 ManaCost:1 W
 Types:Instant
 A:SP$ Untap | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBPump | SpellDescription$ Untap target creature. It gets +2/+2 until end of turn and can block an additional creature this turn.
-SVar:DBPump:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ +2 | NumDef$ +2 | AddHiddenKeyword$ CARDNAME can block an additional creature.
+SVar:DBPump:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ +2 | NumDef$ +2 | AddHiddenKeyword$ CARDNAME can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/act_of_heroism.jpg
 Oracle:Untap target creature. It gets +2/+2 until end of turn and can block an additional creature this turn.
diff --git a/forge-gui/res/cardsfolder/a/anurid_swarmsnapper.txt b/forge-gui/res/cardsfolder/a/anurid_swarmsnapper.txt
index c2a996cd..affd95a8 100644
--- a/forge-gui/res/cardsfolder/a/anurid_swarmsnapper.txt
+++ b/forge-gui/res/cardsfolder/a/anurid_swarmsnapper.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Frog Beast
 PT:1/4
 K:Reach
-A:AB$ Pump | Cost$ 1 G | Defined$ Self | KW$ HIDDEN CARDNAME can block an additional creature. | SpellDescription$ CARDNAME can block an additional creature this turn.
+A:AB$ Pump | Cost$ 1 G | Defined$ Self | KW$ HIDDEN CARDNAME can block an additional creature each combat. | SpellDescription$ CARDNAME can block an additional creature this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anurid_swarmsnapper.jpg
 Oracle:Reach (This creature can block creatures with flying.)\n{1}{G}: Anurid Swarmsnapper can block an additional creature this turn.
diff --git a/forge-gui/res/cardsfolder/b/brave_the_sands.txt b/forge-gui/res/cardsfolder/b/brave_the_sands.txt
index dd96c97f..f8fc947d 100644
--- a/forge-gui/res/cardsfolder/b/brave_the_sands.txt
+++ b/forge-gui/res/cardsfolder/b/brave_the_sands.txt
@@ -2,7 +2,7 @@ Name:Brave the Sands
 ManaCost:1 W
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Vigilance | Description$ Creatures you control have vigilance.
-S:Mode$ Continuous | 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 | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | Description$ Each creature you control can block an additional creature each combat.
 SVar:NonStackingEffect:True
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brave_the_sands.jpg
diff --git a/forge-gui/res/cardsfolder/c/cenns_tactician.txt b/forge-gui/res/cardsfolder/c/cenns_tactician.txt
index bc240216..613adaa7 100644
--- a/forge-gui/res/cardsfolder/c/cenns_tactician.txt
+++ b/forge-gui/res/cardsfolder/c/cenns_tactician.txt
@@ -3,6 +3,6 @@ ManaCost:W
 Types:Creature Kithkin Soldier
 PT:1/1
 A:AB$ PutCounter | Cost$ W T | ValidTgts$ Creature.Soldier | TgtPrompt$ Select target soldier creature | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target Soldier creature.
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddHiddenKeyword$ CARDNAME can block an additional creature. | Description$ Each creature you control with a +1/+1 counter on it can block an additional creature each combat.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | Description$ Each creature you control with a +1/+1 counter on it can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cenns_tactician.jpg
 Oracle:{W}, {T}: Put a +1/+1 counter on target Soldier creature.\nEach creature you control with a +1/+1 counter on it can block an additional creature each combat.
diff --git a/forge-gui/res/cardsfolder/c/coastline_chimera.txt b/forge-gui/res/cardsfolder/c/coastline_chimera.txt
index cb11d8e7..93412389 100644
--- a/forge-gui/res/cardsfolder/c/coastline_chimera.txt
+++ b/forge-gui/res/cardsfolder/c/coastline_chimera.txt
@@ -3,6 +3,6 @@ ManaCost:3 U
 Types:Creature Chimera
 PT:1/5
 K:Flying
-A:AB$ Pump | Cost$ 1 W | Defined$ Self | KW$ HIDDEN CARDNAME can block an additional creature. | SpellDescription$ CARDNAME can block an additional creature this turn.
+A:AB$ Pump | Cost$ 1 W | Defined$ Self | KW$ HIDDEN CARDNAME can block an additional creature each combat. | SpellDescription$ CARDNAME can block an additional creature this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/coastline_chimera.jpg
 Oracle:Flying\n{1}{W}: Coastline Chimera can block an additional creature this turn.
diff --git a/forge-gui/res/cardsfolder/e/echo_circlet.txt b/forge-gui/res/cardsfolder/e/echo_circlet.txt
index 7e883563..a7385ff2 100644
--- a/forge-gui/res/cardsfolder/e/echo_circlet.txt
+++ b/forge-gui/res/cardsfolder/e/echo_circlet.txt
@@ -2,6 +2,6 @@ Name:Echo Circlet
 ManaCost:2
 Types:Artifact Equipment
 K:Equip 1
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ CARDNAME can block an additional creature. | Description$ Equipped creature can block an additional creature each combat.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | Description$ Equipped creature can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/echo_circlet.jpg
 Oracle:Equipped creature can block an additional creature each combat.\nEquip {1}
diff --git a/forge-gui/res/cardsfolder/e/entourage_of_trest.txt b/forge-gui/res/cardsfolder/e/entourage_of_trest.txt
index 5493b709..e26865cb 100644
--- a/forge-gui/res/cardsfolder/e/entourage_of_trest.txt
+++ b/forge-gui/res/cardsfolder/e/entourage_of_trest.txt
@@ -4,6 +4,6 @@ Types:Creature Elf Soldier
 PT:4/4
 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
-S:Mode$ Continuous | Affected$ Card.Self | Condition$ You.isMonarch | AddKeyword$ CARDNAME can block an additional creature. | Description$ CARDNAME can block an additional creature each combat as long as you're the monarch.
+S:Mode$ Continuous | Affected$ Card.Self | Condition$ You.isMonarch | AddKeyword$ CARDNAME can block an additional creature each combat. | Description$ CARDNAME can block an additional creature each combat as long as you're the monarch.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/entourage_of_trest.jpg
 Oracle:When Entourage of Trest enters the battlefield, you become the monarch.\nEntourage of Trest can block an additional creature each combat as long as you're the monarch.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/foriysian_brigade.txt b/forge-gui/res/cardsfolder/f/foriysian_brigade.txt
index 42e862c7..03601992 100644
--- a/forge-gui/res/cardsfolder/f/foriysian_brigade.txt
+++ b/forge-gui/res/cardsfolder/f/foriysian_brigade.txt
@@ -2,6 +2,6 @@ Name:Foriysian Brigade
 ManaCost:3 W
 Types:Creature Human Soldier
 PT:2/4
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foriysian_brigade.jpg
 Oracle:Foriysian Brigade can block an additional creature each combat.
diff --git a/forge-gui/res/cardsfolder/f/foriysian_interceptor.txt b/forge-gui/res/cardsfolder/f/foriysian_interceptor.txt
index fbe12af6..effcce18 100644
--- a/forge-gui/res/cardsfolder/f/foriysian_interceptor.txt
+++ b/forge-gui/res/cardsfolder/f/foriysian_interceptor.txt
@@ -4,6 +4,6 @@ Types:Creature Human Soldier
 PT:0/5
 K:Flash
 K:Defender
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foriysian_interceptor.jpg
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nDefender\nForiysian Interceptor can block an additional creature each combat.
diff --git a/forge-gui/res/cardsfolder/f/foriysian_totem.txt b/forge-gui/res/cardsfolder/f/foriysian_totem.txt
index 6b3c80c3..3351d97f 100644
--- a/forge-gui/res/cardsfolder/f/foriysian_totem.txt
+++ b/forge-gui/res/cardsfolder/f/foriysian_totem.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R} to your mana pool.
 A:AB$ Animate | Cost$ 4 R | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Giant | Colors$ Red | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 4/4 red Giant artifact creature with trample until end of turn.
-S:Mode$ Continuous | Affected$ Creature.Self | AddHiddenKeyword$ CARDNAME can block an additional creature. | Description$ As long as CARDNAME is a creature, it can block an additional creature each combat.
+S:Mode$ Continuous | Affected$ Creature.Self | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | Description$ As long as CARDNAME is a creature, it can block an additional creature each combat.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/foriysian_totem.jpg
 Oracle:{T}: Add {R} to your mana pool.\n{4}{R}: Foriysian Totem becomes a 4/4 red Giant artifact creature with trample until end of turn.\nAs long as Foriysian Totem is a creature, it can block an additional creature each combat.
diff --git a/forge-gui/res/cardsfolder/h/high_ground.txt b/forge-gui/res/cardsfolder/h/high_ground.txt
index 9a7bbbfd..743af4eb 100644
--- a/forge-gui/res/cardsfolder/h/high_ground.txt
+++ b/forge-gui/res/cardsfolder/h/high_ground.txt
@@ -1,6 +1,6 @@
 Name:High Ground
 ManaCost:W
 Types:Enchantment
-S:Mode$ Continuous | 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 | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | Description$ Each creature you control can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/high_ground.jpg
-Oracle:Each creature you control can block an additional creature.
+Oracle:Each creature you control can block an additional creature each combat.
diff --git a/forge-gui/res/cardsfolder/h/hundred_handed_one.txt b/forge-gui/res/cardsfolder/h/hundred_handed_one.txt
index 044a00b2..4cdf94ba 100644
--- a/forge-gui/res/cardsfolder/h/hundred_handed_one.txt
+++ b/forge-gui/res/cardsfolder/h/hundred_handed_one.txt
@@ -4,7 +4,7 @@ Types:Creature Giant
 PT:3/5
 K:Vigilance
 K:Monstrosity:3:3 W W W
-S:Mode$ Continuous | Affected$ Card.Self+IsMonstrous | AddKeyword$ Reach & CARDNAME can block an additional ninety-nine creatures. | Description$ As long as CARDNAME is monstrous, it has reach and can block an additional ninety-nine creatures each combat.
+S:Mode$ Continuous | Affected$ Card.Self+IsMonstrous | AddKeyword$ Reach & CARDNAME can block an additional ninety-nine creatures each combat. | Description$ As long as CARDNAME is monstrous, it has reach and can block an additional ninety-nine creatures each combat.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hundred_handed_one.jpg
 Oracle:Vigilance\n{3}{W}{W}{W}: Monstrosity 3. (If this creature isn't monstrous, put three +1/+1 counters on it and it becomes monstrous.)\nAs long as Hundred-Handed One is monstrous, it has reach and can block an additional ninety-nine creatures each combat.
diff --git a/forge-gui/res/cardsfolder/i/ionas_blessing.txt b/forge-gui/res/cardsfolder/i/ionas_blessing.txt
index d2a9238c..13708dca 100644
--- a/forge-gui/res/cardsfolder/i/ionas_blessing.txt
+++ b/forge-gui/res/cardsfolder/i/ionas_blessing.txt
@@ -3,6 +3,6 @@ ManaCost:3 W
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Vigilance | AddHiddenKeyword$ CARDNAME can block an additional creature. | Description$ Enchanted creature gets +2/+2, has vigilance, and can block an additional creature each combat.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Vigilance | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | Description$ Enchanted creature gets +2/+2, has vigilance, and can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ionas_blessing.jpg
 Oracle:Enchant creature\nEnchanted creature gets +2/+2, has vigilance, and can block an additional creature each combat.
diff --git a/forge-gui/res/cardsfolder/k/kembas_legion.txt b/forge-gui/res/cardsfolder/k/kembas_legion.txt
index cf5ab3be..a9e89be1 100644
--- a/forge-gui/res/cardsfolder/k/kembas_legion.txt
+++ b/forge-gui/res/cardsfolder/k/kembas_legion.txt
@@ -3,7 +3,7 @@ ManaCost:5 W W
 Types:Creature Cat Soldier
 PT:4/6
 K:Vigilance
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can block an additional creature. | KeywordMultiplier$ X | Description$ CARDNAME can block an additional creature each combat for each Equipment attached to CARDNAME.
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | KeywordMultiplier$ X | Description$ CARDNAME can block an additional creature each combat for each Equipment attached to CARDNAME.
 SVar:X:Count$Valid Equipment.Attached
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kembas_legion.jpg
 SVar:EquipMe:Multiple
diff --git a/forge-gui/res/cardsfolder/l/lairwatch_giant.txt b/forge-gui/res/cardsfolder/l/lairwatch_giant.txt
index c52d9795..3295ddcf 100644
--- a/forge-gui/res/cardsfolder/l/lairwatch_giant.txt
+++ b/forge-gui/res/cardsfolder/l/lairwatch_giant.txt
@@ -2,7 +2,7 @@ Name:Lairwatch Giant
 ManaCost:5 W
 Types:Creature Giant Warrior
 PT:5/3
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 T:Mode$ Blocks | ValidCard$ Card.Self | CheckSVar$ X | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks two or more creatures, it gains first strike until end of turn.
 SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 SVar:X:Count$Valid Creature.blockedBySource
diff --git a/forge-gui/res/cardsfolder/l/luminous_guardian.txt b/forge-gui/res/cardsfolder/l/luminous_guardian.txt
index 4e3f8f19..6dee45f1 100644
--- a/forge-gui/res/cardsfolder/l/luminous_guardian.txt
+++ b/forge-gui/res/cardsfolder/l/luminous_guardian.txt
@@ -3,6 +3,6 @@ ManaCost:3 W
 Types:Creature Human Nomad
 PT:1/4
 A:AB$ Pump | Cost$ W | Defined$ Self | NumDef$ 1 | SpellDescription$ CARDNAME gets +0/+1 until end of turn.
-A:AB$ Pump | Cost$ 2 | Defined$ Self | KW$ HIDDEN CARDNAME can block an additional creature. | SpellDescription$ CARDNAME can block an additional creature this turn.
+A:AB$ Pump | Cost$ 2 | Defined$ Self | KW$ HIDDEN CARDNAME can block an additional creature each combat. | SpellDescription$ CARDNAME can block an additional creature this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/luminous_guardian.jpg
 Oracle:{W}: Luminous Guardian gets +0/+1 until end of turn.\n{2}: Luminous Guardian can block an additional creature this turn.
diff --git a/forge-gui/res/cardsfolder/m/mounted_archers.txt b/forge-gui/res/cardsfolder/m/mounted_archers.txt
index 8038d342..aed5f718 100644
--- a/forge-gui/res/cardsfolder/m/mounted_archers.txt
+++ b/forge-gui/res/cardsfolder/m/mounted_archers.txt
@@ -3,6 +3,6 @@ ManaCost:3 W
 Types:Creature Human Soldier Archer
 PT:2/3
 K:Reach
-A:AB$ Pump | Cost$ W | Defined$ Self | KW$ HIDDEN CARDNAME can block an additional creature. | SpellDescription$ CARDNAME can block an additional creature this turn.
+A:AB$ Pump | Cost$ W | Defined$ Self | KW$ HIDDEN CARDNAME can block an additional creature each combat.  | SpellDescription$ CARDNAME can block an additional creature this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mounted_archers.jpg
 Oracle:Reach (This creature can block creatures with flying.)\n{W}: Mounted Archers can block an additional creature this turn.
diff --git a/forge-gui/res/cardsfolder/n/night_market_guard.txt b/forge-gui/res/cardsfolder/n/night_market_guard.txt
index 76e9445b..bc944333 100644
--- a/forge-gui/res/cardsfolder/n/night_market_guard.txt
+++ b/forge-gui/res/cardsfolder/n/night_market_guard.txt
@@ -2,6 +2,6 @@ Name:Night Market Guard
 ManaCost:3
 Types:Artifact Creature Construct
 PT:3/1
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/night_market_guard.jpg
 Oracle:Night Market Guard can block an additional creature each combat.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/selesnya_sagittars.txt b/forge-gui/res/cardsfolder/s/selesnya_sagittars.txt
index f08522d6..fa6614fd 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_sagittars.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_sagittars.txt
@@ -3,6 +3,6 @@ ManaCost:3 G W
 Types:Creature Elf Archer
 PT:2/5
 K:Reach
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_sagittars.jpg
-Oracle:Reach (This creature can block creatures with flying.)\nSelesnya Sagittars can block an additional creature.
+Oracle:Reach (This creature can block creatures with flying.)\nSelesnya Sagittars can block an additional creature each combat
diff --git a/forge-gui/res/cardsfolder/s/spike_tailed_ceratops.txt b/forge-gui/res/cardsfolder/s/spike_tailed_ceratops.txt
index 566fc4be..d367e837 100644
--- a/forge-gui/res/cardsfolder/s/spike_tailed_ceratops.txt
+++ b/forge-gui/res/cardsfolder/s/spike_tailed_ceratops.txt
@@ -2,6 +2,6 @@ Name:Spike-Tailed Ceratops
 ManaCost:4 G
 Types:Creature Dinosaur
 PT:4/4
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spike_tailed_ceratops.jpg
 Oracle:Spike-Tailed Ceratops can block an additional creature each combat.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/t/tangleclaw_werewolf_fibrous_entangler.txt b/forge-gui/res/cardsfolder/t/tangleclaw_werewolf_fibrous_entangler.txt
index 9885abb1..f81e7bf9 100644
--- a/forge-gui/res/cardsfolder/t/tangleclaw_werewolf_fibrous_entangler.txt
+++ b/forge-gui/res/cardsfolder/t/tangleclaw_werewolf_fibrous_entangler.txt
@@ -6,7 +6,7 @@ Types:Creature Werewolf Horror
 
 PT:2/4
 
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 
 A:AB$SetState | Cost$ 6 G | Defined$ Self | Mode$ Transform | SpellDescription$ Transform CARDNAME.
 
@@ -34,9 +34,8 @@ K:Vigilance
 
 K:CARDNAME must be blocked if able.
 
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fibrous_entangler.jpg
 
 Oracle:Vigilance\nFibrous Entangler must be blocked if able.\nFibrous Entangler can block an additional creature each combat.
-
diff --git a/forge-gui/res/cardsfolder/t/trueheart_duelist.txt b/forge-gui/res/cardsfolder/t/trueheart_duelist.txt
index 0fe49571..41f55f2e 100644
--- a/forge-gui/res/cardsfolder/t/trueheart_duelist.txt
+++ b/forge-gui/res/cardsfolder/t/trueheart_duelist.txt
@@ -2,8 +2,8 @@ Name:Trueheart Duelist
 ManaCost:1 W
 Types:Creature Human Warrior
 PT:2/2
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 K:Embalm:2 W
-DeckHas:Ability$Token
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trueheart_duelist.jpg
 Oracle:Trueheart Duelist can block an additional creature each combat.\nEmbalm {2}{W} ({2}{W}, Exile this card from your graveyard: Create a token that's a copy of it, except it's a white Zombie Human Warrior with no mana cost. Embalm only as a sorcery.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/t/two_headed_dragon.txt b/forge-gui/res/cardsfolder/t/two_headed_dragon.txt
index 7c224a29..f72159ff 100644
--- a/forge-gui/res/cardsfolder/t/two_headed_dragon.txt
+++ b/forge-gui/res/cardsfolder/t/two_headed_dragon.txt
@@ -4,7 +4,7 @@ Types:Creature Dragon
 PT:4/4
 K:Flying
 K:Menace
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 A:AB$ Pump | Cost$ 1 R | NumAtt$ +2 | NumDef$ +0 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/two_headed_dragon.jpg
 Oracle:Flying\nMenace (This creature can't be blocked except by two or more creatures.)\nTwo-Headed Dragon can block an additional creature each combat.\n{1}{R}: Two-Headed Dragon gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys.txt b/forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys.txt
index 86f1b7b5..d408f474 100644
--- a/forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys.txt
+++ b/forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys.txt
@@ -3,6 +3,6 @@ ManaCost:4 R
 Types:Creature Giant
 PT:4/4
 K:Trample
-K:CARDNAME can block an additional creature.
+K:CARDNAME can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/two_headed_giant_of_foriys.jpg
 Oracle:Trample\nTwo-Headed Giant of Foriys can block an additional creature each combat.
diff --git a/forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys_avatar.txt b/forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys_avatar.txt
index 8b5e39b2..e8cb3bc6 100644
--- a/forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys_avatar.txt
+++ b/forge-gui/res/cardsfolder/t/two_headed_giant_of_foriys_avatar.txt
@@ -2,7 +2,7 @@ Name:Two-Headed Giant of Foriys Avatar
 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 | AddHiddenKeyword$ 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 | AddKeyword$ Menace | Description$ Creatures you control have menace. (They can't be blocked except by two or more creatures.)
+S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | Description$ Each creature you control can block an additional creature each combat.
 SVar:Picture:https://downloads.cardforge.org/images/cards/VAN/Two-Headed Giant of Foriys Avatar.full.jpg
-Oracle:Hand +1, life -4\nEach creature you control can block an additional creature each combat.\nEach creature you control can't be blocked except by two or more creatures.
+Oracle:Hand +1, life -4\nCreatures you control have menace. (They can't be blocked except by two or more creatures.)\nEach creature you control can block an additional creature each combat.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/v/vanguards_shield.txt b/forge-gui/res/cardsfolder/v/vanguards_shield.txt
index d96d3c5e..2b68d045 100644
--- a/forge-gui/res/cardsfolder/v/vanguards_shield.txt
+++ b/forge-gui/res/cardsfolder/v/vanguards_shield.txt
@@ -2,6 +2,6 @@ Name:Vanguard's Shield
 ManaCost:2
 Types:Artifact Equipment
 K:Equip 3
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ CARDNAME can block an additional creature. | AddToughness$ 3 | Description$ Equipped creature gets +0/+3 and can block an additional creature each combat.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ CARDNAME can block an additional creature each combat. | AddToughness$ 3 | Description$ Equipped creature gets +0/+3 and can block an additional creature each combat.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vanguards_shield.jpg
 Oracle:Equipped creature gets +0/+3 and can block an additional creature each combat.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/y/yare.txt b/forge-gui/res/cardsfolder/y/yare.txt
index 2b95a063..49bd4cf9 100644
--- a/forge-gui/res/cardsfolder/y/yare.txt
+++ b/forge-gui/res/cardsfolder/y/yare.txt
@@ -1,7 +1,7 @@
 Name:Yare
 ManaCost:2 W
 Types:Instant
-A:SP$ Pump | Cost$ 2 W | ValidTgts$ Creature.DefendingPlayerCtrl | TgtPrompt$ Select target creature defending player controls | NumAtt$ 3 | KW$ HIDDEN CARDNAME can block an additional creature. & HIDDEN CARDNAME can block an additional creature. | SpellDescription$ Target creature defending player controls gets +3/+0 until end of turn. That creature can block up to two additional creatures this turn.
+A:SP$ Pump | Cost$ 2 W | ValidTgts$ Creature.DefendingPlayerCtrl | TgtPrompt$ Select target creature defending player controls | NumAtt$ 3 | KW$ HIDDEN CARDNAME can block an additional creature each combat. & HIDDEN CARDNAME can block an additional creature each combat. | SpellDescription$ Target creature defending player controls gets +3/+0 until end of turn. That creature can block up to two additional creatures this turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/yare.jpg
 Oracle:Target creature defending player controls gets +3/+0 until end of turn. That creature can block up to two additional creatures this turn.