From d8e44a62bdba4ef380394ef7f261d6cdd601e92e Mon Sep 17 00:00:00 2001 From: Sol Date: Fri, 16 Jan 2015 16:09:56 +0000 Subject: [PATCH] - FRF: Added Dark Deal and Write Into Being --- .gitattributes | 2 ++ .../forge/game/ability/effects/DigEffect.java | 20 ++++++++++++------- forge-gui/res/cardsfolder/d/dark_deal.txt | 12 +++++++++++ .../res/cardsfolder/w/write_into_being.txt | 8 ++++++++ 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 forge-gui/res/cardsfolder/d/dark_deal.txt create mode 100644 forge-gui/res/cardsfolder/w/write_into_being.txt diff --git a/.gitattributes b/.gitattributes index 97ef57dfebf..68a694508c8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4048,6 +4048,7 @@ forge-gui/res/cardsfolder/d/daring_thief.txt -text forge-gui/res/cardsfolder/d/dark_banishing.txt svneol=native#text/plain forge-gui/res/cardsfolder/d/dark_betrayal.txt -text forge-gui/res/cardsfolder/d/dark_confidant.txt svneol=native#text/plain +forge-gui/res/cardsfolder/d/dark_deal.txt -text forge-gui/res/cardsfolder/d/dark_depths.txt svneol=native#text/plain forge-gui/res/cardsfolder/d/dark_favor.txt svneol=native#text/plain forge-gui/res/cardsfolder/d/dark_hatchling.txt svneol=native#text/plain @@ -15733,6 +15734,7 @@ forge-gui/res/cardsfolder/w/wretched_banquet.txt -text forge-gui/res/cardsfolder/w/wrexial_the_risen_deep.txt -text forge-gui/res/cardsfolder/w/wring_flesh.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/writ_of_passage.txt -text +forge-gui/res/cardsfolder/w/write_into_being.txt -text forge-gui/res/cardsfolder/w/wu_admiral.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wu_elite_cavalry.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wu_infantry.txt svneol=native#text/plain diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java index 3edab01095b..23261729581 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java @@ -208,13 +208,19 @@ public class DigEffect extends SpellAbilityEffect { } else { int j = 0; - String prompt = "Choose a card to put into " + destZone1.name(); - if (destZone1.equals(ZoneType.Library)) { - if (libraryPosition == -1) { - prompt = "Choose a card to put on the bottom of {player's} library"; - } - else if (libraryPosition == 0) { - prompt = "Choose a card to put on top of {player's} library"; + String prompt; + + if (sa.hasParam("PrimaryPrompt")) { + prompt = sa.getParam("PrimaryPrompt"); + } else { + prompt = "Choose a card to put into " + destZone1.name(); + if (destZone1.equals(ZoneType.Library)) { + if (libraryPosition == -1) { + prompt = "Choose a card to put on the bottom of {player's} library"; + } + else if (libraryPosition == 0) { + prompt = "Choose a card to put on top of {player's} library"; + } } } diff --git a/forge-gui/res/cardsfolder/d/dark_deal.txt b/forge-gui/res/cardsfolder/d/dark_deal.txt new file mode 100644 index 00000000000..3bb6f71f12d --- /dev/null +++ b/forge-gui/res/cardsfolder/d/dark_deal.txt @@ -0,0 +1,12 @@ +Name:Dark Deal +ManaCost:2 B +Types:Sorcery +A:SP$ RepeatEach | Cost$ 2 B | RepeatPlayers$ Player | RepeatSubAbility$ DBDiscard | SpellDescription$ Each player discards all the cards in his or her hand, then draws that many cards minus one. +SVar:DBDiscard:DB$ Discard | Defined$ Player.IsRemembered | Mode$ Hand | RememberDiscarded$ True | SubAbility$ DBDraw +SVar:DBDraw:DB$ Draw | NumCards$ X | Defined$ Player.IsRemembered | References$ X | SubAbility$ CleanDrawn +SVar:CleanDrawn:DB$ Cleanup | ClearRemembered$ True +# This calculation isn't considering the remembered player, only the remembered cards? +SVar:X:Remembered$Amount.Minus.1 +SVar:RemAIDeck:True +SVar:RemRandomDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/dark_deal.jpg \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/w/write_into_being.txt b/forge-gui/res/cardsfolder/w/write_into_being.txt new file mode 100644 index 00000000000..d3a290cda22 --- /dev/null +++ b/forge-gui/res/cardsfolder/w/write_into_being.txt @@ -0,0 +1,8 @@ +Name:Write into Being +ManaCost:2 U +Types:Instant +A:SP$ Dig | Cost$ 2 U | DigNum$ 2 | ChangeNum$ 1 | NoLooking$ True | RememberChanged$ True | PrimaryPrompt$ Choose a card to Manifest | DestinationZone$ Library | LibraryPosition$ 0 | LibraryPosition2$ 0 | SkipReorder$ True | SubAbility$ DBManifest | SpellDescription$ Look at the top two cards of your library. Manifest one of those cards, then put the other on the top or bottom of your library. (To manifest a card, put it onto the battlefield face down as a 2/2 creature. Turn it face up any time for its mana cost if it's a creature card.) | StackDescription$ SpellDescription +SVar:DBManifest:DB$ Manifest | Amount$ 1 | Defined$ Remembered | SubAbility$ DBDigRemaining +SVar:DBDigRemaining:DB$ Dig | DigNum$ 1 | ChangeNum$ 1 | NoLooking$ True | Optional$ True | DestinationZone$ Library | LibraryPosition$ 0 | SubAbility$ DBCleanup | StackDescription$ None +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:Picture:http://www.wizards.com/global/images/magic/general/write_into_being.jpg \ No newline at end of file