From 9daacbae6bd49896617dc1193f5c0915deea4553 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Fri, 23 Sep 2011 19:11:29 +0000
Subject: [PATCH] - Added a Planeswalker check to AbilityFactory.playReusable
 to make the AI use the abilities each turn (without random factor).

---
 .../forge/card/abilityFactory/AbilityFactory.java   | 11 +++++++++--
 .../card/abilityFactory/AbilityFactory_Pump.java    | 13 -------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory.java b/src/main/java/forge/card/abilityFactory/AbilityFactory.java
index 93fa331d752..5ac8016b971 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory.java
@@ -1109,11 +1109,18 @@ public class AbilityFactory {
         // TODO probably also consider if winter orb or similar are out
 
         if (sa.getPayCosts() == null) {
-            // This is only true for Drawbacks and triggers
+            return true; // This is only true for Drawbacks and triggers
+        }
+        
+        if (!sa.getPayCosts().isReusuableResource()) {
+            return false;
+        }
+        
+        if (sa.getRestrictions().getPlaneswalker() && AllZone.getPhase().is(Constant.Phase.Main2)) {
             return true;
         }
 
-        return (sa.getPayCosts().isReusuableResource() && AllZone.getPhase().is(Constant.Phase.End_Of_Turn)
+        return (AllZone.getPhase().is(Constant.Phase.End_Of_Turn)
                 && AllZone.getPhase().isNextTurn(AllZone.getComputerPlayer()));
     }
 
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java
index 50b529e5f26..4af95169c42 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java
@@ -455,19 +455,6 @@ public class AbilityFactory_Pump {
                 }
             }
 
-            /*Not needed
-               if (AF.isCurse()){
-                   t = CardFactoryUtil.AI_getBestCreature(list);
-                   goodt = true;
-               }
-               else{
-                   while(!goodt && !list.isEmpty()) {
-                       t = CardFactoryUtil.AI_getBestCreature(list);
-                       if((t.getNetDefense() + defense) > t.getDamage()) goodt = true;
-                       else list.remove(t);
-                   }
-               }*/
-
             t = CardFactoryUtil.AI_getBestCreature(list);
             tgt.addTarget(t);
             list.remove(t);