From 181089178610c4ec2bd89849eca0c9bfce738ccc Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Thu, 6 Dec 2012 13:58:11 +0000
Subject: [PATCH] - The AI will now activate Lu Su, Wu Advisor and other little
 AI tweaks.

---
 src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java | 2 +-
 src/main/java/forge/card/abilityfactory/ai/DrawAi.java       | 2 +-
 src/main/java/forge/card/abilityfactory/ai/TapAi.java        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java b/src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java
index d708fe3bbd7..7f45a7c8077 100644
--- a/src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/ChooseCardAi.java
@@ -50,7 +50,7 @@ public class ChooseCardAi extends SpellAiLogic {
                     return false;
                 }
             } else if (sa.getParam("AILogic").equals("Clone")) {
-                choices = CardLists.getValidCards(choices, "Permanent.YouDontCtrl,Permanent.NonLegendary", host.getController(), host);
+                choices = CardLists.getValidCards(choices, "Permanent.YouDontCtrl,Permanent.nonLegendary", host.getController(), host);
                 if (choices.isEmpty()) {
                     return false;
                 }
diff --git a/src/main/java/forge/card/abilityfactory/ai/DrawAi.java b/src/main/java/forge/card/abilityfactory/ai/DrawAi.java
index 6e60f44b646..31d662573f0 100644
--- a/src/main/java/forge/card/abilityfactory/ai/DrawAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/DrawAi.java
@@ -114,7 +114,7 @@ public class DrawAi extends SpellAiLogic {
         }
 
         // Don't tap creatures that may be able to block
-        if (ComputerUtil.waitForBlocking(sa)) {
+        if (ComputerUtil.waitForBlocking(sa) && !sa.hasParam("ActivationPhases")) {
             return false;
         }
 
diff --git a/src/main/java/forge/card/abilityfactory/ai/TapAi.java b/src/main/java/forge/card/abilityfactory/ai/TapAi.java
index 80e55151507..77e15a9f96d 100644
--- a/src/main/java/forge/card/abilityfactory/ai/TapAi.java
+++ b/src/main/java/forge/card/abilityfactory/ai/TapAi.java
@@ -29,7 +29,7 @@ public class TapAi extends TapAiBase {
             // Tap things down if it's Human's turn
         } else if (turn.isComputer() && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
             // Tap creatures down if in combat -- handled in tapPrefTargeting().
-        } else if (source.isSorcery()) {
+        } else if (AbilityFactory.isSorcerySpeed(sa)) {
             // Cast it if it's a sorcery.
         } else {
             // Generally don't want to tap things with an Instant during AI turn outside of combat