From bec0964726ff7af0473205b29f3f34eb6e33a133 Mon Sep 17 00:00:00 2001
From: spjspj <spjspj4@gmail.com>
Date: Mon, 8 May 2017 21:53:01 +1000
Subject: [PATCH] Token refactor

---
 .../mage/client/deckeditor/collection/viewer/MageBook.java     | 2 ++
 .../java/mage/game/permanent/token/DinOfTheFireherdToken.java  | 2 +-
 .../java/mage/game/permanent/token/TuktukTheReturnedToken.java | 2 +-
 Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java   | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
index ae0cbd27795..d765438da8c 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java
@@ -347,6 +347,8 @@ public class MageBook extends JComponent {
                     Constructor<?> cons = c.getConstructor();
                     Object newToken = cons.newInstance();
                     if (newToken != null && newToken instanceof mage.game.permanent.token.Token) {
+                        ((Token) newToken).setExpansionSetCodeForImage(set);
+                        ((Token) newToken).setOriginalExpansionSetCode(set);
                         tokens.add((Token) newToken);
                     }
                 } catch (ClassNotFoundException ex) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java
index 7c097399311..84f096daf8a 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DinOfTheFireherdToken.java
@@ -37,7 +37,7 @@ import mage.MageInt;
 public class DinOfTheFireherdToken extends Token {
 
     public DinOfTheFireherdToken() {
-        super("", "5/5 black and red Elemental creature");
+        super("Elemental", "5/5 black and red Elemental creature");
         cardType.add(CardType.CREATURE);
         subtype.add("Elemental");
         color.setBlack(true);
diff --git a/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java b/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java
index d227c25b008..1310ad5bd26 100644
--- a/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/TuktukTheReturnedToken.java
@@ -38,7 +38,7 @@ import mage.constants.SuperType;
 public class TuktukTheReturnedToken extends Token {
 
     public TuktukTheReturnedToken() {
-        this("ZEN");
+        this("ROE");
     }
     
     public TuktukTheReturnedToken(String setCode) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java b/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java
index 46a488bfe38..537a2658a9a 100644
--- a/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java
+++ b/Mage/src/main/java/mage/game/permanent/token/Wurm1Token.java
@@ -37,6 +37,9 @@ import mage.abilities.keyword.DeathtouchAbility;
  */
 public class Wurm1Token extends Token {
 
+    public Wurm1Token() {
+        this("MBS");
+    }
     public Wurm1Token(String setCode) {
         super("Wurm", "3/3 colorless Wurm artifact creature token with deathtouch");
         setOriginalExpansionSetCode(setCode);