From 18639bddd9d1e4753b15719ae64eb6ed1b347359 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 20 Apr 2013 20:02:01 +0200
Subject: [PATCH] Added KnightToken to framework and changed the using cards.

---
 .../src/mage/sets/gatecrash/KnightWatch.java  | 17 +-------------
 .../sets/returntoravnica/KnightlyValor.java   |  1 +
 .../returntoravnica/SecurityBlockade.java     |  1 +
 .../sets/returntoravnica/SelesnyaCharm.java   | 17 +-------------
 .../game/permanent/token/KnightToken.java     | 23 +++++++++++++++++++
 5 files changed, 27 insertions(+), 32 deletions(-)
 create mode 100644 Mage/src/mage/game/permanent/token/KnightToken.java

diff --git a/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java b/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java
index 6496a7ec80e..98373570aaf 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/KnightWatch.java
@@ -30,12 +30,9 @@ package mage.sets.gatecrash;
 import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.MageInt;
-import mage.ObjectColor;
 import mage.abilities.effects.common.CreateTokenEffect;
-import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.KnightToken;
 
 /**
  *
@@ -62,15 +59,3 @@ public class KnightWatch extends CardImpl<KnightWatch> {
         return new KnightWatch(this);
     }
 }
-
-class KnightToken extends Token {
-    KnightToken() {
-        super("Knight", "2/2 white Knight creature tokens with vigilance");
-        cardType.add(CardType.CREATURE);
-        color = ObjectColor.WHITE;
-        subtype.add("Knight");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-        this.addAbility(VigilanceAbility.getInstance());
-    }
-}
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java
index 9e5625650af..5d00a98c2f8 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/KnightlyValor.java
@@ -45,6 +45,7 @@ import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EnchantAbility;
 import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
+import mage.game.permanent.token.KnightToken;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SecurityBlockade.java b/Mage.Sets/src/mage/sets/returntoravnica/SecurityBlockade.java
index 7fb384c9408..0eb87ff629d 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SecurityBlockade.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SecurityBlockade.java
@@ -48,6 +48,7 @@ import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.game.Game;
 import mage.game.events.GameEvent;
+import mage.game.permanent.token.KnightToken;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetLandPermanent;
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java
index 6d2ce6ee7ba..e6e4e415549 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java
@@ -31,20 +31,17 @@ import java.util.UUID;
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
-import mage.MageInt;
-import mage.ObjectColor;
 import mage.abilities.Mode;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.ExileTargetEffect;
 import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.TrampleAbility;
-import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.mageobject.PowerPredicate;
-import mage.game.permanent.token.Token;
+import mage.game.permanent.token.KnightToken;
 import mage.target.common.TargetCreaturePermanent;
 
 /**
@@ -91,15 +88,3 @@ public class SelesnyaCharm extends CardImpl<SelesnyaCharm> {
         return new SelesnyaCharm(this);
     }
 }
-
-class KnightToken extends Token {
-    KnightToken() {
-        super("Knight", "2/2 white Knight creature token with vigilance");
-        cardType.add(CardType.CREATURE);
-        color = ObjectColor.WHITE;
-        subtype.add("Knight");
-        power = new MageInt(2);
-        toughness = new MageInt(2);
-        this.addAbility(VigilanceAbility.getInstance());
-    }
-}
\ No newline at end of file
diff --git a/Mage/src/mage/game/permanent/token/KnightToken.java b/Mage/src/mage/game/permanent/token/KnightToken.java
new file mode 100644
index 00000000000..14ba86e7dd6
--- /dev/null
+++ b/Mage/src/mage/game/permanent/token/KnightToken.java
@@ -0,0 +1,23 @@
+package mage.game.permanent.token;
+
+import mage.Constants.CardType;
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.keyword.VigilanceAbility;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class KnightToken extends Token {
+
+    public KnightToken() {
+        super("Knight", "2/2 white Knight creature token with vigilance");
+        cardType.add(CardType.CREATURE);
+        color = ObjectColor.WHITE;
+        subtype.add("Knight");
+        power = new MageInt(2);
+        toughness = new MageInt(2);
+        this.addAbility(VigilanceAbility.getInstance());
+    }
+}