From b7601fded383d6b2dc3e04fc5f1f918391ee8e87 Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 18 Feb 2018 11:59:10 +0300 Subject: [PATCH] - Minor cleanup. --- forge-ai/src/main/java/forge/ai/ability/DestroyAi.java | 10 +++------- forge-gui/res/cardsfolder/s/spirit_mirror.txt | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java b/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java index ae0c36e2c7d..6bdd234aa7e 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DestroyAi.java @@ -81,13 +81,9 @@ public class DestroyAi extends SpellAbilityAi { } } if (("Pactivator".equals(logic)) && (havepact)) { - if ( - (!ai.getGame().getPhaseHandler().isPlayerTurn(ai)) && - ((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)) - || (ai.getGame().getPhaseHandler().is(PhaseType.COMBAT_DECLARE_BLOCKERS))) - && - (ai.getOpponents().get(0).getCreaturesInPlay().size() > 0) - ) { + if ((!ai.getGame().getPhaseHandler().isPlayerTurn(ai)) + && ((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)) || (ai.getGame().getPhaseHandler().is(PhaseType.COMBAT_DECLARE_BLOCKERS))) + && (ai.getOpponents().get(0).getCreaturesInPlay().size() > 0)) { ai.getController().chooseTargetsFor(sa); return true; } diff --git a/forge-gui/res/cardsfolder/s/spirit_mirror.txt b/forge-gui/res/cardsfolder/s/spirit_mirror.txt index 099ffe7b808..3cbb33541b3 100644 --- a/forge-gui/res/cardsfolder/s/spirit_mirror.txt +++ b/forge-gui/res/cardsfolder/s/spirit_mirror.txt @@ -3,7 +3,7 @@ ManaCost:2 W W Types:Enchantment T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Reflection.token | PresentCompare$ EQ0 | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token. SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenName$ Reflection | TokenTypes$ Creature,Reflection | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenSVars$ ReflectionSac -A:AB$ Destroy | Cost$ 0 | ValidTgts$ Reflection | TgtPrompt$ Select target Reflection | AILogic$ Pactivator| SpellDescription$ Destroy target Reflection. +A:AB$ Destroy | Cost$ 0 | ValidTgts$ Reflection | TgtPrompt$ Select target Reflection | AILogic$ Pactivator | SpellDescription$ Destroy target Reflection. SVar:ReflectionSac:SVar:SacMe:2 SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_mirror.jpg Oracle:At the beginning of your upkeep, if there are no Reflection tokens on the battlefield, create a 2/2 white Reflection creature token.\n{0}: Destroy target Reflection.