From 5cc9e22bd5ace013bf13cc12885c3a4f27ffdce1 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 12 May 2014 15:30:55 +0200 Subject: [PATCH] Fixed token image handling for Rat token. --- .../championsofkamigawa/MarrowGnawer.java | 16 +----- .../src/mage/sets/gatecrash/OgreSlumlord.java | 15 +---- .../src/mage/sets/stronghold/LabRats.java | 16 +----- .../mage/game/permanent/token/RatToken.java | 55 +++++++++++++++++++ 4 files changed, 58 insertions(+), 44 deletions(-) create mode 100644 Mage/src/mage/game/permanent/token/RatToken.java diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java index 96c162a69f8..1099535473e 100644 --- a/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java +++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java @@ -34,7 +34,6 @@ import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.Zone; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; @@ -49,7 +48,7 @@ import mage.constants.Duration; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.RatToken; import mage.target.common.TargetControlledPermanent; /** @@ -98,16 +97,3 @@ public class MarrowGnawer extends CardImpl { } } - -class RatToken extends Token { - - public RatToken() { - super("Rat", "1/1 black Rat creature token"); - cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; - subtype.add("Rat"); - power = new MageInt(1); - toughness = new MageInt(1); - } - -} \ No newline at end of file diff --git a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java index a5ff184df9e..7fe96fe2c17 100644 --- a/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java +++ b/Mage.Sets/src/mage/sets/gatecrash/OgreSlumlord.java @@ -33,7 +33,6 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; import mage.MageInt; -import mage.ObjectColor; import mage.abilities.common.DiesCreatureTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -46,7 +45,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.TokenPredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.RatToken; /** * @@ -91,15 +90,3 @@ public class OgreSlumlord extends CardImpl { return new OgreSlumlord(this); } } - -class RatToken extends Token { - - public RatToken() { - super("Rat", "1/1 black Rat creature token"); - cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; - subtype.add("Rat"); - power = new MageInt(1); - toughness = new MageInt(1); - } -} diff --git a/Mage.Sets/src/mage/sets/stronghold/LabRats.java b/Mage.Sets/src/mage/sets/stronghold/LabRats.java index 98f1260a363..dd51ccc7d17 100644 --- a/Mage.Sets/src/mage/sets/stronghold/LabRats.java +++ b/Mage.Sets/src/mage/sets/stronghold/LabRats.java @@ -30,12 +30,10 @@ package mage.sets.stronghold; import java.util.UUID; import mage.constants.CardType; import mage.constants.Rarity; -import mage.MageInt; -import mage.ObjectColor; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.BuybackAbility; import mage.cards.CardImpl; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.RatToken; /** * @@ -64,15 +62,3 @@ public class LabRats extends CardImpl { return new LabRats(this); } } - -class RatToken extends Token { - - public RatToken() { - super("Rat", "1/1 black Rat creature token"); - cardType.add(CardType.CREATURE); - color = ObjectColor.BLACK; - subtype.add("Rat"); - power = new MageInt(1); - toughness = new MageInt(1); - } -} diff --git a/Mage/src/mage/game/permanent/token/RatToken.java b/Mage/src/mage/game/permanent/token/RatToken.java new file mode 100644 index 00000000000..7aa1411d699 --- /dev/null +++ b/Mage/src/mage/game/permanent/token/RatToken.java @@ -0,0 +1,55 @@ +/* +* 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.game.permanent.token; + +import mage.MageInt; +import mage.ObjectColor; +import mage.constants.CardType; + +/** + * + * @author LevelX2 + */ +public class RatToken extends Token { + + public RatToken() { + this("GTC"); + } + + public RatToken(String setCode) { + super("Rat", "1/1 black Rat creature token"); + this.setOriginalExpansionSetCode(setCode); + cardType.add(CardType.CREATURE); + color = ObjectColor.BLACK; + subtype.add("Rat"); + power = new MageInt(1); + toughness = new MageInt(1); + } + +}