From a0043c54156c28c91c2e4db6ee7bac7b10a66c74 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Tue, 23 Oct 2012 05:18:39 +0000 Subject: [PATCH] PhaseHandler.isNextTurn changed by getNextTurn.equals(ai) --- .../card/abilityfactory/AbilityFactory.java | 2 +- .../abilityfactory/AbilityFactoryCounters.java | 3 +-- .../AbilityFactoryDealDamage.java | 5 ++--- .../AbilityFactoryZoneAffecting.java | 5 ++--- .../forge/control/input/InputPassPriority.java | 1 + .../java/forge/game/phase/PhaseHandler.java | 17 +---------------- .../forge/game/player/ComputerUtilAttack.java | 2 +- 7 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java index ca93c3c7482..459b63826a3 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java @@ -1499,7 +1499,7 @@ public class AbilityFactory { } return Singletons.getModel().getGame().getPhaseHandler().is(PhaseType.END_OF_TURN) - && Singletons.getModel().getGame().getNextPlayerAfter(sa.getActivatingPlayer()).equals(ai); + && Singletons.getModel().getGame().getPhaseHandler().getNextTurn().equals(ai); } /** diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java index 1e44dda9810..7feff150dfc 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounters.java @@ -45,7 +45,6 @@ import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.ComputerUtil; import forge.game.player.Player; -import forge.game.player.PlayerType; import forge.game.zone.PlayerZone; import forge.game.zone.Zone; import forge.game.zone.ZoneType; @@ -1929,7 +1928,7 @@ public class AbilityFactoryCounters { if (type.equals("P1P1") && sa.isAbility() && source.isCreature() && sa.getPayCosts() != null && sa.getPayCosts().getTap() && sa instanceof AbilitySub - && (phase.isNextTurn(PlayerType.HUMAN) + && (!phase.getNextTurn().equals(ai) || phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS_INSTANT_ABILITY))) { boolean combatants = false; for (Card c : hList) { diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java index da2b0fb3145..9ba635ff0dc 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDealDamage.java @@ -44,7 +44,6 @@ import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.ComputerUtil; import forge.game.player.Player; -import forge.game.player.PlayerType; import forge.game.zone.ZoneType; import forge.util.MyRandom; @@ -646,7 +645,7 @@ public class AbilityFactoryDealDamage { // on the stack // or from taking combat damage final boolean freePing = isTrigger || saMe.getPayCosts() == null || tgt.getNumTargeted() > 0 - || (phase.is(PhaseType.END_OF_TURN) && saMe.isAbility() && phase.isNextTurn(PlayerType.COMPUTER)) + || (phase.is(PhaseType.END_OF_TURN) && saMe.isAbility() && phase.getNextTurn().equals(ai)) || (phase.is(PhaseType.MAIN2) && saMe.getRestrictions().getPlaneswalker()); if (freePing && saMe.canTarget(ai.getOpponent()) && tgt.addTarget(enemy)) { @@ -664,7 +663,7 @@ public class AbilityFactoryDealDamage { // because we can else if (saMe.canTarget(enemy)) { - if ((phase.is(PhaseType.END_OF_TURN) && phase.isNextTurn(PlayerType.COMPUTER)) + if ((phase.is(PhaseType.END_OF_TURN) && phase.getNextTurn().equals(ai)) || (AbilityFactory.isSorcerySpeed(saMe) && phase.is(PhaseType.MAIN2)) || saMe.getPayCosts() == null || isTrigger) { tgt.addTarget(enemy); diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java index c9645cb2d41..708f3623ddd 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java @@ -46,7 +46,6 @@ import forge.card.spellability.Target; import forge.game.phase.PhaseType; import forge.game.player.ComputerUtil; import forge.game.player.Player; -import forge.game.player.PlayerType; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.util.MyRandom; @@ -363,7 +362,7 @@ public class AbilityFactoryZoneAffecting { randomReturn = true; } if ((Singletons.getModel().getGame().getPhaseHandler().is(PhaseType.END_OF_TURN) - && Singletons.getModel().getGame().getPhaseHandler().isNextTurn(PlayerType.COMPUTER))) { + && Singletons.getModel().getGame().getPhaseHandler().getNextTurn().equals(ai))) { randomReturn = true; } @@ -917,7 +916,7 @@ public class AbilityFactoryZoneAffecting { } if ((Singletons.getModel().getGame().getPhaseHandler().is(PhaseType.END_OF_TURN) - && Singletons.getModel().getGame().getPhaseHandler().isNextTurn(PlayerType.COMPUTER))) { + && Singletons.getModel().getGame().getPhaseHandler().getNextTurn().equals(ai))) { chance = .9; // 90% for end of opponents turn } diff --git a/src/main/java/forge/control/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java index 740ce2bf627..8e72beaade3 100644 --- a/src/main/java/forge/control/input/InputPassPriority.java +++ b/src/main/java/forge/control/input/InputPassPriority.java @@ -85,6 +85,7 @@ public class InputPassPriority extends Input implements java.io.Serializable { @Override public final void selectCard(final Card card, final PlayerZone zone) { if (Singletons.getModel().getGame().getAction().playCard(card)) { + // really need it? does not playCard push it into stack and thus give priority? Singletons.getModel().getGame().getPhaseHandler().setPriority(Singletons.getControl().getPlayer()); } else { diff --git a/src/main/java/forge/game/phase/PhaseHandler.java b/src/main/java/forge/game/phase/PhaseHandler.java index 63fd566823f..ad01c7d9e5e 100644 --- a/src/main/java/forge/game/phase/PhaseHandler.java +++ b/src/main/java/forge/game/phase/PhaseHandler.java @@ -31,7 +31,6 @@ import forge.Singletons; import forge.card.trigger.TriggerType; import forge.game.GameState; import forge.game.player.Player; -import forge.game.player.PlayerType; import forge.game.zone.ZoneType; import forge.properties.ForgePreferences.FPref; import forge.util.MyObservable; @@ -143,7 +142,7 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { * * @return a {@link forge.game.player.Player} object. */ - public final Player getFirstPriority() { + private final Player getFirstPriority() { return this.pFirstPriority; } @@ -652,20 +651,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { return this.extraTurns.peek().getPlayer(); } - /** - *

- * isNextTurn. - *

- * - * @param pl - * a {@link forge.game.player.Player} object. - * @return a boolean. - */ - @Deprecated - public final boolean isNextTurn(final PlayerType pt) { - final Player next = this.getNextTurn(); - return next.getType() == pt; - } /** *

diff --git a/src/main/java/forge/game/player/ComputerUtilAttack.java b/src/main/java/forge/game/player/ComputerUtilAttack.java index 0a5473f5913..8af3f02bec0 100644 --- a/src/main/java/forge/game/player/ComputerUtilAttack.java +++ b/src/main/java/forge/game/player/ComputerUtilAttack.java @@ -242,7 +242,7 @@ public class ComputerUtilAttack { int fixedBlockers = 0; final List vigilantes = new ArrayList(); //check for time walks - if (Singletons.getModel().getGame().getPhaseHandler().isNextTurn(PlayerType.COMPUTER)) { + if (Singletons.getModel().getGame().getPhaseHandler().getNextTurn().equals(ai)) { return attackers; } for (final Card c : this.computerList) {