From 3a531a5bc05369fadd011903749efb7cdec35d89 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:43:27 +0000 Subject: [PATCH] - Added Vulshok Heartstoker to the code block for Inner-Flame Acolyte. --- .gitattributes | 1 + res/cardsfolder/vulshok_heartstoker.txt | 8 +++++++ src/forge/CardFactory_Creatures.java | 29 +++++++++++++++---------- 3 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 res/cardsfolder/vulshok_heartstoker.txt diff --git a/.gitattributes b/.gitattributes index 5076c2078e5..8583e73c2f8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4316,6 +4316,7 @@ res/cardsfolder/vug_lizard.txt -text svneol=native#text/plain res/cardsfolder/vulshok_battlegear.txt -text svneol=native#text/plain res/cardsfolder/vulshok_berserker.txt -text svneol=native#text/plain res/cardsfolder/vulshok_gauntlets.txt -text svneol=native#text/plain +res/cardsfolder/vulshok_heartstoker.txt -text svneol=native#text/plain res/cardsfolder/vulshok_morningstar.txt -text svneol=native#text/plain res/cardsfolder/vulshok_replica.txt -text svneol=native#text/plain res/cardsfolder/vulshok_sorcerer.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/vulshok_heartstoker.txt b/res/cardsfolder/vulshok_heartstoker.txt new file mode 100644 index 00000000000..6f93e2786e8 --- /dev/null +++ b/res/cardsfolder/vulshok_heartstoker.txt @@ -0,0 +1,8 @@ +Name:Vulshok Heartstoker +ManaCost:2 R +Types:Creature Human Shaman +Text:When Vulshok Heartstoker enters the battlefield, target creature gets +2/+0 until end of turn. +PT:2/2 +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/vulshok_heartstoker.jpg +End diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index ceeda6c370c..a1babc29600 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -3275,7 +3275,7 @@ public class CardFactory_Creatures { //*************** START *********** START ************************** - else if(cardName.equals("Inner-Flame Acolyte")) { + else if(cardName.equals("Inner-Flame Acolyte") || cardName.equals("Vulshok Heartstoker")) { final CommandReturn getCreature = new CommandReturn() { //get target card, may be null public Object execute() { @@ -3314,14 +3314,18 @@ public class CardFactory_Creatures { if(AllZone.GameAction.isCardInPlay(c) && CardFactoryUtil.canTarget(card, c)) { c.addTempAttackBoost(2); - c.addExtrinsicKeyword("Haste"); + if (card.getName().equals("Inner-Flame Acolyte")) { + c.addExtrinsicKeyword("Haste"); + } AllZone.EndOfTurn.addUntil(new Command() { private static final long serialVersionUID = -6478147896119509688L; public void execute() { c.addTempAttackBoost(-2); - c.removeExtrinsicKeyword("Haste"); + if (card.getName().equals("Inner-Flame Acolyte")) { + c.removeExtrinsicKeyword("Haste"); + } } }); }//if @@ -3359,15 +3363,16 @@ public class CardFactory_Creatures { return (o != null) && AllZone.getZone(getSourceCard()).is(Constant.Zone.Hand); } }); - - card.addSpellAbility(new Spell_Evoke(card, "R") { - private static final long serialVersionUID = 8173305091293824506L; - - @Override - public boolean canPlayAI() { - return false; - } - }); + if (card.getName().equals("Inner-Flame Acolyte")) { + card.addSpellAbility(new Spell_Evoke(card, "R") { + private static final long serialVersionUID = 8173305091293824506L; + + @Override + public boolean canPlayAI() { + return false; + } + }); + } }//*************** END ************ END **************************