From 5151fbe2b86edd8b09dd25c88e6bb4d2d0d1c23e Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 09:55:13 +0000 Subject: [PATCH] convert Night of Soul's Betrayal to stPumpAll --- res/cardsfolder/night_of_souls_betrayal.txt | 3 +- src/forge/GameActionUtil.java | 74 +++++---------------- src/forge/StaticEffects.java | 2 +- 3 files changed, 18 insertions(+), 61 deletions(-) diff --git a/res/cardsfolder/night_of_souls_betrayal.txt b/res/cardsfolder/night_of_souls_betrayal.txt index 5cca66fca04..ff2c928eaad 100644 --- a/res/cardsfolder/night_of_souls_betrayal.txt +++ b/res/cardsfolder/night_of_souls_betrayal.txt @@ -1,7 +1,8 @@ Name:Night of Souls' Betrayal ManaCost:2 B B Types:Legendary Enchantment -Text:All creatures get -1/-1. +Text:no text +K:stPumpAll:Creature:-1/-1:No Condition:All creatures get -1/-1. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/night_of_souls_betrayal.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 82080d53185..a3616caafa6 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -9382,13 +9382,7 @@ public class GameActionUtil { }// upkeep_Verdant_Force() private static void upkeep_Dragon_Broodmother() { - //final Player player = AllZone.Phase.getActivePlayer(); - PlayerZone hPlay = AllZone.getZone(Constant.Zone.Play, AllZone.HumanPlayer); - PlayerZone cPlay = AllZone.getZone(Constant.Zone.Play, AllZone.ComputerPlayer); - - CardList list = new CardList(hPlay.getCards()); - list.addAll(cPlay.getCards()); - list = list.getName("Dragon Broodmother"); + CardList list = AllZoneUtil.getCardsInPlay("Dragon Broodmother"); Ability ability; for(int i = 0; i < list.size(); i++) { @@ -9651,7 +9645,6 @@ public class GameActionUtil { ability = new Ability(list.get(i), "0") { @Override public void resolve() { - //AllZone.GameAction.addDamage(player, crd, 1); player.addDamage(1, crd); } };// Ability @@ -9677,7 +9670,6 @@ public class GameActionUtil { ability = new Ability(list.get(i), "0") { @Override public void resolve() { - //AllZone.GameAction.addDamage(player, crd, 1); player.addDamage(1, crd); } };// Ability @@ -9709,10 +9701,7 @@ public class GameActionUtil { } private static void draw_Howling_Mine(Player player) { - CardList list = new CardList(); - list.addAll(AllZone.Human_Play.getCards()); - list.addAll(AllZone.Computer_Play.getCards()); - list = list.getName("Howling Mine"); + CardList list = AllZoneUtil.getCardsInPlay("Howling Mine"); for(int i = 0; i < list.size(); i++){ if( list.getCard(i).isUntapped() ) { @@ -9737,10 +9726,7 @@ public class GameActionUtil { }// Font_of_Mythos() private static void draw_Teferi_Puzzle_Box(Player player) { - CardList list = new CardList(); - list.addAll(AllZone.Human_Play.getCards()); - list.addAll(AllZone.Computer_Play.getCards()); - list = list.getName("Teferi's Puzzle Box"); + CardList list = AllZoneUtil.getCardsInPlay("Teferi's Puzzle Box"); PlayerZone Playerhand = AllZone.getZone(Constant.Zone.Hand, player); PlayerZone lib = AllZone.getZone(Constant.Zone.Library, player); @@ -9794,7 +9780,6 @@ public class GameActionUtil { final Ability damage = new Ability(vault, "0") { @Override public void resolve() { - //AllZone.GameAction.addDamage(player, vault, 1); player.addDamage(1, vault); } };//Ability @@ -9993,7 +9978,6 @@ public class GameActionUtil { private static void upkeep_Honden_of_Infinite_Rage() { final Player controller = AllZone.Phase.getActivePlayer(); - //final String opponent = player.getOpponent(); PlayerZone play = AllZone.getZone(Constant.Zone.Play, controller); CardList list = new CardList(); @@ -10114,18 +10098,14 @@ public class GameActionUtil { final Player player = AllZone.Phase.getActivePlayer(); // get all creatures - CardList list = new CardList(); - list.addAll(AllZone.Human_Play.getCards()); - list.addAll(AllZone.Computer_Play.getCards()); - - list = list.getName("Seizan, Perverter of Truth"); + CardList list = AllZoneUtil.getCardsInPlay("Seizan, Perverter of Truth"); if(list.size() == 0) return; final Card F_card = list.get(0); Ability ability = new Ability(list.get(0), "0") { @Override public void resolve() { - player.subtractLife(2,F_card); + player.subtractLife(2, F_card); } };// Ability @@ -10172,10 +10152,7 @@ public class GameActionUtil { private static void upkeep_Grinning_Demon() { final Player player = AllZone.Phase.getActivePlayer(); - PlayerZone playZone = AllZone.getZone(Constant.Zone.Play, player); - - CardList list = new CardList(playZone.getCards()); - list = list.getName("Grinning Demon"); + CardList list = AllZoneUtil.getPlayerCardsInPlay(player, "Grinning Demon"); Ability ability; for(int i = 0; i < list.size(); i++) { @@ -10199,10 +10176,7 @@ public class GameActionUtil { private static void upkeep_Juzam_Djinn() { final Player player = AllZone.Phase.getActivePlayer(); - PlayerZone playZone = AllZone.getZone(Constant.Zone.Play, player); - - CardList list = new CardList(playZone.getCards()); - list = list.getName("Juzam Djinn"); + CardList list = AllZoneUtil.getPlayerCardsInPlay(player, "Juzam Djinn"); Ability ability; for(int i = 0; i < list.size(); i++) { @@ -10210,7 +10184,6 @@ public class GameActionUtil { ability = new Ability(list.get(i), "0") { @Override public void resolve() { - //AllZone.GameAction.addDamage(player, crd, 1); player.addDamage(1, crd); } };// Ability @@ -10236,7 +10209,6 @@ public class GameActionUtil { ability = new Ability(list.get(i), "0") { @Override public void resolve() { - //AllZone.GameAction.addDamage(player, crd, 1); player.addDamage(1, crd); } };// Ability @@ -10442,10 +10414,7 @@ public class GameActionUtil { PlayerZone[] zone = new PlayerZone[4]; - CardList cl = new CardList(); - cl.addAll(AllZone.Human_Play.getCards()); - cl.addAll(AllZone.Computer_Play.getCards()); - cl = cl.getName("Conspiracy"); + CardList cl = AllZoneUtil.getCardsInPlay("Conspiracy"); for(int i = 0; i < cl.size(); i++) { Card card = cl.get(i); @@ -10506,18 +10475,12 @@ public class GameActionUtil { } list.clear(); - CardList cards = new CardList(); - cards.addAll(AllZone.Human_Play.getCards()); - cards.addAll(AllZone.Computer_Play.getCards()); - cards = cards.getName("Engineered Plague"); + CardList cards = AllZoneUtil.getCardsInPlay("Engineered Plague"); for(int outer = 0; outer < cards.size(); outer++) { Card card = cards.get(outer); - CardList creature = new CardList(); - creature.addAll(AllZone.Human_Play.getCards()); - creature.addAll(AllZone.Computer_Play.getCards()); - creature = creature.getType(card.getChosenType()); + CardList creature = AllZoneUtil.getTypeInPlay(card.getChosenType()); for(int i = 0; i < creature.size(); i++) { c = creature.get(i); @@ -10535,7 +10498,7 @@ public class GameActionUtil { }// for outer }// execute() }; //Engineered Plague - + /* public static Command Night_of_Souls_Betrayal = new Command() { private static final long serialVersionUID = 867116049464930958L; @@ -10553,18 +10516,11 @@ public class GameActionUtil { } list.clear(); - CardList cards = new CardList(); - cards.addAll(AllZone.Human_Play.getCards()); - cards.addAll(AllZone.Computer_Play.getCards()); - cards = cards.getName("Night of Souls' Betrayal"); + CardList cards = AllZoneUtil.getCardsInPlay("Night of Souls' Betrayal"); for(int outer = 0; outer < cards.size(); outer++) { - //Card card = cards.get(outer); //unused - CardList creature = new CardList(); - creature.addAll(AllZone.Human_Play.getCards()); - creature.addAll(AllZone.Computer_Play.getCards()); - creature = creature.getType("Creature"); + CardList creature = AllZoneUtil.getCreaturesInPlay(); for(int i = 0; i < creature.size(); i++) { c = creature.get(i); @@ -10577,7 +10533,7 @@ public class GameActionUtil { }// for outer }// execute() }; //Night of Souls' Betrayal - + */ public static Command Rolling_Stones = new Command() { private static final long serialVersionUID = -3317318747868440229L; @@ -21044,7 +21000,7 @@ public class GameActionUtil { commands.put("Nut_Collector", Nut_Collector); commands.put("Engineered_Plague", Engineered_Plague); - commands.put("Night_of_Souls_Betrayal", Night_of_Souls_Betrayal); + //commands.put("Night_of_Souls_Betrayal", Night_of_Souls_Betrayal); commands.put("Thelonite_Hermit", Thelonite_Hermit); commands.put("Deranged_Hermit", Deranged_Hermit); diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java index fd5544c9dc8..8a20348b975 100644 --- a/src/forge/StaticEffects.java +++ b/src/forge/StaticEffects.java @@ -151,7 +151,7 @@ public class StaticEffects cardToEffectsList.put("Muraganda Petroglyphs", new String[] {"Muraganda_Petroglyphs"}); cardToEffectsList.put("Nut Collector", new String[] {"Nut_Collector"}); cardToEffectsList.put("Engineered Plague", new String[] {"Engineered_Plague"}); - cardToEffectsList.put("Night of Souls' Betrayal", new String[] {"Night_of_Souls_Betrayal"}); + //cardToEffectsList.put("Night of Souls' Betrayal", new String[] {"Night_of_Souls_Betrayal"}); cardToEffectsList.put("Thelonite Hermit", new String[] {"Thelonite_Hermit"}); cardToEffectsList.put("Deranged Hermit", new String[] {"Deranged_Hermit"}); cardToEffectsList.put("Jacques le Vert", new String[] {"Jacques"});