From cc713808cff4a1ed12ee434b8497988bf13777df Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 22 Sep 2014 23:31:26 +0200
Subject: [PATCH] * Download definition for M15 + CNS token and emblem images.

---
 .../plugins/card/images/DownloadPictures.java |  4 +++
 .../src/main/resources/card-pictures-tok.txt  | 25 +++++++++++++++++++
 Mage/src/mage/abilities/mana/ManaOptions.java |  2 +-
 .../game/permanent/token/SquirrelToken.java   |  7 ++++--
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
index d1cd4f839ee..bacb2299cf9 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPictures.java
@@ -346,6 +346,10 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
                             String set = params[2].substring(8);
                             CardDownloadData card = new CardDownloadData(params[3] + " Emblem", set, 0, false, 0, "", true);
                             list.add(card);
+                        } else if (params[1].toLowerCase().equals("generate") && params[2].startsWith("EMBLEM!:")) {
+                            String set = params[2].substring(8);
+                            CardDownloadData card = new CardDownloadData(params[3], set, 0, false, 0, "", true);
+                            list.add(card);
                         }
                     } else {
                         log.error("wrong format for image urls: " + line);
diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index d8e3d037b21..eb10057a8fe 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -1,3 +1,28 @@
+|Generate|TOK:M15|Sliver|
+|Generate|TOK:M15|Soldier|
+|Generate|TOK:M15|Zombie|
+|Generate|TOK:M15|Goblin|
+|Generate|TOK:M15|Beast 1|
+|Generate|TOK:M15|Insect|
+|Generate|TOK:M15|Spirit|
+|Generate|TOK:M15|Squid|
+|Generate|TOK:M15|Beast 2|
+|Generate|TOK:M15|Dragon|
+|Generate|TOK:M15|Treefolk Warrior|
+|Generate|TOK:M15|Land Mine|
+|Generate|EMBLEM!:M15|Emblem Ajani|
+|Generate|EMBLEM!:M15|Emblem Garruk|
+
+|Generate|TOK:CNS|Zombie|
+|Generate|TOK:CNS|Spirit|
+|Generate|TOK:CNS|Demon|
+|Generate|TOK:CNS|Ogre|
+|Generate|TOK:CNS|Elephant|
+|Generate|TOK:CNS|Squirrel|
+|Generate|TOK:CNS|Wolf|
+|Generate|TOK:CNS|Construct|
+|Generate|EMBLEM!:CNS|Emblem Dack Fayden|
+
 |Generate|TOK:JOU|Sphinx|
 |Generate|TOK:JOU|Zombie|
 |Generate|TOK:JOU|Minotaur|
diff --git a/Mage/src/mage/abilities/mana/ManaOptions.java b/Mage/src/mage/abilities/mana/ManaOptions.java
index faf4dcb52c2..2b2da9b2a8e 100644
--- a/Mage/src/mage/abilities/mana/ManaOptions.java
+++ b/Mage/src/mage/abilities/mana/ManaOptions.java
@@ -1,4 +1,4 @@
-/*
+    /*
 * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification, are
diff --git a/Mage/src/mage/game/permanent/token/SquirrelToken.java b/Mage/src/mage/game/permanent/token/SquirrelToken.java
index 2bf239781e5..88a35610725 100644
--- a/Mage/src/mage/game/permanent/token/SquirrelToken.java
+++ b/Mage/src/mage/game/permanent/token/SquirrelToken.java
@@ -27,9 +27,8 @@
  */
 package mage.game.permanent.token;
 
-import mage.constants.CardType;
 import mage.MageInt;
-import mage.ObjectColor;
+import mage.constants.CardType;
 
 /**
  *
@@ -38,7 +37,11 @@ import mage.ObjectColor;
 public class SquirrelToken extends Token {
 
     public SquirrelToken() {
+        this("CNS");
+    }
+    public SquirrelToken(String setCode) {
         super("Squirrel", "1/1 green Squirrel creature token");
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         subtype.add("Squirrel");