From a10c5ea3ebb8dcefbc67b8284a15109baf19aac3 Mon Sep 17 00:00:00 2001 From: moomarc Date: Mon, 16 Jan 2012 05:33:40 +0000 Subject: [PATCH] Added Runeflare Trap Small Checkstyle fix --- .gitattributes | 1 + res/cardsfolder/r/runeflare_trap.txt | 13 +++++++++++++ .../forge/card/cardfactory/CardFactoryUtil.java | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 res/cardsfolder/r/runeflare_trap.txt diff --git a/.gitattributes b/.gitattributes index ffe3daf566f..002847b530c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7027,6 +7027,7 @@ res/cardsfolder/r/runeclaw_bear.txt svneol=native#text/plain res/cardsfolder/r/runed_arch.txt svneol=native#text/plain res/cardsfolder/r/runed_servitor.txt svneol=native#text/plain res/cardsfolder/r/runed_stalactite.txt svneol=native#text/plain +res/cardsfolder/r/runeflare_trap.txt -text res/cardsfolder/r/runes_of_the_deus.txt svneol=native#text/plain res/cardsfolder/r/runic_repetition.txt -text res/cardsfolder/r/rupture.txt svneol=native#text/plain diff --git a/res/cardsfolder/r/runeflare_trap.txt b/res/cardsfolder/r/runeflare_trap.txt new file mode 100644 index 00000000000..37456ab5e78 --- /dev/null +++ b/res/cardsfolder/r/runeflare_trap.txt @@ -0,0 +1,13 @@ +Name:Runeflare Trap +ManaCost:4 R R +Types:Instant Trap +Text:no text +A:SP$DealDamage | Cost$ R | ValidTgts$ Player | NumDmg$ X | CheckSVar$ Y | SVarCompare$ GE3 | SpellDescription$ If an opponent drew three or more cards this turn, you may pay R rather than pay CARDNAME's mana cost. +A:SP$DealDamage | Cost$ 4 R R | ValidTgts$ Player | NumDmg$ X | SpellDescription$ CARDNAME deals damage to target player equal to the number of cards in that player's hand. +SVar:X:TargetedPlayer$CardsInHand +SVar:Y:Count$OppDrewThisTurn +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/runeflare_trap.jpg +SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/146.jpg +Oracle:If an opponent drew three or more cards this turn, you may pay {R} rather than pay Runeflare Trap's mana cost.\nRuneflare Trap deals damage to target player equal to the number of cards in that player's hand. +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 05e4a7cc98e..687c11f0f26 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2757,11 +2757,11 @@ public class CardFactoryUtil { return 0; } } - - if(sq[0].equals("YouDrewThisTurn")) { + + if (sq[0].equals("YouDrewThisTurn")) { return CardFactoryUtil.doXMath(c.getController().getNumDrawnThisTurn(), m, c); } - if(sq[0].equals("OppDrewThisTurn")) { + if (sq[0].equals("OppDrewThisTurn")) { return CardFactoryUtil.doXMath(c.getController().getOpponent().getNumDrawnThisTurn(), m, c); }