From 42973302f4c92aa38c40a202a624f31883aae5b1 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 6 Aug 2014 08:22:43 +0200 Subject: [PATCH] * Fixes to M15 token images handling. --- Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java | 2 +- Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java | 2 +- Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java | 2 +- Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java | 1 + Mage.Sets/src/mage/sets/magic2015/SliverHive.java | 1 + Mage/src/mage/game/permanent/token/BeastToken.java | 8 +++++++- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java b/Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java index 1875511687..d6d4a00b8d 100644 --- a/Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java +++ b/Mage.Sets/src/mage/sets/magic2015/ChasmSkulker.java @@ -118,7 +118,7 @@ class ChasmSkulkerSquidToken extends Token { public ChasmSkulkerSquidToken() { super("Squid", "1/1 blue Squid creature token with islandwalk"); - this.setOriginalExpansionSetCode("MMA"); + this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add("Squid"); diff --git a/Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java b/Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java index 7c39a26020..642b1d1ff0 100644 --- a/Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java +++ b/Mage.Sets/src/mage/sets/magic2015/CoralBarrier.java @@ -74,7 +74,7 @@ class CoralBarrierSquidToken extends Token { public CoralBarrierSquidToken() { super("Squid", "1/1 blue Squid creature token with islandwalk"); - this.setOriginalExpansionSetCode("MMA"); + this.setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); color.setBlue(true); subtype.add("Squid"); diff --git a/Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java b/Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java index 6943700fc4..81a839782a 100644 --- a/Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java +++ b/Mage.Sets/src/mage/sets/magic2015/FeralIncarnation.java @@ -50,7 +50,7 @@ public class FeralIncarnation extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); // Put three 3/3 green Beast creature tokens onto the battlefield. - this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken("M15"), 3)); + this.getSpellAbility().addEffect(new CreateTokenEffect(new BeastToken("M15", 1), 3)); } public FeralIncarnation(final FeralIncarnation card) { diff --git a/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java b/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java index 6f1e50c159..1af7f9e09c 100644 --- a/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java +++ b/Mage.Sets/src/mage/sets/magic2015/GarrukApexPredator.java @@ -149,6 +149,7 @@ class GarrukApexPredatorBeastToken extends Token { public GarrukApexPredatorBeastToken() { super("Beast", "3/3 black Beast creature token with deathtouch"); setOriginalExpansionSetCode("M15"); + setTokenType(2); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add("Beast"); diff --git a/Mage.Sets/src/mage/sets/magic2015/SliverHive.java b/Mage.Sets/src/mage/sets/magic2015/SliverHive.java index 93c535a490..1d2c1a0578 100644 --- a/Mage.Sets/src/mage/sets/magic2015/SliverHive.java +++ b/Mage.Sets/src/mage/sets/magic2015/SliverHive.java @@ -130,6 +130,7 @@ class SliverToken extends Token { SliverToken() { super("Sliver", "1/1 colorless Sliver creature token"); + setOriginalExpansionSetCode("M15"); cardType.add(CardType.CREATURE); subtype.add("Sliver"); power = new MageInt(1); diff --git a/Mage/src/mage/game/permanent/token/BeastToken.java b/Mage/src/mage/game/permanent/token/BeastToken.java index fa2ea83a4a..98225911de 100644 --- a/Mage/src/mage/game/permanent/token/BeastToken.java +++ b/Mage/src/mage/game/permanent/token/BeastToken.java @@ -41,10 +41,16 @@ public class BeastToken extends Token { public BeastToken() { this("LRW"); } - public BeastToken(String setCode) { + this(setCode, Integer.MIN_VALUE); + } + + public BeastToken(String setCode, int tokenType) { super("Beast", "3/3 green Beast creature token"); setOriginalExpansionSetCode(setCode); + if (tokenType != Integer.MIN_VALUE) { + setTokenType(tokenType); + } cardType.add(CardType.CREATURE); color = ObjectColor.GREEN; subtype.add("Beast");