From 51f5e4331a569303dbc17f26f06381a0e95d356f Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:19:39 +0000 Subject: [PATCH] - Improved prompt of AF Dig. - Added Ransack and Wu Spy. --- .gitattributes | 2 ++ res/cardsfolder/ransack.txt | 9 +++++++++ res/cardsfolder/wu_spy.txt | 11 +++++++++++ .../abilityFactory/AbilityFactory_Reveal.java | 16 ++++++++++++---- 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 res/cardsfolder/ransack.txt create mode 100644 res/cardsfolder/wu_spy.txt diff --git a/.gitattributes b/.gitattributes index 94eed924ac7..e3bf4023aa7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5481,6 +5481,7 @@ res/cardsfolder/rancor.txt -text svneol=native#text/plain res/cardsfolder/ranger_en_vec.txt -text svneol=native#text/plain res/cardsfolder/ranger_of_eos.txt -text svneol=native#text/plain res/cardsfolder/rank_and_file.txt -text svneol=native#text/plain +res/cardsfolder/ransack.txt -text svneol=native#text/plain res/cardsfolder/rapacious_one.txt svneol=native#text/plain res/cardsfolder/rappelling_scouts.txt -text svneol=native#text/plain res/cardsfolder/rashida_scalebane.txt svneol=native#text/plain @@ -8087,6 +8088,7 @@ res/cardsfolder/wu_infantry.txt -text svneol=native#text/plain res/cardsfolder/wu_light_cavalry.txt -text svneol=native#text/plain res/cardsfolder/wu_longbowman.txt -text svneol=native#text/plain res/cardsfolder/wu_scout.txt svneol=native#text/plain +res/cardsfolder/wu_spy.txt -text svneol=native#text/plain res/cardsfolder/wu_warship.txt -text svneol=native#text/plain res/cardsfolder/wurmcoil_engine.txt -text svneol=native#text/plain res/cardsfolder/wurms_tooth.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/ransack.txt b/res/cardsfolder/ransack.txt new file mode 100644 index 00000000000..f4b157bcfe4 --- /dev/null +++ b/res/cardsfolder/ransack.txt @@ -0,0 +1,9 @@ +Name:Ransack +ManaCost:3 U +Types:Sorcery +Text:no text +A:SP$ Dig | Cost$ 3 U | ValidTgts$ Player | DigNum$ 5 | AnyNumber$ True | DestinationZone$ Library | LibraryPosition2$ 0 | SpellDescription$ Look at the top five cards of target player's library. Put any number of them on the bottom of that library in any order and the rest on top of the library in any order. +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/ransack.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/wu_spy.txt b/res/cardsfolder/wu_spy.txt new file mode 100644 index 00000000000..7a5d2e6ac4c --- /dev/null +++ b/res/cardsfolder/wu_spy.txt @@ -0,0 +1,11 @@ +Name:Wu Spy +ManaCost:1 U +Types:Creature Human Soldier Rogue +Text:no text +PT:1/1 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top two cards of target player's library. Put one of them into his or her graveyard. +SVar:TrigDig:AB$Dig | Cost$ 0 | ValidTgts$ Player | DestinationZone$ Graveyard | DigNum$ 2 | LibraryPosition2 $ 0 +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/wu_spy.jpg +End \ No newline at end of file diff --git a/src/forge/card/abilityFactory/AbilityFactory_Reveal.java b/src/forge/card/abilityFactory/AbilityFactory_Reveal.java index 1992b90f9a9..19a88e41b7d 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_Reveal.java +++ b/src/forge/card/abilityFactory/AbilityFactory_Reveal.java @@ -297,11 +297,16 @@ public class AbilityFactory_Reveal { while(j < destZone1ChangeNum || (anyNumber && j < numToDig)) { //let user get choice Card chosen = null; + String prompt = "Choose a card to put into the "; + if (destZone1.equals("Library") && libraryPosition == -1) + prompt = "Put the rest on the bottom of the "; + if (destZone1.equals("Library") && libraryPosition == 0) + prompt = "Put the rest on top of the "; if(anyNumber || optional) { - chosen = GuiUtils.getChoiceOptional("Choose a card to put into "+destZone1, valid.toArray()); + chosen = GuiUtils.getChoiceOptional(prompt+destZone1, valid.toArray()); } else { - chosen = GuiUtils.getChoice("Choose a card to put into "+destZone1, valid.toArray()); + chosen = GuiUtils.getChoice(prompt+destZone1, valid.toArray()); } if(chosen == null || chosen.getName().equals("[No valid cards]")) break; valid.remove(chosen); @@ -322,7 +327,7 @@ public class AbilityFactory_Reveal { if(anyNumber) changeNum = valid.size();//always take all for (j=0;j 0) { Card chosen; if(rest.size() > 1) { - chosen = GuiUtils.getChoice("Put the rest in the library in any order", rest.toArray()); + String prompt = "Put the rest on top of the library in any order"; + if (libraryPosition2 == -1) + prompt = "Put the rest on the bottom of the library in any order"; + chosen = GuiUtils.getChoice(prompt, rest.toArray()); } else { chosen = rest.get(0);