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

Merge pull request #9053 from PurpleCrowbar/moretokensets

Browse source 
More token images
This commit is contained in:
PurpleCrowbar 2022-06-03 13:48:07 +01:00 • committed by GitHub
commit 9a1ce358e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 145 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ public final class AngelToken extends TokenImpl {
addAbility(FlyingAbility.getInstance());
availableImageSetCodes = Arrays.asList("APC", "AVR", "C14", "C15", "C18", "CON", "DDQ", "GTC",
"ISD", "M14", "MM3", "NEM", "OGW", "ORI", "PC2", "SCG", "SOI", "ZEN", "C20", "M21", "CMR", "AFC", "VOC", "2XM", "IMA");
"ISD", "M14", "MM3", "NEM", "OGW", "ORI", "PC2", "SCG", "SOI", "ZEN", "C20", "M21", "CMR", "AFC", "VOC", "2XM", "IMA", "PCA");
}
public AngelToken(final AngelToken token) {

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

@ -22,7 +22,7 @@ public final class AssemblyWorkerToken extends TokenImpl {
power = new MageInt(2);
toughness = new MageInt(2);
availableImageSetCodes = Arrays.asList("4ED", "ATQ", "DDF", "EMA", "TSR");
availableImageSetCodes = Arrays.asList("4ED", "ATQ", "DDF", "TSR");
}
public AssemblyWorkerToken(final AssemblyWorkerToken token) {

6
Mage/src/main/java/mage/game/permanent/token/BeastToken.java
View file

@ -22,7 +22,7 @@ public final class BeastToken extends TokenImpl {
availableImageSetCodes = Arrays.asList("5DN", "C14", "C16", "C19", "CMA", "CMD", "CN2", "GVL",
"DD3C", "DD3GVL", "DDD", "DDL", "DST", "E01", "EVE", "LRW", "M10", "M11", "M12",
"M13", "M14", "M15", "MM3", "NPH", "PC2", "USG", "M19", "IKO", "M21", "CMR", "C21", "AFC", "MIC", "NEC", "2XM", "NCC", "BBD");
"M13", "M14", "M15", "MM3", "NPH", "PC2", "USG", "M19", "IKO", "M21", "CMR", "C21", "AFC", "MIC", "NEC", "2XM", "NCC", "BBD", "PCA");
}
@Override
@ -41,13 +41,15 @@ public final class BeastToken extends TokenImpl {
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C19")) {
this.setTokenType(1);
}
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DD3C")) {
setTokenType(RandomUtil.nextInt(2) + 1);
}
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) {
setTokenType(RandomUtil.nextInt(2) + 1);
}
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) {
setTokenType(1);
}
}
public BeastToken(final BeastToken token) {

4
Mage/src/main/java/mage/game/permanent/token/BoarToken.java
View file

@ -5,6 +5,8 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
import java.util.Arrays;
/**
*
* @author spjspj
@ -18,6 +20,8 @@ public final class BoarToken extends TokenImpl {
subtype.add(SubType.BOAR);
power = new MageInt(3);
toughness = new MageInt(3);
availableImageSetCodes = Arrays.asList("PCA");
}
public BoarToken(final BoarToken token) {

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

@ -22,7 +22,7 @@ public final class DragonToken2 extends TokenImpl {
addAbility(FlyingAbility.getInstance());
availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "ONS", "ROE", "SCG", "WWK", "M19", "KHM", "AFC", "IMA");
availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "ONS", "ROE", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA");
}
public DragonToken2(final DragonToken2 token) {

4
Mage/src/main/java/mage/game/permanent/token/EldraziAnnihilatorToken.java
View file

@ -6,6 +6,8 @@ import mage.constants.SubType;
import mage.MageInt;
import mage.abilities.keyword.AnnihilatorAbility;
import java.util.Arrays;
/**
*
* @author spjspj
@ -20,6 +22,8 @@ public final class EldraziAnnihilatorToken extends TokenImpl {
power = new MageInt(7);
toughness = new MageInt(7);
addAbility(new AnnihilatorAbility(1));
availableImageSetCodes = Arrays.asList("PCA");
}
public EldraziAnnihilatorToken(final EldraziAnnihilatorToken token) {

6
Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java
View file

@ -26,7 +26,7 @@ public final class EldraziSpawnToken extends TokenImpl {
toughness = new MageInt(1);
addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new SacrificeSourceCost()));
availableImageSetCodes = Arrays.asList("C17", "CMD", "DDP", "MM2", "PC2", "ROE", "MIC", "2XM", "NCC");
availableImageSetCodes = Arrays.asList("C17", "CMD", "DDP", "MM2", "PC2", "ROE", "MIC", "2XM", "NCC", "PCA");
}
@Override
@ -44,6 +44,10 @@ public final class EldraziSpawnToken extends TokenImpl {
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ROE")) {
this.setTokenType(RandomUtil.nextInt(3) + 1); // randomly take image 1, 2 or 3
}
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("PCA")) {
this.setTokenType(RandomUtil.nextInt(3) + 1); // randomly take image 1, 2 or 3
}
}
public EldraziSpawnToken(final EldraziSpawnToken token) {

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

@ -36,7 +36,7 @@ public final class ElfDruidToken extends TokenImpl {
// {T}: Add {G}.
this.addAbility(new GreenManaAbility());
availableImageSetCodes = Arrays.asList("C14");
availableImageSetCodes = Arrays.asList("C14", "CMA");
}
public ElfDruidToken(final ElfDruidToken token) {

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

@ -20,7 +20,7 @@ public final class ElfWarriorToken extends TokenImpl {
power = new MageInt(1);
toughness = new MageInt(1);
availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "MOR", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU");
availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "MOR", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA");
}
public ElfWarriorToken(final ElfWarriorToken token) {

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

@ -16,7 +16,7 @@ public final class GoatToken extends TokenImpl {
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14", "C16", "ELD", "THB", "NCC", "CM2"));
tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14", "C16", "ELD", "THB", "NCC", "CM2", "PCA"));
}
public GoatToken() {

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

@ -32,7 +32,7 @@ public final class GoblinToken extends TokenImpl {
availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR",
"MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "EVG", "MM2",
"MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2");
"MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA");
}
public GoblinToken(final GoblinToken token) {

4
Mage/src/main/java/mage/game/permanent/token/HellionToken.java
View file

@ -5,6 +5,8 @@ import mage.MageInt;
import mage.constants.CardType;
import mage.constants.SubType;
import java.util.Arrays;
/**
*
* @author spjspj
@ -18,6 +20,8 @@ public final class HellionToken extends TokenImpl {
subtype.add(SubType.HELLION);
power = new MageInt(4);
toughness = new MageInt(4);
availableImageSetCodes = Arrays.asList("ROE", "DDP", "PCA");
}
public HellionToken(final HellionToken token) {

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

@ -24,7 +24,7 @@ public final class InsectToken extends TokenImpl {
power = new MageInt(1);
toughness = new MageInt(1);
availableImageSetCodes = Arrays.asList("M10", "MM2", "SOI", "ZNR", "VOW", "NCC");
availableImageSetCodes = Arrays.asList("M10", "MM2", "SOI", "ZNR", "VOW", "NCC", "PCA");
}
public InsectToken(final InsectToken token) {

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

@ -20,7 +20,7 @@ public final class KithkinSoldierToken extends TokenImpl {
power = new MageInt(1);
toughness = new MageInt(1);
availableImageSetCodes = Arrays.asList("CMD", "EVE", "LRW", "MMA", "MOR", "SHM", "MMA", "KHC");
availableImageSetCodes = Arrays.asList("CMD", "EVE", "LRW", "MMA", "MOR", "SHM", "MMA", "KHC", "CMA");
}
public KithkinSoldierToken(final KithkinSoldierToken token) {

4
Mage/src/main/java/mage/game/permanent/token/OozeToken.java
View file

@ -16,8 +16,6 @@ public final class OozeToken extends TokenImpl {
subtype.add(SubType.OOZE);
this.power = new MageInt(power);
this.toughness = new MageInt(toughness);
availableImageSetCodes = Arrays.asList("M11", "PCA", "NCC");
}
public OozeToken() {
@ -28,7 +26,7 @@ public final class OozeToken extends TokenImpl {
power = new MageInt(0);
toughness = new MageInt(0);
availableImageSetCodes = Arrays.asList("ALA", "ROE", "RTR", "MM3", "UMA", "GK2", "2XM");
availableImageSetCodes = Arrays.asList("ALA", "ROE", "RTR", "MM3", "UMA", "GK2", "2XM", "M11", "PCA", "NCC");
}
@Override

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

@ -24,7 +24,7 @@ public final class PenumbraSpiderToken extends TokenImpl {
addAbility(ReachAbility.getInstance());
availableImageSetCodes = Arrays.asList("MMA", "PC2", "TSP", "TSR");
availableImageSetCodes = Arrays.asList("MMA", "PC2", "TSP", "TSR", "PCA");
}
public PenumbraSpiderToken(final PenumbraSpiderToken token) {

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

@ -20,7 +20,7 @@ public final class PhyrexianGermToken extends TokenImpl {
power = new MageInt(0);
toughness = new MageInt(0);
availableImageSetCodes = Arrays.asList("C14", "C15", "C16", "MBS", "MM2", "NPH", "PC2", "MH2", "NEC", "2XM", "CM2");
availableImageSetCodes = Arrays.asList("C14", "C15", "C16", "MBS", "MM2", "NPH", "PC2", "MH2", "NEC", "2XM", "CM2", "CMA", "PCA");
}
@Override

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

@ -16,7 +16,7 @@ public final class PlantToken extends TokenImpl {
power = new MageInt(0);
toughness = new MageInt(1);
availableImageSetCodes = Arrays.asList("ARC", "C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZEN", "ZNR", "CMR", "NEC", "2XM", "NCC");
availableImageSetCodes = Arrays.asList("ARC", "C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZEN", "ZNR", "CMR", "NEC", "2XM", "NCC", "PCA");
}
public PlantToken(final PlantToken token) {

3
Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java
View file

@ -51,7 +51,8 @@ public final class SaprolingToken extends TokenImpl {
"NEC",
"2XM",
"NCC",
"CM2"
"CM2",
"PCA"
));
}

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

@ -22,7 +22,7 @@ public final class SpiderToken extends TokenImpl {
this.addAbility(ReachAbility.getInstance());
availableImageSetCodes.addAll(Arrays.asList("C15", "EMN", "ISD", "SHM", "MH1", "THB", "MID", "UMA", "NCC"));
availableImageSetCodes.addAll(Arrays.asList("C15", "EMN", "ISD", "SHM", "MH1", "THB", "MID", "UMA", "NCC", "CMA"));
}
public SpiderToken(final SpiderToken token) {

3
Mage/src/main/java/mage/game/permanent/token/WolfToken.java
View file

@ -33,6 +33,9 @@ public final class WolfToken extends TokenImpl {
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) {
this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images
}
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) {
this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images
}
}
public WolfToken(final WolfToken token) {

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

@ -31,7 +31,7 @@ public final class ZombieToken extends TokenImpl {
"M20", "C19", "C20", "THB",
"M21", "CMR", "C21", "MH2",
"AFR", "MIC", "VOW", "UMA",
"NCC", "MED", "BBD", "M19", "CM2");
"NCC", "MED", "BBD", "M19", "CM2", "PCA");
}
@Override