From a24ede0474c2796aa487152da5fca702da1a526b Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sun, 7 Aug 2011 00:03:38 +0000
Subject: [PATCH] - Converted March of Souls to script.

---
 res/cardsfolder/march_of_souls.txt            | 14 ++++++---
 .../cardFactory/CardFactory_Sorceries.java    | 29 -------------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/res/cardsfolder/march_of_souls.txt b/res/cardsfolder/march_of_souls.txt
index 0132d612c0c..2ec4b588d33 100644
--- a/res/cardsfolder/march_of_souls.txt
+++ b/res/cardsfolder/march_of_souls.txt
@@ -1,8 +1,14 @@
 Name:March of Souls
 ManaCost:4 W
 Types:Sorcery
-Text:Destroy all creatures. They can't be regenerated. For each creature destroyed this way, its controller puts a 1/1 white Spirit creature token with flying onto the battlefield.
+Text:no text
+A:SP$ DestroyAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | RememberDestroyed$ True | NoRegen$ True | SubAbility$ SVar=DBTokenYou | SpellDescription$ Destroy all creatures. They can't be regenerated. For each creature destroyed this way, its controller puts a 1/1 white Spirit creature token with flying onto the battlefield.
+SVar:DBTokenYou:DB$Token | TokenAmount$ X | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ SVar=DBDestroyOpp
+SVar:DBDestroyOpp:DB$DestroyAll | ValidCards$ Creature.YouDontCtrl | RememberDestroyed$ True | NoRegen$ True | SubAbility$ SVar=DBTokenOpp
+SVar:DBTokenOpp:DB$Token | TokenAmount$ Y | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ Opponent | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
+SVar:X:Remembered$Amount
+SVar:Y:Remembered$Amount
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
-SVar:Picture:http://resources.wizards.com/magic/cards/ps/en-us/card26277.jpg
-SetInfo:PLS|Rare|http://magiccards.info/scans/en/ps/10.jpg
-End
\ No newline at end of file
+SVar:Picture:http://www.wizards.com/global/images/magic/general/march_of_souls.jpg
+End
diff --git a/src/forge/card/cardFactory/CardFactory_Sorceries.java b/src/forge/card/cardFactory/CardFactory_Sorceries.java
index c41b0b3e8e9..b563ea6a525 100644
--- a/src/forge/card/cardFactory/CardFactory_Sorceries.java
+++ b/src/forge/card/cardFactory/CardFactory_Sorceries.java
@@ -1242,36 +1242,7 @@ public class CardFactory_Sorceries {
         }//*************** END ************ END **************************
         
 
-        //*************** START *********** START **************************
-        else if(cardName.equals("March of Souls")) {
-            final SpellAbility spell = new Spell(card) {
-                private static final long serialVersionUID = -1468254925312413359L;
                 
-                @Override
-                public void resolve() {
-                    change(AllZone.Human_Battlefield, card.getController());
-                    change(AllZone.Computer_Battlefield, card.getController());
-                }
-                
-                public void change(PlayerZone play, Player owner) {
-                    Card[] c = play.getCards();
-                    for(int i = 0; i < c.length; i++) {
-                        if(c[i].isCreature() && !c[i].hasKeyword("Indestructible")) {
-                            AllZone.GameAction.destroyNoRegeneration(c[i]);
-                            CardFactoryUtil.makeToken("Spirit", "W 1 1 Spirit", c[i].getController(), "W", new String[] {
-                                    "Creature", "Spirit"}, 1, 1, new String[] {"Flying"});
-                        }
-                    }
-                }//change()
-            };//SpellAbility
-            
-            // Do not remove SpellAbilities created by AbilityFactory or Keywords.
-            card.clearFirstSpellAbility();
-            card.addSpellAbility(spell);
-        }//*************** END ************ END **************************
-        
-        
-        
         //*************** START *********** START **************************
         else if(cardName.equals("Martial Coup")) {
             SpellAbility spell = new Spell(card) {