From 6e0a528c41c06c40235fa53445c8ab2fb0ba1cee Mon Sep 17 00:00:00 2001 From: excessum Date: Wed, 30 Apr 2014 14:11:07 +0000 Subject: [PATCH] - check for regeneration shields when using curses to deal lethal damage --- forge-ai/src/main/java/forge/ai/ComputerUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index 274c8b5d7cd..6cea7a4e56d 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -1413,13 +1413,13 @@ public class ComputerUtil { if (o instanceof Card) { final Card c = (Card) o; final boolean canRemove = (c.getNetDefense() <= dmg) - || (!c.hasKeyword("Indestructible") && (dmg >= ComputerUtilCombat.getDamageToKill(c))); + || (!c.hasKeyword("Indestructible") && c.getShield().isEmpty() && (dmg >= ComputerUtilCombat.getDamageToKill(c))); if (!canRemove) { continue; } if (saviourApi == ApiType.Pump) { final boolean cantSave = c.getNetDefense() + defense <= dmg - || (!c.hasKeyword("Indestructible") && !grantIndestructible + || (!c.hasKeyword("Indestructible") && c.getShield().isEmpty() && !grantIndestructible && (dmg >= defense + ComputerUtilCombat.getDamageToKill(c))); if (cantSave && (tgt == null || !grantShroud)) { continue;