From 87e3894c47e0969cd8d4194ea59dd1a1bbaf6047 Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 15 Feb 2013 11:08:11 +0000 Subject: [PATCH] - Added Fire and Brimstone. --- .gitattributes | 1 + res/cardsfolder/f/fire_and_brimstone.txt | 12 ++++++++++++ src/main/java/forge/game/player/Player.java | 4 ++++ 3 files changed, 17 insertions(+) create mode 100644 res/cardsfolder/f/fire_and_brimstone.txt diff --git a/.gitattributes b/.gitattributes index 900db678ab8..b1b56caa43c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3553,6 +3553,7 @@ res/cardsfolder/f/final_sting_faerie.txt svneol=native#text/plain res/cardsfolder/f/final_strike.txt svneol=native#text/plain res/cardsfolder/f/finest_hour.txt svneol=native#text/plain res/cardsfolder/f/fire_ambush.txt svneol=native#text/plain +res/cardsfolder/f/fire_and_brimstone.txt -text res/cardsfolder/f/fire_ants.txt svneol=native#text/plain res/cardsfolder/f/fire_at_will.txt svneol=native#text/plain res/cardsfolder/f/fire_belly_changeling.txt svneol=native#text/plain diff --git a/res/cardsfolder/f/fire_and_brimstone.txt b/res/cardsfolder/f/fire_and_brimstone.txt new file mode 100644 index 00000000000..c15905df9e0 --- /dev/null +++ b/res/cardsfolder/f/fire_and_brimstone.txt @@ -0,0 +1,12 @@ +Name:Fire and Brimstone +ManaCost:3 W W +Types:Instant +Text:no text +A:SP$ DealDamage | Cost$ 3 W W | ValidTgts$ Player.DeclaredAttackerThisTurn | SubAbility$ DBDealDamage | TgtPrompt$ Select target player who declared an attacking creature this turn | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target player who declared an attacking creature this turn and 4 damage to you. +SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 4 +SVar:RemAIDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_and_brimstone.jpg +SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/82.jpg +Oracle:Fire and Brimstone deals 4 damage to target player who declared an attacking creature this turn and 4 damage to you. +End \ No newline at end of file diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 72da5c03831..368f5ebd472 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -2509,6 +2509,10 @@ public abstract class Player extends GameEntity implements Comparable { if (this.lifeLostThisTurn <= 0) { return false; } + } else if (property.startsWith("DeclaredAttackerThisTurn")) { + if (this.attackersDeclaredThisTurn <= 0) { + return false; + } } else if (property.equals("IsRemembered")) { if (!source.getRemembered().contains(this)) { return false;