From 082fd8cf5f0ef3f3c4372c17315daf3da001bde4 Mon Sep 17 00:00:00 2001 From: Agetian Date: Fri, 10 Jul 2020 12:34:42 +0300 Subject: [PATCH] - Somewhat more appropriate location for the updated trample AI code. --- forge-ai/src/main/java/forge/ai/AiAttackController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index 5527d9f4d62..f8472d1ed22 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java @@ -1257,6 +1257,10 @@ public class AiAttackController { if (LOG_AI_ATTACKS) System.out.println(attacker.getName() + " = attacking because they can't block, expecting to kill or damage player"); return true; + } else if (!canBeKilled && !dangerousBlockersPresent && canTrampleOverDefenders) { + if (LOG_AI_ATTACKS) + System.out.println(attacker.getName() + " = expecting to survive and get some Trample damage through"); + return true; } if (numberOfPossibleBlockers > 2 @@ -1298,9 +1302,7 @@ public class AiAttackController { } break; case 2: // attack expecting to attract a group block or destroying a single blocker and surviving - if (!canBeBlocked - || (!canBeKilled && !dangerousBlockersPresent && canTrampleOverDefenders) - || ((canKillAll || hasAttackEffect || hasCombatEffect) && !canBeKilledByOne && + if (!canBeBlocked || ((canKillAll || hasAttackEffect || hasCombatEffect) && !canBeKilledByOne && ((dangerousBlockersPresent && canKillAllDangerous) || !canBeKilled))) { if (LOG_AI_ATTACKS) System.out.println(attacker.getName() + " = attacking expecting to survive or attract group block");