- Some refactoring and imports cleanup in ChooseTypeAi.

This commit is contained in:
Agetian
2017-06-16 15:05:07 +00:00
parent 130f384853
commit 43ec4e545f

View File

@@ -17,7 +17,6 @@ import forge.game.phase.PhaseType;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class ChooseTypeAi extends SpellAbilityAi { public class ChooseTypeAi extends SpellAbilityAi {
@@ -27,6 +26,14 @@ public class ChooseTypeAi extends SpellAbilityAi {
return false; return false;
} else if ("MostProminentComputerControls".equals(sa.getParam("AILogic"))) { } else if ("MostProminentComputerControls".equals(sa.getParam("AILogic"))) {
if (ComputerUtilAbility.getAbilitySourceName(sa).equals("Mirror Entity Avatar")) { if (ComputerUtilAbility.getAbilitySourceName(sa).equals("Mirror Entity Avatar")) {
return doMirrorEntityLogic(aiPlayer, sa);
}
}
return doTriggerAINoCost(aiPlayer, sa, false);
}
private boolean doMirrorEntityLogic(Player aiPlayer, SpellAbility sa) {
if (AiCardMemory.isRememberedCard(aiPlayer, sa.getHostCard(), AiCardMemory.MemorySet.ANIMATED_THIS_TURN)) { if (AiCardMemory.isRememberedCard(aiPlayer, sa.getHostCard(), AiCardMemory.MemorySet.ANIMATED_THIS_TURN)) {
return false; return false;
} }
@@ -61,10 +68,6 @@ public class ChooseTypeAi extends SpellAbilityAi {
return false; return false;
} }
}
return doTriggerAINoCost(aiPlayer, sa, false);
}
@Override @Override
protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) { protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {