From 940f1121f5586c92c4fb38b59ff515889c15a8b1 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 13:11:33 +0000 Subject: [PATCH] convert Faerie Swarm, Maro, and Molimo, Maro Sorcerer to stSetPT keyword. --- res/cardsfolder/faerie_swarm.txt | 5 +++-- res/cardsfolder/maro.txt | 3 ++- res/cardsfolder/molimo_maro_sorcerer.txt | 5 +++-- src/forge/GameActionUtil.java | 17 +++++++++-------- src/forge/StaticEffects.java | 6 +++--- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/res/cardsfolder/faerie_swarm.txt b/res/cardsfolder/faerie_swarm.txt index 330a517871f..3711f39ec29 100644 --- a/res/cardsfolder/faerie_swarm.txt +++ b/res/cardsfolder/faerie_swarm.txt @@ -1,9 +1,10 @@ Name:Faerie Swarm ManaCost:3 U Types:Creature Faerie -Text:Faerie Swarm's power and toughness are each equal to the number of blue permanents you control. -PT:1/1 +Text:no text +PT:*/* K:Flying +K:stSetPT:Count$Valid Permanent.Blue+YouCtrl:Count$Valid Permanent.Blue+YouCtrl:Faerie Swarm's power and toughness are each equal to the number of blue permanents you control. SVar:BuffedBy:Permanent.Blue SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/faerie_swarm.jpg diff --git a/res/cardsfolder/maro.txt b/res/cardsfolder/maro.txt index fad5bd35dd5..ffc34cc92c7 100644 --- a/res/cardsfolder/maro.txt +++ b/res/cardsfolder/maro.txt @@ -1,8 +1,9 @@ Name:Maro ManaCost:2 G G Types:Creature Elemental -Text:Maro's power and toughness are each equal to the number of cards in your hand. +Text:no text PT:1/1 +K:stSetPT:Count$InYourHand:Count$InYourHand:CARDNAME's power and toughness are each equal to the number of cards in your hand. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/maro.jpg SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/264.jpg diff --git a/res/cardsfolder/molimo_maro_sorcerer.txt b/res/cardsfolder/molimo_maro_sorcerer.txt index c41804f0632..78f20f44f88 100644 --- a/res/cardsfolder/molimo_maro_sorcerer.txt +++ b/res/cardsfolder/molimo_maro_sorcerer.txt @@ -1,9 +1,10 @@ Name:Molimo, Maro-Sorcerer ManaCost:4 G G G Types:Legendary Creature Elemental -Text:Molimo, Maro-Sorcerer's power and toughness are each equal to the number of lands you control. -PT:1/1 +Text:no text +PT:*/* K:Trample +K:stSetPT:Count$NumTypeYouCtrl.Land:Count$NumTypeYouCtrl.Land:Molimo, Maro-Sorcerer's power and toughness are each equal to the number of lands you control. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/molimo_maro_sorcerer.jpg SetInfo:INV|Rare|http://magiccards.info/scans/en/in/199.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 22b06d95bed..a28c4346cca 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -14697,7 +14697,7 @@ public class GameActionUtil { }// execute() }; // Crowd of Cinders */ - + /* public static Command Faerie_Swarm = new Command() { private static final long serialVersionUID = 6686690505949642328L; @@ -14718,7 +14718,7 @@ public class GameActionUtil { return blue.size(); } }; // Faerie Swarm - + */ /* public static Command Drove_of_Elves = new Command() { private static final long serialVersionUID = 6686690505949642328L; @@ -14763,7 +14763,7 @@ public class GameActionUtil { } }; //Multani, Maro-Sorcerer - + /* public static Command Molimo_Maro_Sorcerer = new Command() { private static final long serialVersionUID = -8778902687347191964L; @@ -14779,7 +14779,8 @@ public class GameActionUtil { } }; //Molimo, Maro-Sorcerer - + */ + /* public static Command Maro = new Command() { private static final long serialVersionUID = -8778902687347191964L; @@ -14793,7 +14794,7 @@ public class GameActionUtil { } } }; //Maro - + */ public static Command Masumaro_First_to_Live = new Command() { private static final long serialVersionUID = -8778922687347191964L; @@ -16321,7 +16322,7 @@ public class GameActionUtil { commands.put("Elspeth_Emblem", Elspeth_Emblem); commands.put("Emperor_Crocodile", Emperor_Crocodile); - commands.put("Faerie_Swarm", Faerie_Swarm); + //commands.put("Faerie_Swarm", Faerie_Swarm); commands.put("Gaddock_Teeg", Gaddock_Teeg); commands.put("Gaeas_Avenger", Gaeas_Avenger); @@ -16358,13 +16359,13 @@ public class GameActionUtil { commands.put("Magnivore", Magnivore); commands.put("Magus_of_the_Tabernacle", Magus_of_the_Tabernacle); commands.put("Maraxus_of_Keld", Maraxus_of_Keld); - commands.put("Maro", Maro); + //commands.put("Maro", Maro); commands.put("Marrow_Gnawer", Marrow_Gnawer); //commands.put("Master_of_Etherium", Master_of_Etherium); commands.put("Masumaro_First_to_Live", Masumaro_First_to_Live); commands.put("Matca_Rioters", Matca_Rioters); commands.put("Meddling_Mage", Meddling_Mage); - commands.put("Molimo_Maro_Sorcerer", Molimo_Maro_Sorcerer); + //commands.put("Molimo_Maro_Sorcerer", Molimo_Maro_Sorcerer); commands.put("Mortivore", Mortivore); commands.put("Mul_Daya_Channelers", Mul_Daya_Channelers); commands.put("Multani_Maro_Sorcerer", Multani_Maro_Sorcerer); diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java index c0f2675b0c2..1d83c25e019 100644 --- a/src/forge/StaticEffects.java +++ b/src/forge/StaticEffects.java @@ -48,7 +48,7 @@ public class StaticEffects //cardToEffectsList.put("Eldrazi Monument", new String[] {"Eldrazi_Monument"}); cardToEffectsList.put("Emperor Crocodile", new String[] {"Emperor_Crocodile"}); - cardToEffectsList.put("Faerie Swarm", new String[] {"Faerie_Swarm"}); + //cardToEffectsList.put("Faerie Swarm", new String[] {"Faerie_Swarm"}); cardToEffectsList.put("Gaddock Teeg", new String[] {"Gaddock_Teeg"}); cardToEffectsList.put("Gaea's Avenger", new String[] {"Gaeas_Avenger"}); @@ -84,13 +84,13 @@ public class StaticEffects cardToEffectsList.put("Magnivore", new String[] {"Magnivore"}); cardToEffectsList.put("Magus of the Tabernacle", new String[] {"Magus_of_the_Tabernacle"}); cardToEffectsList.put("Maraxus of Keld", new String[] {"Maraxus_of_Keld"}); - cardToEffectsList.put("Maro", new String[] {"Maro"}); + //cardToEffectsList.put("Maro", new String[] {"Maro"}); cardToEffectsList.put("Marrow-Gnawer", new String[] {"Marrow_Gnawer"}); //cardToEffectsList.put("Master of Etherium", new String[] {"Master_of_Etherium"}); cardToEffectsList.put("Masumaro, First to Live", new String[] {"Masumaro_First_to_Live"}); cardToEffectsList.put("Matca Rioters", new String[] {"Matca_Rioters"}); cardToEffectsList.put("Meddling Mage", new String[] {"Meddling_Mage"}); - cardToEffectsList.put("Molimo, Maro-Sorcerer", new String[] {"Molimo_Maro_Sorcerer"}); + //cardToEffectsList.put("Molimo, Maro-Sorcerer", new String[] {"Molimo_Maro_Sorcerer"}); cardToEffectsList.put("Mortivore", new String[] {"Mortivore"}); cardToEffectsList.put("Mul Daya Channelers", new String[] {"Mul_Daya_Channelers"}); cardToEffectsList.put("Multani, Maro-Sorcerer", new String[] {"Multani_Maro_Sorcerer"});