Merge branch 'master' into 'master'

No need to limit the phase in SetPT logic itself (AnimateAi).

See merge request core-developers/forge!5640
This commit is contained in:
Michael Kamensky
2021-10-23 15:08:57 +00:00

View File

@@ -358,13 +358,11 @@ public class AnimateAi extends SpellAbilityAi {
Card worst = ComputerUtilCard.getWorstCreatureAI(ai.getCreaturesInPlay());
Card buffed = becomeAnimated(worst, sa);
if (ph.is(PhaseType.MAIN1, ai)) {
if (ComputerUtilCard.doesSpecifiedCreatureAttackAI(ai, buffed)
&& (buffed.getNetPower() - worst.getNetPower() >= 3 || !ComputerUtilCard.doesCreatureAttackAI(ai, worst))) {
sa.getTargets().add(worst);
rememberAnimatedThisTurn(ai, worst);
return true;
}
if (ComputerUtilCard.doesSpecifiedCreatureAttackAI(ai, buffed)
&& (buffed.getNetPower() - worst.getNetPower() >= 3 || !ComputerUtilCard.doesCreatureAttackAI(ai, worst))) {
sa.getTargets().add(worst);
rememberAnimatedThisTurn(ai, worst);
return true;
}
}