From 171f0a238b91692f6d49af8507eba53a71894c56 Mon Sep 17 00:00:00 2001 From: PurpleCrowbar <26198472+PurpleCrowbar@users.noreply.github.com> Date: Tue, 2 May 2023 21:04:57 +0100 Subject: [PATCH] Fix Monkey Cage, fix Pongify ape's images, remove some non-token sets from available token sets --- Mage.Sets/src/mage/cards/m/MonkeyCage.java | 8 ++--- Mage.Sets/src/mage/cards/p/Pongify.java | 4 +-- .../mage/game/permanent/token/ApeToken.java | 8 ++--- .../game/permanent/token/MonkeyToken.java | 30 ++++++++++++++++ .../game/permanent/token/PongifyApeToken.java | 34 ------------------- Mage/src/main/resources/tokens-database.txt | 24 ++----------- 6 files changed, 42 insertions(+), 66 deletions(-) create mode 100644 Mage/src/main/java/mage/game/permanent/token/MonkeyToken.java delete mode 100644 Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java diff --git a/Mage.Sets/src/mage/cards/m/MonkeyCage.java b/Mage.Sets/src/mage/cards/m/MonkeyCage.java index 294c003e25f..1142d38505c 100644 --- a/Mage.Sets/src/mage/cards/m/MonkeyCage.java +++ b/Mage.Sets/src/mage/cards/m/MonkeyCage.java @@ -13,7 +13,7 @@ import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.ApeToken; +import mage.game.permanent.token.MonkeyToken; import java.util.UUID; @@ -25,7 +25,7 @@ public final class MonkeyCage extends CardImpl { public MonkeyCage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{5}"); - // When a creature enters the battlefield, sacrifice Monkey Cage and create X 2/2 green Ape creature tokens, where X is that creature's converted mana cost. + // When a creature enters the battlefield, sacrifice Monkey Cage and create X 2/2 green Monkey creature tokens, where X is that creature's converted mana cost. Ability ability = new EntersBattlefieldAllTriggeredAbility( Zone.BATTLEFIELD, new SacrificeSourceEffect(), StaticFilters.FILTER_PERMANENT_A_CREATURE, false, SetTargetPointer.PERMANENT, null @@ -48,7 +48,7 @@ class MonkeyCageEffect extends OneShotEffect { public MonkeyCageEffect() { super(Outcome.Benefit); - staticText = "and create X 2/2 green Ape creature tokens, where X is that creature's mana value"; + staticText = "and create X 2/2 green Monkey creature tokens, where X is that creature's mana value"; } public MonkeyCageEffect(final MonkeyCageEffect effect) { @@ -66,6 +66,6 @@ class MonkeyCageEffect extends OneShotEffect { return false; } int cmc = creature.getManaValue(); - return cmc > 0 && new ApeToken().putOntoBattlefield(cmc, game, source); + return cmc > 0 && new MonkeyToken().putOntoBattlefield(cmc, game, source); } } diff --git a/Mage.Sets/src/mage/cards/p/Pongify.java b/Mage.Sets/src/mage/cards/p/Pongify.java index 292adafd708..9b3a42d0b00 100644 --- a/Mage.Sets/src/mage/cards/p/Pongify.java +++ b/Mage.Sets/src/mage/cards/p/Pongify.java @@ -11,7 +11,7 @@ import mage.constants.CardType; import mage.constants.Outcome; import mage.game.Game; import mage.game.permanent.Permanent; -import mage.game.permanent.token.PongifyApeToken; +import mage.game.permanent.token.ApeToken; import mage.target.common.TargetCreaturePermanent; /** @@ -63,7 +63,7 @@ class PongifyEffect extends OneShotEffect { if (permanent != null) { UUID controllerId = permanent.getControllerId(); if (controllerId != null) { - new PongifyApeToken().putOntoBattlefield(1, game, source, controllerId); + new ApeToken().putOntoBattlefield(1, game, source, controllerId); return true; } } diff --git a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java index f629e829f85..3bcac7031db 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ApeToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ApeToken.java @@ -14,14 +14,14 @@ import java.util.Arrays; public final class ApeToken extends TokenImpl { public ApeToken() { - super("Ape Token", "2/2 green Ape creature token"); + super("Ape Token", "3/3 green Ape creature token"); cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.APE); - power = new MageInt(2); - toughness = new MageInt(2); + power = new MageInt(3); + toughness = new MageInt(3); - availableImageSetCodes = Arrays.asList("2XM", "TSR", "C14"); + availableImageSetCodes = Arrays.asList("C14", "2XM", "TSR"); } public ApeToken(final ApeToken token) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MonkeyToken.java b/Mage/src/main/java/mage/game/permanent/token/MonkeyToken.java new file mode 100644 index 00000000000..5b56ac20af0 --- /dev/null +++ b/Mage/src/main/java/mage/game/permanent/token/MonkeyToken.java @@ -0,0 +1,30 @@ + +package mage.game.permanent.token; + +import mage.constants.CardType; +import mage.constants.SubType; +import mage.MageInt; + +/** + * + * @author spjspj + */ +public final class MonkeyToken extends TokenImpl { + + public MonkeyToken() { + super("Monkey Token", "2/2 green Monkey creature token"); + cardType.add(CardType.CREATURE); + color.setGreen(true); + subtype.add(SubType.MONKEY); + power = new MageInt(2); + toughness = new MageInt(2); + } + + public MonkeyToken(final MonkeyToken token) { + super(token); + } + + public MonkeyToken copy() { + return new MonkeyToken(this); + } +} diff --git a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java b/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java deleted file mode 100644 index 95f6b2f29f0..00000000000 --- a/Mage/src/main/java/mage/game/permanent/token/PongifyApeToken.java +++ /dev/null @@ -1,34 +0,0 @@ - -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 PongifyApeToken extends TokenImpl { - - public PongifyApeToken() { - super("Ape Token", "3/3 green Ape creature token"); - cardType.add(CardType.CREATURE); - color.setGreen(true); - subtype.add(SubType.APE); - power = new MageInt(3); - toughness = new MageInt(3); - - availableImageSetCodes = Arrays.asList("C14", "PLC", "ULG", "UNH", "TSR"); - } - - public PongifyApeToken(final PongifyApeToken token) { - super(token); - } - - public PongifyApeToken copy() { - return new PongifyApeToken(this); - } -} diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt index 8a7d59357b8..84143a94610 100644 --- a/Mage/src/main/resources/tokens-database.txt +++ b/Mage/src/main/resources/tokens-database.txt @@ -266,7 +266,7 @@ |Generate|TOK:BNG|Wolf|||WolfToken| |Generate|TOK:BNG|Zombie|||ForlornPseudammaZombieToken| |Generate|TOK:C14|Angel|||AngelToken| -|Generate|TOK:C14|Ape|||PongifyApeToken| +|Generate|TOK:C14|Ape|||ApeToken| |Generate|TOK:C14|Beast|1||BeastToken| |Generate|TOK:C14|Beast|2||BeastToken2| |Generate|TOK:C14|Cat|||CatToken| @@ -797,14 +797,6 @@ |Generate|TOK:MMA|Treefolk Shaman|||TreefolkShamanToken| |Generate|TOK:MMA|Worm|||BlackGreenWormToken| |Generate|TOK:MMA|Zombie|||ZombieToken| -|Generate|TOK:MMQ|Ape|||ApeToken| -|Generate|TOK:MMQ|Butterfly|||ButterflyToken| -|Generate|TOK:MMQ|Insect|||InsectToken| -|Generate|TOK:MMQ|Saproling|||SaprolingToken| -|Generate|TOK:MMQ|Snake|||SnakeToken| -|Generate|TOK:MMQ|Soldier|||SoldierToken| -|Generate|TOK:MMQ|Spirit|||SpiritWhiteToken| -|Generate|TOK:MMQ|Zombie|||ZombieToken| |Generate|TOK:MOR|Faerie Rogue|||FaerieRogueToken| |Generate|TOK:MOR|Giant Warrior|||GiantWarriorToken| |Generate|TOK:MOR|Treefolk Shaman|||TreefolkShamanToken| @@ -867,12 +859,6 @@ |Generate|TOK:PC2|Spider|||PenumbraSpiderToken| |Generate|TOK:PCY|Minion|||MinionToken| |Generate|TOK:PCY|Squirrel|||SquirrelToken| -|Generate|TOK:PLC|Ape|||PongifyApeToken| -|Generate|TOK:PLC|Cat Warrior|||CatWarriorToken| -|Generate|TOK:PLC|Insect|||DeadlyGrubInsectToken| -|Generate|TOK:PLC|Knight|||RiftmarkedKnightToken| -|Generate|TOK:PLC|Saproling|||SaprolingToken| -|Generate|TOK:PLC|Soldier|||SoldierToken| |Generate|TOK:PLS|Hippo|||HippoToken| |Generate|TOK:PLS|Saproling|||SaprolingToken| |Generate|TOK:PLS|Spirit|||SpiritWhiteToken| @@ -975,12 +961,6 @@ |Generate|TOK:THS|Soldier|3||AkroanSoldierToken| |Generate|TOK:TOR|Squirrel|||SquirrelToken| |Generate|TOK:UDS|Goblin|||GoblinToken| -|Generate|TOK:ULG|Ape|||PongifyApeToken| -|Generate|TOK:ULG|Skeleton|||SkeletonRegenerateToken| -|Generate|TOK:ULG|Squirrel|||SquirrelToken| -|Generate|TOK:UNH|Ape|||PongifyApeToken| -|Generate|TOK:UNH|Goblin|||GoblinToken| -|Generate|TOK:UNH|Squirrel|||SquirrelToken| |Generate|TOK:USG|Beast|||BeastToken| |Generate|TOK:USG|Gnome|||GnomeToken| |Generate|TOK:USG|Goblin|||GoblinToken| @@ -1299,7 +1279,7 @@ |Generate|TOK:KHC|Thopter|||ThopterColorlessToken| # TSR -|Generate|TOK:TSR|Ape|||PongifyApeToken| +|Generate|TOK:TSR|Ape|||ApeToken| |Generate|TOK:TSR|Assembly-Worker|||AssemblyWorkerToken| |Generate|TOK:TSR|Bat|||SengirNosferatuBatToken| |Generate|TOK:TSR|Cloud Sprite|||CloudSpriteToken|