From 2074a02920aa4d364033cc5579053cd7fca3069f Mon Sep 17 00:00:00 2001 From: PurpleCrowbar Date: Sun, 5 Jun 2022 13:17:27 +0100 Subject: [PATCH] Removed duplicate 3/3 angel token class --- .../src/main/resources/card-pictures-tok.txt | 2 +- .../src/mage/cards/l/LinvalaThePreserver.java | 4 +-- .../game/permanent/token/Angel33Token.java | 2 +- .../permanent/token/LinvalaAngelToken.java | 33 ------------------- 4 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 0d91006302..7f9ab642d3 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -926,7 +926,7 @@ |Generate|TOK:ODY|Squirrel|||SquirrelToken| |Generate|TOK:ODY|Wurm|||WurmToken| |Generate|TOK:ODY|Zombie|||ZombieToken| -|Generate|TOK:OGW|Angel|||LinvalaAngelToken| +|Generate|TOK:OGW|Angel|||Angel33Token| |Generate|TOK:OGW|Eldrazi Scion|1||EldraziScionToken| |Generate|TOK:OGW|Eldrazi Scion|2||EldraziScionToken| |Generate|TOK:OGW|Eldrazi Scion|3||EldraziScionToken| diff --git a/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java b/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java index 5deb7d28f3..4ca7caec22 100644 --- a/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java +++ b/Mage.Sets/src/mage/cards/l/LinvalaThePreserver.java @@ -16,7 +16,7 @@ import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterCreaturePermanent; -import mage.game.permanent.token.LinvalaAngelToken; +import mage.game.permanent.token.Angel33Token; /** * @@ -40,7 +40,7 @@ public final class LinvalaThePreserver extends CardImpl { "When {this} enters the battlefield, if an opponent has more life than you, you gain 5 life.")); // When Linvala enters the battlefield, if an opponent controls more creatures than you, create a 3/3 white Angel creature token with flying. - this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new LinvalaAngelToken()), false), + this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new Angel33Token()), false), new OpponentControlsMoreCondition(new FilterCreaturePermanent()), "When {this} enters the battlefield, if an opponent controls more creatures than you, create a 3/3 white Angel creature token with flying.")); } diff --git a/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java b/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java index c6d0f843ef..798552db6c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java +++ b/Mage/src/main/java/mage/game/permanent/token/Angel33Token.java @@ -23,7 +23,7 @@ public final class Angel33Token extends TokenImpl { // Flying this.addAbility(FlyingAbility.getInstance()); - availableImageSetCodes = Arrays.asList("AFR", "SNC"); + availableImageSetCodes = Arrays.asList("AFR", "SNC", "OGW"); } public Angel33Token(final Angel33Token token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java b/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.java deleted file mode 100644 index f3f96cfa77..0000000000 --- a/Mage/src/main/java/mage/game/permanent/token/LinvalaAngelToken.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 LinvalaAngelToken extends TokenImpl { - - public LinvalaAngelToken() { - super("Angel Token", "3/3 white Angel creature token with flying"); - setOriginalExpansionSetCode("OGW"); - cardType.add(CardType.CREATURE); - color.setWhite(true); - subtype.add(SubType.ANGEL); - power = new MageInt(3); - toughness = new MageInt(3); - addAbility(FlyingAbility.getInstance()); - } - - public LinvalaAngelToken(final LinvalaAngelToken token) { - super(token); - } - - public LinvalaAngelToken copy() { - return new LinvalaAngelToken(this); - } -}