From 633b69ec82cf3cbd5cd034eb7a0ac7cd79bca020 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Wed, 24 Aug 2011 01:33:21 +0000
Subject: [PATCH] Add XChoice to CostDiscard Convert Firestorm and Vengeful
 Dreams to Script

---
 res/cardsfolder/f/firestorm.txt                            | 5 ++++-
 res/cardsfolder/v/vengeful_dreams.txt                      | 5 ++++-
 .../java/forge/card/cardFactory/CardFactory_Instants.java  | 7 ++++---
 src/main/java/forge/card/cost/CostDiscard.java             | 4 ++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/res/cardsfolder/f/firestorm.txt b/res/cardsfolder/f/firestorm.txt
index eca03a6d3f3..d6bb328e40e 100644
--- a/res/cardsfolder/f/firestorm.txt
+++ b/res/cardsfolder/f/firestorm.txt
@@ -1,7 +1,10 @@
 Name:Firestorm
 ManaCost:R
 Types:Instant
-Text:As an additional cost to cast CARDNAME, discard X cards.\r\n\r\nCARDNAME deals X damage to each of X target creatures and/or players.
+Text:no text
+A:SP$ DealDamage | Cost$ R Discard<X/Card> | Tgt$ TgtCP | TargetMin$ 0 | TargetMax$ MaxTgts | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to each of X target creatures and/or players.
+SVar:X:Targeted$Amount
+SVar:MaxTgts:Count$Valid Creature/Plus.2
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/firestorm.jpg
diff --git a/res/cardsfolder/v/vengeful_dreams.txt b/res/cardsfolder/v/vengeful_dreams.txt
index 3aecc776673..e6b2911878f 100644
--- a/res/cardsfolder/v/vengeful_dreams.txt
+++ b/res/cardsfolder/v/vengeful_dreams.txt
@@ -1,7 +1,10 @@
 Name:Vengeful Dreams
 ManaCost:W W
 Types:Instant
-Text:As an additional cost to cast Vengeful Dreams, discard X cards.\r\n\r\nExile X target attacking creatures.
+Text:no text
+A:SP$ ChangeZone | Cost$ W W Discard<X/Card> | Origin$ Battlefield | Destination$ Exile | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | SpellDescription$ Exile X target attacking creatures.
+SVar:X:Targeted$Amount
+SVar:MaxTgts:Count$Valid Creature.attacking
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vengeful_dreams.jpg
diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Instants.java b/src/main/java/forge/card/cardFactory/CardFactory_Instants.java
index c0c65a1cc5b..7d08b2f3119 100644
--- a/src/main/java/forge/card/cardFactory/CardFactory_Instants.java
+++ b/src/main/java/forge/card/cardFactory/CardFactory_Instants.java
@@ -1017,6 +1017,7 @@ public class CardFactory_Instants {
 
 
         //*************** START *********** START **************************
+        /*
         else if (cardName.equals("Vengeful Dreams")) {
             final CardList targets = new CardList();
             final SpellAbility spell = new Spell(card) {
@@ -1094,8 +1095,8 @@ public class CardFactory_Instants {
             
             card.addSpellAbility(spell);
         }//*************** END ************ END **************************
-
-
+*/
+/*
         //*************** START *********** START **************************
         else if (cardName.equals("Firestorm")) {
             final ArrayList<Object> targets = new ArrayList<Object>();
@@ -1187,7 +1188,7 @@ public class CardFactory_Instants {
             
             card.addSpellAbility(spell);
         }//*************** END ************ END **************************
-
+*/
 
         //*************** START *********** START **************************
         else if (cardName.equals("Cryptic Command")) {
diff --git a/src/main/java/forge/card/cost/CostDiscard.java b/src/main/java/forge/card/cost/CostDiscard.java
index 83540ed35a2..40589553e1c 100644
--- a/src/main/java/forge/card/cost/CostDiscard.java
+++ b/src/main/java/forge/card/cost/CostDiscard.java
@@ -175,6 +175,10 @@ public class CostDiscard extends CostPartWithList {
         else{
             Integer c = convertAmount();
             if (c == null){
+                String sVar = source.getSVar(amount);
+                if (sVar.equals("XChoice")){
+                    return false;
+                }
                 c = AbilityFactory.calculateAmount(source, amount, ability);
             }