diff --git a/Mage.Sets/src/mage/sets/kaladesh/EddytrailHawk.java b/Mage.Sets/src/mage/sets/kaladesh/EddytrailHawk.java index 68837ef08e..a5e78e1206 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/EddytrailHawk.java +++ b/Mage.Sets/src/mage/sets/kaladesh/EddytrailHawk.java @@ -37,7 +37,6 @@ import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.counter.GetEnergyCountersControllerEffect; import mage.abilities.keyword.FlyingAbility; -import mage.abilities.keyword.IndestructibleAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Duration; @@ -70,9 +69,9 @@ public class EddytrailHawk extends CardImpl { // When Eddytail Hawk enters the battlefield, you get {E}{E}. this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2))); // When Eddytail Hawk attacks you pay {E}. If you do, another target attacking creature gains flying until end of turn. - DoIfCostPaid doIfCostPaidEffect = new DoIfCostPaid(new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn), new PayEnergyCost(1), null, false); + DoIfCostPaid doIfCostPaidEffect = new DoIfCostPaid(new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new PayEnergyCost(1), null, true); Ability ability = new AttacksTriggeredAbility(doIfCostPaidEffect, false, - "Whenever {this} attacks you pay {E}. If you do, another target attacking creature gets indestructible until end of turn."); + "Whenever {this} attacks you pay {E}. If you do, another target attacking creature gains flying until end of turn."); ability.addTarget(new TargetCreaturePermanent(filter)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/sets/kaladesh/JanjeetSentry.java b/Mage.Sets/src/mage/sets/kaladesh/JanjeetSentry.java index b6bfc27b0a..f12d993af4 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/JanjeetSentry.java +++ b/Mage.Sets/src/mage/sets/kaladesh/JanjeetSentry.java @@ -63,8 +63,8 @@ public class JanjeetSentry extends CardImpl { // Tap, Pay {E}{E}: You may tap or untap target artifact or creature. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost()); ability.addCost(new PayEnergyCost(2)); + ability.addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); this.addAbility(ability); - this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE)); } public JanjeetSentry(final JanjeetSentry card) { diff --git a/Mage.Sets/src/mage/sets/kaladesh/NaturesWay.java b/Mage.Sets/src/mage/sets/kaladesh/NaturesWay.java index c50d9d0521..68bbf9fb20 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/NaturesWay.java +++ b/Mage.Sets/src/mage/sets/kaladesh/NaturesWay.java @@ -28,7 +28,7 @@ package mage.sets.kaladesh; import java.util.UUID; -import mage.abilities.dynamicvalue.common.SourcePermanentPowerCount; +import mage.abilities.dynamicvalue.common.TargetPermanentPowerCount; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; @@ -68,7 +68,7 @@ public class NaturesWay extends CardImpl { effect = new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn); effect.setText("and trample until end of turn"); this.getSpellAbility().addEffect(effect); - effect = new DamageTargetEffect(new SourcePermanentPowerCount(), true, null, true); + effect = new DamageTargetEffect(new TargetPermanentPowerCount(), true, null, true); effect.setTargetPointer(new SecondTargetPointer()); effect.setText("It deals damage equal to its power to target creature you don't control"); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/sets/kaladesh/RevolutionaryRebuff.java b/Mage.Sets/src/mage/sets/kaladesh/RevolutionaryRebuff.java index 77c2276687..7802cdc61b 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/RevolutionaryRebuff.java +++ b/Mage.Sets/src/mage/sets/kaladesh/RevolutionaryRebuff.java @@ -35,7 +35,7 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.filter.predicate.mageobject.CardTypePredicate; import mage.target.TargetSpell; /** @@ -50,8 +50,7 @@ public class RevolutionaryRebuff extends CardImpl { // Counter target nonartifact spell unless its controller pays 2. FilterSpell filter = new FilterSpell(); - filter.add(Predicates.not(new SubtypePredicate("Artifact"))); - + filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT))); this.getSpellAbility().addTarget(new TargetSpell(filter)); this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(2))); } diff --git a/Mage.Sets/src/mage/sets/kaladesh/StartYourEngines.java b/Mage.Sets/src/mage/sets/kaladesh/StartYourEngines.java index 268a09f17e..7b01eaea79 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/StartYourEngines.java +++ b/Mage.Sets/src/mage/sets/kaladesh/StartYourEngines.java @@ -1,104 +1,108 @@ -/* - * 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.kaladesh; - -import java.util.UUID; -import mage.abilities.Ability; -import mage.abilities.effects.ContinuousEffectImpl; -import mage.abilities.effects.common.continuous.BoostControlledEffect; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.SubLayer; -import mage.game.Game; -import mage.game.permanent.Permanent; - -/** - * - * @author LevelX2 - */ -public class StartYourEngines extends CardImpl { - - public StartYourEngines(UUID ownerId) { - super(ownerId, 135, "Start Your Engines", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); - this.expansionSetCode = "KLD"; - - // Vehicles you control becomes artifact creatures until end of turn. - this.getSpellAbility().addEffect(new StartYourEnginesEffect()); - // Creatures you control get +2/+0 until end of turn. - this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); - } - - public StartYourEngines(final StartYourEngines card) { - super(card); - } - - @Override - public StartYourEngines copy() { - return new StartYourEngines(this); - } -} - -class StartYourEnginesEffect extends ContinuousEffectImpl { - - public StartYourEnginesEffect() { - super(Duration.EndOfTurn, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.BecomeCreature); - staticText = "Vehicles you control becomes artifact creatures until end of turn"; - } - - public StartYourEnginesEffect(final StartYourEnginesEffect effect) { - super(effect); - } - - @Override - public StartYourEnginesEffect copy() { - return new StartYourEnginesEffect(this); - } - - @Override - public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { - for (Permanent permanent : game.getBattlefield().getAllActivePermanents(source.getControllerId())) { - if (permanent != null && permanent.getSubtype(game).contains("Vehicle")) { - if (sublayer == SubLayer.NA) { - permanent.getCardType().add(CardType.ARTIFACT); - permanent.getCardType().add(CardType.CREATURE);// TODO: Chcek if giving CREATURE Type is correct - } - } - } - return true; - } - - @Override - public boolean apply(Game game, Ability source) { - return false; - } - -} +/* + * 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.kaladesh; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.ContinuousEffectImpl; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.continuous.BoostControlledEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Layer; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.SubLayer; +import mage.game.Game; +import mage.game.permanent.Permanent; + +/** + * + * @author LevelX2 + */ +public class StartYourEngines extends CardImpl { + + public StartYourEngines(UUID ownerId) { + super(ownerId, 135, "Start Your Engines", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{R}"); + this.expansionSetCode = "KLD"; + + // Vehicles you control becomes artifact creatures until end of turn. + Effect effect = new StartYourEnginesEffect(); + effect.setApplyEffectsAfter(); // needed to recognize vehicle as creatures by the next effect + this.getSpellAbility().addEffect(effect); + + // Creatures you control get +2/+0 until end of turn. + this.getSpellAbility().addEffect(new BoostControlledEffect(2, 0, Duration.EndOfTurn)); + } + + public StartYourEngines(final StartYourEngines card) { + super(card); + } + + @Override + public StartYourEngines copy() { + return new StartYourEngines(this); + } +} + +class StartYourEnginesEffect extends ContinuousEffectImpl { + + public StartYourEnginesEffect() { + super(Duration.EndOfTurn, Layer.TypeChangingEffects_4, SubLayer.NA, Outcome.BecomeCreature); + staticText = "Vehicles you control becomes artifact creatures until end of turn"; + } + + public StartYourEnginesEffect(final StartYourEnginesEffect effect) { + super(effect); + } + + @Override + public StartYourEnginesEffect copy() { + return new StartYourEnginesEffect(this); + } + + @Override + public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) { + for (Permanent permanent : game.getBattlefield().getAllActivePermanents(source.getControllerId())) { + if (permanent != null && permanent.getSubtype(game).contains("Vehicle")) { + if (sublayer == SubLayer.NA) { + permanent.getCardType().add(CardType.ARTIFACT); + permanent.getCardType().add(CardType.CREATURE);// TODO: Chcek if giving CREATURE Type is correct + } + } + } + return true; + } + + @Override + public boolean apply(Game game, Ability source) { + return false; + } + +} diff --git a/Mage.Sets/src/mage/sets/kaladesh/TakeDown.java b/Mage.Sets/src/mage/sets/kaladesh/TakeDown.java index 78cb358b86..0f65edf38e 100644 --- a/Mage.Sets/src/mage/sets/kaladesh/TakeDown.java +++ b/Mage.Sets/src/mage/sets/kaladesh/TakeDown.java @@ -58,7 +58,7 @@ public class TakeDown extends CardImpl { // Choose one — // • Take Down deals 4 damage to target creature with flying. this.getSpellAbility().addEffect(new DamageTargetEffect(4)); - this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); // • Take Down deals 1 damage to each creature with flying Mode mode = new Mode();