From 50bc1772d1330f1197b55e36387016f2bff32873 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sat, 2 Mar 2013 20:27:02 +0000
Subject: [PATCH] - Added some keyword entries to isUsefulAttachKeyword.

---
 res/cardsfolder/j/jovens_tools.txt                  | 1 -
 res/cardsfolder/v/varchilds_crusader.txt            | 2 +-
 src/main/java/forge/card/ability/ai/AttachAi.java   | 6 ++++--
 src/main/java/forge/card/ability/ai/PumpAiBase.java | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/res/cardsfolder/j/jovens_tools.txt b/res/cardsfolder/j/jovens_tools.txt
index 215f8d366df..1687a915830 100644
--- a/res/cardsfolder/j/jovens_tools.txt
+++ b/res/cardsfolder/j/jovens_tools.txt
@@ -2,7 +2,6 @@ Name:Joven's Tools
 ManaCost:6
 Types:Artifact
 A:AB$ Pump | Cost$ 4 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't be blocked except by Walls. | SpellDescription$ Target creature can't be blocked this turn except by Walls.
-SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jovens_tools.jpg
 SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/133.jpg
diff --git a/res/cardsfolder/v/varchilds_crusader.txt b/res/cardsfolder/v/varchilds_crusader.txt
index a5fd7f12213..ba6c6e273f6 100644
--- a/res/cardsfolder/v/varchilds_crusader.txt
+++ b/res/cardsfolder/v/varchilds_crusader.txt
@@ -2,7 +2,7 @@ Name:Varchild's Crusader
 ManaCost:3 R
 Types:Creature Human Knight
 PT:3/2
-A:AB$ Pump | Cost$ 0 | KW$ CARDNAME can't be blocked except by Walls. & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ CARDNAME can't be blocked this turn except by Walls. Sacrifice CARDNAME at the beginning of the next end step.
+A:AB$ Pump | Cost$ 0 | KW$ HIDDEN CARDNAME can't be blocked except by Walls. & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ CARDNAME can't be blocked this turn except by Walls. Sacrifice CARDNAME at the beginning of the next end step.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/varchilds_crusader.jpg
diff --git a/src/main/java/forge/card/ability/ai/AttachAi.java b/src/main/java/forge/card/ability/ai/AttachAi.java
index 17903ae8c6a..8af929b570c 100644
--- a/src/main/java/forge/card/ability/ai/AttachAi.java
+++ b/src/main/java/forge/card/ability/ai/AttachAi.java
@@ -998,10 +998,12 @@ public class AttachAi extends SpellAbilityAi {
         if (!CardUtil.isStackingKeyword(keyword) && card.hasKeyword(keyword)) {
             return false;
         }
-        final boolean evasive = (keyword.endsWith("Unblockable") || keyword.equals("Fear")
+        final boolean evasive = (keyword.equals("Unblockable") || keyword.equals("Fear")
                 || keyword.equals("Intimidate") || keyword.equals("Shadow")
                 || keyword.equals("Flying") || keyword.equals("Horsemanship")
-                || keyword.endsWith("walk"));
+                || keyword.endsWith("walk") || keyword.equals("CARDNAME can't be blocked except by Walls.")
+                || keyword.equals("All creatures able to block CARDNAME do so.")
+                || keyword.equals("CARDNAME can't be blocked by more than one creature."));
         // give evasive keywords to creatures that can attack and deal damage
         if (evasive) {
             if (card.getNetCombatDamage() <= 0
diff --git a/src/main/java/forge/card/ability/ai/PumpAiBase.java b/src/main/java/forge/card/ability/ai/PumpAiBase.java
index 6d35c7e80b1..c7e8174d045 100644
--- a/src/main/java/forge/card/ability/ai/PumpAiBase.java
+++ b/src/main/java/forge/card/ability/ai/PumpAiBase.java
@@ -166,7 +166,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
 
         final boolean evasive = (keyword.endsWith("Unblockable") || keyword.endsWith("Fear")
                 || keyword.endsWith("Intimidate") || keyword.endsWith("Shadow")
-                || keyword.contains("CantBeBlockedBy"));
+                || keyword.contains("CantBeBlockedBy") || keyword.endsWith("CARDNAME can't be blocked except by Walls."));
         final boolean combatRelevant = (keyword.endsWith("First Strike") || keyword.contains("Bushido"));
         // give evasive keywords to creatures that can or do attack
         if (evasive) {