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

[MPS-AKH] Added Amonkhet Masterpiece reprints. [MM3] Token updates

Browse source
This commit is contained in:
fireshoes 2017-03-29 10:42:43 -05:00
parent 212f963b43
commit 1bf2d1782c
23 changed files with 198 additions and 39 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

@ -12,7 +12,7 @@ public class AngelToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CFX", "GTC", "ISD", "M14", "ORI", "SOI", "ZEN", "C15"));
tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CFX", "GTC", "ISD", "M14", "ORI", "SOI", "ZEN", "C15", "MM3"));
}
public AngelToken() {

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

@ -42,7 +42,7 @@ public class BeastToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE"));
tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3"));
}
public BeastToken() {
@ -71,7 +71,7 @@ public class BeastToken extends Token {
if (getOriginalExpansionSetCode().equals("M15")) {
this.setTokenType(2);
}
if (getOriginalExpansionSetCode().equals("DD3GVL") || getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD")) {
if (getOriginalExpansionSetCode().equals("DD3GVL") || getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD") || getOriginalExpansionSetCode().equals("MM3")) {
this.setTokenType(1);
}
}

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

@ -42,7 +42,7 @@ public class BeastToken2 extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL"));
tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL", "MM3"));
}
public BeastToken2() {
@ -76,7 +76,7 @@ public class BeastToken2 extends Token {
@Override
public void setExpansionSetCodeForImage(String code) {
super.setExpansionSetCodeForImage(code);
if (getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD") || getOriginalExpansionSetCode().equals("DD3GVL")) {
if (getOriginalExpansionSetCode().equals("C14") || getOriginalExpansionSetCode().equals("DDD") || getOriginalExpansionSetCode().equals("DD3GVL") || getOriginalExpansionSetCode().equals("MM3")) {
this.setTokenType(2);
}
}

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

@ -47,7 +47,7 @@ public class BirdToken extends Token {
power = new MageInt(1);
toughness = new MageInt(1);
addAbility(FlyingAbility.getInstance());
availableImageSetCodes.addAll(Arrays.asList("BNG", "RTR", "ZEN", "C16"));
availableImageSetCodes.addAll(Arrays.asList("BNG", "RTR", "ZEN", "C16", "MM3", "DGM"));
}
public BirdToken(final BirdToken token) {

10
Mage/src/main/java/mage/game/permanent/token/CentaurToken.java
View file

@ -28,6 +28,9 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.constants.CardType;
import mage.MageInt;
import mage.util.RandomUtil;
@ -38,6 +41,12 @@ import mage.util.RandomUtil;
*/
public class CentaurToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("RTR", "MM3"));
}
public CentaurToken() {
super("Centaur", "3/3 green Centaur creature token");
cardType.add(CardType.CREATURE);
@ -46,7 +55,6 @@ public class CentaurToken extends Token {
subtype.add("Centaur");
power = new MageInt(3);
toughness = new MageInt(3);
setOriginalExpansionSetCode("RTR");
}
}

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

@ -44,7 +44,7 @@ public class DragonToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA"));
tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3"));
}
public DragonToken() {

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

@ -43,7 +43,7 @@ public class ElephantToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "CNS", "DDD", "MM2", "WWK", "OGW", "C15", "DD3GVL"));
tokenImageSets.addAll(Arrays.asList("C14", "CNS", "DDD", "MM2", "WWK", "OGW", "C15", "DD3GVL", "MM3"));
}
public ElephantToken() {

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

@ -43,7 +43,7 @@ public class GoblinToken extends Token {
static {
tokenImageSets.addAll(Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR",
"MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "DD3EVG", "MM2"));
"MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "DD3EVG", "MM2", "MM3", "EMA", "C16"));
}
public GoblinToken() {

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

@ -43,7 +43,7 @@ public class GolemToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("MM2", "NPH", "SOM"));
tokenImageSets.addAll(Arrays.asList("MM2", "NPH", "SOM", "MM3"));
}
public GolemToken() {

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

@ -44,7 +44,7 @@ public class SaprolingToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("10E", "ALA", "DDE", "DDH", "DDJ", "M12", "M13", "M14", "MM2", "MMA", "RTR", "C15"));
tokenImageSets.addAll(Arrays.asList("10E", "ALA", "DDE", "DDH", "DDJ", "M12", "M13", "M14", "MM2", "MMA", "RTR", "C15", "MM3", "C16"));
}
public SaprolingToken() {

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

@ -44,7 +44,7 @@ public class SoldierToken extends Token {
static {
tokenImageSets.addAll(Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", "MM2", "MMA", "RTR",
"SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16"));
"SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16", "MM3"));
}
public SoldierToken() {
@ -65,7 +65,7 @@ public class SoldierToken extends Token {
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("THS")) {
this.setTokenType(RandomUtil.nextInt(2) + 1);
}
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CN2")) {
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CN2") || getOriginalExpansionSetCode().equals("MM3")) {
setTokenType(1);
}
}

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

@ -28,6 +28,9 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.constants.CardType;
import mage.MageInt;
import mage.abilities.keyword.HasteAbility;
@ -38,6 +41,12 @@ import mage.abilities.keyword.HasteAbility;
*/
public class SoldierTokenWithHaste extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("GTC", "MM3"));
}
public SoldierTokenWithHaste() {
super("Soldier", "1/1 red and white Soldier creature token with haste");
cardType.add(CardType.CREATURE);
@ -47,6 +56,23 @@ public class SoldierTokenWithHaste extends Token {
power = new MageInt(1);
toughness = new MageInt(1);
addAbility(HasteAbility.getInstance());
setOriginalExpansionSetCode("GTC");
}
@Override
public void setExpansionSetCodeForImage(String code) {
super.setExpansionSetCodeForImage(code);
if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MM3")) {
setTokenType(2);
}
}
public SoldierTokenWithHaste(final SoldierTokenWithHaste token) {
super(token);
}
@Override
public SoldierTokenWithHaste copy() {
return new SoldierTokenWithHaste(this); //To change body of generated methods, choose Tools | Templates.
}
}

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

@ -42,7 +42,7 @@ public class SpiritWhiteToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", "SOI", "EMA", "C16"));
tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM", "SOI", "EMA", "C16", "MM3"));
}
public SpiritWhiteToken() {

10
Mage/src/main/java/mage/game/permanent/token/WurmToken2.java
View file

@ -28,6 +28,9 @@
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import mage.constants.CardType;
import mage.MageInt;
import mage.abilities.keyword.TrampleAbility;
@ -38,6 +41,12 @@ import mage.abilities.keyword.TrampleAbility;
*/
public class WurmToken2 extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("RTR", "MM3"));
}
public WurmToken2() {
super("Wurm", "5/5 green Wurm creature token with trample");
cardType.add(CardType.CREATURE);
@ -46,6 +55,5 @@ public class WurmToken2 extends Token {
power = new MageInt(5);
toughness = new MageInt(5);
addAbility(TrampleAbility.getInstance());
setOriginalExpansionSetCode("RTR");
}
}

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

@ -44,8 +44,8 @@ public class ZombieToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "CNS",
"MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA"));
tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "C16", "CNS",
"MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3"));
}
public ZombieToken() {