From 70d0bf696f7afc93e68c5bc0c81b00f3570840b2 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 12:32:13 +0000 Subject: [PATCH] convert Squirrel Mob to stPumpAll keyword. --- res/cardsfolder/squirrel_mob.txt | 4 +++- src/forge/GameActionUtil.java | 41 +------------------------------- src/forge/StaticEffects.java | 1 - 3 files changed, 4 insertions(+), 42 deletions(-) diff --git a/res/cardsfolder/squirrel_mob.txt b/res/cardsfolder/squirrel_mob.txt index ea912d935f7..f62bdeb5113 100644 --- a/res/cardsfolder/squirrel_mob.txt +++ b/res/cardsfolder/squirrel_mob.txt @@ -1,8 +1,10 @@ Name:Squirrel Mob ManaCost:1 G G Types:Creature Squirrel -Text:Squirrel Mob gets +1/+1 for each other Squirrel on the battlefield. +Text:no text PT:2/2 +K:stPumpSelf:Creature:X/X:no Condition:CARDNAME gets +1/+1 for each other Squirrel on the battlefield. +SVar:X:Count$Valid Squirrel.Other SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/squirrel_mob.jpg SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/273.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 41a59237253..65c157c26fc 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -14750,45 +14750,7 @@ public class GameActionUtil { };//Plague_Rats - public static Command Squirrel_Mob_Other = new Command() { - - private static final long serialVersionUID = 5483285906091676339L; - int otherSquirrels = 0; - - private int countOtherSquirrels(Card c) { - PlayerZone hplay = AllZone.getZone( - Constant.Zone.Play, AllZone.HumanPlayer); - PlayerZone cplay = AllZone.getZone( - Constant.Zone.Play, AllZone.ComputerPlayer); - CardList squirrels = new CardList(hplay.getCards()); - squirrels.addAll(cplay.getCards()); - - squirrels = squirrels.filter(new CardListFilter() - { - public boolean addCard(Card crd) - { - return (crd.getType().contains("Squirrel") || crd.getKeyword().contains("Changeling")); - - } - }); - return squirrels.size() - 1; - } - - public void execute() { - - CardList creature = AllZoneUtil.getCardsInPlay("Squirrel Mob"); - - for(int i = 0; i < creature.size(); i++) { - Card c = creature.get(i); - otherSquirrels = countOtherSquirrels(c); - c.setOtherAttackBoost(otherSquirrels); - c.setOtherDefenseBoost(otherSquirrels); - - }// for inner - }// execute() - - }; - + public static Command Broodwarden = new Command() { private static final long serialVersionUID = -9033688979680507210L; @@ -17839,7 +17801,6 @@ public class GameActionUtil { commands.put("Soulsurge_Elemental", Soulsurge_Elemental); commands.put("Sound_the_Call_Wolf", Sound_the_Call_Wolf); commands.put("Spidersilk_Armor", Spidersilk_Armor); - commands.put("Squirrel_Mob_Other", Squirrel_Mob_Other); commands.put("Steely_Resolve", Steely_Resolve); commands.put("Student_of_Warfare", Student_of_Warfare); commands.put("Svogthos_the_Restless_Tomb", Svogthos_the_Restless_Tomb); diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java index 90eca1aef3f..82284ccfecf 100644 --- a/src/forge/StaticEffects.java +++ b/src/forge/StaticEffects.java @@ -149,7 +149,6 @@ public class StaticEffects cardToEffectsList.put("Skywatcher Adept", new String[] {"Skywatcher_Adept"}); cardToEffectsList.put("Soulsurge Elemental", new String[] {"Soulsurge_Elemental"}); cardToEffectsList.put("Spidersilk Armor", new String[] {"Spidersilk_Armor"}); - cardToEffectsList.put("Squirrel Mob", new String[] {"Squirrel_Mob_Other"}); cardToEffectsList.put("Steely Resolve", new String[] {"Steely_Resolve"}); cardToEffectsList.put("Student of Warfare", new String[]{"Student_of_Warfare"}); cardToEffectsList.put("Svogthos, the Restless Tomb", new String[] {"Svogthos_the_Restless_Tomb"});