diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 549a0b41f4a..55e916826b4 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -572,7 +572,7 @@ public class CardFactory implements NewConstants { else if(Destination.equals("Shuffle")) { AllZone.GameAction.moveToBottomOfLibrary(sa.getSourceCard()); - AllZone.GameAction.shuffle(sa.getSourceCard().getController()); + sa.getSourceCard().getController().shuffle(); } else { @@ -3286,7 +3286,7 @@ public class CardFactory implements NewConstants { else if(Destination.equals("ShuffleIntoLibrary")) { AllZone.GameAction.moveToTopOfLibrary(tgtC); - AllZone.GameAction.shuffle(tgtC.getOwner()); + tgtC.getOwner().shuffle(); } else if(Destination.equals("Exile")) AllZone.GameAction.exile(tgtC); @@ -3449,7 +3449,7 @@ public class CardFactory implements NewConstants { else if (Destination.equals("ShuffleIntoLibrary")) { AllZone.GameAction.moveToTopOfLibrary(tgtC); - AllZone.GameAction.shuffle(tgtC.getOwner()); + tgtC.getOwner().shuffle(); } else if (Destination.equals("Exile")) AllZone.GameAction.exile(tgtC); @@ -3625,7 +3625,7 @@ public class CardFactory implements NewConstants { else if(Destination.equals("BottomofLibrary")) AllZone.GameAction.moveToBottomOfLibrary(c); else if(Destination.equals("ShuffleIntoLibrary")) { AllZone.GameAction.moveToTopOfLibrary(c); - AllZone.GameAction.shuffle(c.getOwner()); + c.getOwner().shuffle(); } else if(Destination.equals("Exile")) AllZone.GameAction.exile(c); else if(Destination.equals("Hand")) { @@ -4170,7 +4170,7 @@ public class CardFactory implements NewConstants { list = list.getNotName(card.getName()); } Card c = list.get(0); - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); AllZone.Computer_Library.remove(c); if (Destination.equals("Hand")) AllZone.Computer_Hand.add(c); //move to hand if (Destination.equals("TopOfLibrary")) AllZone.Computer_Library.add(c, 0); //move to top of library @@ -4192,7 +4192,7 @@ public class CardFactory implements NewConstants { if(list.size() != 0) { Object o = AllZone.Display.getChoiceOptional("Select a card", list.toArray()); - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); if(o != null) { AllZone.Human_Library.remove(o); if (Destination.equals("Hand")) AllZone.Human_Hand.add((Card) o); //move to hand @@ -5839,7 +5839,7 @@ public class CardFactory implements NewConstants { } - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); } }; @@ -10717,7 +10717,7 @@ public class CardFactory implements NewConstants { lib.add(c); } AllZone.getZone(Constant.Zone.Graveyard, player).reset(); - AllZone.GameAction.shuffle(player); + player.shuffle(); } @Override @@ -10853,7 +10853,7 @@ public class CardFactory implements NewConstants { AllZone.GameAction.exile(c); } AllZone.getZone(Constant.Zone.Graveyard, player).reset(); - AllZone.GameAction.shuffle(player); + player.shuffle(); } @Override diff --git a/src/forge/CardFactory_Instants.java b/src/forge/CardFactory_Instants.java index e9fe4f3c570..b54548fbf83 100644 --- a/src/forge/CardFactory_Instants.java +++ b/src/forge/CardFactory_Instants.java @@ -500,7 +500,7 @@ public class CardFactory_Instants { PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController()); AllZone.GameAction.moveTo(grave, (Card) check); } - AllZone.GameAction.shuffle(AllZone.HumanPlayer); + AllZone.HumanPlayer.shuffle(); } public void computerResolve() { @@ -559,7 +559,7 @@ public class CardFactory_Instants { //shuffle card back into the library PlayerZone library = AllZone.getZone(Constant.Zone.Library, card.getController()); AllZone.GameAction.moveTo(library,card); - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); } }; spell.setChooseTargetAI(CardFactoryUtil.AI_targetHumanCreatureOrPlayer()); @@ -2111,7 +2111,7 @@ public class CardFactory_Instants { creature = creature.getType("Creature"); if(creature.size() != 0) { Card c = creature.get(0); - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); //move to top of library AllZone.Computer_Library.remove(c); @@ -2132,7 +2132,7 @@ public class CardFactory_Instants { if(list.size() != 0) { Object o = AllZone.Display.getChoiceOptional("Select a creature", list.toArray()); - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); if(o != null) { //put creature on top of library library.remove(o); @@ -2597,7 +2597,7 @@ public class CardFactory_Instants { PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getController()); AllZone.GameAction.moveTo(hand, (Card) check); } - AllZone.GameAction.shuffle(AllZone.HumanPlayer); + AllZone.HumanPlayer.shuffle(); } public void computerResolve() { @@ -2832,7 +2832,7 @@ public class CardFactory_Instants { c = creature.get(0); } - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); //move to top of library AllZone.Computer_Library.remove(c); @@ -2853,7 +2853,7 @@ public class CardFactory_Instants { if(list.size() != 0) { Object o = AllZone.Display.getChoiceOptional("Select a card", list.toArray()); - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); if(o != null) { //put card on top of library library.remove(o); @@ -2933,7 +2933,7 @@ public class CardFactory_Instants { grave.add(toGrave1); grave.add(toGrave2); - AllZone.GameAction.shuffle(AllZone.HumanPlayer); + AllZone.HumanPlayer.shuffle(); } public void computerResolve() { @@ -3378,7 +3378,7 @@ public class CardFactory_Instants { AllZone.Human_Play.add(card); card.tap(); lands.remove(card); - AllZone.GameAction.shuffle(player); + player.shuffle(); } }// if choice yes } // player equals human @@ -3389,7 +3389,7 @@ public class CardFactory_Instants { AllZone.Computer_Play.add(card); card.tap(); lands.remove(card); - AllZone.GameAction.shuffle(player); + player.shuffle(); } } }//resolve() diff --git a/src/forge/CardFactory_Planeswalkers.java b/src/forge/CardFactory_Planeswalkers.java index 018d935c793..be4b2fe0867 100644 --- a/src/forge/CardFactory_Planeswalkers.java +++ b/src/forge/CardFactory_Planeswalkers.java @@ -446,7 +446,7 @@ class CardFactory_Planeswalkers { play.add(c); } } - AllZone.GameAction.shuffle(AllZone.HumanPlayer); + AllZone.HumanPlayer.shuffle(); }//human else { PlayerZone lib = AllZone.getZone(Constant.Zone.Library, card2.getController()); @@ -459,7 +459,7 @@ class CardFactory_Planeswalkers { lib.remove(nissa); play.add(nissa); } - AllZone.GameAction.shuffle(AllZone.ComputerPlayer); + AllZone.ComputerPlayer.shuffle(); } } @@ -1105,7 +1105,7 @@ class CardFactory_Planeswalkers { creature = creature.getType("Creature"); if(creature.size() != 0) { Card c = creature.get(0); - AllZone.GameAction.shuffle(card2.getController()); + card2.getController().shuffle(); //move to top of library AllZone.Computer_Library.remove(c); @@ -1121,7 +1121,7 @@ class CardFactory_Planeswalkers { if(list.size() != 0) { Object o = AllZone.Display.getChoiceOptional("Select any card", list.toArray()); - AllZone.GameAction.shuffle(card2.getController()); + card2.getController().shuffle(); if(o != null) { //put creature on top of library library.remove(o); diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index d4ae3a5a6a7..e48b6e49bef 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -1327,7 +1327,7 @@ public class CombatUtil { } } } - AllZone.GameAction.shuffle(c.getController()); + c.getController().shuffle(); //we have to have cards like glorious anthem take effect immediately: for(String effect:AllZone.StaticEffects.getStateBasedMap().keySet()) { Command com = GameActionUtil.commands.get(effect); @@ -1346,7 +1346,7 @@ public class CombatUtil { Card card = enchantments.get(0); library.remove(card); play.add(card); - AllZone.GameAction.shuffle(c.getController()); + c.getController().shuffle(); //we have to have cards like glorious anthem take effect immediately: GameActionUtil.executeCardStateEffects(); } @@ -2767,7 +2767,7 @@ public class CombatUtil { play.add(Enchantment); Enchantment.enchantCard(attacker); } - if(player.isHuman()) AllZone.GameAction.shuffle(attacker.getController()); + if(player.isHuman()) attacker.getController().shuffle(); }//resolve };// ability4 ability4.setStackDescription(c + " - (Exalted) searches library for an Aura card that could enchant that creature, put it into play attached to that creature, then shuffles library. "); diff --git a/src/forge/DefaultPlayerZone.java b/src/forge/DefaultPlayerZone.java index b2eb2187a22..9104ec5eb05 100644 --- a/src/forge/DefaultPlayerZone.java +++ b/src/forge/DefaultPlayerZone.java @@ -30,7 +30,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl { PlayerZone lib = AllZone.getZone(Constant.Zone.Library, c.getOwner()); lib.add(c); - AllZone.GameAction.shuffle(c.getOwner()); + c.getOwner().shuffle(); return; } //slight difference from above I guess, the card gets put into the grave first, then shuffled into library. @@ -43,7 +43,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl grave.addOnce(c); grave.remove(c); lib.add(c); - AllZone.GameAction.shuffle(c.getOwner()); + c.getOwner().shuffle(); return; } @@ -57,7 +57,7 @@ public class DefaultPlayerZone extends PlayerZone implements java.io.Serializabl for(Card gc : grave.getCards()) lib.add(gc); grave.reset(); - AllZone.GameAction.shuffle(c.getOwner()); + c.getOwner().shuffle(); return; } diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 7dd7c56fc1c..5798b47db50 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -6192,7 +6192,7 @@ public class GameActionUtil { } } - AllZone.GameAction.shuffle(AllZone.HumanPlayer); + AllZone.HumanPlayer.shuffle(); }// if choice yes } // player equals human else if(player.equals(AllZone.ComputerPlayer) && lands.size() > 0) { @@ -6214,7 +6214,7 @@ public class GameActionUtil { lands.remove(card); } } - AllZone.GameAction.shuffle(AllZone.ComputerPlayer); + AllZone.ComputerPlayer.shuffle(); } } @@ -6775,7 +6775,7 @@ public class GameActionUtil { hand.add(card); } - AllZone.GameAction.shuffle(player); + player.shuffle(); } } @@ -7734,7 +7734,7 @@ public class GameActionUtil { play.add(creature2); } - AllZone.GameAction.shuffle(card.getController()); + card.getController().shuffle(); } diff --git a/src/forge/Input_Mulligan.java b/src/forge/Input_Mulligan.java index 85235a04e7e..5003d43b423 100644 --- a/src/forge/Input_Mulligan.java +++ b/src/forge/Input_Mulligan.java @@ -32,7 +32,7 @@ public class Input_Mulligan extends Input { } for(int i = 0; i < 100; i++) - AllZone.GameAction.shuffle(AllZone.HumanPlayer); + AllZone.HumanPlayer.shuffle(); int newHand = hand.length - 1;