- Further logic update for Voyaging Satyr and similar cards.

This commit is contained in:
Agetian
2017-10-15 14:45:19 +00:00
parent cde55f37f3
commit 95ee7ba2f8

View File

@@ -66,6 +66,7 @@ public class UntapAi extends SpellAbilityAi {
}
if (source != null && source.isCreature() && sa.getPayCosts() != null && sa.getPayCosts().hasTapCost()) {
if (sa.getTargetRestrictions() != null && !sa.getTargetRestrictions().canTgtCreature()) {
// Voyaging Satyr and friends: only do it after attacking/blocking and not when in immediate danger
PhaseHandler ph = source.getGame().getPhaseHandler();
if (ph.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
@@ -73,10 +74,11 @@ public class UntapAi extends SpellAbilityAi {
}
if (ai.getLife() < ai.getStartingLife() / 4
&& ((ai.getLifeLostLastTurn() > 0 || ai.getLifeLostThisTurn() > 0) && ph.getPlayerTurn().isOpponentOf(ai))) {
&& (ai.getLifeLostLastTurn() > 0 || ai.getLifeLostThisTurn() > 0 || ph.getPlayerTurn().isOpponentOf(ai))) {
return false;
}
}
}
return true;
}