From cb1793eddf104a8642238e4dd3dedba34e8ad77f Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Wed, 6 Feb 2013 06:41:51 +0000 Subject: [PATCH] player.isHostileTo() renamed to more correct 'isOpponentOf()' --- src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java | 2 +- src/main/java/forge/card/abilityfactory/ai/AttachAi.java | 6 +++--- .../java/forge/card/abilityfactory/ai/ChangeZoneAi.java | 8 ++++---- .../java/forge/card/abilityfactory/ai/ChooseTypeAi.java | 2 +- .../java/forge/card/abilityfactory/ai/DamageDealAi.java | 6 +++--- src/main/java/forge/card/abilityfactory/ai/DrawAi.java | 2 +- src/main/java/forge/card/abilityfactory/ai/FogAi.java | 2 +- src/main/java/forge/card/abilityfactory/ai/PumpAi.java | 4 ++-- src/main/java/forge/card/abilityfactory/ai/TapAi.java | 2 +- src/main/java/forge/card/abilityfactory/ai/TapAllAi.java | 4 ++-- .../card/abilityfactory/effects/ChangeZoneEffect.java | 2 +- .../card/abilityfactory/effects/ChoosePlayerEffect.java | 2 +- .../card/abilityfactory/effects/SacrificeEffect.java | 2 +- src/main/java/forge/game/ai/ComputerUtil.java | 2 +- src/main/java/forge/game/player/Player.java | 8 ++++---- .../java/forge/game/player/PlayerControllerHuman.java | 5 ++--- 16 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java b/src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java index 85420abcfd0..f99dc53c66b 100644 --- a/src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/AddTurnAi.java @@ -62,7 +62,7 @@ public class AddTurnAi extends SpellAiLogic { } else { final List tgtPlayers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), sa.getParam("Defined"), sa); for (final Player p : tgtPlayers) { - if (p.isHostileTo(ai) && !mandatory) { + if (p.isOpponentOf(ai) && !mandatory) { return false; } } diff --git a/src/main/java/forge/card/abilityfactory/ai/AttachAi.java b/src/main/java/forge/card/abilityfactory/ai/AttachAi.java index 41bac56fa13..bb7d6d5dfb8 100644 --- a/src/main/java/forge/card/abilityfactory/ai/AttachAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/AttachAi.java @@ -275,7 +275,7 @@ public class AttachAi extends SpellAiLogic { } else { // then try any other opponent for (final Player curseChoice : targetable) { - if (curseChoice.isHostileTo(aiPlayer)) { + if (curseChoice.isOpponentOf(aiPlayer)) { return curseChoice; } } @@ -294,7 +294,7 @@ public class AttachAi extends SpellAiLogic { } else { // then try allies for (final Player boonChoice : targetable) { - if (!boonChoice.isHostileTo(aiPlayer)) { + if (!boonChoice.isOpponentOf(aiPlayer)) { return boonChoice; } } @@ -595,7 +595,7 @@ public class AttachAi extends SpellAiLogic { if (!mandatory && card.isEquipment() && !targets.isEmpty()) { Card newTarget = (Card) targets.get(0); //don't equip human creatures - if (newTarget.getController().isHostileTo(ai)) { + if (newTarget.getController().isOpponentOf(ai)) { return false; } diff --git a/src/main/java/forge/card/abilityfactory/ai/ChangeZoneAi.java b/src/main/java/forge/card/abilityfactory/ai/ChangeZoneAi.java index 5332e48cabb..2a1ed0652c6 100644 --- a/src/main/java/forge/card/abilityfactory/ai/ChangeZoneAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/ChangeZoneAi.java @@ -813,7 +813,7 @@ public class ChangeZoneAi extends SpellAiLogic { @Override public boolean apply(final Card c) { for (Card aura : c.getEnchantedBy()) { - if (c.getOwner().isHostileTo(ai) && aura.getController().equals(ai)) { + if (c.getOwner().isOpponentOf(ai) && aura.getController().equals(ai)) { return false; } } @@ -1037,7 +1037,7 @@ public class ChangeZoneAi extends SpellAiLogic { if (!list.isEmpty()) { final Card attachedTo = list.get(0); // This code is for the Dragon auras - if (attachedTo.getController().isHostileTo(ai)) { + if (attachedTo.getController().isOpponentOf(ai)) { return false; } } @@ -1148,7 +1148,7 @@ public class ChangeZoneAi extends SpellAiLogic { return true; } }); - if (player.isHostileTo(ai) && sa.hasParam("GainControl") && activator.equals(ai)) { + if (player.isOpponentOf(ai) && sa.hasParam("GainControl") && activator.equals(ai)) { fetchList = CardLists.filter(fetchList, new Predicate() { @Override public boolean apply(final Card c) { @@ -1162,7 +1162,7 @@ public class ChangeZoneAi extends SpellAiLogic { } if (ZoneType.Exile.equals(destination) || origin.contains(ZoneType.Battlefield)) { // Exiling or bouncing stuff - if (player.isHostileTo(ai)) { + if (player.isOpponentOf(ai)) { c = CardFactoryUtil.getBestAI(fetchList); } else { c = CardFactoryUtil.getWorstAI(fetchList); diff --git a/src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java b/src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java index 8c8b4d602c6..2a3ef83c362 100644 --- a/src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/ChooseTypeAi.java @@ -26,7 +26,7 @@ public class ChooseTypeAi extends SpellAiLogic { sa.getTarget().addTarget(ai); } else { for (final Player p : AbilityFactory.getDefinedPlayers(sa.getSourceCard(), sa.getParam("Defined"), sa)) { - if (p.isHostileTo(ai) && !mandatory) { + if (p.isOpponentOf(ai) && !mandatory) { return false; } } diff --git a/src/main/java/forge/card/abilityfactory/ai/DamageDealAi.java b/src/main/java/forge/card/abilityfactory/ai/DamageDealAi.java index 22c96dc7659..73c72893692 100644 --- a/src/main/java/forge/card/abilityfactory/ai/DamageDealAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/DamageDealAi.java @@ -162,7 +162,7 @@ public class DamageDealAi extends DamageAiBase { }); Card targetCard; - if (pl.isHostileTo(ai) && (killables.size() > 0)) { + if (pl.isOpponentOf(ai) && (killables.size() > 0)) { targetCard = CardFactoryUtil.getBestCreatureAI(killables); return targetCard; @@ -173,7 +173,7 @@ public class DamageDealAi extends DamageAiBase { } if (hPlay.size() > 0) { - if (pl.isHostileTo(ai)) { + if (pl.isOpponentOf(ai)) { targetCard = CardFactoryUtil.getBestCreatureAI(hPlay); } else { targetCard = CardFactoryUtil.getWorstCreatureAI(hPlay); @@ -327,7 +327,7 @@ public class DamageDealAi extends DamageAiBase { // from this spell will kill me return false; } - if (p.isHostileTo(ai) && !p.canLoseLife()) { + if (p.isOpponentOf(ai) && !p.canLoseLife()) { return false; } } diff --git a/src/main/java/forge/card/abilityfactory/ai/DrawAi.java b/src/main/java/forge/card/abilityfactory/ai/DrawAi.java index 0384e6ea5ef..800d5f376e9 100644 --- a/src/main/java/forge/card/abilityfactory/ai/DrawAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/DrawAi.java @@ -98,7 +98,7 @@ public class DrawAi extends SpellAiLogic { if (tgt != null) { final ArrayList players = tgt.getTargetPlayers(); - if ((players.size() > 0) && players.get(0).isHostileTo(ai)) { + if ((players.size() > 0) && players.get(0).isOpponentOf(ai)) { return true; } } diff --git a/src/main/java/forge/card/abilityfactory/ai/FogAi.java b/src/main/java/forge/card/abilityfactory/ai/FogAi.java index 9bb516cf44f..fe936b310c5 100644 --- a/src/main/java/forge/card/abilityfactory/ai/FogAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/FogAi.java @@ -43,7 +43,7 @@ public class FogAi extends SpellAiLogic { boolean chance; // should really check if other player is attacking this player - if (ai.isHostileTo(Singletons.getModel().getGame().getPhaseHandler().getPlayerTurn())) { + if (ai.isOpponentOf(Singletons.getModel().getGame().getPhaseHandler().getPlayerTurn())) { chance = Singletons.getModel().getGame().getPhaseHandler().getPhase().isBefore(PhaseType.COMBAT_FIRST_STRIKE_DAMAGE); } else { chance = Singletons.getModel().getGame().getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_DAMAGE); diff --git a/src/main/java/forge/card/abilityfactory/ai/PumpAi.java b/src/main/java/forge/card/abilityfactory/ai/PumpAi.java index a3cadf83e03..664fd87c5dc 100644 --- a/src/main/java/forge/card/abilityfactory/ai/PumpAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/PumpAi.java @@ -139,7 +139,7 @@ public class PumpAi extends PumpAiBase { // everything? for (final Card card : cards) { if (sa.isCurse()) { - if (!card.getController().isHostileTo(ai)) { + if (!card.getController().isOpponentOf(ai)) { return false; } @@ -149,7 +149,7 @@ public class PumpAi extends PumpAiBase { return true; } - if (!card.getController().isHostileTo(ai) && shouldPumpCard(ai, sa, card, defense, attack, keywords)) { + if (!card.getController().isOpponentOf(ai) && shouldPumpCard(ai, sa, card, defense, attack, keywords)) { return true; } } diff --git a/src/main/java/forge/card/abilityfactory/ai/TapAi.java b/src/main/java/forge/card/abilityfactory/ai/TapAi.java index 969b6100eb3..4101eef4bdb 100644 --- a/src/main/java/forge/card/abilityfactory/ai/TapAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/TapAi.java @@ -26,7 +26,7 @@ public class TapAi extends TapAiBase { final PhaseHandler phase = Singletons.getModel().getGame().getPhaseHandler(); final Player turn = phase.getPlayerTurn(); - if (turn.isHostileTo(ai) && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)) { + if (turn.isOpponentOf(ai) && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)) { // Tap things down if it's Human's turn } else if (turn == ai && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)) { // Tap creatures down if in combat -- handled in tapPrefTargeting(). diff --git a/src/main/java/forge/card/abilityfactory/ai/TapAllAi.java b/src/main/java/forge/card/abilityfactory/ai/TapAllAi.java index 733eb20ae25..874e6ac5556 100644 --- a/src/main/java/forge/card/abilityfactory/ai/TapAllAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/TapAllAi.java @@ -132,13 +132,13 @@ public class TapAllAi extends SpellAiLogic { final int human = Iterables.size(Iterables.filter(validTappables, new Predicate() { @Override public boolean apply(final Card c) { - return c.getController().isHostileTo(ai); + return c.getController().isOpponentOf(ai); } })); final int compy = Iterables.size(Iterables.filter(validTappables, new Predicate() { @Override public boolean apply(final Card c) { - return !c.getController().isHostileTo(ai); + return !c.getController().isOpponentOf(ai); } })); if (human > compy) { diff --git a/src/main/java/forge/card/abilityfactory/effects/ChangeZoneEffect.java b/src/main/java/forge/card/abilityfactory/effects/ChangeZoneEffect.java index 4af2a7d947c..2e36ccc117a 100644 --- a/src/main/java/forge/card/abilityfactory/effects/ChangeZoneEffect.java +++ b/src/main/java/forge/card/abilityfactory/effects/ChangeZoneEffect.java @@ -609,7 +609,7 @@ public class ChangeZoneEffect extends SpellEffect { } // Look at opponents hand before moving onto choosing a card - if (origin.contains(ZoneType.Hand) && player.isHostileTo(player)) { + if (origin.contains(ZoneType.Hand) && player.isOpponentOf(player)) { GuiChoose.oneOrNone(sa.getSourceCard().getName() + " - Looking at Opponent's Hand", player .getCardsIn(ZoneType.Hand)); } diff --git a/src/main/java/forge/card/abilityfactory/effects/ChoosePlayerEffect.java b/src/main/java/forge/card/abilityfactory/effects/ChoosePlayerEffect.java index 1d3244b0907..169d3645a6b 100644 --- a/src/main/java/forge/card/abilityfactory/effects/ChoosePlayerEffect.java +++ b/src/main/java/forge/card/abilityfactory/effects/ChoosePlayerEffect.java @@ -56,7 +56,7 @@ public class ChoosePlayerEffect extends SpellEffect { if (sa.hasParam("AILogic")) { if (sa.getParam("AILogic").equals("Curse")) { for (int curseChoice = 0; curseChoice < choices.size(); curseChoice++) { - if (choices.get(curseChoice).isHostileTo(p)) { + if (choices.get(curseChoice).isOpponentOf(p)) { card.setChosenPlayer(choices.get(curseChoice)); break; } diff --git a/src/main/java/forge/card/abilityfactory/effects/SacrificeEffect.java b/src/main/java/forge/card/abilityfactory/effects/SacrificeEffect.java index dfd1543e818..46aeebc9fda 100644 --- a/src/main/java/forge/card/abilityfactory/effects/SacrificeEffect.java +++ b/src/main/java/forge/card/abilityfactory/effects/SacrificeEffect.java @@ -53,7 +53,7 @@ public class SacrificeEffect extends SpellEffect { if (sa.hasParam("Random")) { sacList = sacrificeRandom(p, amount, valid, sa, destroy); } else if (p.isComputer()) { - if (sa.hasParam("Optional") && sa.getActivatingPlayer().isHostileTo(p)) { + if (sa.hasParam("Optional") && sa.getActivatingPlayer().isOpponentOf(p)) { continue; } sacList = sacrificeAI(p, amount, valid, sa, destroy); diff --git a/src/main/java/forge/game/ai/ComputerUtil.java b/src/main/java/forge/game/ai/ComputerUtil.java index d0f86b553b7..48d9cf4be0e 100644 --- a/src/main/java/forge/game/ai/ComputerUtil.java +++ b/src/main/java/forge/game/ai/ComputerUtil.java @@ -1196,7 +1196,7 @@ public class ComputerUtil { // don't bounce or blink a permanent that the human // player owns or is a token - if (saviourApi == ApiType.ChangeZone && (c.getOwner().isHuman() || c.isToken())) { + if (saviourApi == ApiType.ChangeZone && (c.getOwner().isOpponentOf(aiPlayer) || c.isToken())) { continue; } diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 65ada6a2af9..5ef798d5de8 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -1678,7 +1678,7 @@ public abstract class Player extends GameEntity implements Comparable { boolean hasPutIntoPlayWith2xP1P1InsteadOfDiscard = c.hasKeyword("If a spell or ability an opponent controls causes you to discard CARDNAME, put it onto the battlefield with two +1/+1 counters on it instead of putting it into your graveyard."); if ((hasPutIntoPlayInsteadOfDiscard || hasPutIntoPlayWith2xP1P1InsteadOfDiscard) - && null != sa && sa.getSourceCard().getController().isHostileTo(c.getController())) { + && null != sa && sa.getSourceCard().getController().isOpponentOf(c.getController())) { game.getAction().moveToPlay(c); if (hasPutIntoPlayWith2xP1P1InsteadOfDiscard) { @@ -2477,7 +2477,7 @@ public abstract class Player extends GameEntity implements Comparable { final String[] incR = restriction.split("\\."); if (incR[0].equals("Opponent")) { - if (this.equals(sourceController) || !this.isHostileTo(sourceController)) { + if (this.equals(sourceController) || !this.isOpponentOf(sourceController)) { return false; } } else if (incR[0].equals("You")) { @@ -2526,7 +2526,7 @@ public abstract class Player extends GameEntity implements Comparable { return false; } } else if (property.equals("Opponent")) { - if (this.equals(sourceController) || !this.isHostileTo(sourceController)) { + if (this.equals(sourceController) || !this.isOpponentOf(sourceController)) { return false; } } else if (property.equals("Other")) { @@ -3114,7 +3114,7 @@ public abstract class Player extends GameEntity implements Comparable { * @param playerTurn * @return */ - public boolean isHostileTo(Player other) { + public boolean isOpponentOf(Player other) { if (other.equals(getOpponent())) { return true; } diff --git a/src/main/java/forge/game/player/PlayerControllerHuman.java b/src/main/java/forge/game/player/PlayerControllerHuman.java index 79296705693..f60dc2d6c71 100644 --- a/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/src/main/java/forge/game/player/PlayerControllerHuman.java @@ -17,6 +17,7 @@ import forge.game.GameState; import forge.game.GameType; import forge.game.phase.PhaseType; import forge.gui.GuiChoose; +import forge.gui.GuiDialog; import forge.gui.match.CMatchUI; import forge.item.CardPrinted; @@ -106,10 +107,8 @@ public class PlayerControllerHuman extends PlayerController { question.append("Cast ").append(cascadedCard.getName()); question.append(" without paying its mana cost?"); - final int answer = JOptionPane.showConfirmDialog(null, question.toString(), - title.toString(), JOptionPane.YES_NO_OPTION); - boolean result = answer == JOptionPane.YES_OPTION; + boolean result = GuiDialog.confirm(cascadedCard, question.toString()); if ( result ) game.getAction().playCardWithoutManaCost(cascadedCard, getPlayer()); return result;