From d1609866ff749833dbdbd5a5d812a9e2fc8e3e03 Mon Sep 17 00:00:00 2001 From: excessum Date: Fri, 18 Apr 2014 03:15:27 +0000 Subject: [PATCH] - Minor update to EffectAI to prevent negative "fight" logic from falling through to the random return in canPlayAI(). Prevent Polukranos activation from targeting shielded or creatures that can regenerate. --- forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java | 3 ++- forge-ai/src/main/java/forge/ai/ability/EffectAi.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java index 9a5753ca857..ca80a41d6c1 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java @@ -260,7 +260,8 @@ public class DamageDealAi extends DamageAiBase { continue; } final int assignedDamage = ComputerUtilCombat.getEnoughDamageToKill(humanCreature, dmg, source, false, noPrevention); - if (assignedDamage <= dmg) { + if (assignedDamage <= dmg + && humanCreature.getShield().isEmpty() && !ComputerUtil.canRegenerate(humanCreature.getController(), humanCreature)) { tcs.add(humanCreature); tgt.addDividedAllocation(humanCreature, assignedDamage); lastTgt = humanCreature; diff --git a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java index cf5d23e64e8..295616f38ac 100644 --- a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java @@ -166,6 +166,8 @@ public class EffectAi extends SpellAbilityAi { tgtFight.getTargets().add(aiCreature); sa.getTargets().add(humanCreature); return true; + } else { + return false; } } }