From 3fc84d9ba471bf82e41a3a8b9f807d069d2412ba Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Sun, 5 Jun 2022 13:48:53 +0100 Subject: [PATCH] Removed duplicate dragon egg dragon token class --- .../src/main/resources/card-pictures-tok.txt | 2 +- Mage.Sets/src/mage/cards/b/BroodKeeper.java | 4 +- .../token/BroodKeeperDragonToken.java | 40 ------------------- .../permanent/token/DragonEggDragonToken.java | 2 +- 4 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index b554273d90..b12f308391 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -802,7 +802,7 @@ |Generate|TOK:M14|Zombie|||ZombieToken| |Generate|TOK:M15|Beast|1||GarrukApexPredatorBeastToken| |Generate|TOK:M15|Beast|2||BeastToken| -|Generate|TOK:M15|Dragon|||BroodKeeperDragonToken| +|Generate|TOK:M15|Dragon|||DragonEggDragonToken| |Generate|TOK:M15|Goblin|||GoblinToken| |Generate|TOK:M15|Insect|||InsectDeathToken| |Generate|TOK:M15|Land Mine|||LandMineToken| diff --git a/Mage.Sets/src/mage/cards/b/BroodKeeper.java b/Mage.Sets/src/mage/cards/b/BroodKeeper.java index 9b6048f76d..806eb98a01 100644 --- a/Mage.Sets/src/mage/cards/b/BroodKeeper.java +++ b/Mage.Sets/src/mage/cards/b/BroodKeeper.java @@ -10,7 +10,7 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.game.permanent.token.BroodKeeperDragonToken; +import mage.game.permanent.token.DragonEggDragonToken; /** * @@ -27,7 +27,7 @@ public final class BroodKeeper extends CardImpl { // Whenever an Aura becomes attached to Brood Keeper, create a 2/2 red Dragon creature token with flying. // It has "{R}: This creature gets +1/+0 until end of turn." - Effect effect = new CreateTokenEffect(new BroodKeeperDragonToken()); + Effect effect = new CreateTokenEffect(new DragonEggDragonToken()); effect.setText("create a 2/2 red Dragon creature token with flying. It has \"{R}: This creature gets +1/+0 until end of turn.\""); this.addAbility(new AuraAttachedTriggeredAbility(effect, false)); } diff --git a/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java deleted file mode 100644 index 07819ea32d..0000000000 --- a/Mage/src/main/java/mage/game/permanent/token/BroodKeeperDragonToken.java +++ /dev/null @@ -1,40 +0,0 @@ - - -package mage.game.permanent.token; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.MageInt; -import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.continuous.BoostSourceEffect; -import mage.abilities.keyword.FlyingAbility; -import mage.constants.Duration; -import mage.constants.Zone; - -/** - * - * @author spjspj - */ -public final class BroodKeeperDragonToken extends TokenImpl { - - public BroodKeeperDragonToken() { - super("Dragon Token", "2/2 red Dragon creature token with flying. It has \"{R}: This creature gets +1/+0 until end of turn.\""); - this.setOriginalExpansionSetCode("M15"); - cardType.add(CardType.CREATURE); - color.setRed(true); - subtype.add(SubType.DRAGON); - power = new MageInt(2); - toughness = new MageInt(2); - - this.addAbility(FlyingAbility.getInstance()); - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); - } - - public BroodKeeperDragonToken(final BroodKeeperDragonToken token) { - super(token); - } - - public BroodKeeperDragonToken copy() { - return new BroodKeeperDragonToken(this); - } -} diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java index 1ebf683e44..3d4614632d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java @@ -28,7 +28,7 @@ public final class DragonEggDragonToken extends TokenImpl { this.addAbility(FlyingAbility.getInstance()); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}"))); - availableImageSetCodes = Arrays.asList("C18", "EMA", "M14", "M19", "CMR", "IMA"); + availableImageSetCodes = Arrays.asList("C18", "EMA", "M14", "M15", "M19", "CMR", "IMA"); } public DragonEggDragonToken(final DragonEggDragonToken token) {