From 90aec7c5174b05539c3c24d8858e4e4c040eccc4 Mon Sep 17 00:00:00 2001 From: MTGfan Date: Thu, 8 Dec 2016 22:38:17 -0500 Subject: [PATCH] Changes to Consecrate Land and Power Surge both not working yet. --- .../src/mage/cards/c/ConsecrateLand.java | 6 +- Mage.Sets/src/mage/cards/p/PowerSurge.java | 7 +- ...UntappedLandsAtBeginningOfTurnWatcher.java | 90 +++++++++++++++++++ 3 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 Mage/src/main/java/mage/watchers/common/UntappedLandsAtBeginningOfTurnWatcher.java diff --git a/Mage.Sets/src/mage/cards/c/ConsecrateLand.java b/Mage.Sets/src/mage/cards/c/ConsecrateLand.java index 3fa4153242..0ac0892f80 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecrateLand.java +++ b/Mage.Sets/src/mage/cards/c/ConsecrateLand.java @@ -30,7 +30,7 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.CantBeEnchantedSourceEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -90,7 +90,7 @@ public class ConsecrateLand extends CardImpl { // 9/25/2006 ruling: If Consecrate Land enters the battlefield attached to a land that’s enchanted by other Auras, those Auras are put into their owners’ graveyards. -class ConsecrateLandEffect extends OneShotEffect { +class ConsecrateLandEffect extends ContinuousEffectImpl { private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent(); @@ -99,7 +99,7 @@ class ConsecrateLandEffect extends OneShotEffect { } public ConsecrateLandEffect() { - super(Outcome.Benefit); + super(Duration.WhileOnBattlefield, Outcome.Benefit); } public ConsecrateLandEffect(final ConsecrateLandEffect effect) { diff --git a/Mage.Sets/src/mage/cards/p/PowerSurge.java b/Mage.Sets/src/mage/cards/p/PowerSurge.java index 09d5330b84..1eb7bc9cfc 100644 --- a/Mage.Sets/src/mage/cards/p/PowerSurge.java +++ b/Mage.Sets/src/mage/cards/p/PowerSurge.java @@ -38,9 +38,9 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.constants.TargetController; import mage.constants.Zone; -import mage.filter.common.FilterControlledUntappedLandPermanent; import mage.game.Game; import mage.players.Player; +import mage.watchers.common.UntappedLandsAtBeginningOfTurnWatcher; /** * @@ -53,7 +53,7 @@ public class PowerSurge extends CardImpl { // At the beginning of each player's upkeep, Power Surge deals X damage to that player, where X is the number of untapped lands he or she controlled at the beginning of this turn. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PowerSurgeDamageEffect(), TargetController.ANY, false, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PowerSurgeDamageEffect(), TargetController.ANY, false, true), new UntappedLandsAtBeginningOfTurnWatcher()); } public PowerSurge(final PowerSurge card) { @@ -87,7 +87,8 @@ class PowerSurgeDamageEffect extends OneShotEffect{ public boolean apply(Game game, Ability source) { Player player = game.getPlayer(targetPointer.getFirst(game, source)); if (player != null) { - int damage = game.getBattlefield().getAllActivePermanents(new FilterControlledUntappedLandPermanent(), targetPointer.getFirst(game, source), game).size(); + UntappedLandsAtBeginningOfTurnWatcher watcher = (UntappedLandsAtBeginningOfTurnWatcher) game.getState().getWatchers().get("UntappedLandsAtBeginningOfTurn"); + int damage = watcher.getUntappedLandCount(targetPointer.getFirst(game, source)); player.damage(damage, source.getSourceId(), game, false, true); return true; } diff --git a/Mage/src/main/java/mage/watchers/common/UntappedLandsAtBeginningOfTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/UntappedLandsAtBeginningOfTurnWatcher.java new file mode 100644 index 0000000000..14a676d9c7 --- /dev/null +++ b/Mage/src/main/java/mage/watchers/common/UntappedLandsAtBeginningOfTurnWatcher.java @@ -0,0 +1,90 @@ +/* + * 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.watchers.common; + +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.UUID; +import mage.constants.WatcherScope; +import mage.filter.common.FilterControlledUntappedLandPermanent; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.watchers.Watcher; + +/** + * + * @author MTGfan + */ +public class UntappedLandsAtBeginningOfTurnWatcher extends Watcher { + + private final Map untappedLandCount = new HashMap<>(); + + public UntappedLandsAtBeginningOfTurnWatcher() { + super("UntappedLandsAtBeginningOfTurn", WatcherScope.GAME); + } + + public UntappedLandsAtBeginningOfTurnWatcher(final UntappedLandsAtBeginningOfTurnWatcher watcher) { + super(watcher); + for (Entry entry : watcher.untappedLandCount.entrySet()) { + untappedLandCount.put(entry.getKey(), entry.getValue()); + } + } + + @Override + public void watch(GameEvent event, Game game) { + if (event.getType() == GameEvent.EventType.BEGINNING_PHASE + && game.getPhase() != null) { + UUID playerId = event.getPlayerId(); + if (playerId != null) { + Integer amount = game.getBattlefield().getAllActivePermanents(new FilterControlledUntappedLandPermanent(), playerId, game).size(); + + untappedLandCount.put(playerId, amount); + } + } + } + + public int getUntappedLandCount(UUID playerId) { + Integer amount = untappedLandCount.get(playerId); + if (amount != null) { + return amount; + } + return 0; + } + + @Override + public void reset() { + untappedLandCount.clear(); + } + + @Override + public UntappedLandsAtBeginningOfTurnWatcher copy() { + return new UntappedLandsAtBeginningOfTurnWatcher(this); + } +}