- Removed some unnecessary chkAIDrawback overrides.

src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java

@@ -63,11 +63,6 @@ public class AddTurnAi extends SpellAiLogic {
         return true;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */

src/main/java/forge/card/abilityfactory/ai/AlwaysPlayAi.java

@@ -13,12 +13,4 @@ public class AlwaysPlayAi extends SpellAiLogic {
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {
         return true;
     }
-
-    /* (non-Javadoc)
-     * @see forge.card.abilityfactory.SpellAiLogic#chkAIDrawback(java.util.Map, forge.card.spellability.SpellAbility, forge.game.player.Player)
-     */
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
 }

src/main/java/forge/card/abilityfactory/ai/CanPlayAsDrawbackAi.java

@@ -15,14 +15,6 @@ public class CanPlayAsDrawbackAi extends SpellAiLogic {
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see forge.card.abilityfactory.SpellAiLogic#chkAIDrawback(java.util.Map, forge.card.spellability.SpellAbility, forge.game.player.Player)
-     */
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     /**
      * <p>
      * copySpellTriggerAI.

src/main/java/forge/card/abilityfactory/ai/ChooseCardNameAi.java

@@ -8,11 +8,6 @@ import forge.game.player.Player;
 
 public class ChooseCardNameAi extends SpellAiLogic {
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean canPlayAI(Player ai, SpellAbility sa) {
 

src/main/java/forge/card/abilityfactory/ai/ChooseColorAi.java

@@ -16,11 +16,6 @@ public class ChooseColorAi extends SpellAiLogic {
         return chance;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
         return mandatory || canPlayAI(ai, sa);

src/main/java/forge/card/abilityfactory/ai/ChooseSourceAi.java

@@ -123,9 +123,4 @@ public class ChooseSourceAi extends SpellAiLogic {
 
         return true;
     }
-
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player ai) {
-        return true;
-    }
 }

src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java

@@ -18,11 +18,6 @@ public class ChooseTypeAi extends SpellAiLogic {
         return doTriggerAINoCost(aiPlayer, sa, false);
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
         final Target tgt = sa.getTarget();

src/main/java/forge/card/abilityfactory/ai/ClashAi.java

@@ -16,14 +16,6 @@ public class ClashAi extends SpellAiLogic {
         return true;
     }
 
-    /* (non-Javadoc)
-     * @see forge.card.abilityfactory.SpellAiLogic#chkAIDrawback(java.util.Map, forge.card.spellability.SpellAbility, forge.game.player.Player)
-     */
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */

src/main/java/forge/card/abilityfactory/ai/ControlExchangeAi.java

@@ -58,12 +58,6 @@ public class ControlExchangeAi extends SpellAiLogic {
         return false;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        // check AI life before playing this drawback?
-        return true;
-    }
-
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#doTriggerAINoCost(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility, boolean)
      */

src/main/java/forge/card/abilityfactory/ai/CopyPermanentAi.java

@@ -44,11 +44,6 @@ public class CopyPermanentAi extends SpellAiLogic {
         }
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
         final Card source = sa.getSourceCard();

src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java

@@ -103,8 +103,50 @@ public class  DamageAllAi extends SpellAiLogic {
     }
 
     @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
+    public boolean chkAIDrawback(SpellAbility sa, Player ai) {
-        // check AI life before playing this drawback?
+        final Card source = sa.getSourceCard();
+        String validP = "";
+
+        final String damage = sa.getParam("NumDmg");
+        int dmg = AbilityFactory.calculateAmount(sa.getSourceCard(), damage, sa);
+
+        if (damage.equals("X") && sa.getSVar(damage).equals("Count$xPaid")) {
+            // Set PayX here to maximum value.
+            dmg = ComputerUtil.determineLeftoverMana(sa, ai);
+            source.setSVar("PayX", Integer.toString(dmg));
+        }
+
+        if (sa.hasParam("ValidPlayers")) {
+            validP = sa.getParam("ValidPlayers");
+        }
+
+        // Evaluate creatures getting killed
+        Player enemy = ai.getOpponent();
+        final List<Card> humanList = this.getKillableCreatures(sa, enemy, dmg);
+        List<Card> computerList = this.getKillableCreatures(sa, ai, dmg);
+        final Target tgt = sa.getTarget();
+
+        if (tgt != null && sa.canTarget(enemy)) {
+            tgt.resetTargets();
+            sa.getTarget().addTarget(enemy);
+            computerList.clear();
+        }
+        // Don't get yourself killed
+        if (validP.contains("Each") && (ai.getLife() <= ai.predictDamage(dmg, source, false))) {
+            return false;
+        }
+
+        // if we can kill human, do it
+        if ((validP.contains("Each") || validP.contains("EachOpponent") || validP.contains("Targeted"))
+                && (enemy.getLife() <= enemy.predictDamage(dmg, source, false))) {
+            return true;
+        }
+
+        if (!computerList.isEmpty() && CardFactoryUtil.evaluateCreatureList(computerList) > CardFactoryUtil
+                .evaluateCreatureList(humanList)) {
+            return false;
+        }
+
         return true;
     }
 
@@ -152,7 +194,6 @@ public class  DamageAllAi extends SpellAiLogic {
         final String damage = sa.getParam("NumDmg");
         int dmg = AbilityFactory.calculateAmount(sa.getSourceCard(), damage, sa);
 
-
         if (damage.equals("X") && sa.getSVar(damage).equals("Count$xPaid")) {
             // Set PayX here to maximum value.
             dmg = ComputerUtil.determineLeftoverMana(sa, ai);

src/main/java/forge/card/abilityfactory/ai/DamagePreventAi.java

@@ -21,10 +21,6 @@ import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 
 public class DamagePreventAi extends SpellAiLogic {
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
 
     @Override
     protected boolean canPlayAI(Player ai, SpellAbility sa) {

src/main/java/forge/card/abilityfactory/ai/DamagePreventAllAi.java

@@ -12,14 +12,6 @@ import forge.game.player.Player;
 
 public class DamagePreventAllAi extends SpellAiLogic {
 
-    /* (non-Javadoc)
-     * @see forge.card.abilityfactory.SpellAiLogic#chkAIDrawback(java.util.Map, forge.card.spellability.SpellAbility, forge.game.player.Player)
-     */
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */

src/main/java/forge/card/abilityfactory/ai/DebuffAllAi.java

@@ -63,21 +63,4 @@ public class DebuffAllAi extends SpellAiLogic {
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
         return true;
     }
-
-    /**
-     * <p>
-     * debuffAllChkDrawbackAI.
-     * </p>
-     * @param sa
-     *            a {@link forge.card.spellability.SpellAbility} object.
-     * @param af
-     *            a {@link forge.card.abilityfactory.AbilityFactory} object.
-     * 
-     * @return a boolean.
-     */
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
 }

src/main/java/forge/card/abilityfactory/ai/DestroyAllAi.java

@@ -74,6 +74,7 @@ public class DestroyAllAi extends SpellAiLogic {
 
     @Override
     public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
+        //TODO: Check for bad outcome
         return true;
     }
 

src/main/java/forge/card/abilityfactory/ai/DigAi.java

@@ -59,11 +59,6 @@ public class DigAi extends SpellAiLogic {
         return randomReturn;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
         final Target tgt = sa.getTarget();

src/main/java/forge/card/abilityfactory/ai/DigUntilAi.java

@@ -44,11 +44,6 @@ public class DigUntilAi extends SpellAiLogic {
         return randomReturn;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
 

src/main/java/forge/card/abilityfactory/ai/FightAi.java

@@ -82,12 +82,6 @@ public class FightAi extends SpellAiLogic {
         return false;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        // check AI life before playing this drawback?
-        return true;
-    }
-
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#doTriggerAINoCost(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility, boolean)
      */

src/main/java/forge/card/abilityfactory/ai/GameLossAi.java

@@ -27,11 +27,6 @@ public class GameLossAi extends SpellAiLogic {
         return true;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
 

src/main/java/forge/card/abilityfactory/ai/GameWinAi.java

@@ -24,12 +24,6 @@ public class GameWinAi extends SpellAiLogic {
         return true;
     }
 
-
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
         return true;

src/main/java/forge/card/abilityfactory/ai/PlayAi.java

@@ -20,14 +20,6 @@ import forge.util.MyRandom;
 
 public class PlayAi extends SpellAiLogic {
 
-    /* (non-Javadoc)
-     * @see forge.card.abilityfactory.SpellAiLogic#chkAIDrawback(java.util.Map, forge.card.spellability.SpellAbility, forge.game.player.Player)
-     */
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean canPlayAI(Player ai, SpellAbility sa) {
         final Cost abCost = sa.getPayCosts();

src/main/java/forge/card/abilityfactory/ai/ProtectAllAi.java

@@ -45,12 +45,4 @@ public class ProtectAllAi extends SpellAiLogic {
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
         return true;
     }
-
-    /* (non-Javadoc)
-     * @see forge.card.abilityfactory.SpellAiLogic#chkAIDrawback(java.util.Map, forge.card.spellability.SpellAbility, forge.game.player.Player)
-     */
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    } // protectAllDrawbackAI()
 }

src/main/java/forge/card/abilityfactory/ai/RegenerateAi.java

@@ -167,11 +167,6 @@ public class RegenerateAi extends SpellAiLogic {
         return chance;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     private static boolean regenMandatoryTarget(final Player ai, final SpellAbility sa, final boolean mandatory) {
         final Card hostCard = sa.getSourceCard();
         final Target tgt = sa.getTarget();

src/main/java/forge/card/abilityfactory/ai/RegenerateAllAi.java

@@ -82,11 +82,6 @@ public class RegenerateAllAi extends SpellAiLogic {
         return chance;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
         boolean chance = true;

src/main/java/forge/card/abilityfactory/ai/RepeatAi.java

@@ -21,14 +21,4 @@ public class RepeatAi extends SpellAiLogic {
         }
         return true;
     }
-
-    /* (non-Javadoc)
-     * @see forge.card.abilityfactory.SpellAiLogic#chkAIDrawback(java.util.Map, forge.card.spellability.SpellAbility, forge.game.player.Player)
-     */
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
-
 }

src/main/java/forge/card/abilityfactory/ai/RevealAiBase.java

@@ -9,7 +9,7 @@ import forge.game.zone.ZoneType;
 
 public abstract class RevealAiBase extends SpellAiLogic {
 
-    protected  boolean revealHandTargetAI(final Player ai, final SpellAbility sa/*, final boolean primarySA, final boolean mandatory*/) {
+    protected  boolean revealHandTargetAI(final Player ai, final SpellAbility sa) {
         final Target tgt = sa.getTarget();
 
         Player opp = ai.getOpponent();
@@ -38,6 +38,7 @@ public abstract class RevealAiBase extends SpellAiLogic {
      */
     @Override
     public boolean chkAIDrawback(SpellAbility sa, Player ai) {
-        return revealHandTargetAI(ai, sa/*, false, false*/);
+        revealHandTargetAI(ai, sa);
+        return true;
     }
 }

src/main/java/forge/card/abilityfactory/ai/SacrificeAllAi.java

@@ -77,6 +77,7 @@ public class SacrificeAllAi extends SpellAiLogic {
 
     @Override
     public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
+        //TODO: Add checks for bad outcome
         return true;
     }
 }

src/main/java/forge/card/abilityfactory/ai/StoreSVarAi.java

@@ -23,13 +23,6 @@ public class StoreSVarAi extends SpellAiLogic {
         return true;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    };
-
-
-
     @Override
     protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) {
 

src/main/java/forge/card/abilityfactory/ai/TapAllAi.java

@@ -146,10 +146,4 @@ public class TapAllAi extends SpellAiLogic {
 
         return false;
     }
-
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
 }

src/main/java/forge/card/abilityfactory/ai/TwoPilesAi.java

@@ -57,11 +57,6 @@ public class TwoPilesAi extends SpellAiLogic  {
         return size > 2;
     }
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellAiLogic#doTriggerAINoCost(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility, boolean)
      */

src/main/java/forge/card/abilityfactory/ai/UntapAllAi.java

@@ -7,11 +7,6 @@ import forge.game.player.Player;
 
 public class UntapAllAi extends SpellAiLogic {
 
-    @Override
-    public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
-        return true;
-    }
-
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {
         // check SubAbilities DoTrigger?