From fde9b1cda5cce041379214326b42128c3b0d25af Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 May 2018 22:11:40 -0400 Subject: [PATCH 01/22] 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 91cf8cf3d7..385cf06345 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/22] 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 fb84b3ddac..ac8b587e67 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/22] 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 b2a74140ff..73c4fe7a90 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/22] 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 59d0162ef2..50be9805b2 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/22] 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 125243d346..9d6473f30b 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/22] 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 147b1ab620..0e526afe6a 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/22] 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 eeb7623d96..2db41d82e3 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/22] 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 52c5ff44b7..5af06d6042 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/22] 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 a62ecd7c7b..68059eb78f 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/22] 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 270ecc6e7e..8d12f5895b 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| From 15c72f6d8d688455ccaab282b72875810d034abc Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:25:49 -0400 Subject: [PATCH 11/22] Token image changes for DOM --- .../src/main/resources/card-pictures-tok.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 92e8911e18..83df7a8e29 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -513,6 +513,20 @@ |Generate|TOK:DKA|Vampire|||SorinLordOfInnistradVampireToken| |Generate|TOK:DKA|Wolf|||WolfToken| |Generate|TOK:DKA|Zombie|||ZombieToken| +|Generate|TOK:DOM|Cleric|||BelzenlokClericToken| +|Generate|TOK:DOM|Construct|||KarnConstructToken| +|Generate|TOK:DOM|Demon|||BelzenlokDemonToken| +|Generate|TOK:DOM|Elemental|||ValdukElementalToken| +|Gererate|TOK:DOM|Goblin|| +|Generate|TOK:DOM|Karox Bladewing|||KaroxBladewingDragonToken| +|Generate|TOK:DOM|Knight|1| +|Generate|TOK:DOM|Knight|2| +|Generate|TOK:DOM|Nightmare Horror|||ChainersTormentNightmareToken| +|Generate|TOK:DOM|Saproling|1| +|Generate|TOK:DOM|Saproling|2| +|Generate|TOK:DOM|Saproling|3| +|Generate|TOK:DOM|Soldier|| +|Generate|TOK:DOM|Zombie Knight|| |Generate|TOK:DRB|Saproling|||SaprolingToken| |Generate|TOK:DST|Beast|||BeastToken| |Generate|TOK:DST|Elemental|1||WandOfTheElementsFirstToken| From b773599614813a6f3c60ed748f24a58aa4681c9d Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:27:26 -0400 Subject: [PATCH 12/22] Token image changes for DOM --- .../permanent/token/ZombieKnightToken.java | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java index 136850dab4..ae28f573f4 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java @@ -1,5 +1,35 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.ObjectColor; import mage.abilities.keyword.MenaceAbility; @@ -8,9 +38,16 @@ import mage.constants.SubType; public class ZombieKnightToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("DOM")); + } + public ZombieKnightToken(){ super("Zombie Knight", "a 2/2 black Zombie Knight creature token with menace"); - color.addColor(ObjectColor.BLACK); + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode("DOM"); + color.setBlack(true); cardType.add(CardType.CREATURE); subtype.add(SubType.ZOMBIE, SubType.KNIGHT); addAbility(new MenaceAbility()); From bc70a5e4ad4f89645e030260c9046f923f0f8f73 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:27:53 -0400 Subject: [PATCH 13/22] Token image changes for DOM --- Mage/src/main/java/mage/game/permanent/token/SoldierToken.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java index 5960e94025..33e18b779c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java @@ -45,7 +45,7 @@ public class SoldierToken extends TokenImpl { 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", "MM3", "E01")); + "SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16", "MM3", "E01", "DOM")); } public SoldierToken() { From 43d99b5caa235b504a651515c396f13654969d02 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:28:17 -0400 Subject: [PATCH 14/22] Token image changes for DOM --- .../java/mage/game/permanent/token/SaprolingToken.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java index 8837db22f4..ecb3a41b2c 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java @@ -64,7 +64,9 @@ public class SaprolingToken extends TokenImpl { "CMA", "VMA", // 2 different token, one with DIFFERENT stats, "Saproling Burst" create different token, see https://scryfall.com/card/tvma/12 "E02", - "RIX")); + "RIX", + "DOM" // 3 different token images + )); } public SaprolingToken() { @@ -82,6 +84,9 @@ public class SaprolingToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) { this.setTokenType(RandomUtil.nextInt(2) + 1); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DOM")) { + this.setTokenType(RandomUtil.nextInt(3) + 1); + } cardType.add(CardType.CREATURE); color.setGreen(true); subtype.add(SubType.SAPROLING); From af31f86b10f13b47f252dece87e25c718a8012cb Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:29:12 -0400 Subject: [PATCH 15/22] Token image changes for DOM --- .../token/ChainersTormentNightmareToken.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java index 4306280617..c4042149cf 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.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,12 +40,23 @@ import mage.MageInt; */ public class ChainersTormentNightmareToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("DOM")); + } + public ChainersTormentNightmareToken() { this(0); }; public ChainersTormentNightmareToken(int xValue) { - super("Nightmare", "X/X black Nightmare artifact creature token"); + super("Nightmare Horror", "X/X black Nightmare Horror creature token"); + + availableImageSetCodes = tokenImageSets; + setOriginalExpansionSetCode("DOM"); + cardType.add(CardType.CREATURE); subtype.add(SubType.NIGHTMARE); + subtype.add(SubType.HORROR); + color.setBlack(true); power = new MageInt(xValue); toughness = new MageInt(xValue); } From 801d2c39a43c2bfb0df4663acaa7b19662fcf696 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:29:51 -0400 Subject: [PATCH 16/22] Token image changes for DOM --- Mage/src/main/java/mage/game/permanent/token/KnightToken.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java index 4e71634137..5ad8c1f723 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java @@ -7,6 +7,7 @@ import mage.MageInt; import mage.abilities.keyword.VigilanceAbility; import mage.constants.CardType; import mage.constants.SubType; +import mage.util.RandomUtil; /** * @@ -25,6 +26,9 @@ public class KnightToken extends TokenImpl { if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C15")) { setTokenType(2); } + if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DOM")) { + this.setTokenType(RandomUtil.nextInt(2) + 1); + } cardType.add(CardType.CREATURE); color.setWhite(true); subtype.add(SubType.KNIGHT); From 8477a56c54ff19dc359439a2f2492d7c34b90a25 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:30:27 -0400 Subject: [PATCH 17/22] Token image changes for DOM --- .../permanent/token/KaroxBladewingDragonToken.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java index 5830be0b35..cd212caa88 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.abilities.keyword.FlyingAbility; import mage.constants.CardType; import mage.constants.SubType; @@ -38,14 +41,21 @@ import mage.constants.SuperType; */ public class KaroxBladewingDragonToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("DOM")); + } + public KaroxBladewingDragonToken() { super("Karox Bladewing", "legendary 4/4 red Dragon creature token with flying", 4, 4); + availableImageSetCodes = tokenImageSets; this.setOriginalExpansionSetCode("DOM"); this.addSuperType(SuperType.LEGENDARY); this.cardType.add(CardType.CREATURE); this.subtype.add(SubType.DRAGON); + this.color.setRed(true); this.addAbility(FlyingAbility.getInstance()); } From 63df28668076f899e9fe4ef0b7f90ffe92181b64 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:30:50 -0400 Subject: [PATCH 18/22] Token image changes for DOM --- Mage/src/main/java/mage/game/permanent/token/GoblinToken.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java index 52f5a2a3bd..6134019de3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java @@ -44,7 +44,8 @@ public class GoblinToken extends TokenImpl { static { tokenImageSets.addAll(Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR", - "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "DD3EVG", "MM2", "MM3", "EMA", "C16")); + "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "DD3EVG", "MM2", + "MM3", "EMA", "C16", "DOM")); } public GoblinToken() { From fc488e63a311cba60422c560397f881a0b3bd413 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:31:25 -0400 Subject: [PATCH 19/22] Token image changes for DOM --- .../mage/game/permanent/token/ValdukElementalToken.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java index 193c8a999a..364ecc45a1 100644 --- a/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.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; @@ -39,12 +42,18 @@ import mage.abilities.keyword.TrampleAbility; */ public class ValdukElementalToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("DOM")); + } + public ValdukElementalToken() { this("DOM"); } public ValdukElementalToken(String setCode) { super("Elemental", "3/1 red Elemental creature token with trample and haste"); + availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setRed(true); subtype.add(SubType.ELEMENTAL); From ae69f3ea699b2e4051aeb98f02c4fb412f7aef53 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:31:47 -0400 Subject: [PATCH 20/22] Token image changes for DOM --- .../mage/game/permanent/token/KarnConstructToken.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java index a4a3aaee44..8c265f1de3 100644 --- a/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import static javax.management.Query.value; import mage.constants.CardType; import mage.constants.SubType; @@ -52,12 +55,18 @@ public class KarnConstructToken extends TokenImpl { filter.add(new CardTypePredicate(CardType.ARTIFACT)); } + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("DOM")); + } + public KarnConstructToken() { this("DOM"); } public KarnConstructToken(String setCode) { super("Construct", "0/0 colorless Construct artifact creature token with \"This creature gets +1/+1 for each artifact you control.\""); + availableImageSetCodes = tokenImageSets; this.setOriginalExpansionSetCode(setCode); cardType.add(CardType.ARTIFACT); cardType.add(CardType.CREATURE); From 09e0877c1b0d58423d417ce99e0377f0a86385eb Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:32:31 -0400 Subject: [PATCH 21/22] Token image changes for DOM --- .../mage/game/permanent/token/BelzenlokDemonToken.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java index c2b128189b..e7d194041d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -51,9 +54,15 @@ import mage.game.permanent.Permanent; */ public class BelzenlokDemonToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("DOM")); + } + public BelzenlokDemonToken() { super("Demon", "6/6 black Demon creature token with flying, trample, and " + "\"At the beginning of your upkeep, sacrifice another creature. If you can't, this creature deals 6 damage to you.\""); + availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); color.setBlack(true); subtype.add(SubType.DEMON); From f2f9661a91a482952327639784c5608c53e63d07 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 May 2018 00:32:53 -0400 Subject: [PATCH 22/22] Token image changes for DOM --- .../mage/game/permanent/token/BelzenlokClericToken.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java index f6b6a787ee..00eee82110 100644 --- a/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java @@ -27,6 +27,9 @@ */ package mage.game.permanent.token; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; @@ -37,8 +40,14 @@ import mage.constants.SubType; */ public class BelzenlokClericToken extends TokenImpl { + final static private List tokenImageSets = new ArrayList<>(); + static { + tokenImageSets.addAll(Arrays.asList("DOM")); + } + public BelzenlokClericToken() { super("Cleric", "0/1 black Cleric creature token"); + availableImageSetCodes = tokenImageSets; cardType.add(CardType.CREATURE); subtype.add(SubType.CLERIC); color.setBlack(true);