External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: improved tokens structure (#13487)

Browse source 
- removed duplicate tokens
- fixed names of some tokens
- corrected tokens used in tokens database
This commit is contained in:
androosss 2025-04-01 11:58:05 +02:00 • committed by GitHub
parent 08135af525
commit 730bd8e63d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 112 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Mage/src/main/java/mage/game/permanent/token/CrushOfTentaclesToken.java
View file

@ -1,29 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author spjspj
*/
public final class CrushOfTentaclesToken extends TokenImpl {
public CrushOfTentaclesToken() {
super("Octopus Token", "8/8 blue Octopus creature");
this.cardType.add(CardType.CREATURE);
this.color.setBlue(true);
this.subtype.add(SubType.OCTOPUS);
this.power = new MageInt(8);
this.toughness = new MageInt(8);
}
private CrushOfTentaclesToken(final CrushOfTentaclesToken token) {
super(token);
}
public CrushOfTentaclesToken copy() {
return new CrushOfTentaclesToken(this);
}
}

2
Mage/src/main/java/mage/game/permanent/token/DinDragonToken.java
View file

@ -11,7 +11,7 @@ import mage.constants.SubType;
public final class DinDragonToken extends TokenImpl {
public DinDragonToken() {
super("Dragon Token", "4/4 red Dinosaur Dragon creature token with flying");
super("Dinosaur Dragon Token", "4/4 red Dinosaur Dragon creature token with flying");
cardType.add(CardType.CREATURE);
color.setRed(true);
subtype.add(SubType.DINOSAUR);

10
Mage/src/main/java/mage/game/permanent/token/EyesOfTheWisentElementalToken.java → Mage/src/main/java/mage/game/permanent/token/Elemental44GreenToken.java
View file

@ -7,9 +7,9 @@ import mage.constants.SubType;
/**
* @author spjspj
*/
public final class EyesOfTheWisentElementalToken extends TokenImpl {
public final class Elemental44GreenToken extends TokenImpl {
public EyesOfTheWisentElementalToken() {
public Elemental44GreenToken() {
super("Elemental Token", "4/4 green Elemental creature token");
cardType.add(CardType.CREATURE);
color.setGreen(true);
@ -18,11 +18,11 @@ public final class EyesOfTheWisentElementalToken extends TokenImpl {
toughness = new MageInt(4);
}
private EyesOfTheWisentElementalToken(final EyesOfTheWisentElementalToken token) {
private Elemental44GreenToken(final Elemental44GreenToken token) {
super(token);
}
public EyesOfTheWisentElementalToken copy() {
return new EyesOfTheWisentElementalToken(this);
public Elemental44GreenToken copy() {
return new Elemental44GreenToken(this);
}
}

12
Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java → Mage/src/main/java/mage/game/permanent/token/ElementalXXGreenToken.java
View file

@ -7,13 +7,13 @@ import mage.constants.SubType;
/**
* @author spjspj
*/
public final class SeedGuardianToken extends TokenImpl {
public final class ElementalXXGreenToken extends TokenImpl {
public SeedGuardianToken() {
public ElementalXXGreenToken() {
this(1);
}
public SeedGuardianToken(int xValue) {
public ElementalXXGreenToken(int xValue) {
super("Elemental Token", "X/X green Elemental creature token");
cardType.add(CardType.CREATURE);
color.setGreen(true);
@ -22,11 +22,11 @@ public final class SeedGuardianToken extends TokenImpl {
toughness = new MageInt(xValue);
}
private SeedGuardianToken(final SeedGuardianToken token) {
private ElementalXXGreenToken(final ElementalXXGreenToken token) {
super(token);
}
public SeedGuardianToken copy() {
return new SeedGuardianToken(this);
public ElementalXXGreenToken copy() {
return new ElementalXXGreenToken(this);
}
}

28
Mage/src/main/java/mage/game/permanent/token/GrovetenderDruidsPlantToken.java
View file

@ -1,28 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author spjspj
*/
public final class GrovetenderDruidsPlantToken extends TokenImpl {
public GrovetenderDruidsPlantToken() {
super("Plant Token", "1/1 green Plant creature token");
cardType.add(CardType.CREATURE);
color.setGreen(true);
subtype.add(SubType.PLANT);
power = new MageInt(1);
toughness = new MageInt(1);
}
private GrovetenderDruidsPlantToken(final GrovetenderDruidsPlantToken token) {
super(token);
}
public GrovetenderDruidsPlantToken copy() {
return new GrovetenderDruidsPlantToken(this);
}
}

12
Mage/src/main/java/mage/game/permanent/token/FleshCarverHorrorToken.java → Mage/src/main/java/mage/game/permanent/token/HorrorXXBlackToken.java
View file

@ -7,13 +7,13 @@ import mage.constants.SubType;
/**
* @author spjspj
*/
public final class FleshCarverHorrorToken extends TokenImpl {
public final class HorrorXXBlackToken extends TokenImpl {
public FleshCarverHorrorToken() {
public HorrorXXBlackToken() {
this(1);
}
public FleshCarverHorrorToken(int xValue) {
public HorrorXXBlackToken(int xValue) {
super("Horror Token", "X/X black Horror creature token");
cardType.add(CardType.CREATURE);
color.setBlack(true);
@ -22,11 +22,11 @@ public final class FleshCarverHorrorToken extends TokenImpl {
toughness = new MageInt(xValue);
}
private FleshCarverHorrorToken(final FleshCarverHorrorToken token) {
private HorrorXXBlackToken(final HorrorXXBlackToken token) {
super(token);
}
public FleshCarverHorrorToken copy() {
return new FleshCarverHorrorToken(this);
public HorrorXXBlackToken copy() {
return new HorrorXXBlackToken(this);
}
}

2
Mage/src/main/java/mage/game/permanent/token/HumanRogueToken.java
View file

@ -10,7 +10,7 @@ import mage.constants.SubType;
public final class HumanRogueToken extends TokenImpl {
public HumanRogueToken() {
super("Human Token", "1/1 white Human Rogue creature token");
super("Human Rogue Token", "1/1 white Human Rogue creature token");
cardType.add(CardType.CREATURE);
color.setWhite(true);
subtype.add(SubType.HUMAN);

30
Mage/src/main/java/mage/game/permanent/token/MarathWillOfTheWildElementalToken.java
View file

@ -1,30 +0,0 @@
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
/**
* @author spjspj
*/
public final class MarathWillOfTheWildElementalToken extends TokenImpl {
public MarathWillOfTheWildElementalToken() {
super("Elemental Token", "X/X green Elemental creature token");
cardType.add(CardType.CREATURE);
subtype.add(SubType.ELEMENTAL);
color.setGreen(true);
power = new MageInt(0);
toughness = new MageInt(0);
}
private MarathWillOfTheWildElementalToken(final MarathWillOfTheWildElementalToken token) {
super(token);
}
public MarathWillOfTheWildElementalToken copy() {
return new MarathWillOfTheWildElementalToken(this);
}
}

15
Mage/src/main/java/mage/game/permanent/token/MinionToken.java
View file

@ -5,25 +5,20 @@ import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author FenrisulfrX
* @author Quercitron
*/
public final class MinionToken extends TokenImpl {
public MinionToken() {
this("DDE");
}
public MinionToken(String setCode) {
super("Phyrexian Minion Token", "X/X black Phyrexian Minion creature token");
super("Minion Token", "1/1 black Minion creature token");
cardType.add(CardType.CREATURE);
subtype.add(SubType.PHYREXIAN);
subtype.add(SubType.MINION);
color.setBlack(true);
power = new MageInt(0);
toughness = new MageInt(0);
power = new MageInt(1);
toughness = new MageInt(1);
}
private MinionToken(final MinionToken token) {
protected MinionToken(final MinionToken token) {
super(token);
}

28
Mage/src/main/java/mage/game/permanent/token/MinionToken2.java
View file

@ -1,28 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author Quercitron
*/
public final class MinionToken2 extends TokenImpl {
public MinionToken2() {
super("Minion Token", "1/1 black Minion creature token");
cardType.add(CardType.CREATURE);
subtype.add(SubType.MINION);
color.setBlack(true);
power = new MageInt(1);
toughness = new MageInt(1);
}
protected MinionToken2(final MinionToken2 token) {
super(token);
}
public MinionToken2 copy() {
return new MinionToken2(this);
}
}

44
Mage/src/main/java/mage/game/permanent/token/NighteyesTheDesecratorToken.java
View file

@ -1,44 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.StaticFilters;
import mage.target.common.TargetCardInGraveyard;
/**
* @author spjspj
*/
public final class NighteyesTheDesecratorToken extends TokenImpl {
public NighteyesTheDesecratorToken() {
super("Nighteyes the Desecrator Token", "");
this.supertype.add(SuperType.LEGENDARY);
cardType.add(CardType.CREATURE);
color.setBlack(true);
subtype.add(SubType.RAT);
subtype.add(SubType.WIZARD);
power = new MageInt(4);
toughness = new MageInt(2);
// {4}{B}: Put target creature card from a graveyard onto the battlefield under your control.
Ability ability = new SimpleActivatedAbility(new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{4}{B}"));
ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_A_GRAVEYARD));
this.addAbility(ability);
}
private NighteyesTheDesecratorToken(final NighteyesTheDesecratorToken token) {
super(token);
}
public NighteyesTheDesecratorToken copy() {
return new NighteyesTheDesecratorToken(this);
}
}

33
Mage/src/main/java/mage/game/permanent/token/PhyrexianMinionToken.java Normal file
View file

@ -0,0 +1,33 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author FenrisulfrX
*/
public final class PhyrexianMinionToken extends TokenImpl {
public PhyrexianMinionToken() {
this(1);
}
public PhyrexianMinionToken(int xValue) {
super("Phyrexian Minion Token", "X/X black Phyrexian Minion creature token");
cardType.add(CardType.CREATURE);
subtype.add(SubType.PHYREXIAN);
subtype.add(SubType.MINION);
color.setBlack(true);
power = new MageInt(xValue);
toughness = new MageInt(xValue);
}
private PhyrexianMinionToken(final PhyrexianMinionToken token) {
super(token);
}
public PhyrexianMinionToken copy() {
return new PhyrexianMinionToken(this);
}
}

13
Mage/src/main/java/mage/game/permanent/token/GrismoldPlantToken.java → Mage/src/main/java/mage/game/permanent/token/Plant11Token.java
View file

@ -4,9 +4,12 @@ import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
public final class GrismoldPlantToken extends TokenImpl {
/**
* @author spjspj
*/
public final class Plant11Token extends TokenImpl {
public GrismoldPlantToken() {
public Plant11Token() {
super("Plant Token", "1/1 green Plant creature token");
cardType.add(CardType.CREATURE);
color.setGreen(true);
@ -15,11 +18,11 @@ public final class GrismoldPlantToken extends TokenImpl {
toughness = new MageInt(1);
}
private GrismoldPlantToken(final GrismoldPlantToken token) {
private Plant11Token(final Plant11Token token) {
super(token);
}
public GrismoldPlantToken copy() {
return new GrismoldPlantToken(this);
public Plant11Token copy() {
return new Plant11Token(this);
}
}

29
Mage/src/main/java/mage/game/permanent/token/RallyTheHordeWarriorToken.java
View file

@ -1,29 +0,0 @@
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
/**
* @author spjspj
*/
public final class RallyTheHordeWarriorToken extends TokenImpl {
public RallyTheHordeWarriorToken() {
super("Warrior Token", "1/1 red Warrior creature token");
cardType.add(CardType.CREATURE);
color.setRed(true);
subtype.add(SubType.WARRIOR);
power = new MageInt(1);
toughness = new MageInt(1);
}
private RallyTheHordeWarriorToken(final RallyTheHordeWarriorToken token) {
super(token);
}
public RallyTheHordeWarriorToken copy() {
return new RallyTheHordeWarriorToken(this);
}
}

30
Mage/src/main/java/mage/game/permanent/token/SorinSolemnVisitorVampireToken.java
View file

@ -1,30 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.abilities.keyword.FlyingAbility;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author spjspj
*/
public final class SorinSolemnVisitorVampireToken extends TokenImpl {
public SorinSolemnVisitorVampireToken() {
super("Vampire Token", "2/2 black Vampire creature token with flying");
cardType.add(CardType.CREATURE);
color.setBlack(true);
subtype.add(SubType.VAMPIRE);
power = new MageInt(2);
toughness = new MageInt(2);
addAbility(FlyingAbility.getInstance());
}
private SorinSolemnVisitorVampireToken(final SorinSolemnVisitorVampireToken token) {
super(token);
}
public SorinSolemnVisitorVampireToken copy() {
return new SorinSolemnVisitorVampireToken(this);
}
}

32
Mage/src/main/java/mage/game/permanent/token/SpoilsOfBloodHorrorToken.java
View file

@ -1,32 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author spjspj
*/
public final class SpoilsOfBloodHorrorToken extends TokenImpl {
public SpoilsOfBloodHorrorToken() {
this(1);
}
public SpoilsOfBloodHorrorToken(int xValue) {
super("Horror Token", "X/X black Horror creature token");
cardType.add(CardType.CREATURE);
color.setBlack(true);
subtype.add(SubType.HORROR);
power = new MageInt(xValue);
toughness = new MageInt(xValue);
}
private SpoilsOfBloodHorrorToken(final SpoilsOfBloodHorrorToken token) {
super(token);
}
public SpoilsOfBloodHorrorToken copy() {
return new SpoilsOfBloodHorrorToken(this);
}
}

29
Mage/src/main/java/mage/game/permanent/token/WalkerOfTheGroveToken.java
View file

@ -1,29 +0,0 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author spjspj
*/
public final class WalkerOfTheGroveToken extends TokenImpl {
public WalkerOfTheGroveToken() {
super("Elemental Token", "4/4 green Elemental creature token");
cardType.add(CardType.CREATURE);
this.subtype.add(SubType.ELEMENTAL);
this.color.setGreen(true);
power = new MageInt(4);
toughness = new MageInt(4);
}
private WalkerOfTheGroveToken(final WalkerOfTheGroveToken token) {
super(token);
}
public WalkerOfTheGroveToken copy() {
return new WalkerOfTheGroveToken(this);
}
}

26
Mage/src/main/resources/tokens-database.txt
View file

@ -242,7 +242,7 @@
|Generate|TOK:ARN|Djinn|||DjinnToken|
|Generate|TOK:AVR|Angel|||AngelToken|
|Generate|TOK:AVR|Demon|||DemonToken|
|Generate|TOK:AVR|Human|1||RedHumanToken|
|Generate|TOK:AVR|Human|1||ThatcherHumanToken|
|Generate|TOK:AVR|Human|2||HumanToken|
|Generate|TOK:AVR|Spirit|1||SpiritBlueToken|
|Generate|TOK:AVR|Spirit|2||SpiritWhiteToken|
@ -257,7 +257,7 @@
|Generate|TOK:BFZ|Knight Ally|||KnightAllyToken|
|Generate|TOK:BFZ|Kor Ally|||KorAllyToken|
|Generate|TOK:BFZ|Octopus|||OctopusToken|
|Generate|TOK:BFZ|Plant|||GrovetenderDruidsPlantToken|
|Generate|TOK:BFZ|Plant|||Plant11Token|
|Generate|TOK:BNG|Bird|1||EnchantmentBirdToken|
|Generate|TOK:BNG|Bird|2||BirdToken|
|Generate|TOK:BNG|Cat Soldier|||CatSoldierCreatureToken|
@ -284,7 +284,7 @@
|Generate|TOK:C14|Phyrexian Germ|||PhyrexianGermToken|
|Generate|TOK:C14|Goat|||GoatToken|
|Generate|TOK:C14|Goblin|||GoblinToken|
|Generate|TOK:C14|Horror|||SpoilsOfBloodHorrorToken|
|Generate|TOK:C14|Horror|||HorrorXXBlackToken|
|Generate|TOK:C14|Kor Soldier|||KorSoldierToken|
|Generate|TOK:C14|Kraken|||Kraken99Token|
|Generate|TOK:C14|Myr|||MyrToken|
@ -395,7 +395,7 @@
|Generate|TOK:C19|Phyrexian Horror|||PhyrexianRebirthHorrorToken|
|Generate|TOK:C19|Human|||HumanToken|
|Generate|TOK:C19|Pegasus|||PegasusToken|
|Generate|TOK:C19|Plant|||GrismoldPlantToken|
|Generate|TOK:C19|Plant|||Plant11Token|
|Generate|TOK:C19|Rhino|||RhinoToken|
|Generate|TOK:C19|Saproling|||SaprolingToken|
|Generate|TOK:C19|Sculpture|||DoomedArtisanToken|
@ -457,7 +457,7 @@
|Generate|TOK:DDD|Beast|2||BeastToken2|
|Generate|TOK:DDD|Elephant|||ElephantToken|
|Generate|TOK:DDE|Hornet|||HornetToken|
|Generate|TOK:DDE|Minion|||MinionToken|
|Generate|TOK:DDE|Phyrexian Minion|||PhyrexianMinionToken|
|Generate|TOK:DDE|Saproling|||SaprolingToken|
|Generate|TOK:DDF|Soldier|||SoldierToken|
|Generate|TOK:DDG|Goblin|||GoblinToken|
@ -612,7 +612,7 @@
# LGN don't have tokens, from wiki: A Sliver token for Brood Sliver and a Goblin token for Warbreak Trumpeter were featured as a Magic Player Reward.
|Generate|TOK:LRW|Avatar|||AvatarToken|
|Generate|TOK:LRW|Beast|||BeastToken|
|Generate|TOK:LRW|Elemental|1||WalkerOfTheGroveToken|
|Generate|TOK:LRW|Elemental|1||Elemental44GreenToken|
|Generate|TOK:LRW|Elemental|2||WhiteElementalToken|
|Generate|TOK:LRW|Elemental Shaman|||ElementalShamanToken|
|Generate|TOK:LRW|Elf Warrior|||ElfWarriorToken|
@ -724,7 +724,7 @@
|Generate|TOK:MM3|Zombie|||ZombieToken|
|Generate|TOK:MMA|Bat|||BatToken|
|Generate|TOK:MMA|Dragon|||DragonToken|
|Generate|TOK:MMA|Elemental|||WalkerOfTheGroveToken|
|Generate|TOK:MMA|Elemental|||Elemental44GreenToken|
|Generate|TOK:MMA|Faerie Rogue|||OonaQueenFaerieRogueToken|
|Generate|TOK:MMA|Giant Warrior|||GiantWarriorToken|
|Generate|TOK:MMA|Goblin Rogue|||GoblinRogueToken|
@ -757,7 +757,7 @@
|Generate|TOK:OGW|Eldrazi Scion|4||EldraziScionToken|
|Generate|TOK:OGW|Eldrazi Scion|5||EldraziScionToken|
|Generate|TOK:OGW|Eldrazi Scion|6||EldraziScionToken|
|Generate|TOK:OGW|Elemental|1||SeedGuardianToken|
|Generate|TOK:OGW|Elemental|1||ElementalXXGreenToken|
|Generate|TOK:OGW|Elemental|2||ElementalTokenWithHaste|
|Generate|TOK:OGW|Plant|||PlantToken|
|Generate|TOK:OGW|Zombie|||ZombieToken|
@ -1073,7 +1073,7 @@
# OonaQueenFaerieRogueToken is FaerieRogueToken with additional blue color, but ZNC contains only one token - so don't use normal token for it
#|Generate|TOK:ZNC|Faerie Rogue|||OonaQueenFaerieRogueToken|
# Germ token uses in chest and antology, but scryfall put it here
#|Generate|TOK:ZNC|Phyrexian Germ|||PhyrexianGermToken|
|Generate|TOK:ZNC|Phyrexian Germ|||PhyrexianGermToken|
#
|Generate|TOK:ZNC|Goblin Rogue|||GoblinRogueToken|
|Generate|TOK:ZNC|Kor Ally|||KorAllyToken|
@ -1308,7 +1308,7 @@
# UMA
|Generate|TOK:UMA|Citizen|||CitizenToken|
|Generate|TOK:UMA|Drake|||DrakeToken|
|Generate|TOK:UMA|Elemental|1||WalkerOfTheGroveToken|
|Generate|TOK:UMA|Elemental|1||Elemental44GreenToken|
|Generate|TOK:UMA|Elemental|2||RedElementalToken|
|Generate|TOK:UMA|Elemental|3||RedElementalToken|
|Generate|TOK:UMA|Faerie Rogue|||FaerieRogueToken|
@ -1536,7 +1536,7 @@
|Generate|TOK:DDR|Eldrazi Scion|||EldraziScionToken|
|Generate|TOK:DDR|Demon|||DemonToken|
|Generate|TOK:DDR|Zombie Giant|||QuestForTheGravelordZombieToken|
|Generate|TOK:DDR|Elemental|||WalkerOfTheGroveToken|
|Generate|TOK:DDR|Elemental|||Elemental44GreenToken|
|Generate|TOK:DDR|Plant|||PlantToken|
# DDS
@ -2176,7 +2176,7 @@
|Generate|TOK:OTJ|Bird|||BlueBirdToken|
|Generate|TOK:OTJ|Clue|||ClueArtifactToken|
|Generate|TOK:OTJ|Dinosaur|||Dinosaur31Token|
|Generate|TOK:OTJ|Elemental|||SeedGuardianToken|
|Generate|TOK:OTJ|Elemental|||ElementalXXGreenToken|
|Generate|TOK:OTJ|Elk|||ElkToken|
|Generate|TOK:OTJ|Mercenary|||MercenaryToken|
|Generate|TOK:OTJ|Meteorite|||MeteoriteToken|
@ -2460,7 +2460,7 @@
|Generate|TOK:DFT|Elephant|||ElephantToken|
|Generate|TOK:DFT|Goblin|||GoblinToken|
|Generate|TOK:DFT|Insect|||InsectToken|
|Generate|TOK:DFT|Pilot|||PilotCrewToken|
|Generate|TOK:DFT|Pilot|||PilotSaddleCrewToken|
|Generate|TOK:DFT|Servo|||ServoToken|
|Generate|TOK:DFT|Thopter|1||ThopterColorlessToken|
|Generate|TOK:DFT|Thopter|2||ThopterColorlessToken|