From 368f489abfabb61b3611a76305fb71e417d71638 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 09:09:44 +0000 Subject: [PATCH] - Updated combat AI to use the new keyword. --- src/forge/CombatUtil.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index 31ef17eaa45..402509f2e09 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -461,8 +461,10 @@ public class CombatUtil { }//flanking - if(attacker.hasStartOfKeyword("Prevent all combat damage that would be dealt to") || - attacker.getKeyword().contains("Prevent all damage that would be dealt to CARDNAME.")) return false; + if(attacker.hasStartOfKeyword("Prevent all combat damage that would be dealt to")) return false; + if(defender.getKeyword().contains("Prevent all combat damage that would be dealt to and dealt by CARDNAME.") || + defender.getKeyword().contains("Prevent all combat damage that would be dealt by CARDNAME")) return false; + if(attacker.getKeyword().contains("Indestructible") && !(defender.getKeyword().contains("Wither") || defender.getKeyword().contains("Infect"))) return false; @@ -588,8 +590,9 @@ public class CombatUtil { if(defender.isValidCard(restrictions)) return true; } - if(defender.hasStartOfKeyword("Prevent all combat damage that would be dealt to")|| - defender.getKeyword().contains("Prevent all damage that would be dealt to CARDNAME.")) return false; + if(defender.hasStartOfKeyword("Prevent all combat damage that would be dealt to")) return false; + if(attacker.getKeyword().contains("Prevent all combat damage that would be dealt to and dealt by CARDNAME.") || + attacker.getKeyword().contains("Prevent all combat damage that would be dealt by CARDNAME")) return false; if(defender.getKeyword().contains("Prevent all damage that would be dealt to CARDNAME by artifact creatures.") && attacker.isCreature() && attacker.isArtifact()) return false;