[M20] added tokens

Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java

@@ -70,6 +70,21 @@ public class ScryfallImageSupportTokens {
             put("WAR/Zombie Warrior", "https://api.scryfall.com/cards/twar/11/en?format=image");
             put("WAR/Zombie", "https://api.scryfall.com/cards/twar/7/en?format=image");
 
+            // M20
+            put("M20/Ajani's Pridemate", "https://api.scryfall.com/cards/tm20/1/en?format=image");
+            put("M20/Emblem Chandra, Awakened Inferno", "https://api.scryfall.com/cards/tm20/11/en?format=image");
+            put("M20/Demon", "https://api.scryfall.com/cards/tm20/5/en?format=image");
+            put("M20/Elemental Bird", "https://api.scryfall.com/cards/tm20/4/en?format=image");
+            put("M20/Elemental", "https://api.scryfall.com/cards/tm20/7/en?format=image");
+            put("M20/Golem", "https://api.scryfall.com/cards/tm20/9/en?format=image");
+            put("M20/Emblem Mu Yanling, Sky Dancer", "https://api.scryfall.com/cards/tm20/12/en?format=image");
+            put("M20/Soldier", "https://api.scryfall.com/cards/tm20/2/en?format=image");
+            put("M20/Spirit", "https://api.scryfall.com/cards/tm20/3/en?format=image");
+            put("M20/Treasure", "https://api.scryfall.com/cards/tm20/10/en?format=image");
+            put("M20/Wolf", "https://api.scryfall.com/cards/tm20/8/en?format=image");
+            put("M20/Zombie", "https://api.scryfall.com/cards/tm20/6/en?format=image");
+
+
             // generate supported sets
             supportedSets.clear();
             for (String cardName : this.keySet()) {

Mage.Client/src/main/resources/card-pictures-tok.txt

@@ -88,6 +88,8 @@
 |Generate|EMBLEM:RIX|Huatli, Radiant Champion||Emblem Huatli|HuatliRadiantChampionEmblem|
 |Generate|EMBLEM:RNA|Domri, Chaos Bringer||Emblem Domri|DomriChaosBringerEmblem|
 |Generate|EMBLEM:WAR|Nissa, Who Shakes the World||Emblem Nissa|NissaWhoShakesTheWorldEmblem|
+|Generate|EMBLEM:M20|Chandra, Awakened Inferno||Emblem Chandra|ChandraAwakenedInfernoEmblem|
+|Generate|EMBLEM:M20|Mu Yanling, Sky Dancer||Emblem Yanling|MuYanlingSkyDancerEmblem|
 |Generate|PLANE:PCA|Plane - Academy At Tolaria West|||AcademyAtTolariaWestPlane|
 |Generate|PLANE:PCA|Plane - Agyrem|||AgyremPlane|
 |Generate|PLANE:PCA|Plane - Akoum|||AkoumPlane|
@@ -1216,7 +1218,16 @@
 |Generate|TOK:WAR|Zombie Army|1||ZombieArmyToken|
 |Generate|TOK:WAR|Zombie Army|2||ZombieArmyToken|
 |Generate|TOK:WAR|Zombie Army|3||ZombieArmyToken|
-
+|Generate|TOK:M20|Ajani's Pridemate|||AjanisPridemateToken|
+|Generate|TOK:M20|Demon|||DemonToken|
+|Generate|TOK:M20|Elemental|||YoungPyromancerElementalToken|
+|Generate|TOK:M20|Elemental Bird|||MuYanlingSkyDancerToken|
+|Generate|TOK:M20|Golem|||GolemToken|
+|Generate|TOK:M20|Soldier|||SoldierToken|
+|Generate|TOK:M20|Spirit|||SpiritWhiteToken|
+|Generate|TOK:M20|Treasure|||TreasureToken|
+|Generate|TOK:M20|Wolf|||WolfToken|
+|Generate|TOK:M20|Zombie|||ZombieToken|
 
 
 

Mage.Sets/src/mage/cards/a/AjanisPridemate.java

@@ -1,5 +1,3 @@
-
-
 package mage.cards.a;
 
 import mage.MageInt;

Mage.Sets/src/mage/cards/c/ChandraAcolyteOfFlame.java

@@ -6,6 +6,7 @@ import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
 import mage.abilities.common.delayed.AtTheBeginOfNextEndStepDelayedTriggeredAbility;
 import mage.abilities.effects.*;
+import mage.abilities.effects.common.InfoEffect;
 import mage.abilities.effects.common.SacrificeTargetEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.effects.common.counter.AddCountersAllEffect;
@@ -114,6 +115,9 @@ class ChandraAcolyteOfFlameEffect extends OneShotEffect {
             Effect effect2 = new SacrificeTargetEffect();
             effect.setTargetPointer(new FixedTarget(permId, game));
             game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(effect2), source);
+
+            // extra info
+            InfoEffect.addInfoToPermanent(game, source, permanent, "<i><b>Warning</b>: It will be sacrificed at the beginning of the next end step<i>");
         });
 
         return true;

