From 6c3b48b2a7dbf3c0ca9cb31c81396d63f585cbab Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 3 Apr 2019 13:02:21 +0400 Subject: [PATCH] [WAR] - added token image; --- Mage.Client/src/main/resources/card-pictures-tok.txt | 3 ++- .../mage/abilities/effects/keyword/AmassEffect.java | 4 ++-- .../token/{AmassToken.java => ZombieArmyToken.java} | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) rename Mage/src/main/java/mage/game/permanent/token/{AmassToken.java => ZombieArmyToken.java} (63%) diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index fd3f65f7aa2..481ac3559df 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -1197,4 +1197,5 @@ |Generate|TOK:RNA|Spirit|||SpiritWhiteToken| |Generate|TOK:RNA|Thopter|||ThopterToken| |Generate|TOK:RNA|Treasure|||TreasureToken| -|Generate|TOK:RNA|Zombie|||ZombieToken| \ No newline at end of file +|Generate|TOK:RNA|Zombie|||ZombieToken| +|Generate|TOK:WAR|Zombie Army|||ZombieArmyToken| \ No newline at end of file diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java index d0ee543a955..b5a81604272 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java @@ -13,7 +13,7 @@ import mage.filter.common.FilterControlledPermanent; import mage.filter.predicate.mageobject.SubtypePredicate; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.AmassToken; +import mage.game.permanent.token.ZombieArmyToken; import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; @@ -69,7 +69,7 @@ public class AmassEffect extends OneShotEffect { return false; } if (!game.getBattlefield().contains(filter, 1, game)) { - new CreateTokenEffect(new AmassToken()).apply(game, source); + new CreateTokenEffect(new ZombieArmyToken()).apply(game, source); } Target target = new TargetPermanent(filter); target.setNotTarget(true); diff --git a/Mage/src/main/java/mage/game/permanent/token/AmassToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java similarity index 63% rename from Mage/src/main/java/mage/game/permanent/token/AmassToken.java rename to Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java index 82785f7229f..86fe1a490d1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/AmassToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieArmyToken.java @@ -8,10 +8,11 @@ import mage.constants.SubType; /** * @author TheElk801 */ -public final class AmassToken extends TokenImpl { +public final class ZombieArmyToken extends TokenImpl { - public AmassToken() { + public ZombieArmyToken() { super("Zombie Army", "0/0 black Zombie Army creature token"); + setExpansionSetCodeForImage("WAR"); // default cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.ZOMBIE); @@ -20,12 +21,12 @@ public final class AmassToken extends TokenImpl { toughness = new MageInt(0); } - private AmassToken(final AmassToken token) { + private ZombieArmyToken(final ZombieArmyToken token) { super(token); } @Override - public AmassToken copy() { - return new AmassToken(this); + public ZombieArmyToken copy() { + return new ZombieArmyToken(this); } }