diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KodamaOfTheCenterTree.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KodamaOfTheCenterTree.java new file mode 100644 index 00000000000..526b6b6a098 --- /dev/null +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KodamaOfTheCenterTree.java @@ -0,0 +1,81 @@ +/* + * 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.betrayersofkamigawa; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; +import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; +import mage.abilities.keyword.SoulshiftAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterControlledPermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; + +/** + * + * @author LevelX2 + */ +public class KodamaOfTheCenterTree extends CardImpl { + + private static final FilterControlledPermanent filter = new FilterControlledPermanent("Spirits you control"); + + static { + filter.add(new SubtypePredicate("Spirit")); + } + + public KodamaOfTheCenterTree(UUID ownerId) { + super(ownerId, 131, "Kodama of the Center Tree", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{G}"); + this.expansionSetCode = "BOK"; + this.supertype.add("Legendary"); + this.subtype.add("Spirit"); + + this.color.setGreen(true); + this.power = new MageInt(0); + this.toughness = new MageInt(0); + + // Kodama of the Center Tree's power and toughness are each equal to the number of Spirits you control. + this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame))); + + // Kodama of the Center Tree has soulshift X, where X is the number of Spirits you control. + this.addAbility(new SoulshiftAbility(new PermanentsOnBattlefieldCount(filter))); + } + + public KodamaOfTheCenterTree(final KodamaOfTheCenterTree card) { + super(card); + } + + @Override + public KodamaOfTheCenterTree copy() { + return new KodamaOfTheCenterTree(this); + } +} diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Lifespinner.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Lifespinner.java new file mode 100644 index 00000000000..680a7b39179 --- /dev/null +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Lifespinner.java @@ -0,0 +1,85 @@ +/* + * 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.betrayersofkamigawa; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.SacrificeTargetCost; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.common.FilterPermanentCard; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.filter.predicate.mageobject.SupertypePredicate; +import mage.target.common.TargetCardInLibrary; +import mage.target.common.TargetControlledPermanent; + +/** + * + * @author LevelX2 + */ +public class Lifespinner extends CardImpl { + + private static final FilterPermanentCard filter = new FilterPermanentCard("legendary Spirit permanent card"); + + static { + filter.add(new SupertypePredicate("Legendary")); + filter.add(new SubtypePredicate("Spirit")); + } + + public Lifespinner(UUID ownerId) { + super(ownerId, 133, "Lifespinner", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}"); + this.expansionSetCode = "BOK"; + this.subtype.add("Spirit"); + + this.color.setGreen(true); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // {t}, Sacrifice three Spirits: Search your library for a legendary Spirit permanent card and put it onto the battlefield. Then shuffle your library. + SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), + new TapSourceCost()); + ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(3, 3, new FilterCreaturePermanent("Spirit", "three Spirits"), false))); + this.addAbility(ability); + } + + public Lifespinner(final Lifespinner card) { + super(card); + } + + @Override + public Lifespinner copy() { + return new Lifespinner(this); + } +} diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/LoamDweller.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/LoamDweller.java new file mode 100644 index 00000000000..cb5f43d51d1 --- /dev/null +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/LoamDweller.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.betrayersofkamigawa; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.common.SpellCastControllerTriggeredAbility; +import mage.abilities.effects.common.PutLandFromHandOntoBattlefieldEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.common.FilterSpiritOrArcaneCard; + +/** + * + * @author LevelX2 + */ +public class LoamDweller extends CardImpl { + + public LoamDweller(UUID ownerId) { + super(ownerId, 134, "Loam Dweller", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); + this.expansionSetCode = "BOK"; + this.subtype.add("Spirit"); + + this.color.setGreen(true); + this.power = new MageInt(2); + this.toughness = new MageInt(2); + + // Whenever you cast a Spirit or Arcane spell, you may put a land card from your hand onto the battlefield tapped. + this.addAbility(new SpellCastControllerTriggeredAbility(new PutLandFromHandOntoBattlefieldEffect(true), new FilterSpiritOrArcaneCard(), true)); + + } + + public LoamDweller(final LoamDweller card) { + super(card); + } + + @Override + public LoamDweller copy() { + return new LoamDweller(this); + } +} diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MatsuTribeSniper.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MatsuTribeSniper.java new file mode 100644 index 00000000000..b4fce07ec45 --- /dev/null +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MatsuTribeSniper.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.sets.betrayersofkamigawa; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.DealsDamageToACreatureTriggeredAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.effects.common.SkipNextUntapTargetEffect; +import mage.abilities.effects.common.TapTargetEffect; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.Zone; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.AbilityPredicate; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author LevelX2 + */ +public class MatsuTribeSniper extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying"); + + static { + filter.add(new AbilityPredicate(FlyingAbility.class)); + } + + public MatsuTribeSniper(UUID ownerId) { + super(ownerId, 136, "Matsu-Tribe Sniper", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{1}{G}"); + this.expansionSetCode = "BOK"; + this.subtype.add("Snake"); + this.subtype.add("Warrior"); + this.subtype.add("Archer"); + + this.color.setGreen(true); + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + // {t}: Matsu-Tribe Sniper deals 1 damage to target creature with flying. + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); + ability.addTarget(new TargetCreaturePermanent(filter)); + this.addAbility(ability); + + // Whenever Matsu-Tribe Sniper deals damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. + ability = new DealsDamageToACreatureTriggeredAbility(new TapTargetEffect("that creature"), false, false, true); + ability.addEffect(new SkipNextUntapTargetEffect("and it")); + this.addAbility(ability); + } + + public MatsuTribeSniper(final MatsuTribeSniper card) { + super(card); + } + + @Override + public MatsuTribeSniper copy() { + return new MatsuTribeSniper(this); + } +} diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoarOfJukai.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoarOfJukai.java new file mode 100644 index 00000000000..86be2972555 --- /dev/null +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoarOfJukai.java @@ -0,0 +1,128 @@ +/* + * 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.betrayersofkamigawa; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition.CountType; +import mage.abilities.costs.common.GainLifeOpponentCost; +import mage.abilities.effects.ContinuousEffect; +import mage.abilities.effects.OneShotEffect; +import mage.abilities.effects.common.continious.BoostTargetEffect; +import mage.abilities.keyword.SpliceOntoArcaneAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterBlockingCreature; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.filter.predicate.permanent.BlockedPredicate; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author LevelX2 + */ +public class RoarOfJukai extends CardImpl { + + public RoarOfJukai(UUID ownerId) { + super(ownerId, 140, "Roar of Jukai", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{G}"); + this.expansionSetCode = "BOK"; + this.subtype.add("Arcane"); + + this.color.setGreen(true); + + // If you control a Forest, each blocked creature gets +2/+2 until end of turn. + this.getSpellAbility().addEffect(new RoarOfJukaiEffect()); + + // Splice onto Arcane-An opponent gains 5 life. + this.addAbility(new SpliceOntoArcaneAbility(new GainLifeOpponentCost(5))); + } + + public RoarOfJukai(final RoarOfJukai card) { + super(card); + } + + @Override + public RoarOfJukai copy() { + return new RoarOfJukai(this); + } +} + +class RoarOfJukaiEffect extends OneShotEffect { + + private static final FilterPermanent filter = new FilterPermanent("Forest"); + private static final FilterCreaturePermanent filterBlocked = new FilterCreaturePermanent("blocked creature"); + + static { + filter.add(new SubtypePredicate("Forest")); + filterBlocked.add(new BlockedPredicate()); + } + + + static { + + } + + public RoarOfJukaiEffect() { + super(Outcome.BoostCreature); + this.staticText = "If you control a Forest, each blocked creature gets +2/+2 until end of turn"; + } + + public RoarOfJukaiEffect(final RoarOfJukaiEffect effect) { + super(effect); + } + + @Override + public RoarOfJukaiEffect copy() { + return new RoarOfJukaiEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Player controller = game.getPlayer(source.getControllerId()); + if (controller != null) { + if (new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0).apply(game, source)) { + for(Permanent permanent : game.getBattlefield().getActivePermanents(new FilterBlockingCreature(), source.getControllerId(), source.getSourceId(), game)) { + ContinuousEffect effect = new BoostTargetEffect(2,2, Duration.EndOfTurn); + effect.setTargetPointer(new FixedTarget(permanent.getId())); + game.addEffect(effect, source); + } + } + return true; + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/onslaught/WordsOfWar.java b/Mage.Sets/src/mage/sets/onslaught/WordsOfWar.java index e87423a472d..62b44408adf 100644 --- a/Mage.Sets/src/mage/sets/onslaught/WordsOfWar.java +++ b/Mage.Sets/src/mage/sets/onslaught/WordsOfWar.java @@ -104,7 +104,7 @@ class WordsOfWarEffect extends ReplacementEffectImpl { used = true; return true; } - Permanent permanent = game.getPermanent(source.getFirstTarget()); + Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); if (permanent != null) { permanent.damage(2, source.getSourceId(), game, false, true); used = true; @@ -118,4 +118,4 @@ class WordsOfWarEffect extends ReplacementEffectImpl { public boolean applies(GameEvent event, Ability source, Game game) { return event.getType() == EventType.DRAW_CARD && source.getControllerId().equals(event.getPlayerId()) && used == false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaForgemaster.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaForgemaster.java index d24bb18d801..9e8149a88c9 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaForgemaster.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/KuldothaForgemaster.java @@ -58,6 +58,8 @@ public class KuldothaForgemaster extends CardImpl { this.power = new MageInt(3); this.toughness = new MageInt(5); + + // {T}, Sacrifice three artifacts: Search your library for an artifact card and put it onto the battlefield. Then shuffle your library. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterArtifactCard)), new TapSourceCost()); diff --git a/Mage/src/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java b/Mage/src/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java index 6e76de76029..a0bfaf4442c 100644 --- a/Mage/src/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java +++ b/Mage/src/mage/abilities/effects/common/PutLandFromHandOntoBattlefieldEffect.java @@ -42,13 +42,19 @@ import mage.players.Player; */ public class PutLandFromHandOntoBattlefieldEffect extends OneShotEffect { + private boolean tapped; + public PutLandFromHandOntoBattlefieldEffect() { + this(false); + } + public PutLandFromHandOntoBattlefieldEffect(boolean tapped) { super(Outcome.PutLandInPlay); - staticText = "You may put a land card from your hand onto the battlefield"; + staticText = "you may put a land card from your hand onto the battlefield" + (tapped ? " tapped":""); } public PutLandFromHandOntoBattlefieldEffect(final PutLandFromHandOntoBattlefieldEffect effect) { super(effect); + this.tapped = effect.tapped; } @Override @@ -57,7 +63,7 @@ public class PutLandFromHandOntoBattlefieldEffect extends OneShotEffect { if (controller != null) { Card card = game.getCard(targetPointer.getFirst(game, source)); if (card != null) { - controller.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId()); + controller.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId(), tapped); } return true; @@ -71,4 +77,4 @@ public class PutLandFromHandOntoBattlefieldEffect extends OneShotEffect { return new PutLandFromHandOntoBattlefieldEffect(this); } - } \ No newline at end of file + } diff --git a/Mage/src/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/mage/abilities/keyword/SoulshiftAbility.java index c202e050fef..7927a9fd7d7 100644 --- a/Mage/src/mage/abilities/keyword/SoulshiftAbility.java +++ b/Mage/src/mage/abilities/keyword/SoulshiftAbility.java @@ -1,23 +1,68 @@ +/* + * 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.keyword; +import java.util.UUID; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.filter.Filter; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.Game; import mage.target.common.TargetCardInYourGraveyard; +/** + * + * 702.45. Soulshift + * 702.45a Soulshift is a triggered ability. “Soulshift N” means “When this permanent is put into a graveyard from play, + * you may return target Spirit card with converted mana cost N or less from your graveyard to your hand.” + * 702.45b If a permanent has multiple instances of soulshift, each triggers separately. + * + * The soulshift number tells you the maximum converted mana cost of the Spirit card you can target. + * You choose whether or not to return the targeted creature card when the ability resolves. + * + * @author Loki, LevelX2 + */ public class SoulshiftAbility extends DiesTriggeredAbility { - private int amount; + + private final DynamicValue amount; public SoulshiftAbility(int amount) { + this(new StaticValue(amount)); + } + + public SoulshiftAbility(DynamicValue amount) { super(new ReturnToHandTargetEffect()); - FilterCard filter = new FilterCard("Spirit card with converted mana cost " + amount + " or less from your graveyard"); - filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, amount + 1)); - filter.add(new SubtypePredicate("Spirit")); - this.addTarget(new TargetCardInYourGraveyard(filter)); - this.amount = amount; + this.amount = amount; } public SoulshiftAbility(final SoulshiftAbility ability) { @@ -25,6 +70,17 @@ public class SoulshiftAbility extends DiesTriggeredAbility { this.amount = ability.amount; } + @Override + public void trigger(Game game, UUID controllerId) { + this.getTargets().clear(); + int intValue = amount.calculate(game, this, null); + FilterCard filter = new FilterCard("Spirit card with converted mana cost " + intValue + " or less from your graveyard"); + filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, intValue + 1)); + filter.add(new SubtypePredicate("Spirit")); + this.addTarget(new TargetCardInYourGraveyard(filter)); + super.trigger(game, controllerId); //To change body of generated methods, choose Tools | Templates. + } + @Override public DiesTriggeredAbility copy() { return new SoulshiftAbility(this); @@ -32,6 +88,12 @@ public class SoulshiftAbility extends DiesTriggeredAbility { @Override public String getRule() { - return "Soulshift " + amount; + if (amount instanceof StaticValue) { + return "Soulshift " + amount.toString() + " (When this creature dies, you may return target Spirit card with converted mana cost " + amount.toString() + " or less from your graveyard to your hand.)"; + } else { + return "{this} has soulshift X, where X is the number of " + amount.getMessage() + + ". (When this creature dies, you may return target Spirit card with converted mana cost X or less from your graveyard to your hand.)"; + } + } }