From 40d1ea8da1c5d69ded8ec2613a064a96b4f69bc7 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 27 May 2013 12:55:11 +0200 Subject: [PATCH 1/5] [minor] fixes to handling of auras going to battlefield from library or graveyard. --- .../src/mage/sets/darkascension/CurseOfMisfortunes.java | 1 + Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java | 1 + Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java | 3 +++ Mage/src/mage/abilities/effects/AuraReplacementEffect.java | 5 +++++ 4 files changed, 10 insertions(+) diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java index 5549efcb573..a9ec0f04c9f 100644 --- a/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java +++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfMisfortunes.java @@ -118,6 +118,7 @@ class CurseOfMisfortunesEffect extends OneShotEffect { Card card = game.getCard(targetCard.getFirstTarget()); if (card != null) { this.setTargetPointer(new FixedTarget(targetPlayer.getId())); + game.getState().setValue("attachTo:" + card.getId(), targetPlayer.getId()); player.shuffleLibrary(game); return card.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), source.getControllerId()); } diff --git a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java index fe0072d0bc1..93e6aeb3371 100644 --- a/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java +++ b/Mage.Sets/src/mage/sets/innistrad/BitterheartWitch.java @@ -109,6 +109,7 @@ class BitterheartWitchEffect extends OneShotEffect { if (player.searchLibrary(targetCard, game)) { Card card = game.getCard(targetCard.getFirstTarget()); if (card != null) { + game.getState().setValue("attachTo:" + card.getId(), targetPlayer.getId()); card.putOntoBattlefield(game, Zone.LIBRARY, source.getSourceId(), source.getControllerId()); targetPlayer.addAttachment(card.getId(), game); } diff --git a/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java b/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java index 5cedfb214eb..b8ad26dd5bf 100644 --- a/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java +++ b/Mage.Sets/src/mage/sets/magic2012/ArachnusSpinner.java @@ -76,7 +76,9 @@ public class ArachnusSpinner extends CardImpl { this.power = new MageInt(5); this.toughness = new MageInt(7); + // Reach (This creature can block creatures with flying.) this.addAbility(ReachAbility.getInstance()); + // Tap an untapped Spider you control: Search your graveyard and/or library for a card named Arachnus Web and put it onto the battlefield attached to target creature. If you search your library this way, shuffle it. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ArachnusSpinnerEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); @@ -144,6 +146,7 @@ class ArachnusSpinnerEffect extends OneShotEffect { if (card != null) { Permanent permanent = game.getPermanent(source.getFirstTarget()); if (permanent != null) { + game.getState().setValue("attachTo:" + card.getId(), permanent.getId()); card.putOntoBattlefield(game, zone, source.getSourceId(), source.getControllerId()); return permanent.addAttachment(card.getId(), game); } diff --git a/Mage/src/mage/abilities/effects/AuraReplacementEffect.java b/Mage/src/mage/abilities/effects/AuraReplacementEffect.java index f4613b5904f..a87d6afe796 100644 --- a/Mage/src/mage/abilities/effects/AuraReplacementEffect.java +++ b/Mage/src/mage/abilities/effects/AuraReplacementEffect.java @@ -46,6 +46,11 @@ import mage.target.Target; import java.util.UUID; /** + * Cards with the Aura subtype don't change the zone they are in, if there is no + * valid target on the battlefield. Also, when entering the Battlefield and it + * was not cast, this effect gets the target to witch to attach it. + * + * This effect is automatically added to ContinuousEffects at the start of a game * * @author North */ From 9c1883578d3b124a8bbd6a92cb15e431b6513d21 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 27 May 2013 14:47:33 +0200 Subject: [PATCH 2/5] Added 7 equipments with atomatic attach effect. --- .../mage/sets/morningtide/CloakAndDagger.java | 88 +++++++++++++++ .../mage/sets/morningtide/DivinersWand.java | 102 ++++++++++++++++++ .../sets/morningtide/ObsidianBattleAxe.java | 88 +++++++++++++++ .../mage/sets/morningtide/ThornbiteStaff.java | 100 +++++++++++++++++ .../sets/morningtide/VeteransArmaments.java | 96 +++++++++++++++++ .../sets/planechase2012/SaiOfTheShinobi.java | 82 ++++++++++++++ .../effects/common/AttachEffect.java | 4 +- 7 files changed, 558 insertions(+), 2 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/morningtide/CloakAndDagger.java create mode 100644 Mage.Sets/src/mage/sets/morningtide/DivinersWand.java create mode 100644 Mage.Sets/src/mage/sets/morningtide/ObsidianBattleAxe.java create mode 100644 Mage.Sets/src/mage/sets/morningtide/ThornbiteStaff.java create mode 100644 Mage.Sets/src/mage/sets/morningtide/VeteransArmaments.java create mode 100644 Mage.Sets/src/mage/sets/planechase2012/SaiOfTheShinobi.java diff --git a/Mage.Sets/src/mage/sets/morningtide/CloakAndDagger.java b/Mage.Sets/src/mage/sets/morningtide/CloakAndDagger.java new file mode 100644 index 00000000000..c3bfe01ad99 --- /dev/null +++ b/Mage.Sets/src/mage/sets/morningtide/CloakAndDagger.java @@ -0,0 +1,88 @@ +/* + * 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.morningtide; + +import java.util.UUID; +import mage.Constants.AttachmentType; +import mage.Constants.CardType; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; +import mage.abilities.keyword.EquipAbility; +import mage.abilities.keyword.ShroudAbility; +import mage.cards.CardImpl; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; + +/** + * + * @author LevelX2 + */ +public class CloakAndDagger extends CardImpl { + + private static final FilterPermanent filter = new FilterCreaturePermanent("a Rogue creature"); + static { + filter.add(new SubtypePredicate("Rogue")); + } + + public CloakAndDagger(UUID ownerId) { + super(ownerId, 141, "Cloak and Dagger", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + this.expansionSetCode = "MOR"; + this.supertype.add("Tribal"); + this.subtype.add("Rogue"); + this.subtype.add("Equipment"); + + // Equipped creature gets +2/+0 and has shroud. + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 0)); + ability.addEffect(new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.EQUIPMENT)); + this.addAbility(ability); + // Whenever a Rogue creature enters the battlefield, you may attach Cloak and Dagger to it. + this.addAbility(new EntersBattlefieldAllTriggeredAbility( + Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "attach {source} to it"), + filter, true, true, null)); + // Equip {3} + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); + } + + public CloakAndDagger(final CloakAndDagger card) { + super(card); + } + + @Override + public CloakAndDagger copy() { + return new CloakAndDagger(this); + } +} diff --git a/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java b/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java new file mode 100644 index 00000000000..68888e48e59 --- /dev/null +++ b/Mage.Sets/src/mage/sets/morningtide/DivinersWand.java @@ -0,0 +1,102 @@ +/* + * 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.morningtide; + +import java.util.UUID; +import mage.Constants.AttachmentType; +import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.common.DrawCardTriggeredAbility; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.DrawCardControllerEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; +import mage.abilities.effects.common.continious.GainAbilitySourceEffect; +import mage.abilities.keyword.EquipAbility; +import mage.abilities.keyword.FlyingAbility; +import mage.cards.CardImpl; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; + +/** + * + * @author LevelX2 + */ +public class DivinersWand extends CardImpl { + + private static final FilterPermanent filter = new FilterCreaturePermanent("a Wizard creature"); + static { + filter.add(new SubtypePredicate("Wizard")); + } + + public DivinersWand(UUID ownerId) { + super(ownerId, 142, "Diviner's Wand", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); + this.expansionSetCode = "MOR"; + this.supertype.add("Tribal"); + this.subtype.add("Wizard"); + this.subtype.add("Equipment"); + + // Equipped creature has "Whenever you draw a card, this creature gets +1/+1 and gains flying until end of turn" and "{4}: Draw a card." + Ability gainedAbility = new DrawCardTriggeredAbility(new BoostSourceEffect(1,1, Duration.EndOfTurn), false); + gainedAbility.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)); + Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); + effect.setText("Equipped creature has \"Whenever you draw a card, this creature gets +1/+1 and gains flying until end of turn\""); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + effect = new GainAbilityAttachedEffect( + new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardControllerEffect(1), new GenericManaCost(4)), AttachmentType.EQUIPMENT); + effect.setText("and \"{4}: Draw a card.\""); + ability.addEffect(effect); + this.addAbility(ability); + + // Whenever a Wizard creature enters the battlefield, you may attach Diviner's Wand to it. + this.addAbility(new EntersBattlefieldAllTriggeredAbility( + Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "attach {source} to it"), + filter, true, true, null)); + // Equip {3} + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); + } + + public DivinersWand(final DivinersWand card) { + super(card); + } + + @Override + public DivinersWand copy() { + return new DivinersWand(this); + } +} diff --git a/Mage.Sets/src/mage/sets/morningtide/ObsidianBattleAxe.java b/Mage.Sets/src/mage/sets/morningtide/ObsidianBattleAxe.java new file mode 100644 index 00000000000..f41d463fabc --- /dev/null +++ b/Mage.Sets/src/mage/sets/morningtide/ObsidianBattleAxe.java @@ -0,0 +1,88 @@ +/* + * 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.morningtide; + +import java.util.UUID; +import mage.Constants.AttachmentType; +import mage.Constants.CardType; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; +import mage.abilities.keyword.EquipAbility; +import mage.abilities.keyword.HasteAbility; +import mage.cards.CardImpl; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; + +/** + * + * @author LevelX2 + */ +public class ObsidianBattleAxe extends CardImpl { + + private static final FilterPermanent filter = new FilterCreaturePermanent("a Warrior creature"); + static { + filter.add(new SubtypePredicate("Warrior")); + } + + public ObsidianBattleAxe(UUID ownerId) { + super(ownerId, 144, "Obsidian Battle-Axe", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{3}"); + this.expansionSetCode = "MOR"; + this.supertype.add("Tribal"); + this.subtype.add("Warrior"); + this.subtype.add("Equipment"); + + // Equipped creature gets +2/+1 and has haste. + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 1)); + ability.addEffect(new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.EQUIPMENT)); + this.addAbility(ability); + // Whenever a Warrior creature enters the battlefield, you may attach Obsidian Battle-Axe to it. + this.addAbility(new EntersBattlefieldAllTriggeredAbility( + Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "attach {source} to it"), + filter, true, true, null)); + // Equip {3} + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(3))); + } + + public ObsidianBattleAxe(final ObsidianBattleAxe card) { + super(card); + } + + @Override + public ObsidianBattleAxe copy() { + return new ObsidianBattleAxe(this); + } +} diff --git a/Mage.Sets/src/mage/sets/morningtide/ThornbiteStaff.java b/Mage.Sets/src/mage/sets/morningtide/ThornbiteStaff.java new file mode 100644 index 00000000000..d633aededb9 --- /dev/null +++ b/Mage.Sets/src/mage/sets/morningtide/ThornbiteStaff.java @@ -0,0 +1,100 @@ +/* + * 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.morningtide; + +import java.util.UUID; +import mage.Constants.AttachmentType; +import mage.Constants.CardType; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.common.DiesCreatureTriggeredAbility; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.abilities.effects.common.UntapSourceEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; +import mage.abilities.keyword.EquipAbility; +import mage.cards.CardImpl; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.target.common.TargetCreatureOrPlayer; + +/** + * + * @author LevelX2 + */ +public class ThornbiteStaff extends CardImpl { + + private static final FilterPermanent filter = new FilterCreaturePermanent("a Shaman creature"); + static { + filter.add(new SubtypePredicate("Shaman")); + } + + public ThornbiteStaff(UUID ownerId) { + super(ownerId, 145, "Thornbite Staff", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + this.expansionSetCode = "MOR"; + this.supertype.add("Tribal"); + this.subtype.add("Shaman"); + this.subtype.add("Equipment"); + + // Equipped creature has "{2}, {T}: This creature deals 1 damage to target creature or player" and "Whenever a creature dies, untap this creature." + Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(2)); + gainedAbility.addCost(new TapSourceCost()); + gainedAbility.addTarget(new TargetCreatureOrPlayer()); + Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); + effect.setText("Equipped creature has \"{2}, {T}: This creature deals 1 damage to target creature or player\""); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + effect = new GainAbilityAttachedEffect(new DiesCreatureTriggeredAbility(new UntapSourceEffect(),false), AttachmentType.EQUIPMENT); + effect.setText("and \"Whenever a creature dies, untap this creature.\""); + ability.addEffect(effect); + this.addAbility(ability); + // Whenever a Shaman creature enters the battlefield, you may attach Thornbite Staff to it. + this.addAbility(new EntersBattlefieldAllTriggeredAbility( + Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "attach {source} to it"), + filter, true, true, null)); + // Equip {4} + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(4))); + } + + public ThornbiteStaff(final ThornbiteStaff card) { + super(card); + } + + @Override + public ThornbiteStaff copy() { + return new ThornbiteStaff(this); + } +} diff --git a/Mage.Sets/src/mage/sets/morningtide/VeteransArmaments.java b/Mage.Sets/src/mage/sets/morningtide/VeteransArmaments.java new file mode 100644 index 00000000000..f92e9929f35 --- /dev/null +++ b/Mage.Sets/src/mage/sets/morningtide/VeteransArmaments.java @@ -0,0 +1,96 @@ +/* + * 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.morningtide; + +import java.util.UUID; +import mage.Constants.AttachmentType; +import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.common.AttacksOrBlocksTriggeredAbility; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.dynamicvalue.common.AttackingCreatureCount; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.continious.BoostSourceEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; +import mage.abilities.keyword.EquipAbility; +import mage.cards.CardImpl; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.SubtypePredicate; + +/** + * + * @author LevelX2 + */ +public class VeteransArmaments extends CardImpl { + + private static final FilterPermanent filter = new FilterCreaturePermanent("a Soldier creature"); + static { + filter.add(new SubtypePredicate("Soldier")); + } + + public VeteransArmaments(UUID ownerId) { + super(ownerId, 146, "Veteran's Armaments", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{2}"); + this.expansionSetCode = "MOR"; + this.supertype.add("Tribal"); + this.subtype.add("Soldier"); + this.subtype.add("Equipment"); + + // Equipped creature has "Whenever this creature attacks or blocks, it gets +1/+1 until end of turn for each attacking creature." + DynamicValue attackingCreatures = new AttackingCreatureCount("attacking creature"); + Ability gainedAbility = new AttacksOrBlocksTriggeredAbility(new BoostSourceEffect(attackingCreatures,attackingCreatures, Duration.EndOfTurn),false); + Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT); + effect.setText("Equipped creature has \"Whenever this creature attacks or blocks, it gets +1/+1 until end of turn for each attacking creature.\""); + Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); + this.addAbility(ability); + + // Whenever a Soldier creature enters the battlefield, you may attach Veteran's Armaments to it. + this.addAbility(new EntersBattlefieldAllTriggeredAbility( + Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "attach {source} to it"), + filter, true, true, null)); + // Equip {2} + this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2))); + } + + public VeteransArmaments(final VeteransArmaments card) { + super(card); + } + + @Override + public VeteransArmaments copy() { + return new VeteransArmaments(this); + } +} diff --git a/Mage.Sets/src/mage/sets/planechase2012/SaiOfTheShinobi.java b/Mage.Sets/src/mage/sets/planechase2012/SaiOfTheShinobi.java new file mode 100644 index 00000000000..d2f30eced0e --- /dev/null +++ b/Mage.Sets/src/mage/sets/planechase2012/SaiOfTheShinobi.java @@ -0,0 +1,82 @@ +/* + * 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.planechase2012; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +import mage.Constants.TargetController; +import mage.Constants.Zone; +import mage.abilities.common.EntersBattlefieldAllTriggeredAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.continious.BoostEquippedEffect; +import mage.abilities.keyword.EquipAbility; +import mage.cards.CardImpl; +import mage.filter.FilterPermanent; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.permanent.ControllerPredicate; + +/** + * + * @author LevelX2 + */ +public class SaiOfTheShinobi extends CardImpl { + + private static final FilterPermanent filter = new FilterCreaturePermanent("a creature"); + static { + filter.add(new ControllerPredicate(TargetController.YOU)); + } + + public SaiOfTheShinobi(UUID ownerId) { + super(ownerId, 113, "Sai of the Shinobi", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{1}"); + this.expansionSetCode = "PC2"; + this.subtype.add("Equipment"); + + // Equipped creature gets +1/+1. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1))); + // Whenever a creature enters the battlefield under your control, you may attach Sai of the Shinobi to it. + this.addAbility(new EntersBattlefieldAllTriggeredAbility( + Zone.BATTLEFIELD, new AttachEffect(Outcome.Detriment, "attach {source} to it"), + filter, true, true, + null, true)); + // Equip {2} + this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(2))); + } + + public SaiOfTheShinobi(final SaiOfTheShinobi card) { + super(card); + } + + @Override + public SaiOfTheShinobi copy() { + return new SaiOfTheShinobi(this); + } +} diff --git a/Mage/src/mage/abilities/effects/common/AttachEffect.java b/Mage/src/mage/abilities/effects/common/AttachEffect.java index 610f2576eb8..a4eb3d8ffdf 100644 --- a/Mage/src/mage/abilities/effects/common/AttachEffect.java +++ b/Mage/src/mage/abilities/effects/common/AttachEffect.java @@ -61,12 +61,12 @@ public class AttachEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Permanent permanent = game.getPermanent(source.getFirstTarget()); + Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { return permanent.addAttachment(source.getSourceId(), game); } else { - Player player = game.getPlayer(source.getFirstTarget()); + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { return player.addAttachment(source.getSourceId(), game); } From 80baa5db2e48d7341e0560b686debb4a0568607d Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 27 May 2013 16:54:42 +0200 Subject: [PATCH 3/5] Added Krosan Verge. --- .../src/mage/sets/judgment/KrosanVerge.java | 52 +++++++++++ .../mage/sets/planechase2012/KrosanVerge.java | 92 +++++++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/judgment/KrosanVerge.java create mode 100644 Mage.Sets/src/mage/sets/planechase2012/KrosanVerge.java diff --git a/Mage.Sets/src/mage/sets/judgment/KrosanVerge.java b/Mage.Sets/src/mage/sets/judgment/KrosanVerge.java new file mode 100644 index 00000000000..b61f6f29ad0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/judgment/KrosanVerge.java @@ -0,0 +1,52 @@ +/* + * 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.judgment; + +import java.util.UUID; + +/** + * + * @author LevelX2 + */ +public class KrosanVerge extends mage.sets.planechase2012.KrosanVerge { + + public KrosanVerge(UUID ownerId) { + super(ownerId); + this.cardNumber = 141; + this.expansionSetCode = "JUD"; + } + + public KrosanVerge(final KrosanVerge card) { + super(card); + } + + @Override + public KrosanVerge copy() { + return new KrosanVerge(this); + } +} diff --git a/Mage.Sets/src/mage/sets/planechase2012/KrosanVerge.java b/Mage.Sets/src/mage/sets/planechase2012/KrosanVerge.java new file mode 100644 index 00000000000..6840c904ff4 --- /dev/null +++ b/Mage.Sets/src/mage/sets/planechase2012/KrosanVerge.java @@ -0,0 +1,92 @@ +/* + * 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.planechase2012; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Outcome; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldTappedAbility; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.common.SacrificeSourceCost; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.Effect; +import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; +import mage.abilities.mana.ColorlessManaAbility; +import mage.cards.CardImpl; +import mage.filter.FilterCard; +import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.target.common.TargetCardInLibrary; + +/** + * + * @author LevelX2 + */ +public class KrosanVerge extends CardImpl { + + private static final FilterCard filterForest = new FilterCard("a Forest"); + private static final FilterCard filterPlains = new FilterCard("a Plains"); + + static { + filterForest.add(new SubtypePredicate("Forest")); + filterPlains.add(new SubtypePredicate("Plains")); + } + + public KrosanVerge(UUID ownerId) { + super(ownerId, 123, "Krosan Verge", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, ""); + this.expansionSetCode = "PC2"; + + // Krosan Verge enters the battlefield tapped. + this.addAbility(new EntersBattlefieldTappedAbility()); + // {tap}: Add {1} to your mana pool. + this.addAbility(new ColorlessManaAbility()); + // {2}, {T}, Sacrifice Krosan Verge: Search your library for a Forest card and a Plains card and put them onto the battlefield tapped. Then shuffle your library. + Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterForest), true, Outcome.PutLandInPlay); + effect.setText("Search your library for a Forest card and a Plains card and put them onto the battlefield tapped. Then shuffle your library"); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2)); + effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterPlains), true, Outcome.PutLandInPlay); + effect.setText(null); + ability.addEffect(effect); + ability.addCost(new TapSourceCost()); + ability.addCost(new SacrificeSourceCost()); + this.addAbility(ability); + + } + + public KrosanVerge(final KrosanVerge card) { + super(card); + } + + @Override + public KrosanVerge copy() { + return new KrosanVerge(this); + } +} From 9ea3eb5fe3b0d3eeadf438591c671e2339d6264a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 27 May 2013 16:55:01 +0200 Subject: [PATCH 4/5] [minor] formatting. --- Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java index 1c4aab0dc15..95f90fc42d8 100644 --- a/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java +++ b/Mage.Sets/src/mage/sets/morningtide/EverbarkShaman.java @@ -67,6 +67,8 @@ public class EverbarkShaman extends CardImpl { this.color.setGreen(true); this.power = new MageInt(3); this.toughness = new MageInt(5); + + // {T}, Exile a Treefolk card from your graveyard: Search your library for up to two Forest cards and put them onto the battlefield tapped. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(2, filterForest), true, Constants.Outcome.PutLandInPlay), new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filterTreefolk))); this.addAbility(ability); From b7881f8eb2a26d9d1feab1e1ad6508b42d5a903e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 27 May 2013 16:57:16 +0200 Subject: [PATCH 5/5] Implemented split card name handling according the rules (two separate names). I guess this fixes #221. --- .../mage/cards/repository/CardRepository.java | 24 ++++++++++++++++--- .../predicate/mageobject/NamePredicate.java | 14 ++++++++++- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java index 03663557a6e..7fe43f647df 100644 --- a/Mage/src/mage/cards/repository/CardRepository.java +++ b/Mage/src/mage/cards/repository/CardRepository.java @@ -144,7 +144,13 @@ public enum CardRepository { qb.distinct().selectColumns("name"); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { - names.add(card.getName()); + int result = card.getName().indexOf(" // "); + if (result > 0) { + names.add(card.getName().substring(0, result)); + names.add(card.getName().substring(result+4)); + } else { + names.add(card.getName()); + } } } catch (SQLException ex) { } @@ -159,7 +165,13 @@ public enum CardRepository { qb.where().not().like("types", new SelectArg('%' + CardType.LAND.name() + '%')); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { - names.add(card.getName()); + int result = card.getName().indexOf(" // "); + if (result > 0) { + names.add(card.getName().substring(0, result)); + names.add(card.getName().substring(result+4)); + } else { + names.add(card.getName()); + } } } catch (SQLException ex) { } @@ -175,7 +187,13 @@ public enum CardRepository { where.and(where.not().like("types", '%' + CardType.CREATURE.name() +'%'),where.not().like("types", '%' + CardType.LAND.name() + '%')); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { - names.add(card.getName()); + int result = card.getName().indexOf(" // "); + if (result > 0) { + names.add(card.getName().substring(0, result)); + names.add(card.getName().substring(result+4)); + } else { + names.add(card.getName()); + } } } catch (SQLException ex) { } diff --git a/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java b/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java index 505e37efdef..07e789827b4 100644 --- a/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java +++ b/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java @@ -27,9 +27,12 @@ */ package mage.filter.predicate.mageobject; +import mage.Constants.SpellAbilityType; import mage.MageObject; +import mage.cards.SplitCard; import mage.filter.predicate.Predicate; import mage.game.Game; +import mage.game.stack.Spell; /** * @@ -45,7 +48,16 @@ public class NamePredicate implements Predicate { @Override public boolean apply(MageObject input, Game game) { - return name.equals(input.getName()); + // If a player names a card, the player may name either half of a split card, but not both. + // A split card has the chosen name if one of its two names matches the chosen name. + if (input instanceof SplitCard) { + return name.equals(((SplitCard)input).getLeftHalfCard().getName()) || name.equals(((SplitCard)input).getRightHalfCard().getName()); + } else if (input instanceof Spell && ((Spell)input).getSpellAbility().getSpellAbilityType().equals(SpellAbilityType.SPLIT_FUSED)){ + SplitCard card = (SplitCard) ((Spell)input).getCard(); + return name.equals(card.getLeftHalfCard().getName()) || name.equals(card.getRightHalfCard().getName()); + } else { + return name.equals(input.getName()); + } } @Override