From 2344572fa5192a1dd86f9f1049040b5e57b48c7c Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 03:11:28 +0000 Subject: [PATCH] - Fixed the setStackDescription() for Hatchlings. - Replace "Computer is thinking" with "An error may have occurred. Please send the STACK REPORT to the Forge forum." - Added the Eyeblight's Ending spell (uses spDestroyTgt keyword) to cards.txt and added the LQ pic url to cards-pictures.txt. - Fixed Rappelling Scouts. - Fixed Karmic Guide. --- res/card-pictures.txt | 1 + res/cards.txt | 16 +++++++++++----- res/main.properties | 2 +- src/forge/CardFactory_Creatures.java | 6 +++--- src/forge/ComputerAI_StackNotEmpty.java | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/res/card-pictures.txt b/res/card-pictures.txt index 6594fb8850e..e043ded9898 100644 --- a/res/card-pictures.txt +++ b/res/card-pictures.txt @@ -18,6 +18,7 @@ forest.jpg http://resources.wizards.com/magic/cards/unh/en-us/card73946.jpg forest1.jpg http://gatherer.wizards.com/handlers/image.ashx?type=card&multiverseid=2748 forest2.jpg http://gatherer.wizards.com/handlers/image.ashx?type=card&multiverseid=587 forest3.jpg http://gatherer.wizards.com/handlers/image.ashx?type=card&multiverseid=586 +eyeblights_ending.jpg http://www.wizards.com/global/images/magic/general/eyeblights_ending.jpg collective_restraint.jpg http://www.wizards.com/global/images/magic/general/collective_restraint.jpg force_spike.jpg http://www.wizards.com/global/images/magic/general/force_spike.jpg daze.jpg http://www.wizards.com/global/images/magic/general/daze.jpg diff --git a/res/cards.txt b/res/cards.txt index c4b7e2635a9..343df83395c 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,9 @@ +Eyeblight's Ending +2 B +Tribal Instant Elf +Destroy target non-Elf creature. +spDestroyTgt:Creature.nonElf + Collective Restraint 3 U Enchantment @@ -669,11 +675,11 @@ Creature Human Rebel Scout no text 1/4 Flying -abPump 2 W:Protection from white. -abPump 2 W:Protection from blue. -abPump 2 W:Protection from black. -abPump 2 W:Protection from red. -abPump 2 W:Protection from green. +abPump 2 W:Protection from white +abPump 2 W:Protection from blue +abPump 2 W:Protection from black +abPump 2 W:Protection from red +abPump 2 W:Protection from green Jodah's Avenger 5 U diff --git a/res/main.properties b/res/main.properties index 3d917b28d4a..0b38b49e3ca 100644 --- a/res/main.properties +++ b/res/main.properties @@ -1,6 +1,6 @@ program/mail=mtgerror@yahoo.com program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26 -program/version=Forge -- official beta: 10/01/01, SVN revision: 262 +program/version=Forge -- official beta: 10/01/01, SVN revision: 264 tokens--file=AllTokens.txt diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 0196bd03102..d4005e604e6 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -124,7 +124,7 @@ public class CardFactory_Creatures { AllZone.Stack.add(ability); } }; - ability.setStackDescription(cardName + "enters the battlefield with four -1/-1 counters on it."); + ability.setStackDescription(cardName + " enters the battlefield with four -1/-1 counters on it."); card.addComesIntoPlayCommand(intoPlay); }//*************** END ************ END ************************** @@ -4300,7 +4300,7 @@ public class CardFactory_Creatures { card.addComesIntoPlayCommand(intoPlay); }//*************** END ************ END ************************** - //*************** START *********** START ************************** + //*************** START *********** START ************************** else if(cardName.equals("Karmic Guide")) { final SpellAbility ability = new Ability(card, "0") @@ -4310,7 +4310,7 @@ public class CardFactory_Creatures { PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController()); if(AllZone.GameAction.isCardInZone(getTargetCard(), grave)) { - PlayerZone play = AllZone.getZone(Constant.Zone.Hand, card.getController()); + PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController()); grave.remove(getTargetCard()); play.add(getTargetCard()); } diff --git a/src/forge/ComputerAI_StackNotEmpty.java b/src/forge/ComputerAI_StackNotEmpty.java index cc2575032d8..e479575b30b 100644 --- a/src/forge/ComputerAI_StackNotEmpty.java +++ b/src/forge/ComputerAI_StackNotEmpty.java @@ -5,7 +5,7 @@ public class ComputerAI_StackNotEmpty extends Input public void showMessage() { - AllZone.Display.showMessage("Phase: " +AllZone.Phase.getPhase() +"\nComputer is thinking"); + AllZone.Display.showMessage("Phase: " +AllZone.Phase.getPhase() + "\nAn error may have occurred. Please send the STACK REPORT to the Forge forum."); AllZone.Computer.stackNotEmpty(); } }