From 0afaa5c59cb0f51ea390c156b468a8b0f20f52f3 Mon Sep 17 00:00:00 2001 From: spjspj Date: Sat, 8 Jul 2017 23:53:17 +1000 Subject: [PATCH] Minor refactor --- .../src/mage/cards/c/CrestedSunmare.java | 15 +----- .../permanent/token/CrestedSunmareToken.java | 47 +++++++++++++++++++ 2 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java diff --git a/Mage.Sets/src/mage/cards/c/CrestedSunmare.java b/Mage.Sets/src/mage/cards/c/CrestedSunmare.java index fd96744255..4bfaac4842 100644 --- a/Mage.Sets/src/mage/cards/c/CrestedSunmare.java +++ b/Mage.Sets/src/mage/cards/c/CrestedSunmare.java @@ -46,7 +46,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.CrestedSunmareToken; import mage.watchers.common.PlayerGainedLifeWatcher; /** @@ -56,6 +56,7 @@ import mage.watchers.common.PlayerGainedLifeWatcher; public class CrestedSunmare extends CardImpl { private static final FilterControlledPermanent filter = new FilterControlledPermanent("Horses you control"); + static { filter.add(new SubtypePredicate(SubType.HORSE)); } @@ -88,15 +89,3 @@ public class CrestedSunmare extends CardImpl { return new CrestedSunmare(this); } } - -class CrestedSunmareToken extends Token { - - CrestedSunmareToken() { - super("Horse", "5/5 white Horse creature token"); - power = new MageInt(5); - toughness = new MageInt(5); - color.setWhite(true); - subtype.add("Horse"); - cardType.add(CardType.CREATURE); - } -} diff --git a/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java new file mode 100644 index 0000000000..5c102cd8ae --- /dev/null +++ b/Mage/src/main/java/mage/game/permanent/token/CrestedSunmareToken.java @@ -0,0 +1,47 @@ +/* +* 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.constants.CardType; +import mage.MageInt; + +/** + * + * @author spjspj + */ +public class CrestedSunmareToken extends Token { + + public CrestedSunmareToken() { + super("Horse", "5/5 white Horse creature token"); + power = new MageInt(5); + toughness = new MageInt(5); + color.setWhite(true); + subtype.add("Horse"); + cardType.add(CardType.CREATURE); + } +}