From 943555cebf17708a47ccd23a1bd8362825e5f90a Mon Sep 17 00:00:00 2001 From: Loki Date: Mon, 14 May 2012 12:48:07 +0300 Subject: [PATCH] [AVR] Moonsilver Spear, extract common ability --- .../sets/avacynrestored/MoonsilverSpear.java | 73 +++++++++++++++++++ .../sets/scarsofmirrodin/ArgentumArmor.java | 38 ++-------- .../mage/sets/zendikar/ExplorersScope.java | 35 +-------- .../AttacksEquippedTriggeredAbility.java | 39 ++++++++++ 4 files changed, 120 insertions(+), 65 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/avacynrestored/MoonsilverSpear.java create mode 100644 Mage/src/mage/abilities/common/AttacksEquippedTriggeredAbility.java diff --git a/Mage.Sets/src/mage/sets/avacynrestored/MoonsilverSpear.java b/Mage.Sets/src/mage/sets/avacynrestored/MoonsilverSpear.java new file mode 100644 index 00000000000..58a20e8f628 --- /dev/null +++ b/Mage.Sets/src/mage/sets/avacynrestored/MoonsilverSpear.java @@ -0,0 +1,73 @@ +/* + * 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.avacynrestored; + +import java.util.UUID; + +import mage.Constants; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.common.AttacksEquippedTriggeredAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.CreateTokenEffect; +import mage.abilities.effects.common.continious.GainAbilityAttachedEffect; +import mage.abilities.keyword.EquipAbility; +import mage.abilities.keyword.FirstStrikeAbility; +import mage.cards.CardImpl; +import mage.game.permanent.token.AngelToken; + +/** + * + * @author Loki + */ +public class MoonsilverSpear extends CardImpl { + + public MoonsilverSpear(UUID ownerId) { + super(ownerId, 217, "Moonsilver Spear", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{4}"); + this.expansionSetCode = "AVR"; + this.subtype.add("Equipment"); + + // Equipped creature has first strike. + this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), Constants.AttachmentType.EQUIPMENT))); + // Whenever equipped creature attacks, put a 4/4 white Angel creature token with flying onto the battlefield. + this.addAbility(new AttacksEquippedTriggeredAbility(new CreateTokenEffect(new AngelToken()))); + // Equip {4} + this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(4))); + } + + public MoonsilverSpear(final MoonsilverSpear card) { + super(card); + } + + @Override + public MoonsilverSpear copy() { + return new MoonsilverSpear(this); + } +} diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java index d6b8b080e7f..8b12975e737 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ArgentumArmor.java @@ -34,7 +34,9 @@ import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.Constants.Zone; +import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.common.AttacksEquippedTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.continious.BoostEquippedEffect; @@ -56,9 +58,11 @@ public class ArgentumArmor extends CardImpl { super(ownerId, 137, "Argentum Armor", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{6}"); this.expansionSetCode = "SOM"; this.subtype.add("Equipment"); - this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(6))); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(6, 6))); - this.addAbility(new ArgentumArmorAbiltity()); + Ability ability = new AttacksEquippedTriggeredAbility(new DestroyTargetEffect()); + ability.addTarget(new TargetPermanent()); + this.addAbility(ability); + this.addAbility(new EquipAbility(Constants.Outcome.AddAbility, new GenericManaCost(6))); } public ArgentumArmor (final ArgentumArmor card) { @@ -70,33 +74,3 @@ public class ArgentumArmor extends CardImpl { return new ArgentumArmor(this); } } - -class ArgentumArmorAbiltity extends TriggeredAbilityImpl { - public ArgentumArmorAbiltity() { - super(Zone.BATTLEFIELD, new DestroyTargetEffect()); - this.addTarget(new TargetPermanent()); - } - - public ArgentumArmorAbiltity(final ArgentumArmorAbiltity abiltity) { - super(abiltity); - } - - @Override - public ArgentumArmorAbiltity copy() { - return new ArgentumArmorAbiltity(this); - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - Permanent equipment = game.getPermanent(this.sourceId); - if (equipment != null && equipment.getAttachedTo() != null && event.getType() == GameEvent.EventType.ATTACKER_DECLARED && event.getSourceId().equals(equipment.getAttachedTo())) { - return true; - } - return false; - } - - @Override - public String getRule() { - return "Whenever equipped creature attacks, destroy target permanent."; - } -} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java b/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java index 49c2e6a6846..dfdf0ac22ab 100644 --- a/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java +++ b/Mage.Sets/src/mage/sets/zendikar/ExplorersScope.java @@ -34,6 +34,7 @@ import mage.Constants.Rarity; import mage.Constants.Zone; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.common.AttacksEquippedTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.keyword.EquipAbility; @@ -57,7 +58,7 @@ public class ExplorersScope extends CardImpl { this.expansionSetCode = "ZEN"; this.subtype.add("Equipment"); - this.addAbility(new ExplorersScopeTriggeredAbiltity()); + this.addAbility(new AttacksEquippedTriggeredAbility(new ExplorersScopeEffect())); this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(1))); } @@ -71,38 +72,6 @@ public class ExplorersScope extends CardImpl { } } -class ExplorersScopeTriggeredAbiltity extends TriggeredAbilityImpl { - - public ExplorersScopeTriggeredAbiltity() { - super(Zone.BATTLEFIELD, new ExplorersScopeEffect()); - } - - public ExplorersScopeTriggeredAbiltity(final ExplorersScopeTriggeredAbiltity abiltity) { - super(abiltity); - } - - @Override - public ExplorersScopeTriggeredAbiltity copy() { - return new ExplorersScopeTriggeredAbiltity(this); - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - Permanent equipment = game.getPermanent(this.sourceId); - if (equipment != null && equipment.getAttachedTo() != null - && event.getType() == GameEvent.EventType.ATTACKER_DECLARED - && event.getSourceId().equals(equipment.getAttachedTo())) { - return true; - } - return false; - } - - @Override - public String getRule() { - return "Whenever equipped creature attacks, look at the top card of your library. If it's a land card, you may put it onto the battlefield tapped."; - } -} - class ExplorersScopeEffect extends OneShotEffect { public ExplorersScopeEffect() { diff --git a/Mage/src/mage/abilities/common/AttacksEquippedTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksEquippedTriggeredAbility.java new file mode 100644 index 00000000000..220c85e5f7c --- /dev/null +++ b/Mage/src/mage/abilities/common/AttacksEquippedTriggeredAbility.java @@ -0,0 +1,39 @@ +package mage.abilities.common; + +import mage.Constants; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.Effect; +import mage.game.Game; +import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; + +public class AttacksEquippedTriggeredAbility extends TriggeredAbilityImpl { + public AttacksEquippedTriggeredAbility(Effect effect) { + super(Constants.Zone.BATTLEFIELD, effect); + } + + public AttacksEquippedTriggeredAbility(final AttacksEquippedTriggeredAbility abiltity) { + super(abiltity); + } + + @Override + public AttacksEquippedTriggeredAbility copy() { + return new AttacksEquippedTriggeredAbility(this); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + Permanent equipment = game.getPermanent(this.sourceId); + if (equipment != null && equipment.getAttachedTo() != null + && event.getType() == GameEvent.EventType.ATTACKER_DECLARED + && event.getSourceId().equals(equipment.getAttachedTo())) { + return true; + } + return false; + } + + @Override + public String getRule() { + return "Whenever equipped creature attacks, " + super.getRule(); + } +}