From 7ed642bf20b76ad6e164790312954dbfb0737a8b Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 1 Sep 2011 12:27:22 +0000 Subject: [PATCH] - Expanded and changed digUntilStackDescription. - Added Sacred Guide. --- .gitattributes | 1 + res/cardsfolder/h/hermit_druid.txt | 2 +- res/cardsfolder/s/sacred_guide.txt | 11 +++++++++++ .../card/abilityFactory/AbilityFactory_Reveal.java | 12 +++++------- 4 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 res/cardsfolder/s/sacred_guide.txt diff --git a/.gitattributes b/.gitattributes index e442c9b1630..081436a8a4b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6360,6 +6360,7 @@ res/cardsfolder/s/sabretooth_tiger.txt svneol=native#text/plain res/cardsfolder/s/sacellum_archers.txt svneol=native#text/plain res/cardsfolder/s/sachi_daughter_of_seshiro.txt svneol=native#text/plain res/cardsfolder/s/sacred_foundry.txt svneol=native#text/plain +res/cardsfolder/s/sacred_guide.txt -text res/cardsfolder/s/sacred_knight.txt svneol=native#text/plain res/cardsfolder/s/sacred_nectar.txt svneol=native#text/plain res/cardsfolder/s/sacred_prey.txt svneol=native#text/plain diff --git a/res/cardsfolder/h/hermit_druid.txt b/res/cardsfolder/h/hermit_druid.txt index b9fbb4bbece..25c95791f98 100644 --- a/res/cardsfolder/h/hermit_druid.txt +++ b/res/cardsfolder/h/hermit_druid.txt @@ -3,7 +3,7 @@ ManaCost:1 G Types:Creature Human Druid Text:no text PT:1/1 -A:AB$ DigUntil | Cost$ G T | Valid$ Land.Basic | ValidDescription$ Basic Land | FoundDestination$ Hand | RevealedDestination$ Graveyard | SpellDescription$ Reveal cards from the top of your library until you reveal a basic land card. Put that card into your hand and all other cards revealed this way into your graveyard. +A:AB$ DigUntil | Cost$ G T | Valid$ Land.Basic | ValidDescription$ basic land | FoundDestination$ Hand | RevealedDestination$ Graveyard | SpellDescription$ Reveal cards from the top of your library until you reveal a basic land card. Put that card into your hand and all other cards revealed this way into your graveyard. SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/hermit_druid.jpg diff --git a/res/cardsfolder/s/sacred_guide.txt b/res/cardsfolder/s/sacred_guide.txt new file mode 100644 index 00000000000..184bacdc5c9 --- /dev/null +++ b/res/cardsfolder/s/sacred_guide.txt @@ -0,0 +1,11 @@ +Name:Sacred Guide +ManaCost:W +Types:Creature Human Cleric +Text:no text +PT:1/1 +A:AB$ DigUntil | Cost$ 1 W Sac<1/CARDNAME> | Valid$ Card.White | ValidDescription$ white | FoundDestination$ Hand | RevealedDestination$ Exile | SpellDescription$ Reveal cards from the top of your library until you reveal a white card. Put that card into your hand and exile all other cards revealed this way. +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/sacred_guide.jpg +SetInfo:TMP|Rare|http://magiccards.info/scans/en/tp/250.jpg +End \ No newline at end of file diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java index 3d0658ec157..3cc7bbdea7e 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java @@ -646,7 +646,7 @@ public final class AbilityFactory_Reveal { } sb.append("reveals cards from his or her library until revealing "); - sb.append(untilAmount).append(" ").append(desc); + sb.append(untilAmount).append(" ").append(desc).append(" card"); if (untilAmount != 1) { sb.append("s"); } @@ -662,16 +662,14 @@ public final class AbilityFactory_Reveal { if (found.equals(Constant.Zone.Hand)) { sb.append("into his or her hand "); } - - sb.append("and all other cards "); - } - else { - sb.append("the revealed cards "); } String revealed = params.get("RevealedDestination"); if (revealed.equals(Constant.Zone.Graveyard)) { - sb.append("into his or her graveyard."); + sb.append("and all other cards into his or her graveyard."); + } + if (revealed.equals(Constant.Zone.Exile)) { + sb.append("and exile all other cards revealed this way."); } Ability_Sub abSub = sa.getSubAbility();