diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfRhetoric.java b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfRhetoric.java index b6a766758e3..29e18d52ffd 100644 --- a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfRhetoric.java +++ b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfRhetoric.java @@ -27,27 +27,15 @@ */ package mage.sets.journeyintonyx; -import java.util.HashSet; -import java.util.Set; import java.util.UUID; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ReplacementEffectImpl; +import mage.abilities.effects.common.continious.CantCastMoreThanOneSpellEffect; import mage.cards.CardImpl; import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; import mage.constants.Rarity; -import mage.constants.WatcherScope; +import mage.constants.TargetController; import mage.constants.Zone; -import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.permanent.Permanent; -import mage.game.stack.Spell; -import mage.players.Player; -import mage.watchers.Watcher; -import mage.watchers.WatcherImpl; /** * @@ -65,8 +53,7 @@ public class EidolonOfRhetoric extends CardImpl { this.toughness = new MageInt(4); // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EidolonOfRhetoricEffect())); - this.addWatcher(new EidolonOfRhetoricWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); } public EidolonOfRhetoric(final EidolonOfRhetoric card) { @@ -78,81 +65,3 @@ public class EidolonOfRhetoric extends CardImpl { return new EidolonOfRhetoric(this); } } - -class EidolonOfRhetoricWatcher extends WatcherImpl { - - private final Set players = new HashSet<>(); - - public EidolonOfRhetoricWatcher() { - super("SpellCast", WatcherScope.GAME); - } - - public EidolonOfRhetoricWatcher(final EidolonOfRhetoricWatcher watcher) { - super(watcher); - } - - @Override - public EidolonOfRhetoricWatcher copy() { - return new EidolonOfRhetoricWatcher(this); - } - - @Override - public void watch(GameEvent event, Game game) { - if (event.getType() == GameEvent.EventType.SPELL_CAST ) { - Spell spell = game.getStack().getSpell(event.getTargetId()); - if (spell != null) { - players.add(spell.getControllerId()); - } - } - } - - @Override - public void reset() { - super.reset(); - players.clear(); - } - - - public boolean playerCastSpellThisTurn(UUID playerId) { - return players.contains(playerId); - } -} - -class EidolonOfRhetoricEffect extends ReplacementEffectImpl { - - public EidolonOfRhetoricEffect() { - super(Duration.WhileOnBattlefield, Outcome.Detriment); - staticText = "Each player can't cast more than one spell each turn"; - } - - public EidolonOfRhetoricEffect(final EidolonOfRhetoricEffect effect) { - super(effect); - } - - @Override - public EidolonOfRhetoricEffect copy() { - return new EidolonOfRhetoricEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - return true; - } - - @Override - public boolean replaceEvent(GameEvent event, Ability source, Game game) { - return true; - } - - @Override - public boolean applies(GameEvent event, Ability source, Game game) { - if (event.getType() == GameEvent.EventType.CAST_SPELL) { - EidolonOfRhetoricWatcher watcher = (EidolonOfRhetoricWatcher) game.getState().getWatchers().get("SpellCast", event.getPlayerId()); - if (watcher != null && watcher.playerCastSpellThisTurn(event.getPlayerId())) { - return true; - } - } - return false; - } - -} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/tenth/RuleOfLaw.java b/Mage.Sets/src/mage/sets/tenth/RuleOfLaw.java index 14e2ed55e13..ca24f9a910d 100644 --- a/Mage.Sets/src/mage/sets/tenth/RuleOfLaw.java +++ b/Mage.Sets/src/mage/sets/tenth/RuleOfLaw.java @@ -28,18 +28,13 @@ package mage.sets.tenth; import java.util.UUID; - -import mage.constants.*; -import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.ReplacementEffectImpl; +import mage.abilities.effects.common.continious.CantCastMoreThanOneSpellEffect; import mage.cards.CardImpl; -import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.permanent.Permanent; -import mage.players.Player; -import mage.watchers.Watcher; -import mage.watchers.WatcherImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; /** * @@ -54,8 +49,7 @@ public class RuleOfLaw extends CardImpl { this.color.setWhite(true); // Each player can't cast more than one spell each turn. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RuleOfLawEffect())); - this.addWatcher(new RuleOfLawWatcher()); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantCastMoreThanOneSpellEffect(TargetController.ANY))); } @@ -68,75 +62,3 @@ public class RuleOfLaw extends CardImpl { return new RuleOfLaw(this); } } - -class RuleOfLawWatcher extends WatcherImpl { - - public RuleOfLawWatcher() { - super("SpellCast", WatcherScope.PLAYER); - } - - public RuleOfLawWatcher(final RuleOfLawWatcher watcher) { - super(watcher); - } - - @Override - public RuleOfLawWatcher copy() { - return new RuleOfLawWatcher(this); - } - - @Override - public void watch(GameEvent event, Game game) { - if (condition == true) {//no need to check - condition has already occured - return; - } - if (event.getType() == GameEvent.EventType.SPELL_CAST ) { - Permanent enchantment = game.getPermanent(this.sourceId); - if (enchantment != null && enchantment.getAttachedTo() != null) { - Player player = game.getPlayer(enchantment.getAttachedTo()); - if (player != null && event.getPlayerId().equals(player.getId())) { - condition = true; - } - } - } - } - -} - -class RuleOfLawEffect extends ReplacementEffectImpl { - - public RuleOfLawEffect() { - super(Duration.WhileOnBattlefield, Outcome.Benefit); - staticText = "Each player can't cast more than one spell each turn"; - } - - public RuleOfLawEffect(final RuleOfLawEffect effect) { - super(effect); - } - - @Override - public RuleOfLawEffect copy() { - return new RuleOfLawEffect(this); - } - - @Override - public boolean apply(Game game, Ability source) { - return true; - } - - @Override - public boolean replaceEvent(GameEvent event, Ability source, Game game) { - return true; - } - - @Override - public boolean applies(GameEvent event, Ability source, Game game) { - if (event.getType() == GameEvent.EventType.CAST_SPELL) { - Watcher watcher = game.getState().getWatchers().get("SpellCast", event.getPlayerId()); - if (watcher != null && watcher.conditionMet()) { - return true; - } - } - return false; - } - -} diff --git a/Mage/src/mage/abilities/effects/common/continious/CantCastMoreThanOneSpellEffect.java b/Mage/src/mage/abilities/effects/common/continious/CantCastMoreThanOneSpellEffect.java new file mode 100644 index 00000000000..68e1b554b0b --- /dev/null +++ b/Mage/src/mage/abilities/effects/common/continious/CantCastMoreThanOneSpellEffect.java @@ -0,0 +1,129 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ + +package mage.abilities.effects.common.continious; + +import mage.abilities.Ability; +import mage.abilities.Mode; +import mage.abilities.effects.ReplacementEffectImpl; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; +import mage.watchers.common.CastSpellLastTurnWatcher; + +/** + * + * @author LevelX2 + */ + +public class CantCastMoreThanOneSpellEffect extends ReplacementEffectImpl { + + private final TargetController targetController; + + public CantCastMoreThanOneSpellEffect(TargetController targetController) { + super(Duration.WhileOnBattlefield, Outcome.Detriment); + this.targetController = targetController; + } + + public CantCastMoreThanOneSpellEffect(final CantCastMoreThanOneSpellEffect effect) { + super(effect); + this.targetController = effect.targetController; + } + + @Override + public CantCastMoreThanOneSpellEffect copy() { + return new CantCastMoreThanOneSpellEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + return true; + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + return true; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + if (event.getType() == GameEvent.EventType.CAST_SPELL) { + switch (targetController) { + case NOT_YOU: + if (event.getPlayerId().equals(source.getControllerId())) { + return false; + } + break; + case OPPONENT: + if (!game.getOpponents(source.getControllerId()).contains(event.getPlayerId())) { + return false; + } + break; + case CONTROLLER_ATTACHED_TO: + Permanent attachment = game.getPermanent(source.getSourceId()); + if (attachment == null || !attachment.getAttachedTo().equals(event.getPlayerId())) { + return false; + } + } + CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get("CastSpellLastTurnWatcher", event.getPlayerId()); + if (watcher != null && watcher.getAmountOfSpellsPlayerCastOnCurrentTurn(event.getPlayerId())> 0) { + return true; + } + } + return false; + } + + @Override + public String getText(Mode mode) { + if (staticText != null && !staticText.isEmpty()) { + return staticText; + } + StringBuilder sb = new StringBuilder(); + switch(targetController) { + case NOT_YOU: + sb.append("Each other player"); + break; + case OPPONENT: + sb.append("Each opponent"); + break; + case ANY: + sb.append("Each player"); + break; + case CONTROLLER_ATTACHED_TO: + sb.append("Enchanted player"); + break; + default: + throw new UnsupportedOperationException("TargetController = " + targetController.toString() + " not supported"); + } + sb.append(" can't cast more than one spell each turn"); + return sb.toString(); + } +} diff --git a/Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java b/Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java index 8c3c02df3a5..b8b1d020dc6 100644 --- a/Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java +++ b/Mage/src/mage/abilities/effects/common/discard/DiscardEachPlayerEffect.java @@ -61,7 +61,7 @@ public class DiscardEachPlayerEffect extends OneShotEffect cardsToDiscard = new HashMap(); + HashMap cardsToDiscard = new HashMap<>(); if (controller != null) { // choose cards to discard for (UUID playerId : controller.getInRange()) { diff --git a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java b/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java index ddbe9ad9154..ce4a46a8fc2 100644 --- a/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java +++ b/Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java @@ -44,9 +44,9 @@ import mage.watchers.WatcherImpl; */ public class CastSpellLastTurnWatcher extends WatcherImpl { - private Map amountOfSpellsCastOnPrevTurn = new HashMap(); - private Map amountOfSpellsCastOnCurrentTurn = new HashMap(); - private List spellsCastThisTurnInOrder = new ArrayList(); + private final Map amountOfSpellsCastOnPrevTurn = new HashMap<>(); + private final Map amountOfSpellsCastOnCurrentTurn = new HashMap<>(); + private final List spellsCastThisTurnInOrder = new ArrayList<>(); public CastSpellLastTurnWatcher() { super("CastSpellLastTurnWatcher", WatcherScope.GAME);