From 9aec30e0dcc4a623ecbb0f740d088cfd8ca475b6 Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 30 Apr 2018 09:36:31 +0300 Subject: [PATCH] - FogAi update from Seravy (updated for style consistency). --- .../main/java/forge/ai/AiAttackController.java | 6 ++---- .../src/main/java/forge/ai/ability/FogAi.java | 17 ++++++----------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index 0028ed584f7..7a6ca1f3f0b 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java @@ -40,8 +40,6 @@ import forge.util.Expressions; import forge.util.MyRandom; import forge.util.collect.FCollectionView; -import static forge.ai.AiCardMemory.isMemorySetEmpty; - import java.util.ArrayList; import java.util.List; @@ -265,8 +263,8 @@ public class AiAttackController { if (ai.getGame().getPhaseHandler().getNextTurn().equals(ai)) { return attackers; } - // no need to block is already holding mana to cast fog next turn - if (!isMemorySetEmpty(ai, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT)) { + // no need to block (already holding mana to cast fog next turn) + if (!AiCardMemory.isMemorySetEmpty(ai, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT)) { // Don't send the card that'll do the fog effect to attack, it's unsafe! if (attackers.contains(AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT)) { attackers.remove(AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT); diff --git a/forge-ai/src/main/java/forge/ai/ability/FogAi.java b/forge-ai/src/main/java/forge/ai/ability/FogAi.java index 32357aad658..00a7386ea7d 100644 --- a/forge-ai/src/main/java/forge/ai/ability/FogAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/FogAi.java @@ -30,11 +30,9 @@ public class FogAi extends SpellAbilityAi { // if card would be destroyed, react and use immediately if it's not own turn if ((AiCardMemory.isRememberedCard(ai, hostCard, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT)) - && (!game.getStack().isEmpty()) && - (!game.getPhaseHandler().isPlayerTurn(sa.getActivatingPlayer())) - ) { - final List objects = ComputerUtil - .predictThreatenedObjects(ai, null); + && (!game.getStack().isEmpty()) + && (!game.getPhaseHandler().isPlayerTurn(sa.getActivatingPlayer()))) { + final List objects = ComputerUtil.predictThreatenedObjects(ai, null); if (objects.contains(hostCard)) { AiCardMemory.clearMemorySet(ai, AiCardMemory.MemorySet.HELD_MANA_SOURCES_FOR_ENEMY_DECLBLK); return true; @@ -42,15 +40,12 @@ public class FogAi extends SpellAbilityAi { } // Reserve mana to cast this card if it will be likely needed - if (((game.getPhaseHandler().isPlayerTurn(sa.getActivatingPlayer())) || - (game.getPhaseHandler().getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS))) + if (((game.getPhaseHandler().isPlayerTurn(sa.getActivatingPlayer())) + || (game.getPhaseHandler().getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS))) && (AiCardMemory.isMemorySetEmpty(ai, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT)) - && (ComputerUtil.aiLifeInDanger(ai, false, 0)) - ) { + && (ComputerUtil.aiLifeInDanger(ai, false, 0))) { ((PlayerControllerAi) ai.getController()).getAi().reserveManaSources(sa, PhaseType.COMBAT_DECLARE_BLOCKERS, true); - AiCardMemory.rememberCard(ai, hostCard, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT); - } // AI should only activate this during Human's Declare Blockers phase