From f9527723a3dc6485a04d578b68d6ce71c58ddb71 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 07:19:53 +0000 Subject: [PATCH] - Fixed a rare bug with the keyword: When CARDNAME enters the battlefield, return a land you control to its owner's hand. - Added Noggle Bridgebreaker. --- .gitattributes | 1 + res/cardsfolder/juntu_stakes.txt | 2 +- res/cardsfolder/noggle_bridgebreaker.txt | 9 +++++++++ src/forge/CardFactory.java | 7 ++++--- 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 res/cardsfolder/noggle_bridgebreaker.txt diff --git a/.gitattributes b/.gitattributes index 9c72fc95f20..8cf68ad2ee9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2425,6 +2425,7 @@ res/cardsfolder/noble_panther.txt -text svneol=native#text/plain res/cardsfolder/noble_steeds.txt -text svneol=native#text/plain res/cardsfolder/noble_templar.txt -text svneol=native#text/plain res/cardsfolder/nocturnal_raid.txt -text svneol=native#text/plain +res/cardsfolder/noggle_bridgebreaker.txt -text svneol=native#text/plain res/cardsfolder/nomadic_elf.txt -text svneol=native#text/plain res/cardsfolder/norwood_archers.txt -text svneol=native#text/plain res/cardsfolder/norwood_ranger.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/juntu_stakes.txt b/res/cardsfolder/juntu_stakes.txt index 3fad4b08d47..01594d5a4a3 100644 --- a/res/cardsfolder/juntu_stakes.txt +++ b/res/cardsfolder/juntu_stakes.txt @@ -1,6 +1,6 @@ Name:Juntu Stakes ManaCost:2 -Types:Enchantment +Types:Artifact Text:Creatures with power 1 or less don't untap during their controllers' untap steps. K:Permanents don't untap during their controllers' untap steps:Creature.powerLE1 K:SVar:RemAIDeck:True diff --git a/res/cardsfolder/noggle_bridgebreaker.txt b/res/cardsfolder/noggle_bridgebreaker.txt new file mode 100644 index 00000000000..4954b01ef08 --- /dev/null +++ b/res/cardsfolder/noggle_bridgebreaker.txt @@ -0,0 +1,9 @@ +Name:Noggle Bridgebreaker +ManaCost:2 UR UR +Types:Creature Noggle Rogue +Text:no text +PT:4/3 +K:When CARDNAME enters the battlefield, return a land you control to its owner's hand. +K:SVar:Rarity:Common +K:SVar:Picture:http://www.wizards.com/global/images/magic/general/noggle_bridgebreaker.jpg +End diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index 90aa2783064..2724cfe447f 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -668,10 +668,11 @@ public class CardFactory implements NewConstants { public void execute() { PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController()); CardList choice = new CardList(play.getCards()).getType("Land"); - AllZone.InputControl.setInput(CardFactoryUtil.input_targetSpecific(ability, choice, + if (!choice.isEmpty()) { + AllZone.InputControl.setInput(CardFactoryUtil.input_targetSpecific(ability, choice, "Select a land you control.", false, false)); - ButtonUtil.disableAll(); - + ButtonUtil.disableAll(); + } }//execute() };//Command card.addComesIntoPlayCommand(intoPlay);