From c09a0633bb07fda7982783b6495eae88142fd644 Mon Sep 17 00:00:00 2001 From: jeffwadsworth Date: Wed, 22 Feb 2012 07:34:48 +0000 Subject: [PATCH] - Added Omen Machine. --- .gitattributes | 1 + res/cardsfolder/o/omen_machine.txt | 18 ++++++++++++++++++ src/main/java/forge/Player.java | 6 +++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 res/cardsfolder/o/omen_machine.txt diff --git a/.gitattributes b/.gitattributes index 09b4288ccff..fa1b5690b14 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6138,6 +6138,7 @@ res/cardsfolder/o/old_man_of_the_sea.txt svneol=native#text/plain res/cardsfolder/o/olivia_voldaren.txt -text res/cardsfolder/o/omega_myr.txt svneol=native#text/plain res/cardsfolder/o/omen.txt svneol=native#text/plain +res/cardsfolder/o/omen_machine.txt -text svneol=unset#text/plain res/cardsfolder/o/omen_of_fire.txt svneol=native#text/plain res/cardsfolder/o/omnath_locus_of_mana.txt svneol=native#text/plain res/cardsfolder/o/omnibian.txt svneol=native#text/plain diff --git a/res/cardsfolder/o/omen_machine.txt b/res/cardsfolder/o/omen_machine.txt new file mode 100644 index 00000000000..6f69c81e766 --- /dev/null +++ b/res/cardsfolder/o/omen_machine.txt @@ -0,0 +1,18 @@ +Name:Omen Machine +ManaCost:6 +Types:Artifact +Text:no text +K:Players can't draw cards. +T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | Execute$ TrigOmenExileCardYou | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's draw step, that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able. +SVar:TrigOmenExileCardYou:AB$ Mill | Cost$ 0 | NumCards$ 1 | Defined$ You | Destination$ Exile | RememberMilled$ True | SubAbility$ DBOmenPlayYou +SVar:DBOmenPlayYou:DB$ Play | ValidZone$ Exile | Controller$ TriggeredPlayer | Valid$ Remembered | WithoutManaCost$ True | SubAbility$ DBOmenCleanupYou +SVar:DBOmenCleanupYou:DB$ Cleanup | ClearRemembered$ True +T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Opponent | Execute$ TrigOmenExileCardOpp | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ At the beginning of each player's draw step, that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able. +SVar:TrigOmenExileCardOpp:AB$ Mill | Cost$ 0 | NumCards$ 1 | Destination$ Exile | Defined$ Opponent | RememberMilled$ True | SubAbility$ DBOmenPlayOpp +SVar:DBOmenPlayOpp:DB$ Play | ValidZone$ Exile | Controller$ TriggeredPlayer | Valid$ Remembered | WithoutManaCost$ True | SubAbility$ DBOmenCleanupOpp +SVar:DBOmenCleanupOpp:DB$ Cleanup | ClearRemembered$ True +SVar:RemAIDeck:True +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/omen_machine.jpg +End \ No newline at end of file diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java index d39f3f2618f..2cb334e2b01 100644 --- a/src/main/java/forge/Player.java +++ b/src/main/java/forge/Player.java @@ -1121,7 +1121,11 @@ public abstract class Player extends GameEntity { * @return true if a player can draw a card, false otherwise */ public final boolean canDraw() { - return !AllZoneUtil.isCardInPlay("Maralen of the Mornsong"); + if (AllZoneUtil.isCardInPlay("Omen Machine") || AllZoneUtil.isCardInPlay("Maralen of the Mornsong")) + { + return false; + } + return true; } /**