diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index e4ea3b9f9f4..34a01345111 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -766,7 +766,7 @@ |Generate|TOK:M13|Drake|||DrakeToken| |Generate|TOK:M13|Goat|||GoatToken| |Generate|TOK:M13|Goblin|||GoblinToken| -|Generate|TOK:M13|Hellion|||HellionHasteToken| +|Generate|TOK:M13|Hellion|||HellionToken| |Generate|TOK:M13|Saproling|||SaprolingToken| |Generate|TOK:M13|Soldier|||SoldierToken| |Generate|TOK:M13|Wurm|||WurmToken| diff --git a/Mage.Sets/src/mage/cards/h/HellionCrucible.java b/Mage.Sets/src/mage/cards/h/HellionCrucible.java index c34fe35312b..39eeacdfa96 100644 --- a/Mage.Sets/src/mage/cards/h/HellionCrucible.java +++ b/Mage.Sets/src/mage/cards/h/HellionCrucible.java @@ -16,7 +16,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; import mage.counters.CounterType; -import mage.game.permanent.token.HellionHasteToken; +import mage.game.permanent.token.HellionToken; /** * @@ -36,7 +36,7 @@ public final class HellionCrucible extends CardImpl { this.addAbility(ability); // {1}{R}, {tap}, Remove two pressure counters from Hellion Crucible and sacrifice it: Create a 4/4 red Hellion creature token with haste. - ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionHasteToken(), 1), new ManaCostsImpl<>("{1}{R}")); + ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HellionToken(true), 1), new ManaCostsImpl<>("{1}{R}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.PRESSURE.createInstance(2))); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java b/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java deleted file mode 100644 index 7bb525bb43c..00000000000 --- a/Mage/src/main/java/mage/game/permanent/token/HellionHasteToken.java +++ /dev/null @@ -1,31 +0,0 @@ - -package mage.game.permanent.token; - -import mage.MageInt; -import mage.abilities.keyword.HasteAbility; -import mage.constants.CardType; -import mage.constants.SubType; - -/** - * - * @author spjspj - */ -public final class HellionHasteToken extends TokenImpl { - - public HellionHasteToken() { - super("Hellion Token", "4/4 red Hellion creature token with haste"); - cardType.add(CardType.CREATURE); - color.setRed(true); - subtype.add(SubType.HELLION); - power = new MageInt(4); - toughness = new MageInt(4); - addAbility(HasteAbility.getInstance()); - } - public HellionHasteToken(final HellionHasteToken token) { - super(token); - } - - public HellionHasteToken copy() { - return new HellionHasteToken(this); - } -} diff --git a/Mage/src/main/java/mage/game/permanent/token/HellionToken.java b/Mage/src/main/java/mage/game/permanent/token/HellionToken.java index e23f017cfa9..bee514f974a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HellionToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/HellionToken.java @@ -2,6 +2,7 @@ package mage.game.permanent.token; import mage.MageInt; +import mage.abilities.keyword.HasteAbility; import mage.constants.CardType; import mage.constants.SubType; @@ -13,6 +14,15 @@ import java.util.Arrays; */ public final class HellionToken extends TokenImpl { + public HellionToken(boolean withHaste) { + this(); + + if (withHaste) { + addAbility(HasteAbility.getInstance()); + this.description = "4/4 red Hellion creature token with haste"; + } + } + public HellionToken() { super("Hellion Token", "4/4 red Hellion creature token"); cardType.add(CardType.CREATURE); @@ -21,7 +31,7 @@ public final class HellionToken extends TokenImpl { power = new MageInt(4); toughness = new MageInt(4); - availableImageSetCodes = Arrays.asList("ROE", "DDP", "PCA"); + availableImageSetCodes = Arrays.asList("ROE", "DDP", "M13", "PCA"); } public HellionToken(final HellionToken token) {