From da94a40658b0fb10a2b95fb8e948f151a41a6ec9 Mon Sep 17 00:00:00 2001 From: JOAC69 Date: Thu, 29 Sep 2016 19:36:58 -0500 Subject: [PATCH] Refactor - Use shared EldraziHorrorToken --- .../src/mage/sets/eldritchmoon/DesperateSentry.java | 1 + .../src/mage/sets/eldritchmoon/EmrakulsEvangel.java | 1 + .../mage/sets/eldritchmoon/EnlightenedManiac.java | 1 + .../mage/sets/eldritchmoon/ExtricatorOfFlesh.java | 1 + .../src/mage/sets/eldritchmoon/ExtricatorOfSin.java | 1 + .../src/mage/sets/eldritchmoon/FoulEmissary.java | 1 + .../eldritchmoon/HanweirTheWrithingTownship.java | 1 + .../src/mage/sets/eldritchmoon/HowlingChorus.java | 1 + .../sets/eldritchmoon/OtherworldlyOutburst.java | 1 + .../mage/sets/eldritchmoon/WharfInfiltrator.java | 13 +------------ 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/DesperateSentry.java b/Mage.Sets/src/mage/sets/eldritchmoon/DesperateSentry.java index 8287627984a..e0b75ce53b1 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/DesperateSentry.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/DesperateSentry.java @@ -41,6 +41,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; +import mage.game.permanent.token.EldraziHorrorToken; /** * diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/EmrakulsEvangel.java b/Mage.Sets/src/mage/sets/eldritchmoon/EmrakulsEvangel.java index 515d0160b6d..73cafb0458a 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/EmrakulsEvangel.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/EmrakulsEvangel.java @@ -46,6 +46,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; import mage.filter.predicate.permanent.AnotherPredicate; import mage.game.Game; import mage.game.permanent.Permanent; +import mage.game.permanent.token.EldraziHorrorToken; import mage.players.Player; import mage.target.Target; import mage.target.common.TargetControlledCreaturePermanent; diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/EnlightenedManiac.java b/Mage.Sets/src/mage/sets/eldritchmoon/EnlightenedManiac.java index 39adb15acf5..74869c7026d 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/EnlightenedManiac.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/EnlightenedManiac.java @@ -34,6 +34,7 @@ import mage.abilities.effects.common.CreateTokenEffect; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; +import mage.game.permanent.token.EldraziHorrorToken; /** * diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/ExtricatorOfFlesh.java b/Mage.Sets/src/mage/sets/eldritchmoon/ExtricatorOfFlesh.java index dbf0ba4b8cd..ce6d6ade2e2 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/ExtricatorOfFlesh.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/ExtricatorOfFlesh.java @@ -46,6 +46,7 @@ import mage.constants.Zone; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.SubtypePredicate; +import mage.game.permanent.token.EldraziHorrorToken; import mage.target.common.TargetControlledCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/ExtricatorOfSin.java b/Mage.Sets/src/mage/sets/eldritchmoon/ExtricatorOfSin.java index c45ad38b6a5..3d88ac3ca17 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/ExtricatorOfSin.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/ExtricatorOfSin.java @@ -45,6 +45,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.permanent.AnotherPredicate; +import mage.game.permanent.token.EldraziHorrorToken; import mage.target.common.TargetControlledPermanent; /** diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/FoulEmissary.java b/Mage.Sets/src/mage/sets/eldritchmoon/FoulEmissary.java index c3ec39e2b15..aa8384811b3 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/FoulEmissary.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/FoulEmissary.java @@ -43,6 +43,7 @@ import mage.filter.FilterCard; import mage.filter.predicate.mageobject.CardTypePredicate; import mage.game.Game; import mage.game.events.GameEvent; +import mage.game.permanent.token.EldraziHorrorToken; import mage.game.stack.Spell; /** diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/HanweirTheWrithingTownship.java b/Mage.Sets/src/mage/sets/eldritchmoon/HanweirTheWrithingTownship.java index 01220e96499..b6b336da89c 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/HanweirTheWrithingTownship.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/HanweirTheWrithingTownship.java @@ -36,6 +36,7 @@ import mage.abilities.keyword.TrampleAbility; import mage.cards.MeldCard; import mage.constants.CardType; import mage.constants.Rarity; +import mage.game.permanent.token.EldraziHorrorToken; /** * diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/HowlingChorus.java b/Mage.Sets/src/mage/sets/eldritchmoon/HowlingChorus.java index f5c6214b4ce..cb54edfd5f2 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/HowlingChorus.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/HowlingChorus.java @@ -37,6 +37,7 @@ import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.Zone; +import mage.game.permanent.token.EldraziHorrorToken; /** * diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/OtherworldlyOutburst.java b/Mage.Sets/src/mage/sets/eldritchmoon/OtherworldlyOutburst.java index 6c3c1f7629e..00014c8f4eb 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/OtherworldlyOutburst.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/OtherworldlyOutburst.java @@ -43,6 +43,7 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.events.ZoneChangeEvent; +import mage.game.permanent.token.EldraziHorrorToken; import mage.target.common.TargetCreaturePermanent; /** diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/WharfInfiltrator.java b/Mage.Sets/src/mage/sets/eldritchmoon/WharfInfiltrator.java index 1d023ee583c..7a50de021fe 100644 --- a/Mage.Sets/src/mage/sets/eldritchmoon/WharfInfiltrator.java +++ b/Mage.Sets/src/mage/sets/eldritchmoon/WharfInfiltrator.java @@ -45,6 +45,7 @@ import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; +import mage.game.permanent.token.EldraziHorrorToken; import mage.game.permanent.token.Token; /** @@ -120,15 +121,3 @@ class WharfInfiltratorDiscardAbility extends TriggeredAbilityImpl { return "Whenever you discard a creature card, " + super.getRule(); } } - -class EldraziHorrorToken extends Token { - - public EldraziHorrorToken() { - super("Eldrazi Horror", "3/2 colorless Eldrazi Horror creature token"); - cardType.add(CardType.CREATURE); - subtype.add("Eldrazi"); - subtype.add("Horror"); - power = new MageInt(3); - toughness = new MageInt(2); - } -}