- AI improvements for AF Sacrifice with the Destroy parameter.

src/main/java/forge/CombatUtil.java

@@ -2179,7 +2179,7 @@ public class CombatUtil {
                         public void resolve() {
                             if (crd.getController().isHuman()) {
                                 final CardList list = AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield);
-                                ComputerUtil.sacrificePermanents(a, list);
+                                ComputerUtil.sacrificePermanents(a, list, false);
                             } else {
                                 AllZone.getInputControl().setInput(PlayerUtil.inputSacrificePermanents(a));
                             }

src/main/java/forge/ComputerUtil.java

@@ -1524,7 +1524,7 @@ public class ComputerUtil {
      *            a {@link forge.CardList} object.
      * @return the card list
      */
-    public static CardList sacrificePermanents(final int amount, final CardList list) {
+    public static CardList sacrificePermanents(final int amount, final CardList list, boolean destroy) {
         final CardList sacList = new CardList();
         // used in Annihilator and AF_Sacrifice
         int max = list.size();
@@ -1536,15 +1536,20 @@ public class ComputerUtil {
         list.reverse();
 
         for (int i = 0; i < max; i++) {
-            // TODO: use getWorstPermanent() would be wayyyy better
+            Card c = null;
             
-            Card c;
+            if (destroy) {
+                CardList indestructibles = list.getKeyword("Indestructible");
+                if (!indestructibles.isEmpty()) {
+                    c = indestructibles.get(0);
+                }
+            } else {
                 if (list.getNotType("Creature").size() == 0) {
                     c = CardFactoryUtil.getWorstCreatureAI(list);
                 } else if (list.getNotType("Land").size() == 0) {
                     c = CardFactoryUtil.getWorstLand(AllZone.getComputerPlayer());
                 } else {
-                c = list.get(0);
+                    c = CardFactoryUtil.getWorstPermanentAI(list, true, true, true, true);
                 }
     
                 final ArrayList<Card> auras = c.getEnchantedBy();
@@ -1559,10 +1564,18 @@ public class ComputerUtil {
                         }
                     }
                 }
-
+                if (destroy) {
+                    if(!AllZone.getGameAction().destroy(c)) {
+                        continue;
+                    }
+                } else {
+                    if(!AllZone.getGameAction().sacrifice(c)) {
+                        continue;
+                    }
+                }
+            }
             list.remove(c);
             sacList.add(c);
-            AllZone.getGameAction().sacrifice(c);
         }
         return sacList;
     }

src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java

@@ -214,7 +214,12 @@ public class AbilityFactorySacrifice {
                 msg = valid;
             }
 
-            sb.append("Sacrifices ").append(amount).append(" ").append(msg).append(".");
+            if (params.containsKey("Destroy")) {
+                sb.append("Destroys ");
+            } else {
+                sb.append("Sacrifices ");
+            }
+            sb.append(amount).append(" ").append(msg).append(".");
         }
 
         final AbilitySub abSub = sa.getSubAbility();
@@ -514,7 +519,7 @@ public class AbilityFactorySacrifice {
         CardList list = p.getCardsIn(Zone.Battlefield);
         list = list.getValidCards(valid.split(","), sa.getActivatingPlayer(), sa.getSourceCard());
 
-        final CardList sacList = ComputerUtil.sacrificePermanents(amount, list);
+        final CardList sacList = ComputerUtil.sacrificePermanents(amount, list, destroy);
 
         return sacList;
     }
@@ -551,11 +556,11 @@ public class AbilityFactorySacrifice {
                 final Card c = (Card) o;
                 
                 if (destroy) {
-                    if(!AllZone.getGameAction().destroy(c)) {
+                    if (!AllZone.getGameAction().destroy(c)) {
                         continue;
                     }
                 } else {
-                    if(!AllZone.getGameAction().sacrifice(c)){
+                    if (!AllZone.getGameAction().sacrifice(c)) {
                         continue;
                     }
                 }