From fde9b1cda5cce041379214326b42128c3b0d25af Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:11:40 -0400 Subject: [PATCH 01/10] Token changes for C17 --- .../mage/game/permanent/token/DeathtouchRatToken.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java index 91cf8cf3d79..385cf063456 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java @@ -27,6 +27,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.DeathtouchAbility; @@ -37,10 +40,16 @@ import mage.constants.SubType; * @author Saga */ public class DeathtouchRatToken extends TokenImpl { + + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("C17")); + } public DeathtouchRatToken() { super("Rat", "1/1 black Rat creature token with deathtouch"); this.setExpansionSetCodeForImage("C17"); + availableImageSetCodes = tokenImageSets; this.cardType.add(CardType.CREATURE); this.color.setBlack(true); this.subtype.add(SubType.RAT); From 849fb5a14a979c5ae72d5288ea6db2fc94dcd32d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:11:50 -0400 Subject: [PATCH 02/10] Token changes for C17 --- .../mage/game/permanent/token/EdgarMarkovToken.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java index fb84b3ddac0..ac8b587e67f 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; @@ -37,8 +40,15 @@ import mage.MageInt; */ public class EdgarMarkovToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("C17")); + } + public EdgarMarkovToken() { super("Vampire", "1/1 black Vampire creature token"); + availableImageSetCodes = tokenImageSets; + setExpansionSetCodeForImage("C17"); cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.VAMPIRE); From b93bbb6e3c5b7a8922df18ccb957b35bbc29aeb7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:11:56 -0400 Subject: [PATCH 03/10] Token changes for C17 --- .../permanent/token/UtvaraHellkiteDragonToken.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java index b2a74140ff4..73c4fe7a90b 100644 --- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; @@ -37,9 +40,16 @@ import mage.abilities.keyword.FlyingAbility; * @author spjspj */ public class UtvaraHellkiteDragonToken extends TokenImpl { + + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("C17")); + } public UtvaraHellkiteDragonToken() { super("Dragon", "6/6 red Dragon creature token with flying"); + availableImageSetCodes = tokenImageSets; + setExpansionSetCodeForImage("C17"); cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.DRAGON); From ba57aeb82072961ddcdb20def7093ccfb5eb7b96 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:12:06 -0400 Subject: [PATCH 04/10] Token changes for C17 --- .../java/mage/game/permanent/token/EldraziSpawnToken.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java index 59d0162ef25..50be9805b2a 100644 --- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java @@ -49,7 +49,7 @@ public class EldraziSpawnToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("ROE", "MM2", "DDP")); + tokenImageSets.addAll(Arrays.asList("ROE", "MM2", "DDP", "C17")); } public EldraziSpawnToken() { @@ -62,8 +62,8 @@ public class EldraziSpawnToken extends TokenImpl { addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new SacrificeSourceCost())); availableImageSetCodes = tokenImageSets; - // Get one of the three possible token images - this.setTokenType(RandomUtil.nextInt(3) + 1); + // Get one of the four possible token images + this.setTokenType(RandomUtil.nextInt(4) + 1); } public EldraziSpawnToken(final EldraziSpawnToken token) { From 4a6cdbe560ba1a807a1fa796ba1060a2a090e9a7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:12:13 -0400 Subject: [PATCH 05/10] Token changes for C17 --- Mage/src/main/java/mage/game/permanent/token/DragonToken.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java index 125243d346b..9d6473f30be 100644 --- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java @@ -45,7 +45,7 @@ public class DragonToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3")); + tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3", "C17")); } public DragonToken() { From 31419dbc766364250cef8f037f479a24bd324320 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:12:23 -0400 Subject: [PATCH 06/10] Token changes for C17 --- .../mage/game/permanent/token/CatWarriorToken.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java index 147b1ab6206..0e526afe6ac 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.constants.CardType; import mage.abilities.keyword.ForestwalkAbility; import mage.constants.SubType; @@ -37,8 +40,15 @@ import mage.constants.SubType; */ public class CatWarriorToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("PLC", "C17")); + } + public CatWarriorToken() { super("Cat Warrior", "2/2 green Cat Warrior creature token with forestwalk"); + availableImageSetCodes = tokenImageSets; this.setOriginalExpansionSetCode("PLC"); this.getPower().modifyBaseValue(2); this.getToughness().modifyBaseValue(2); From d73b1c298761ffcb51b476956be84c9449e462bf Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:12:40 -0400 Subject: [PATCH 07/10] Token changes for C17 --- .../game/permanent/token/WasitoraCatDragonToken.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java index eeb7623d960..2db41d82e35 100644 --- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.constants.CardType; import mage.constants.SubType; import mage.MageInt; @@ -38,8 +41,17 @@ import mage.abilities.keyword.FlyingAbility; */ public class WasitoraCatDragonToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("C17")); + } + public WasitoraCatDragonToken() { super("Cat Dragon", "3/3 black, red, and green Cat Dragon creature token with flying"); + + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode("C17"); cardType.add(CardType.CREATURE); this.subtype.add(SubType.CAT); From 5274436938c6a2ab4aa446dd2a8ad089a111979e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:12:46 -0400 Subject: [PATCH 08/10] Token changes for C17 --- Mage/src/main/java/mage/game/permanent/token/CatToken.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken.java b/Mage/src/main/java/mage/game/permanent/token/CatToken.java index 52c5ff44b79..5af06d60428 100644 --- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java @@ -44,7 +44,7 @@ public class CatToken extends TokenImpl { final static private List tokenImageSets = new ArrayList<>(); static { - tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15")); + tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15", "C17")); } public CatToken() { From c8d2c2f25f44ed003988b1bc6f36fcc5447c8e34 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:12:56 -0400 Subject: [PATCH 09/10] Token changes for C17 --- .../main/java/mage/game/permanent/token/BatToken.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java index a62ecd7c7bc..68059eb78ff 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java @@ -1,14 +1,24 @@ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; public class BatToken extends TokenImpl { + + final static private List tokenImageSets = new ArrayList<>(); + + static { + tokenImageSets.addAll(Arrays.asList("MMA", "C17")); + } public BatToken() { super("Bat", "1/1 black Bat creature token with flying"); + availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.BAT); From e6546352118793bf5918b1a931069387a1c2d9ec Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:13:30 -0400 Subject: [PATCH 10/10] Token changes for C17 --- Mage.Client/src/main/resources/card-pictures-tok.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 270ecc6e7ed..8d12f5895ba 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -343,6 +343,17 @@ |Generate|TOK:C16|Thopter|| |Generate|TOK:C16|Worm|| |Generate|TOK:C16|Zombie|| +|Generate|TOK:C17|Bat|| +|Generate|TOK:C17|Cat|| +|Generate|TOK:C17|Cat Dragon|||WasitoraCatDragonToken| +|Generate|TOK:C17|Cat Warrior|| +|Generate|TOK:C17|Dragon|1||DragonToken| +|Generate|TOK:C17|Dragon|2||UtavaraHellkiteDragonToken| +|Generate|TOK:C17|Eldrazi Spawn|| +|Generate|TOK:C17|Gold|| +|Generate|TOK:C17|Rat|||DeathtouchRatToken| +|Generate|TOK:C17|Vampire|||EdgarMarkovToken| +|Generate|TOK:C17|Zombie|| |Generate|TOK:CHK|Dragon Spirit|||TatsumaDragonToken| |Generate|TOK:CHK|Elemental|||SeedGuardianToken| |Generate|TOK:CHK|Illusion|||MelokuTheCloudedMirrorToken|