From 5604b34bf321b47bf8f4050529f9d361a17b401b Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Mon, 3 Oct 2011 18:28:37 +0000
Subject: [PATCH] - Added Myr Battlesphere.

---
 .gitattributes                                    |  1 +
 res/cardsfolder/m/myr_battlesphere.txt            | 15 +++++++++++++++
 .../forge/card/abilityFactory/AbilityFactory.java |  2 ++
 3 files changed, 18 insertions(+)
 create mode 100644 res/cardsfolder/m/myr_battlesphere.txt

diff --git a/.gitattributes b/.gitattributes
index ddf4bd6e2ae..ee891902bb4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5176,6 +5176,7 @@ res/cardsfolder/m/mycosynth_fiend.txt svneol=native#text/plain
 res/cardsfolder/m/mycosynth_golem.txt svneol=native#text/plain
 res/cardsfolder/m/mycosynth_wellspring.txt svneol=native#text/plain
 res/cardsfolder/m/myr_adapter.txt svneol=native#text/plain
+res/cardsfolder/m/myr_battlesphere.txt -text
 res/cardsfolder/m/myr_enforcer.txt svneol=native#text/plain
 res/cardsfolder/m/myr_galvanizer.txt svneol=native#text/plain
 res/cardsfolder/m/myr_incubator.txt svneol=native#text/plain
diff --git a/res/cardsfolder/m/myr_battlesphere.txt b/res/cardsfolder/m/myr_battlesphere.txt
new file mode 100644
index 00000000000..549bd6d1728
--- /dev/null
+++ b/res/cardsfolder/m/myr_battlesphere.txt
@@ -0,0 +1,15 @@
+Name:Myr Battlesphere
+ManaCost:7
+Types:Artifact Creature Myr Construct
+PT:4/7
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put four 1/1 colorless Myr artifact creature tokens onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 4 | TokenName$ Myr | TokenTypes$ Artifact,Creature,Myr | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1
+T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, you may tap X untapped Myr you control. If you do, CARDNAME gets +X/+0 until end of turn and deals X damage to defending player.
+SVar:TrigPump:AB$ Pump | Cost$ tapXType<X/Myr> | NumAtt$ +ChosenX | NumDef$ +0 | SubAbility$ DBDealDamage
+SVar:DBDealDamage:DB$ DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ ChosenX
+SVar:X:XChoice
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/myr_battlesphere.jpg
+SetInfo:MBS|Rare|http://magiccards.info/scans/en/som/180.jpg
+Oracle:When Myr Battlesphere enters the battlefield, put four 1/1 colorless Myr artifact creature tokens onto the battlefield.\nWhenever Myr Battlesphere attacks, you may tap X untapped Myr you control. If you do, Myr Battlesphere gets +X/+0 until end of turn and deals X damage to defending player.
+End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory.java b/src/main/java/forge/card/abilityFactory/AbilityFactory.java
index c8cbb28650e..98e89614e80 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory.java
@@ -1338,6 +1338,8 @@ public class AbilityFactory {
                 return 0;
             }
         }
+        if(amount.equals("ChosenX")) //this is for the case that the choice isn't made yet
+            return 0;
 
         return Integer.parseInt(amount) * multiplier;
     }