From 4a1bd50dc10d285d356b5efe97c9e783c87de609 Mon Sep 17 00:00:00 2001 From: Michael Napoleon Date: Wed, 4 Mar 2015 21:58:47 -0500 Subject: [PATCH] finished up Invasion cards Crimson Acolyte, Explosive Growth, Nightscape Master and Trench Wurm --- .../mage/sets/invasion/CrimsonAcolyte.java | 2 +- .../mage/sets/invasion/ExplosiveGrowth.java | 2 +- .../mage/sets/invasion/NightscapeMaster.java | 2 +- .../mage/sets/invasion/ScavengedWeaponry.java | 80 ------------------- .../src/mage/sets/invasion/TrenchWurm.java | 2 +- 5 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 Mage.Sets/src/mage/sets/invasion/ScavengedWeaponry.java diff --git a/Mage.Sets/src/mage/sets/invasion/CrimsonAcolyte.java b/Mage.Sets/src/mage/sets/invasion/CrimsonAcolyte.java index 5331c36f9c..c7e90f813e 100644 --- a/Mage.Sets/src/mage/sets/invasion/CrimsonAcolyte.java +++ b/Mage.Sets/src/mage/sets/invasion/CrimsonAcolyte.java @@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent; /** * - * @author anonymous + * @author michael.napoleon@gmail.com */ public class CrimsonAcolyte extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/invasion/ExplosiveGrowth.java b/Mage.Sets/src/mage/sets/invasion/ExplosiveGrowth.java index 80e1a92630..143dd2ea2e 100644 --- a/Mage.Sets/src/mage/sets/invasion/ExplosiveGrowth.java +++ b/Mage.Sets/src/mage/sets/invasion/ExplosiveGrowth.java @@ -40,7 +40,7 @@ import mage.target.common.TargetCreaturePermanent; /** * - * @author anonymous + * @author michael.napoleon@gmail.com */ public class ExplosiveGrowth extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/invasion/NightscapeMaster.java b/Mage.Sets/src/mage/sets/invasion/NightscapeMaster.java index 8a74693b66..a72d0903ff 100644 --- a/Mage.Sets/src/mage/sets/invasion/NightscapeMaster.java +++ b/Mage.Sets/src/mage/sets/invasion/NightscapeMaster.java @@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent; /** * - * @author anonymous + * @author michael.napoleon@gmail.com */ public class NightscapeMaster extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/invasion/ScavengedWeaponry.java b/Mage.Sets/src/mage/sets/invasion/ScavengedWeaponry.java deleted file mode 100644 index 9b9c7fa96a..0000000000 --- a/Mage.Sets/src/mage/sets/invasion/ScavengedWeaponry.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * 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.invasion; - -import java.util.UUID; -import mage.abilities.Ability; -import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.effects.common.AttachEffect; -import mage.abilities.effects.common.DrawCardSourceControllerEffect; -import mage.abilities.effects.common.continuous.BoostEnchantedEffect; -import mage.abilities.keyword.EnchantAbility; -import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.Zone; -import mage.target.TargetPermanent; -import mage.target.common.TargetCreaturePermanent; - -/** - * - * @author anonymous - */ -public class ScavengedWeaponry extends CardImpl { - - public ScavengedWeaponry(UUID ownerId) { - super(ownerId, 123, "Scavenged Weaponry", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}"); - this.expansionSetCode = "INV"; - this.subtype.add("Aura"); - - // Enchant creature - TargetPermanent auraTarget = new TargetCreaturePermanent(); - this.spellAbility.addTarget(auraTarget); - this.spellAbility.addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); - this.addAbility(ability); - - // When Scavenged Weaponry enters the battlefield, draw a card. - this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); - - // Enchanted creature gets +1/+1. - this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); - } - - public ScavengedWeaponry(final ScavengedWeaponry card) { - super(card); - } - - @Override - public ScavengedWeaponry copy() { - return new ScavengedWeaponry(this); - } -} diff --git a/Mage.Sets/src/mage/sets/invasion/TrenchWurm.java b/Mage.Sets/src/mage/sets/invasion/TrenchWurm.java index 4b9742f930..f2c5914fb6 100644 --- a/Mage.Sets/src/mage/sets/invasion/TrenchWurm.java +++ b/Mage.Sets/src/mage/sets/invasion/TrenchWurm.java @@ -41,7 +41,7 @@ import mage.target.common.TargetNonBasicLandPermanent; /** * - * @author anonymous + * @author michael.napoleon@gmail.com */ public class TrenchWurm extends CardImpl {