From 1e8ab8ac22fd975b9e2b2be28729053895e6d01f Mon Sep 17 00:00:00 2001 From: Hellfish Date: Sat, 1 Dec 2012 12:37:46 +0000 Subject: [PATCH] *Added Count mode Random.. *Added Vanguard Avatar "Flametongue Kavu Avatar" --- .gitattributes | 1 + res/cardsfolder/f/flametongue_kavu_avatar.txt | 12 ++++++++++++ .../java/forge/card/cardfactory/CardFactoryUtil.java | 7 +++++++ 3 files changed, 20 insertions(+) create mode 100644 res/cardsfolder/f/flametongue_kavu_avatar.txt diff --git a/.gitattributes b/.gitattributes index bb3ee2fddeb..e4f13085ba7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3480,6 +3480,7 @@ res/cardsfolder/f/flames_of_the_firebrand.txt -text res/cardsfolder/f/flameshot.txt svneol=native#text/plain res/cardsfolder/f/flamestick_courier.txt svneol=native#text/plain res/cardsfolder/f/flametongue_kavu.txt svneol=native#text/plain +res/cardsfolder/f/flametongue_kavu_avatar.txt -text res/cardsfolder/f/flamewave_invoker.txt svneol=native#text/plain res/cardsfolder/f/flaming_sword.txt svneol=native#text/plain res/cardsfolder/f/flanking_troops.txt svneol=native#text/plain diff --git a/res/cardsfolder/f/flametongue_kavu_avatar.txt b/res/cardsfolder/f/flametongue_kavu_avatar.txt new file mode 100644 index 00000000000..d9f2a07bd6c --- /dev/null +++ b/res/cardsfolder/f/flametongue_kavu_avatar.txt @@ -0,0 +1,12 @@ +Name:Flametongue Kavu Avatar +ManaCost:no cost +Types:Vanguard +Text:no text +HandLifeModifier:+0/-6 +T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigDealDamage | TriggerZones$ Command | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, that creature deals X damage to target creature, where X is a number chosen at random from 0 to 4. +SVar:TrigDealDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ Creature | NumDmg$ X | DamageSource$ TriggeredCard +SVar:X:Count$Random.0.4 +SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/flametongue_kavu_avatar.jpg +SetInfo:VAN|Special|http://magiccards.info/extras/other/vanguard-mtgo/flametongue-kavu.jpg +Oracle:Hand +0, life -6\nWhenever a nontoken creature enters the battlefield under your control, that creature deals X damage to target creature, where X is a number chosen at random from 0 to 4. +End \ No newline at end of file diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index e1089b898df..5f458259d9c 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2729,6 +2729,13 @@ public class CardFactoryUtil { return CardFactoryUtil.doXMath(mmc, m, c); } + + //Count$Random.. + if (sq[0].equals("Random")) { + int min = Integer.parseInt(sq[1]); + int max = Integer.parseInt(sq[2]); + return forge.util.MyRandom.getRandom().nextInt(max)+min; + } n = someCards.size();