From 226a74ebb50de3aba9ac731be4c79cb9ec333801 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Thu, 15 Sep 2011 21:23:15 +0400 Subject: [PATCH] Fixes --- .../mage/sets/innistrad/InvisibleStalker.java | 56 +++++++++++++++---- .../riseoftheeldrazi/KabiraVindicator.java | 5 +- .../scarsofmirrodin/MoltenTailMasticore.java | 9 +-- .../continious/BoostControlledEffect.java | 4 ++ 4 files changed, 55 insertions(+), 19 deletions(-) diff --git a/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java b/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java index 6d38e2ba7fc..b2d37cd9054 100644 --- a/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java +++ b/Mage.Sets/src/mage/sets/innistrad/InvisibleStalker.java @@ -1,31 +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.innistrad; -import mage.Constants; +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; import mage.MageInt; import mage.abilities.keyword.HexproofAbility; import mage.abilities.keyword.UnblockableAbility; import mage.cards.CardImpl; -import java.util.UUID; - +/** + * + * @author nantuko + */ public class InvisibleStalker extends CardImpl { + public InvisibleStalker(UUID ownerId) { - super(ownerId, 60, "Invisible Stalker", Constants.Rarity.UNCOMMON, new Constants.CardType[]{Constants.CardType.CREATURE}, "{1}{U}"); + super(ownerId, 60, "Invisible Stalker", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.expansionSetCode = "ISD"; - this.subtype.add("Human"); + this.subtype.add("Human"); this.subtype.add("Rogue"); - this.color.setBlue(true); - this.power = new MageInt(1); - this.toughness = new MageInt(1); + + this.color.setBlue(true); + this.power = new MageInt(1); + this.toughness = new MageInt(1); this.addAbility(new HexproofAbility()); + // Invisible Stalker is unblockable. this.addAbility(UnblockableAbility.getInstance()); + } + public InvisibleStalker(final InvisibleStalker card) { + super(card); } @Override public InvisibleStalker copy() { - return null; //To change body of implemented methods use File | Settings | File Templates. + return new InvisibleStalker(this); } - } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KabiraVindicator.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KabiraVindicator.java index 454c2e3be72..cc1920e9faa 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KabiraVindicator.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KabiraVindicator.java @@ -37,6 +37,7 @@ import mage.abilities.Abilities; import mage.abilities.AbilitiesImpl; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.continious.BoostControlledEffect; @@ -64,11 +65,11 @@ public class KabiraVindicator extends LevelerCard { this.addAbility(new LevelUpAbility(new ManaCostsImpl("{2}{W}"))); Abilities abilities1 = new AbilitiesImpl(); - abilities1.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, FilterCreaturePermanent.getDefault(), true), new TapSourceCost())); + abilities1.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, FilterCreaturePermanent.getDefault(), true))); this.getLevels().add(new LevelAbility(2, 4, abilities1, 3, 6)); Abilities abilities2 = new AbilitiesImpl(); - abilities2.add(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, FilterCreaturePermanent.getDefault(), true), new TapSourceCost())); + abilities2.add(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, FilterCreaturePermanent.getDefault(), true))); this.getLevels().add(new LevelAbility(5, -1, abilities2, 4, 8)); } diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java index 0f5e73a89e8..b36fd549c94 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java @@ -46,6 +46,7 @@ import mage.abilities.effects.common.SacrificeSourceUnlessPaysEffect; import mage.cards.CardImpl; import mage.filter.Filter; import mage.filter.FilterCard; +import mage.filter.common.FilterCreatureCard; import mage.game.Game; import mage.game.events.GameEvent; import mage.target.common.TargetCardInHand; @@ -57,12 +58,6 @@ import mage.target.common.TargetCreatureOrPlayer; * @author Loki */ public class MoltenTailMasticore extends CardImpl { - private static FilterCard filter = new FilterCard("creature card"); - - static { - filter.getCardType().add(CardType.CREATURE); - filter.setScopeCardType(Filter.ComparisonScope.Any); - } public MoltenTailMasticore (UUID ownerId) { super(ownerId, 177, "Molten-Tail Masticore", Rarity.MYTHIC, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{4}"); @@ -72,7 +67,7 @@ public class MoltenTailMasticore extends CardImpl { this.toughness = new MageInt(4); this.addAbility(new MoltenTailMasticoreAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new GenericManaCost(4)); - ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter))); + ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard()))); ability.addTarget(new TargetCreatureOrPlayer()); this.addAbility(ability); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new GenericManaCost(2))); diff --git a/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java b/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java index 7614e04c1f8..6feadd92c82 100644 --- a/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java +++ b/Mage/src/mage/abilities/effects/common/continious/BoostControlledEffect.java @@ -63,6 +63,10 @@ public class BoostControlledEffect extends ContinuousEffectImpl