From 256e6b4123b4ed063e3c15a007f52f29e922ebbb Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 8 Mar 2012 11:49:17 +0000 Subject: [PATCH] - Hardcoded static abilities are now only be called by checkStaticAbilities. --- src/main/java/forge/CombatUtil.java | 65 ------------------- src/main/java/forge/PhaseHandler.java | 6 -- .../java/forge/PlayerZoneComesIntoPlay.java | 5 -- .../java/forge/control/input/InputAttack.java | 7 -- .../java/forge/control/input/InputBlock.java | 6 -- 5 files changed, 89 deletions(-) diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index cb02c52b19d..b98d00b718c 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -2633,71 +2633,6 @@ public class CombatUtil { } } // Mijae Djinn - /*if (c.getName().equals("Zur the Enchanter") && !c.getCreatureAttackedThisCombat()) { - // hack, to make sure this doesn't break grabbing an oblivion ring: - c.setCreatureAttackedThisCombat(true); - - CardList enchantments = c.getController().getCardsIn(Zone.Library); - enchantments = enchantments.filter(new CardListFilter() { - @Override - public boolean addCard(final Card card) { - return (card.isEnchantment() && (card.getCMC() <= 3)); - } - }); - - if (enchantments.size() > 0) { - if (c.getController().isHuman()) { - final Object o = GuiUtils.getChoiceOptional("Pick an enchantment to put onto the battlefield", - enchantments.toArray()); - if (o != null) { - final Card crd = (Card) o; - Singletons.getModel().getGameAction().moveToPlay(crd); - - if (crd.isAura()) { - Object obj = null; - if (crd.hasKeyword("Enchant creature")) { - final CardList creats = AllZoneUtil.getCreaturesInPlay(); - obj = GuiUtils.getChoiceOptional("Pick a creature to attach " + crd.getName() + " to", - creats.toArray()); - } else if (crd.hasKeyword("Enchant land") || crd.hasKeyword("Enchant land you control")) { - final CardList lands = AllZoneUtil.getLandsInPlay(); - if (lands.size() > 0) { - obj = GuiUtils.getChoiceOptional("Pick a land to attach " + crd.getName() + " to", - lands.toArray()); - } - } - if (obj != null) { - final Card target = (Card) obj; - if (AllZoneUtil.isCardInPlay(target)) { - crd.enchantEntity(target); - } - } - } - c.getController().shuffle(); - // we have to have cards like glorious anthem take - // effect immediately: - for (final String effect : AllZone.getStaticEffects().getStateBasedMap().keySet()) { - final Command com = GameActionUtil.getCommands().get(effect); - com.execute(); - } - - } - } else if (c.getController().isComputer()) { - enchantments = enchantments.filter(new CardListFilter() { - @Override - public boolean addCard(final Card c) { - return !c.isAura(); - } - }); - if (enchantments.size() > 0) { - final Card card = CardFactoryUtil.getBestEnchantmentAI(enchantments, null, false); - Singletons.getModel().getGameAction().moveToPlay(card); - c.getController().shuffle(); - } - } - } // enchantments.size > 0 - }*/ // Zur the enchanter - else if (c.getName().equals("Spectral Bears")) { final Player opp = c.getController().getOpponent(); CardList list = opp.getCardsIn(Zone.Battlefield); diff --git a/src/main/java/forge/PhaseHandler.java b/src/main/java/forge/PhaseHandler.java index c87ac186f68..693d2ae7e26 100644 --- a/src/main/java/forge/PhaseHandler.java +++ b/src/main/java/forge/PhaseHandler.java @@ -500,12 +500,6 @@ public class PhaseHandler extends MyObservable implements java.io.Serializable { *

*/ public final void nextPhase() { - // experimental, add executeCardStateEffects() here: - for (final String effect : AllZone.getStaticEffects().getStateBasedMap().keySet()) { - final Command com = GameActionUtil.getCommands().get(effect); - com.execute(); - } - this.needToNextPhase = false; // If the Stack isn't empty why is nextPhase being called? diff --git a/src/main/java/forge/PlayerZoneComesIntoPlay.java b/src/main/java/forge/PlayerZoneComesIntoPlay.java index 1c304a9f283..011c8abb598 100644 --- a/src/main/java/forge/PlayerZoneComesIntoPlay.java +++ b/src/main/java/forge/PlayerZoneComesIntoPlay.java @@ -264,11 +264,6 @@ public class PlayerZoneComesIntoPlay extends DefaultPlayerZone { comm.execute(); } } - - for (final String effect : AllZone.getStaticEffects().getStateBasedMap().keySet()) { - final Command com = GameActionUtil.getCommands().get(effect); - com.execute(); - } } /** diff --git a/src/main/java/forge/control/input/InputAttack.java b/src/main/java/forge/control/input/InputAttack.java index a34ac79a222..a58d4c9c484 100644 --- a/src/main/java/forge/control/input/InputAttack.java +++ b/src/main/java/forge/control/input/InputAttack.java @@ -107,13 +107,6 @@ public class InputAttack extends Input { // just to make sure the attack symbol is marked AllZone.getHumanPlayer().getZone(Zone.Battlefield).updateObservers(); - - // for Castle Raptors, since it gets a bonus if untapped - for (final String effect : AllZone.getStaticEffects().getStateBasedMap().keySet()) { - final Command com = GameActionUtil.getCommands().get(effect); - com.execute(); - } - CombatUtil.showCombat(); } else { diff --git a/src/main/java/forge/control/input/InputBlock.java b/src/main/java/forge/control/input/InputBlock.java index 1d34b70dfd0..77e22e73fbd 100644 --- a/src/main/java/forge/control/input/InputBlock.java +++ b/src/main/java/forge/control/input/InputBlock.java @@ -59,12 +59,6 @@ public class InputBlock extends Input { /** {@inheritDoc} */ @Override public final void showMessage() { - // for Castle Raptors, since it gets a bonus if untapped - for (final String effect : AllZone.getStaticEffects().getStateBasedMap().keySet()) { - final Command com = GameActionUtil.getCommands().get(effect); - com.execute(); - } - // could add "Reset Blockers" button ButtonUtil.enableOnlyOK();