From d2361e87b84e99530a7acbc516d54237848f7c7e Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Fri, 22 Feb 2013 22:37:08 +0000
Subject: [PATCH] - When cards move to a non-Battlefield zone, reset it to its
 base colors - Added Deathlace

---
 .gitattributes                                    |  1 +
 res/cardsfolder/d/deathlace.txt                   | 14 ++++++++++++++
 src/main/java/forge/card/CardCharacteristics.java |  7 +++++++
 src/main/java/forge/game/GameAction.java          |  4 ++++
 4 files changed, 26 insertions(+)
 create mode 100644 res/cardsfolder/d/deathlace.txt

diff --git a/.gitattributes b/.gitattributes
index 2df56ec2702..ee01e795b95 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2409,6 +2409,7 @@ res/cardsfolder/d/deathgazer.txt svneol=native#text/plain
 res/cardsfolder/d/deathgreeter.txt svneol=native#text/plain
 res/cardsfolder/d/deathgrip.txt svneol=native#text/plain
 res/cardsfolder/d/deathknell_kami.txt svneol=native#text/plain
+res/cardsfolder/d/deathlace.txt -text
 res/cardsfolder/d/deathless_angel.txt svneol=native#text/plain
 res/cardsfolder/d/deathmark.txt svneol=native#text/plain
 res/cardsfolder/d/deathmark_prelate.txt svneol=native#text/plain
diff --git a/res/cardsfolder/d/deathlace.txt b/res/cardsfolder/d/deathlace.txt
new file mode 100644
index 00000000000..464358b04f8
--- /dev/null
+++ b/res/cardsfolder/d/deathlace.txt
@@ -0,0 +1,14 @@
+Name:Deathlace
+ManaCost:B
+Types:Instant
+A:SP$ Animate | Cost$ B | Colors$ Black | OverwriteColors$ True | ValidTgts$ Card | TgtZone$ Stack,Battlefield | Permanent$ True | SpellDescription$ Target spell or permanent becomes black. (Mana symbols on that permanent remain unchanged.)
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/deathlace.jpg
+SVar:RemAIDeck:True
+SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/10.jpg
+SetInfo:LEB|Rare|http://magiccards.info/scans/en/be/10.jpg
+SetInfo:3ED|Rare|http://magiccards.info/scans/en/rv/10.jpg
+SetInfo:4ED|Rare|http://magiccards.info/scans/en/4e/15.jpg
+SetInfo:2ED|Rare|http://magiccards.info/scans/en/un/10.jpg
+Oracle:Target spell or permanent becomes black. (Mana symbols on that permanent remain unchanged.)
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/CardCharacteristics.java b/src/main/java/forge/card/CardCharacteristics.java
index 5ab44d000a9..a2cf4e3491a 100644
--- a/src/main/java/forge/card/CardCharacteristics.java
+++ b/src/main/java/forge/card/CardCharacteristics.java
@@ -129,6 +129,13 @@ public class CardCharacteristics {
     public final void setCardColor(final Iterable<CardColor> cardColor0) {
         this.cardColor = Lists.newArrayList(cardColor0);
     }
+    
+    /**
+     * Resets the card color.
+     */
+    public final void resetCardColor() {
+        this.cardColor = Lists.newArrayList(this.cardColor.subList(0, 1));
+    }
 
     /**
      * Gets the base attack.
diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index ccdc36b1564..ef2a8492520 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -243,6 +243,10 @@ public class GameAction {
                 (!zoneTo.is(ZoneType.Battlefield) && !c.getName().equals("Skullbriar, the Walking Grave"))) {
             copied.clearCounters();
         }
+        
+        if (!zoneTo.is(ZoneType.Battlefield)) {
+            copied.getCharacteristics().resetCardColor();
+        }
 
         if (zoneFrom.is(ZoneType.Battlefield)) {
             copied.setSuspendCast(false);