From eefe3ae5099952b25df234746b2d6006d5074a0c Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:44:23 +0000 Subject: [PATCH] - Added AI checks for regeneration in AF Destroy and DealDamage. --- src/forge/card/abilityFactory/AbilityFactory_DealDamage.java | 3 ++- src/forge/card/abilityFactory/AbilityFactory_Destroy.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/forge/card/abilityFactory/AbilityFactory_DealDamage.java b/src/forge/card/abilityFactory/AbilityFactory_DealDamage.java index 3ad43765140..369dcfd756b 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_DealDamage.java +++ b/src/forge/card/abilityFactory/AbilityFactory_DealDamage.java @@ -313,7 +313,8 @@ public class AbilityFactory_DealDamage { CardList killables = hPlay.filter(new CardListFilter() { public boolean addCard(Card c) { - return (c.getEnoughDamageToKill(d, source, false, noPrevention) <= d ) + return (c.getEnoughDamageToKill(d, source, false, noPrevention) <= d ) + && !ComputerUtil.canRegenerate(c) && !(c.getSVar("SacMe").length() > 0); } }); diff --git a/src/forge/card/abilityFactory/AbilityFactory_Destroy.java b/src/forge/card/abilityFactory/AbilityFactory_Destroy.java index c62bc9bee68..463736f84a9 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_Destroy.java +++ b/src/forge/card/abilityFactory/AbilityFactory_Destroy.java @@ -130,7 +130,7 @@ public class AbilityFactory_Destroy { // TODO: filter out things that could regenerate in response? might be tougher? list = list.filter(new CardListFilter() { public boolean addCard(Card c) { - return c.getShield() == 0; + return (c.getShield() == 0 && !ComputerUtil.canRegenerate(c)); } }); }