Mage/src/main/java/mage/game/permanent/token/GolemToken.java

@@ -1,16 +1,14 @@
-
 package mage.game.permanent.token;
 
+import mage.MageInt;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import mage.constants.CardType;
-import mage.constants.SubType;
-import mage.MageInt;
-
 /**
- *
  * @author North
  */
 public final class GolemToken extends TokenImpl {
@@ -18,11 +16,11 @@ public final class GolemToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("MM2", "NPH", "SOM", "MM3"));
+        tokenImageSets.addAll(Arrays.asList("MM2", "NPH", "SOM", "MM3", "M20"));
     }
 
     public GolemToken() {
-        this((String)null);
+        this((String) null);
     }
 
     public GolemToken(String setCode) {

Mage/src/main/java/mage/game/permanent/token/SoldierToken.java

@@ -1,16 +1,15 @@
-
 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;
 import mage.util.RandomUtil;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
 public final class SoldierToken extends TokenImpl {
@@ -19,7 +18,7 @@ public final 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", "DOM"));
+                "SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16", "MM3", "E01", "DOM", "M20"));
     }
 
     public SoldierToken() {

Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java

@@ -18,7 +18,7 @@ public final class SpiritWhiteToken extends TokenImpl {
 
     static {
         tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM",
-                "SOI", "EMA", "C16", "MM3", "CMA", "E01", "ANA", "RNA"));
+                "SOI", "EMA", "C16", "MM3", "CMA", "E01", "ANA", "RNA", "M20"));
     }
 
     public SpiritWhiteToken() {

Mage/src/main/java/mage/game/permanent/token/TreasureToken.java

@@ -21,7 +21,7 @@ public final class TreasureToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("XLN", "RNA"));
+        tokenImageSets.addAll(Arrays.asList("XLN", "RNA", "M20"));
     }
 
     public TreasureToken() {

Mage/src/main/java/mage/game/permanent/token/WolfToken.java

@@ -1,16 +1,14 @@
-
-
 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;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
 public final class WolfToken extends TokenImpl {
@@ -18,7 +16,8 @@ public final class WolfToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("BNG", "C14", "CNS", "FNMP", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOM", "ZEN", "SOI", "C15", "M15", "WAR"));
+        tokenImageSets.addAll(Arrays.asList("BNG", "C14", "CNS", "FNMP", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOM",
+                "ZEN", "SOI", "C15", "M15", "WAR", "M20"));
     }
 
     public WolfToken() {

Mage/src/main/java/mage/game/permanent/token/ZombieToken.java

@@ -18,7 +18,7 @@ public final class ZombieToken extends TokenImpl {
 
     static {
         tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "C16", "C17", "CNS",
-                "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3", "AKH", "CMA", "E01", "RNA", "WAR"));
+                "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3", "AKH", "CMA", "E01", "RNA", "WAR", "M20"));
     }
 
     public ZombieToken() {