diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java index bcf988ef09f..21842d5f2c6 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HanabiBlast.java @@ -85,7 +85,7 @@ class HanabiBlastDiscardEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - if(player != null) { + if (player != null) { player.discard(player.getHand().getRandom(game), source, game); return true; } diff --git a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java index 020e411a74b..cc76c4e5f48 100644 --- a/Mage.Sets/src/mage/sets/worldwake/Groundswell.java +++ b/Mage.Sets/src/mage/sets/worldwake/Groundswell.java @@ -36,19 +36,14 @@ import mage.Constants.Layer; import mage.Constants.Outcome; import mage.Constants.Rarity; import mage.Constants.SubLayer; -import mage.Constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.ContinuousEffectImpl; -import mage.cards.Card; import mage.cards.CardImpl; import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; -import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; import mage.watchers.Watcher; -import mage.watchers.WatcherImpl; +import mage.watchers.common.LandfallWatcher; /** * diff --git a/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java new file mode 100644 index 00000000000..f8b63f2c554 --- /dev/null +++ b/Mage.Sets/src/mage/sets/worldwake/RestForTheWeary.java @@ -0,0 +1,67 @@ +/* + * 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.sets.worldwake; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.condition.common.LandfallCondition; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.effects.common.GainLifeTargetEffect; +import mage.cards.CardImpl; +import mage.target.TargetPlayer; +import mage.watchers.common.LandfallWatcher; + +/** + * + * @author Loki + */ +public class RestForTheWeary extends CardImpl { + + public RestForTheWeary(UUID ownerId) { + super(ownerId, 18, "Rest for the Weary", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); + this.expansionSetCode = "WWK"; + + this.color.setWhite(true); + + // Target player gains 4 life. + // Landfall - If you had a land enter the battlefield under your control this turn, that player gains 8 life instead. + this.addWatcher(new LandfallWatcher()); + this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new GainLifeTargetEffect(8), new GainLifeTargetEffect(4), LandfallCondition.getInstance(), "Target player gains 4 life. Landfall - If you had a land enter the battlefield under your control this turn, that player gains 8 life instead")); + this.getSpellAbility().addTarget(new TargetPlayer()); + } + + public RestForTheWeary(final RestForTheWeary card) { + super(card); + } + + @Override + public RestForTheWeary copy() { + return new RestForTheWeary(this); + } +} diff --git a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java index 022f31efeeb..b49c304230c 100644 --- a/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java +++ b/Mage.Sets/src/mage/sets/worldwake/SearingBlaze.java @@ -34,17 +34,12 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Outcome; import mage.Constants.Rarity; -import mage.Constants.WatcherScope; -import mage.Constants.Zone; import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; -import mage.game.events.ZoneChangeEvent; import mage.game.permanent.Permanent; import mage.game.stack.StackObject; import mage.players.Player; @@ -52,7 +47,7 @@ import mage.target.TargetPermanent; import mage.target.TargetPlayer; import mage.target.common.TargetCreaturePermanent; import mage.watchers.Watcher; -import mage.watchers.WatcherImpl; +import mage.watchers.common.LandfallWatcher; /** * @@ -85,35 +80,6 @@ public class SearingBlaze extends CardImpl { } -class LandfallWatcher extends WatcherImpl { - - public LandfallWatcher() { - super("LandPlayed", WatcherScope.PLAYER); - } - - public LandfallWatcher(final LandfallWatcher watcher) { - super(watcher); - } - - @Override - public LandfallWatcher copy() { - return new LandfallWatcher(this); - } - - @Override - public void watch(GameEvent event, Game game) { - if (condition == true) //no need to check - condition has already occured - return; - if (event.getType() == EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).getToZone() == Zone.BATTLEFIELD) { - Permanent permanent = game.getPermanent(event.getTargetId()); - if (permanent.getCardType().contains(CardType.LAND) && permanent.getControllerId().equals(this.controllerId)) { - condition = true; - } - } - } - -} - class SearingBlazeEffect extends OneShotEffect { public SearingBlazeEffect() { diff --git a/Mage/src/mage/abilities/condition/common/LandfallCondition.java b/Mage/src/mage/abilities/condition/common/LandfallCondition.java new file mode 100644 index 00000000000..ecfa892b968 --- /dev/null +++ b/Mage/src/mage/abilities/condition/common/LandfallCondition.java @@ -0,0 +1,26 @@ +package mage.abilities.condition.common; + +import mage.abilities.Ability; +import mage.abilities.condition.Condition; +import mage.game.Game; +import mage.watchers.Watcher; + +/** + * @author Loki + */ +public class LandfallCondition implements Condition { + private static LandfallCondition instance = new LandfallCondition(); + + public static LandfallCondition getInstance() { + return instance; + } + + private LandfallCondition() { + } + + @Override + public boolean apply(Game game, Ability source) { + Watcher watcher = game.getState().getWatchers().get("LandPlayed", source.getControllerId()); + return watcher.conditionMet(); + } +} diff --git a/Mage/src/mage/watchers/common/LandfallWatcher.java b/Mage/src/mage/watchers/common/LandfallWatcher.java new file mode 100644 index 00000000000..79b3900c2f6 --- /dev/null +++ b/Mage/src/mage/watchers/common/LandfallWatcher.java @@ -0,0 +1,41 @@ +package mage.watchers.common; + +import mage.Constants; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.events.ZoneChangeEvent; +import mage.game.permanent.Permanent; +import mage.watchers.WatcherImpl; + +/** + * @author BetaSteward_at_googlemail.com + * @author Loki + */ +public class LandfallWatcher extends WatcherImpl { + + public LandfallWatcher() { + super("LandPlayed", Constants.WatcherScope.PLAYER); + } + + public LandfallWatcher(final LandfallWatcher watcher) { + super(watcher); + } + + @Override + public LandfallWatcher copy() { + return new LandfallWatcher(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.ZONE_CHANGE && ((ZoneChangeEvent)event).getToZone() == Constants.Zone.BATTLEFIELD) { + Permanent permanent = game.getPermanent(event.getTargetId()); + if (permanent.getCardType().contains(Constants.CardType.LAND) && permanent.getControllerId().equals(this.controllerId)) { + condition = true; + } + } + } + +}