From 165b6eb47efb04a792e18e3463de9323f7956b4b Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Tue, 20 Sep 2011 03:13:48 +0000 Subject: [PATCH] getPlayerTypeIn from AllZoneUtil removed in favour of player.getCardsIn(zone).getType(type) --- src/main/java/forge/AllZoneUtil.java | 25 ++++--------------- src/main/java/forge/ComputerUtil.java | 4 +-- src/main/java/forge/Player.java | 4 +-- src/main/java/forge/Upkeep.java | 8 +++--- .../card/cardFactory/CardFactoryUtil.java | 2 +- .../cardFactory/CardFactory_Creatures.java | 4 +-- .../cardFactory/CardFactory_Instants.java | 2 +- .../CardFactory_Planeswalkers.java | 6 ++--- .../cardFactory/CardFactory_Sorceries.java | 6 ++--- src/main/java/forge/card/cost/CostExile.java | 1 - 10 files changed, 23 insertions(+), 39 deletions(-) diff --git a/src/main/java/forge/AllZoneUtil.java b/src/main/java/forge/AllZoneUtil.java index 9365ceafcc6..20484e265e6 100644 --- a/src/main/java/forge/AllZoneUtil.java +++ b/src/main/java/forge/AllZoneUtil.java @@ -12,26 +12,11 @@ import java.util.List; * @author dennis.r.friedrichsen (slapshot5 on slightlymagic.net) * @version $Id$ */ -public final class AllZoneUtil { +public abstract class AllZoneUtil { - private AllZoneUtil() { - throw new AssertionError(); - } //////////// Creatures - /** - * gets a list of all cards of a certain type that a given player has in given zone. - * - * @param player the player to check for cards in play - * @param cardType the card type to check for - * @return a CardList with all cards of a certain type the player has in play - */ - public static CardList getPlayerTypeIn(final Player player, final Constant.Zone zone, final String cardType) { - CardList cards = player.getCardsIn(zone); - cards = cards.getType(cardType); - return cards; - } /** * gets a list of all cards owned by both players that have are currently in the given zone. @@ -250,8 +235,8 @@ public final class AllZoneUtil { public static int compareTypeAmountInPlay(final Player player, final String type) { // returns the difference between player's Player opponent = player.getOpponent(); - CardList playerList = getPlayerTypeIn(player, Zone.Battlefield, type); - CardList opponentList = getPlayerTypeIn(opponent, Zone.Battlefield, type); + CardList playerList = player.getCardsIn(Zone.Battlefield).getType(type); + CardList opponentList = opponent.getCardsIn(Zone.Battlefield).getType(type); return (playerList.size() - opponentList.size()); } @@ -265,8 +250,8 @@ public final class AllZoneUtil { public static int compareTypeAmountInGraveyard(final Player player, final String type) { // returns the difference between player's Player opponent = player.getOpponent(); - CardList playerList = getPlayerTypeIn(player, Zone.Graveyard, type); - CardList opponentList = getPlayerTypeIn(opponent, Zone.Graveyard, type); + CardList playerList = player.getCardsIn(Zone.Graveyard).getType(type); + CardList opponentList = opponent.getCardsIn(Zone.Graveyard).getType(type); return (playerList.size() - opponentList.size()); } diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/ComputerUtil.java index 269d4a3b66a..a1acc08d2bb 100644 --- a/src/main/java/forge/ComputerUtil.java +++ b/src/main/java/forge/ComputerUtil.java @@ -778,7 +778,7 @@ public class ComputerUtil { landList = landList.filter(CardListFilter.lands); - CardList lands = AllZoneUtil.getPlayerTypeIn(computer, Zone.Graveyard, "Land"); + CardList lands = computer.getCardsIn(Zone.Graveyard).getType("Land"); for (Card crd : lands){ if (crd.isLand() && crd.hasKeyword("May be played")) landList.add(crd); @@ -972,7 +972,7 @@ public class ComputerUtil { if (hand.size() <= 0) { continue; } - CardList landsInPlay = AllZoneUtil.getPlayerTypeIn(AllZone.getComputerPlayer(), Zone.Battlefield, "Land"); + CardList landsInPlay = AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield).getType("Land"); if (landsInPlay.size() > 5) { CardList landsInHand = hand.getType("Land"); if (landsInHand.size() > 0) { //discard lands diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index 2c508656f0d..60b4c07cba1 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -1274,7 +1274,7 @@ public abstract class Player extends GameEntity { * @return a {@link forge.Card} object. */ public Card getPlaneswalker() { - CardList c = AllZoneUtil.getPlayerTypeIn(this, Zone.Battlefield, "Planeswalker"); + CardList c = getCardsIn(Zone.Battlefield).getType("Planeswalker"); if (null != c && c.size() > 0) return c.get(0); else return null; } @@ -1580,7 +1580,7 @@ public abstract class Player extends GameEntity { * @return a boolean. */ public boolean hasMetalcraft() { - CardList list = AllZoneUtil.getPlayerTypeIn(this, Zone.Battlefield, "Artifact"); + CardList list = getCardsIn(Zone.Battlefield).getType("Artifact"); return list.size() >= 3; } diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java index f012e6ad17a..2ac427baeba 100644 --- a/src/main/java/forge/Upkeep.java +++ b/src/main/java/forge/Upkeep.java @@ -2066,8 +2066,8 @@ public class Upkeep implements java.io.Serializable { oathFlag = false; } } else { // if player == Computer - CardList creaturesInLibrary = AllZoneUtil.getPlayerTypeIn(player, Zone.Library, "Creature"); - CardList creaturesInBattlefield = AllZoneUtil.getPlayerTypeIn(player, Zone.Battlefield, "Creature"); + CardList creaturesInLibrary = player.getCardsIn(Zone.Library).getType("Creature"); + CardList creaturesInBattlefield = player.getCardsIn(Zone.Battlefield).getType("Creature"); // if there are at least 3 creatures in library, or none in play with one in library, oath if (creaturesInLibrary.size() > 2 @@ -2131,7 +2131,7 @@ public class Upkeep implements java.io.Serializable { Ability ability = new Ability(oathList.get(0), "0") { @Override public void resolve() { - CardList graveyardCreatures = AllZoneUtil.getPlayerTypeIn(player, Zone.Graveyard, "Creature"); + CardList graveyardCreatures = player.getCardsIn(Zone.Graveyard).getType("Creature"); if (AllZoneUtil.compareTypeAmountInGraveyard(player, "Creature") > 0) { if (player.isHuman()) { @@ -2169,7 +2169,7 @@ public class Upkeep implements java.io.Serializable { private static void upkeep_Karma() { final Player player = AllZone.getPhase().getPlayerTurn(); CardList karmas = AllZoneUtil.getCardsIn(Zone.Battlefield, "Karma"); - CardList swamps = AllZoneUtil.getPlayerTypeIn(player, Zone.Battlefield, "Swamp"); + CardList swamps = player.getCardsIn(Zone.Battlefield).getType("Swamp"); // determine how much damage to deal the current player final int damage = swamps.size(); diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java index 49fc4441927..cbc47d744d8 100644 --- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java @@ -2773,7 +2773,7 @@ public class CardFactoryUtil { } if (sq[0].contains("LandsInGraveyard")) { if (players.size() > 0) { - return doXMath(AllZoneUtil.getPlayerTypeIn(players.get(0), Zone.Graveyard, "Land").size(), m, source); + return doXMath(players.get(0).getCardsIn(Zone.Graveyard).getType("Land").size(), m, source); } } diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java index c2c75ace543..02530b1d78e 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java @@ -485,7 +485,7 @@ public class CardFactory_Creatures { if (card.getController().isHuman()) { - CardList artifacts = AllZoneUtil.getPlayerTypeIn(AllZone.getHumanPlayer(), Zone.Battlefield, "Artifact"); + CardList artifacts = AllZone.getHumanPlayer().getCardsIn(Zone.Battlefield).getType("Artifact"); if (artifacts.size() != 0) AllZone.getInputControl().setInput(target); @@ -986,7 +986,7 @@ public class CardFactory_Creatures { } public CardList getCreatures() { - CardList creatures = AllZoneUtil.getPlayerTypeIn(card.getController(), Zone.Graveyard, "Elemental"); + CardList creatures = card.getController().getCardsIn(Zone.Graveyard).getType("Elemental"); return creatures; } diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Instants.java b/src/main/java/forge/card/cardFactory/CardFactory_Instants.java index 5537d06fd9c..7791967b9eb 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Instants.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Instants.java @@ -1506,7 +1506,7 @@ public class CardFactory_Instants { String[] choices = new String[]{"Artifact", "Creature", "Land"}; Object o = GuiUtils.getChoice("Select permanent type", choices); String cardType = (String) o; - CardList list = AllZoneUtil.getPlayerTypeIn(getTargetPlayer(), Zone.Battlefield, cardType); + CardList list = getTargetPlayer().getCardsIn(Zone.Battlefield).getType(cardType); String[] tapOrUntap = new String[]{"Tap", "Untap"}; Object z = GuiUtils.getChoice("Tap or Untap?", tapOrUntap); diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java b/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java index b4d70ea8f48..6c6a761f5b0 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java @@ -1238,7 +1238,7 @@ public class CardFactory_Planeswalkers { final Player target = getTargetPlayer(); final Player player = card.getController(); - CardList dragons = AllZoneUtil.getPlayerTypeIn(player, Zone.Battlefield, "Dragon"); + CardList dragons = player.getCardsIn(Zone.Battlefield).getType("Dragon"); for (int i = 0; i < dragons.size(); i++) { Card dragon = dragons.get(i); int damage = dragon.getNetAttack(); @@ -1250,7 +1250,7 @@ public class CardFactory_Planeswalkers { @Override public boolean canPlayAI() { setTargetPlayer(AllZone.getHumanPlayer()); - CardList dragons = AllZoneUtil.getPlayerTypeIn(AllZone.getComputerPlayer(), Zone.Battlefield, "Dragon"); + CardList dragons = AllZone.getComputerPlayer().getCardsIn(Zone.Battlefield).getType("Dragon"); return card.getCounters(Counters.LOYALTY) >= 4 && dragons.size() >= 1; } @@ -1471,7 +1471,7 @@ public class CardFactory_Planeswalkers { @Override public void showMessage() { - CardList lands = AllZoneUtil.getPlayerTypeIn(card.getController(), Zone.Battlefield, "Mountain"); + CardList lands = card.getController().getCardsIn(Zone.Battlefield).getType("Mountain"); stopSetNext(CardFactoryUtil.input_targetSpecific(ability1, lands, "Select target Mountain", true, false)); diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java b/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java index 27b70cf2cb2..84ad58bf37f 100644 --- a/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java +++ b/src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java @@ -2266,12 +2266,12 @@ public class CardFactory_Sorceries { } public Card[] getCreatures() { - CardList creature = AllZoneUtil.getPlayerTypeIn(card.getController(), Zone.Graveyard, "Creature"); + CardList creature = card.getController().getCardsIn(Zone.Graveyard).getType("Creature"); return creature.toArray(); } public Card[] getCreaturesAI() { - CardList creature = AllZoneUtil.getPlayerTypeIn(card.getController(), Zone.Graveyard, "Creature"); + CardList creature = card.getController().getCardsIn(Zone.Graveyard).getType("Creature"); creature = creature.filter(new CardListFilter() { public boolean addCard(Card c) { return c.getNetAttack() > 4; @@ -2300,7 +2300,7 @@ public class CardFactory_Sorceries { @Override public void showMessage() { - CardList creature = AllZoneUtil.getPlayerTypeIn(card.getController(), Zone.Graveyard, "Creature"); + CardList creature = card.getController().getCardsIn(Zone.Graveyard).getType("Creature"); Object check = GuiUtils.getChoiceOptional("Select creature", creature); if (check != null) { spell.setTargetCard((Card) check); diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index 6fb9a9099b4..66552cbc53d 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/src/main/java/forge/card/cost/CostExile.java @@ -5,7 +5,6 @@ import java.util.Iterator; import javax.swing.JOptionPane; import forge.AllZone; -import forge.AllZoneUtil; import forge.ButtonUtil; import forge.Card; import forge.CardList;