From bde27916246c399a4d829d0adf207302f30b5b0a Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Sun, 5 Jun 2022 14:01:48 +0100 Subject: [PATCH] Removed duplicate black and green worm token class --- .../src/main/resources/card-pictures-tok.txt | 10 +++--- .../src/mage/cards/c/CreakwoodLiege.java | 4 +-- Mage.Sets/src/mage/cards/w/WormHarvest.java | 4 +-- ...egeToken.java => BlackGreenWormToken.java} | 16 ++++++---- .../permanent/token/WormHarvestToken.java | 31 ------------------- 5 files changed, 19 insertions(+), 46 deletions(-) rename Mage/src/main/java/mage/game/permanent/token/{CreakwoodLiegeToken.java => BlackGreenWormToken.java} (57%) delete mode 100644 Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index b12f308391..d4a4d34358 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -363,7 +363,7 @@ |Generate|TOK:C16|Spirit|2||SpiritWhiteToken| |Generate|TOK:C16|Squid|||SquidToken| |Generate|TOK:C16|Thopter|||ThopterToken| -|Generate|TOK:C16|Worm|||WormHarvestToken| +|Generate|TOK:C16|Worm|||BlackGreenWormToken| |Generate|TOK:C16|Zombie|||ZombieToken| |Generate|TOK:C17|Bat|||BatToken| |Generate|TOK:C17|Cat|||CatToken| @@ -399,7 +399,7 @@ |Generate|TOK:C18|Thopter|1||ThopterColorlessToken| |Generate|TOK:C18|Thopter|2||ThopterColorlessToken| |Generate|TOK:C18|Thopter|3||ThopterToken| -|Generate|TOK:C18|Worm|||WormHarvestToken| +|Generate|TOK:C18|Worm|||BlackGreenWormToken| |Generate|TOK:C18|Zombie|||ZombieToken| |Generate|TOK:C19|Assassin|||AssassinToken| |Generate|TOK:C19|Beast|1||BeastToken| @@ -632,7 +632,7 @@ |Generate|TOK:EVE|Kithkin Soldier|||KithkinSoldierToken| |Generate|TOK:EVE|Spirit|||BeckonApparitionToken| |Generate|TOK:EVE|Wolf|||WolfToken| -|Generate|TOK:EVE|Worm|||WormHarvestToken| +|Generate|TOK:EVE|Worm|||BlackGreenWormToken| |Generate|TOK:EVG|Elemental|||VoiceOfTheWoodsElementalToken| |Generate|TOK:EVG|Elf Warrior|||ElfWarriorToken| |Generate|TOK:EVG|Goblin|||GoblinToken| @@ -855,7 +855,7 @@ |Generate|TOK:MM2|Spirit|||SpiritWhiteToken| |Generate|TOK:MM2|Thrull|||ThrullToken| |Generate|TOK:MM2|Wolf|||WolfToken| -|Generate|TOK:MM2|Worm|||WormHarvestToken| +|Generate|TOK:MM2|Worm|||BlackGreenWormToken| |Generate|TOK:MM3|Angel|| |Generate|TOK:MM3|Beast|1| |Generate|TOK:MM3|Beast|2| @@ -889,7 +889,7 @@ |Generate|TOK:MMA|Soldier|||SoldierToken| |Generate|TOK:MMA|Spider|||PenumbraSpiderToken| |Generate|TOK:MMA|Treefolk Shaman|||TreefolkShamanToken| -|Generate|TOK:MMA|Worm|||WormHarvestToken| +|Generate|TOK:MMA|Worm|||BlackGreenWormToken| |Generate|TOK:MMA|Zombie|||ZombieToken| |Generate|TOK:MMQ|Ape|||ApeToken| |Generate|TOK:MMQ|Insect Butterfly|||ButterflyToken| diff --git a/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java b/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java index e7a8c8f0d3..44ea3a4bf0 100644 --- a/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java +++ b/Mage.Sets/src/mage/cards/c/CreakwoodLiege.java @@ -17,7 +17,7 @@ import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.mageobject.ColorPredicate; -import mage.game.permanent.token.CreakwoodLiegeToken; +import mage.game.permanent.token.BlackGreenWormToken; /** * @@ -45,7 +45,7 @@ public final class CreakwoodLiege extends CardImpl { // Other green creatures you control get +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filterGreenCreature, true))); // At the beginning of your upkeep, you may create a 1/1 black and green Worm creature token. - this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new CreakwoodLiegeToken(), 1), TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new BlackGreenWormToken(), 1), TargetController.YOU, true)); } private CreakwoodLiege(final CreakwoodLiege card) { diff --git a/Mage.Sets/src/mage/cards/w/WormHarvest.java b/Mage.Sets/src/mage/cards/w/WormHarvest.java index b79781890b..8fddba5b54 100644 --- a/Mage.Sets/src/mage/cards/w/WormHarvest.java +++ b/Mage.Sets/src/mage/cards/w/WormHarvest.java @@ -9,7 +9,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.filter.common.FilterLandCard; -import mage.game.permanent.token.WormHarvestToken; +import mage.game.permanent.token.BlackGreenWormToken; /** * @@ -22,7 +22,7 @@ public final class WormHarvest extends CardImpl { // Create a 1/1 black and green Worm creature token for each land card in your graveyard. CardsInControllerGraveyardCount value = new CardsInControllerGraveyardCount(new FilterLandCard()); - this.getSpellAbility().addEffect(new CreateTokenEffect(new WormHarvestToken(), value)); + this.getSpellAbility().addEffect(new CreateTokenEffect(new BlackGreenWormToken(), value)); // Retrace this.addAbility(new RetraceAbility(this)); diff --git a/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java b/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java similarity index 57% rename from Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java rename to Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java index 5d569c2b0f..a932760bb6 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CreakwoodLiegeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java @@ -1,17 +1,19 @@ - package mage.game.permanent.token; + import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; +import java.util.Arrays; + /** * * @author spjspj */ -public final class CreakwoodLiegeToken extends TokenImpl { +public final class BlackGreenWormToken extends TokenImpl { - public CreakwoodLiegeToken() { + public BlackGreenWormToken() { super("Worm Token", "1/1 black and green Worm creature token"); cardType.add(CardType.CREATURE); color.setBlack(true); @@ -19,13 +21,15 @@ public final class CreakwoodLiegeToken extends TokenImpl { subtype.add(SubType.WORM); power = new MageInt(1); toughness = new MageInt(1); + + availableImageSetCodes = Arrays.asList("EVE", "MMA", "MM2", "C16", "C18"); } - public CreakwoodLiegeToken(final CreakwoodLiegeToken token) { + public BlackGreenWormToken(final BlackGreenWormToken token) { super(token); } - public CreakwoodLiegeToken copy() { - return new CreakwoodLiegeToken(this); + public BlackGreenWormToken copy() { + return new BlackGreenWormToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java b/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java deleted file mode 100644 index 44c2d902d8..0000000000 --- a/Mage/src/main/java/mage/game/permanent/token/WormHarvestToken.java +++ /dev/null @@ -1,31 +0,0 @@ - -package mage.game.permanent.token; - -import mage.constants.CardType; -import mage.constants.SubType; -import mage.MageInt; - -/** - * - * @author spjspj - */ -public final class WormHarvestToken extends TokenImpl { - - public WormHarvestToken() { - super("Worm Token", "1/1 black and green Worm creature token"); - cardType.add(CardType.CREATURE); - color.setBlack(true); - color.setGreen(true); - subtype.add(SubType.WORM); - power = new MageInt(1); - toughness = new MageInt(1); - } - - public WormHarvestToken(final WormHarvestToken token) { - super(token); - } - - public WormHarvestToken copy() { - return new WormHarvestToken(this); - } -}