From 0cb6b29e0cf818d8214a1af66a449de64aa9455a Mon Sep 17 00:00:00 2001 From: Sloth Date: Sat, 1 Sep 2012 10:35:57 +0000 Subject: [PATCH] - Added Skullscorch. --- .gitattributes | 1 + res/cardsfolder/d/dwarven_driller.txt | 2 +- res/cardsfolder/e/essence_of_the_wild.txt | 1 + res/cardsfolder/s/skullscorch.txt | 10 ++++++++++ src/main/java/forge/card/cost/CostUtil.java | 3 +++ 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 res/cardsfolder/s/skullscorch.txt diff --git a/.gitattributes b/.gitattributes index 0fb60078a7a..4679f1c5c1c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8598,6 +8598,7 @@ res/cardsfolder/s/skullclamp.txt svneol=native#text/plain res/cardsfolder/s/skullmane_baku.txt -text res/cardsfolder/s/skullmead_cauldron.txt svneol=native#text/plain res/cardsfolder/s/skullmulcher.txt svneol=native#text/plain +res/cardsfolder/s/skullscorch.txt -text res/cardsfolder/s/skullsnatcher.txt svneol=native#text/plain res/cardsfolder/s/skulltap.txt svneol=native#text/plain res/cardsfolder/s/sky_diamond.txt svneol=native#text/plain diff --git a/res/cardsfolder/d/dwarven_driller.txt b/res/cardsfolder/d/dwarven_driller.txt index a9efa35f731..3fea7584c41 100644 --- a/res/cardsfolder/d/dwarven_driller.txt +++ b/res/cardsfolder/d/dwarven_driller.txt @@ -3,7 +3,7 @@ ManaCost:3 R Types:Creature Dwarf Text:no text PT:2/2 -A:AB$ Destroy | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | UnlessCost$ DamageYou<2> | SpellDescription$ Destroy target land unless its controller has Dwarven Driller deal 2 damage to him or her. +A:AB$ Destroy | Cost$ T | ValidTgts$ Land | TgtPrompt$ Select target land | UnlessCost$ DamageYou<2> | SpellDescription$ Destroy target land unless its controller has CARDNAME deal 2 damage to him or her. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/dwarven_driller.jpg SetInfo:JUD|Uncommon|http://magiccards.info/scans/en/ju/85.jpg diff --git a/res/cardsfolder/e/essence_of_the_wild.txt b/res/cardsfolder/e/essence_of_the_wild.txt index 9afdf5bfafe..080b011e232 100644 --- a/res/cardsfolder/e/essence_of_the_wild.txt +++ b/res/cardsfolder/e/essence_of_the_wild.txt @@ -4,4 +4,5 @@ Types:Creature Avatar Text:no text PT:6/6 SetInfo:ISD|Mythic|http://magiccards.info/scans/en/isd/178.jpg +Oracle:Creatures you control enter the battlefield as a copy of Essence of the Wild. End \ No newline at end of file diff --git a/res/cardsfolder/s/skullscorch.txt b/res/cardsfolder/s/skullscorch.txt new file mode 100644 index 00000000000..548ca66bc34 --- /dev/null +++ b/res/cardsfolder/s/skullscorch.txt @@ -0,0 +1,10 @@ +Name:Skullscorch +ManaCost:R R +Types:Sorcery +Text:no text +A:SP$ Discard | Cost$ R R | ValidTgts$ Player | NumCards$ 2 | Mode$ Random | UnlessCost$ DamageYou<4> | UnlessPayer$ Targeted | SpellDescription$ Target player discards two cards at random unless that player has CARDNAME deal 4 damage to him or her. +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/skullscorch.jpg +SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/114.jpg +Oracle:Target player discards two cards at random unless that player has Skullscorch deal 4 damage to him or her. +End \ No newline at end of file diff --git a/src/main/java/forge/card/cost/CostUtil.java b/src/main/java/forge/card/cost/CostUtil.java index 70f8af93b21..6747c97edf0 100644 --- a/src/main/java/forge/card/cost/CostUtil.java +++ b/src/main/java/forge/card/cost/CostUtil.java @@ -160,6 +160,9 @@ public class CostUtil { && computer.canLoseLife()) { return false; } + if (source.getName().equals("Skullscorch") && computer.getCardsIn(ZoneType.Hand).size() < 2) { + return false; + } } } return true;