From 9ed04cc3c5284351f907a244f2662ea103b78b60 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Mon, 30 May 2022 16:05:17 +0100 Subject: [PATCH] Removed duplicate djinn monk token class, for #8996 (#9029) --- .../src/main/resources/card-pictures-tok.txt | 2 +- .../src/mage/cards/s/SkywiseTeachings.java | 4 +-- .../game/permanent/token/DjinnMonkToken.java | 4 +++ .../token/SkywiseTeachingsToken.java | 33 ------------------- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index a8788381d5..d6ed694d9c 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -610,7 +610,7 @@ |Generate|TOK:DST|Insect|||InsectToken| |Generate|TOK:DST|Myr|||MyrToken| |Generate|TOK:DST|Spawn|||SpawningPitToken| -|Generate|TOK:DTK|Djinn Monk|||SkywiseTeachingsToken| +|Generate|TOK:DTK|Djinn Monk|||DjinnMonkToken| |Generate|TOK:DTK|Dragon|||DragonToken| |Generate|TOK:DTK|Goblin|||GoblinToken| |Generate|TOK:DTK|Morph|| diff --git a/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java b/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java index e5f61bedac..eab6812a92 100644 --- a/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java +++ b/Mage.Sets/src/mage/cards/s/SkywiseTeachings.java @@ -11,7 +11,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.FilterSpell; import mage.filter.predicate.Predicates; -import mage.game.permanent.token.SkywiseTeachingsToken; +import mage.game.permanent.token.DjinnMonkToken; /** * @@ -29,7 +29,7 @@ public final class SkywiseTeachings extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}"); // Whenever you cast a noncreature spell, you may pay {1}{U}. If you do, create a 2/2 blue Djinn Monk creature token with flying. - this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new SkywiseTeachingsToken()), new ManaCostsImpl("{1}{U}")), filter, false)); + this.addAbility(new SpellCastControllerTriggeredAbility(new DoIfCostPaid(new CreateTokenEffect(new DjinnMonkToken()), new ManaCostsImpl("{1}{U}")), filter, false)); } diff --git a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java index 12b5075192..0edf0cc786 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DjinnMonkToken.java @@ -6,6 +6,8 @@ import mage.constants.SubType; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; +import java.util.Arrays; + /** * * @author spjspj @@ -21,6 +23,8 @@ public final class DjinnMonkToken extends TokenImpl { power = new MageInt(2); toughness = new MageInt(2); addAbility(FlyingAbility.getInstance()); + + availableImageSetCodes = Arrays.asList("DTK", "IMA"); } public DjinnMonkToken(final DjinnMonkToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java b/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java deleted file mode 100644 index 25fd6e41d5..0000000000 --- a/Mage/src/main/java/mage/game/permanent/token/SkywiseTeachingsToken.java +++ /dev/null @@ -1,33 +0,0 @@ - - -package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.MageInt; -import mage.abilities.keyword.FlyingAbility; - -/** - * - * @author spjspj - */ -public final class SkywiseTeachingsToken extends TokenImpl { - - public SkywiseTeachingsToken() { - super("Djinn Monk Token", "2/2 blue Djinn Monk creature token with flying"); - cardType.add(CardType.CREATURE); - color.setBlue(true); - this.subtype.add(SubType.DJINN); - this.subtype.add(SubType.MONK); - power = new MageInt(2); - toughness = new MageInt(2); - this.addAbility(FlyingAbility.getInstance()); - } - - public SkywiseTeachingsToken(final SkywiseTeachingsToken token) { - super(token); - } - - public SkywiseTeachingsToken copy() { - return new SkywiseTeachingsToken(this); - } -}