From 2f06273865b09fb42a30d95bd6c267d4a2eba8dc Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 09:12:54 +0000
Subject: [PATCH] - Added doDrawBack() to spReturnTgt and added Macabre Waltz.

---
 .gitattributes                    |  1 +
 res/cardsfolder/macabre_waltz.txt | 12 ++++++++++++
 src/forge/CardFactory.java        |  6 +++++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 res/cardsfolder/macabre_waltz.txt

diff --git a/.gitattributes b/.gitattributes
index 7ece6575f99..8184277c074 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2462,6 +2462,7 @@ res/cardsfolder/lux_cannon.txt -text svneol=native#text/plain
 res/cardsfolder/lynx.txt -text svneol=native#text/plain
 res/cardsfolder/lys_alana_huntmaster.txt -text svneol=native#text/plain
 res/cardsfolder/ma_chao_western_warrior.txt -text svneol=native#text/plain
+res/cardsfolder/macabre_waltz.txt -text svneol=native#text/plain
 res/cardsfolder/macetail_hystrodon.txt -text svneol=native#text/plain
 res/cardsfolder/machinate.txt -text svneol=native#text/plain
 res/cardsfolder/mad_auntie.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/macabre_waltz.txt b/res/cardsfolder/macabre_waltz.txt
new file mode 100644
index 00000000000..a3858faa8b2
--- /dev/null
+++ b/res/cardsfolder/macabre_waltz.txt
@@ -0,0 +1,12 @@
+Name:Macabre Waltz
+ManaCost:1 B
+Types:Sorcery
+Text:Return up to two target creature cards from your graveyard to your hand, then discard a card.
+K:spReturnTgt:2/UpTo:Creature:Hand:Drawback$YouDiscard/1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/macabre_waltz.jpg
+End
+
+
+
+K:spDestroyTgt:Creature.cmcLE3:NoRegen
\ No newline at end of file
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 39a31672123..978f28c8200 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -3650,7 +3650,7 @@ public class CardFactory implements NewConstants {
          *  Generic return target card(s) from graveyard to Hand, Battlefield or Top of Library
          *  spReturnTgt:{Num Cards/Parameters}:{Type}:{To Zone}:{DrawBack}:{Spell Desc}
          *  
-         *  DrawBack and X Count/Costs are not yet implemented.
+         *  X Count/Costs are not yet implemented.
          */
         if (hasKeyword(card, "spReturnTgt") != -1) {
             int n = hasKeyword(card, "spReturnTgt");
@@ -3806,6 +3806,10 @@ public class CardFactory implements NewConstants {
                                 AllZone.GameAction.moveToTopOfLibrary(c);
                             }
                         }
+                    }// for
+                    
+                    if (!Drawback[0].equals("none")) {
+                        CardFactoryUtil.doDrawBack(Drawback[0], 0, card.getController(), AllZone.GameAction.getOpponent(card.getController()), card.getController(), card, card, this);
                     }
                 }// resolve()