From 68a42726a88a0fa4cca1ffe42850632c72689202 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 14 Sep 2017 11:19:29 -0400 Subject: [PATCH] Implemented Shadowed Caravel, generalized explore triggers --- .../src/mage/cards/l/LurkingChupacabra.java | 46 +----------- .../src/mage/cards/s/ShadowedCaravel.java | 74 +++++++++++++++++++ .../src/mage/cards/w/WildgrowthWalker.java | 45 +---------- Mage.Sets/src/mage/sets/Ixalan.java | 1 + .../CreatureExploresTriggeredAbility.java | 43 +++++++++++ 5 files changed, 124 insertions(+), 85 deletions(-) create mode 100644 Mage.Sets/src/mage/cards/s/ShadowedCaravel.java create mode 100644 Mage/src/main/java/mage/abilities/effects/common/CreatureExploresTriggeredAbility.java diff --git a/Mage.Sets/src/mage/cards/l/LurkingChupacabra.java b/Mage.Sets/src/mage/cards/l/LurkingChupacabra.java index 6c011ea8f05..7f607f32f94 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingChupacabra.java +++ b/Mage.Sets/src/mage/cards/l/LurkingChupacabra.java @@ -30,8 +30,7 @@ package mage.cards.l; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.TriggeredAbilityImpl; -import mage.abilities.effects.Effect; +import mage.abilities.effects.common.CreatureExploresTriggeredAbility; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.constants.SubType; import mage.cards.CardImpl; @@ -39,12 +38,8 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.TargetController; -import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.permanent.ControllerPredicate; -import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.permanent.Permanent; import mage.target.common.TargetCreaturePermanent; /** @@ -53,7 +48,7 @@ import mage.target.common.TargetCreaturePermanent; */ public class LurkingChupacabra extends CardImpl { - private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); @@ -68,7 +63,7 @@ public class LurkingChupacabra extends CardImpl { this.toughness = new MageInt(3); // Whenever a creature you control explores, target creature an opponent controls gets -2/-2 until end of turn - Ability ability = new LurkingChupacabraTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); + Ability ability = new CreatureExploresTriggeredAbility(new BoostTargetEffect(-2, -2, Duration.EndOfTurn)); ability.addTarget(new TargetCreaturePermanent(filter)); } @@ -81,38 +76,3 @@ public class LurkingChupacabra extends CardImpl { return new LurkingChupacabra(this); } } - -class LurkingChupacabraTriggeredAbility extends TriggeredAbilityImpl { - - LurkingChupacabraTriggeredAbility(Effect effect) { - super(Zone.BATTLEFIELD, effect, false); - } - - LurkingChupacabraTriggeredAbility(final LurkingChupacabraTriggeredAbility effect) { - super(effect); - } - - @Override - public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.EXPLORED; - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - Permanent creature = game.getPermanentOrLKIBattlefield(event.getSourceId()); - if (creature != null) { - return creature.getControllerId().equals(controllerId); - } - return false; - } - - @Override - public LurkingChupacabraTriggeredAbility copy() { - return new LurkingChupacabraTriggeredAbility(this); - } - - @Override - public String getRule() { - return "Whenever a creature you control explores, target creature an opponent controls gets -2/-2 until end of turn"; - } -} diff --git a/Mage.Sets/src/mage/cards/s/ShadowedCaravel.java b/Mage.Sets/src/mage/cards/s/ShadowedCaravel.java new file mode 100644 index 00000000000..ab340946d07 --- /dev/null +++ b/Mage.Sets/src/mage/cards/s/ShadowedCaravel.java @@ -0,0 +1,74 @@ +/* + * 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.cards.s; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.CreatureExploresTriggeredAbility; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.constants.SubType; +import mage.abilities.keyword.CrewAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.counters.CounterType; + +/** + * + * @author TheElk801 + */ +public class ShadowedCaravel extends CardImpl { + + public ShadowedCaravel(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}"); + + this.subtype.add(SubType.VEHICLE); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // Whenever a creature you control explores, put a +1/+1 counter on Shadowed Caravel. + Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance()); + Ability ability = new CreatureExploresTriggeredAbility(effect); + this.addAbility(ability); + + // Crew 2 + this.addAbility(new CrewAbility(2)); + + } + + public ShadowedCaravel(final ShadowedCaravel card) { + super(card); + } + + @Override + public ShadowedCaravel copy() { + return new ShadowedCaravel(this); + } +} diff --git a/Mage.Sets/src/mage/cards/w/WildgrowthWalker.java b/Mage.Sets/src/mage/cards/w/WildgrowthWalker.java index 8066b2dad33..7830ef9d03b 100644 --- a/Mage.Sets/src/mage/cards/w/WildgrowthWalker.java +++ b/Mage.Sets/src/mage/cards/w/WildgrowthWalker.java @@ -30,20 +30,15 @@ package mage.cards.w; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.abilities.effects.common.CreatureExploresTriggeredAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.Zone; import mage.counters.CounterType; -import mage.game.Game; -import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; -import mage.game.permanent.Permanent; /** * @@ -60,8 +55,9 @@ public class WildgrowthWalker extends CardImpl { // Whenever a creature you control explores, put a +1/+1 counter on Wildgrowth Walker and you gain 3 life. Effect effect = new AddCountersSourceEffect(CounterType.P1P1.createInstance()); - Ability ability = new WildgrowthWalkerTriggeredAbility(effect); + Ability ability = new CreatureExploresTriggeredAbility(effect); effect = new GainLifeEffect(3); + effect.setText("and you gain 3 life"); ability.addEffect(effect); this.addAbility(ability); } @@ -75,38 +71,3 @@ public class WildgrowthWalker extends CardImpl { return new WildgrowthWalker(this); } } - -class WildgrowthWalkerTriggeredAbility extends TriggeredAbilityImpl { - - WildgrowthWalkerTriggeredAbility(Effect effect) { - super(Zone.BATTLEFIELD, effect, false); - } - - WildgrowthWalkerTriggeredAbility(final WildgrowthWalkerTriggeredAbility effect) { - super(effect); - } - - @Override - public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == EventType.EXPLORED; - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - Permanent creature = game.getPermanentOrLKIBattlefield(event.getSourceId()); - if (creature != null) { - return creature.getControllerId().equals(controllerId); - } - return false; - } - - @Override - public WildgrowthWalkerTriggeredAbility copy() { - return new WildgrowthWalkerTriggeredAbility(this); - } - - @Override - public String getRule() { - return "Whenever a creature you control explores, put a +1/+1 counter on {this} and you gain 3 life"; - } -} diff --git a/Mage.Sets/src/mage/sets/Ixalan.java b/Mage.Sets/src/mage/sets/Ixalan.java index 9db95b74e6d..751beb6597f 100644 --- a/Mage.Sets/src/mage/sets/Ixalan.java +++ b/Mage.Sets/src/mage/sets/Ixalan.java @@ -169,6 +169,7 @@ public class Ixalan extends ExpansionSet { cards.add(new SetCardInfo("Search for Azcanta", 74, Rarity.RARE, mage.cards.s.SearchForAzcanta.class)); cards.add(new SetCardInfo("Sentinel Totem", 245, Rarity.UNCOMMON, mage.cards.s.SentinelTotem.class)); cards.add(new SetCardInfo("Settle the Wreckage", 34, Rarity.RARE, mage.cards.s.SettleTheWreckage.class)); + cards.add(new SetCardInfo("Shadowed Caravel", 246, Rarity.RARE, mage.cards.s.ShadowedCaravel.class)); cards.add(new SetCardInfo("Shapers of Nature", 228, Rarity.UNCOMMON, mage.cards.s.ShapersOfNature.class)); cards.add(new SetCardInfo("Shapers' Sanctuary", 206, Rarity.RARE, mage.cards.s.ShapersSanctuary.class)); cards.add(new SetCardInfo("Siren Stormtamer", 79, Rarity.UNCOMMON, mage.cards.s.SirenStormtamer.class)); diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreatureExploresTriggeredAbility.java b/Mage/src/main/java/mage/abilities/effects/common/CreatureExploresTriggeredAbility.java new file mode 100644 index 00000000000..e78b559cc46 --- /dev/null +++ b/Mage/src/main/java/mage/abilities/effects/common/CreatureExploresTriggeredAbility.java @@ -0,0 +1,43 @@ +package mage.abilities.effects.common; + +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.Effect; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; + +public class CreatureExploresTriggeredAbility extends TriggeredAbilityImpl { + + public CreatureExploresTriggeredAbility(Effect effect) { + super(Zone.BATTLEFIELD, effect, false); + } + + public CreatureExploresTriggeredAbility(final CreatureExploresTriggeredAbility effect) { + super(effect); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.EXPLORED; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + Permanent creature = game.getPermanentOrLKIBattlefield(event.getSourceId()); + if (creature != null) { + return creature.getControllerId().equals(controllerId); + } + return false; + } + + @Override + public CreatureExploresTriggeredAbility copy() { + return new CreatureExploresTriggeredAbility(this); + } + + @Override + public String getRule() { + return "Whenever a creature you control explores, " + super.getRule(); + } +}