From a92c0ec0a4820a82cee2dda8ada99032e7fc54f1 Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 17 Feb 2012 13:45:19 +0000 Subject: [PATCH] - Added Galvanoth. --- .gitattributes | 1 + res/cardsfolder/g/galvanoth.txt | 13 +++++++++++++ res/cardsfolder/h/horde_of_notions.txt | 2 +- res/cardsfolder/m/memory_plunder.txt | 2 +- .../card/abilityfactory/AbilityFactoryPlay.java | 6 ++++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 res/cardsfolder/g/galvanoth.txt diff --git a/.gitattributes b/.gitattributes index ef7ebe44cdb..a3b171cde7f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3304,6 +3304,7 @@ res/cardsfolder/g/galvanic_arc.txt svneol=native#text/plain res/cardsfolder/g/galvanic_blast.txt svneol=native#text/plain res/cardsfolder/g/galvanic_juggernaut.txt -text res/cardsfolder/g/galvanic_key.txt svneol=native#text/plain +res/cardsfolder/g/galvanoth.txt -text res/cardsfolder/g/gamble.txt svneol=native#text/plain res/cardsfolder/g/game_trail_changeling.txt svneol=native#text/plain res/cardsfolder/g/gamekeeper.txt -text diff --git a/res/cardsfolder/g/galvanoth.txt b/res/cardsfolder/g/galvanoth.txt new file mode 100644 index 00000000000..21aabb2b550 --- /dev/null +++ b/res/cardsfolder/g/galvanoth.txt @@ -0,0 +1,13 @@ +Name:Galvanoth +ManaCost:3 R R +Types:Creature Beast +Text:no text +PT:3/3 +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may look at the top card of your library. If it's an instant or sorcery card, you may cast it without paying its mana cost. +SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ 1 | NoMove$ True | SubAbility$ TrigPlay +SVar:TrigPlay:DB$ Play | Defined$ TopOfLibrary | WithoutManaCost$ True | Optional$ True | ConditionDefined$ TopOfLibrary | ConditionPresent$ Instant,Sorcery | ConditionCompare$ EQ1 +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/galvanoth.jpg +SetInfo:MBS|Rare|http://magiccards.info/scans/en/mbs/62.jpg +Oracle:At the beginning of your upkeep, you may look at the top card of your library. If it's an instant or sorcery card, you may cast it without paying its mana cost. +End \ No newline at end of file diff --git a/res/cardsfolder/h/horde_of_notions.txt b/res/cardsfolder/h/horde_of_notions.txt index 32bbcc009f3..36a73a0d6e1 100644 --- a/res/cardsfolder/h/horde_of_notions.txt +++ b/res/cardsfolder/h/horde_of_notions.txt @@ -6,7 +6,7 @@ PT:5/5 K:Vigilance K:Trample K:Haste -A:AB$ Play | Cost$ W U B R G | TgtZone$ Graveyard | WithoutManaCost$ True | ValidTgts$ Elemental.YouCtrl | TgtPrompt$ Choose target Elemental card from your graveyard | SpellDescription$ You may play target Elemental card from your graveyard without paying its mana cost. +A:AB$ Play | Cost$ W U B R G | TgtZone$ Graveyard | WithoutManaCost$ True | ValidTgts$ Elemental.YouCtrl | TgtPrompt$ Choose target Elemental card from your graveyard | Optional$ True | SpellDescription$ You may play target Elemental card from your graveyard without paying its mana cost. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/horde_of_notions.jpg SetInfo:LRW|Rare|http://magiccards.info/scans/en/lw/249.jpg diff --git a/res/cardsfolder/m/memory_plunder.txt b/res/cardsfolder/m/memory_plunder.txt index 98a1ed4ee73..233da4a1ea4 100644 --- a/res/cardsfolder/m/memory_plunder.txt +++ b/res/cardsfolder/m/memory_plunder.txt @@ -2,7 +2,7 @@ Name:Memory Plunder ManaCost:UB UB UB UB Types:Instant Text:no text -A:SP$ Play | Cost$ UB UB UB UB | TgtZone$ Graveyard | WithoutManaCost$ True | ValidTgts$ Instant.YouDontCtrl,Sorcery.YouDontCtrl | TgtPrompt$ Choose target instant or sorcery card from an opponent's graveyard | SpellDescription$ You may cast target instant or sorcery card from an opponent's graveyard without paying its mana cost. +A:SP$ Play | Cost$ UB UB UB UB | TgtZone$ Graveyard | WithoutManaCost$ True | ValidTgts$ Instant.YouDontCtrl,Sorcery.YouDontCtrl | TgtPrompt$ Choose target instant or sorcery card from an opponent's graveyard | Optional$ True | SpellDescription$ You may cast target instant or sorcery card from an opponent's graveyard without paying its mana cost. SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/memory_plunder.jpg diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryPlay.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryPlay.java index b168ab465aa..b84474f647a 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryPlay.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryPlay.java @@ -27,6 +27,7 @@ import forge.AllZoneUtil; import forge.Card; import forge.CardList; import forge.ComputerUtil; +import forge.GameActionUtil; import forge.Player; import forge.Constant.Zone; import forge.card.cardfactory.CardFactoryUtil; @@ -336,6 +337,11 @@ public final class AbilityFactoryPlay { } Card tgtCard = tgtCards.get(0); + final StringBuilder sb = new StringBuilder(); + sb.append("Do you want to play " + tgtCard + "?"); + if (controller.isHuman() && params.containsKey("Optional") && !GameActionUtil.showYesNoDialog(card, sb.toString())) { + return; + } if (tgtCard.isLand()) { controller.playLand(tgtCard); return;