From c52fc8c6125b70a2cec0bf7c6eac1f814359f07e Mon Sep 17 00:00:00 2001 From: elcnesh Date: Mon, 28 Jul 2014 13:26:02 +0000 Subject: [PATCH] Add Ogre Enforcer. --- .gitattributes | 1 + forge-game/src/main/java/forge/game/GameAction.java | 13 ++++++++++--- forge-gui/res/cardsfolder/o/ogre_enforcer.txt | 7 +++++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 forge-gui/res/cardsfolder/o/ogre_enforcer.txt diff --git a/.gitattributes b/.gitattributes index 178a5995b7b..04365fd68a9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9551,6 +9551,7 @@ forge-gui/res/cardsfolder/o/offering_to_asha.txt svneol=native#text/plain forge-gui/res/cardsfolder/o/ogre_arsonist.txt svneol=native#text/plain forge-gui/res/cardsfolder/o/ogre_battledriver.txt -text forge-gui/res/cardsfolder/o/ogre_berserker.txt svneol=native#text/plain +forge-gui/res/cardsfolder/o/ogre_enforcer.txt -text forge-gui/res/cardsfolder/o/ogre_gatecrasher.txt svneol=native#text/plain forge-gui/res/cardsfolder/o/ogre_geargrabber.txt -text forge-gui/res/cardsfolder/o/ogre_jailbreaker.txt -text diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 9fa74c7aa6c..b87a4752bdb 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -845,10 +845,17 @@ public class GameAction { if (c.getNetDefense() <= 0) { noRegCreats.add(c); checkAgain = true; - } else - + } else if (c.hasKeyword("CARDNAME can't be destroyed by lethal damage unless lethal damage dealt by a single source is marked on it.")) { + for (final Integer dmg : c.getReceivedDamageFromThisTurn().values()) { + if (c.getNetDefense() <= dmg.intValue()) { + desCreats.add(c); + checkAgain = true; + break; + } + } + } // Rule 704.5g - Destroy due to lethal damage - if (c.getNetDefense() <= c.getDamage()) { + else if (c.getNetDefense() <= c.getDamage()) { desCreats.add(c); checkAgain = true; } diff --git a/forge-gui/res/cardsfolder/o/ogre_enforcer.txt b/forge-gui/res/cardsfolder/o/ogre_enforcer.txt new file mode 100644 index 00000000000..2fcc7c42afc --- /dev/null +++ b/forge-gui/res/cardsfolder/o/ogre_enforcer.txt @@ -0,0 +1,7 @@ +Name:Ogre Enforcer +ManaCost:3 R R +Types:Creature Ogre +PT:4/4 +K:CARDNAME can't be destroyed by lethal damage unless lethal damage dealt by a single source is marked on it. +SVar:Picture:http://www.wizards.com/global/images/magic/general/ogre_enforcer.jpg +Oracle:Ogre Enforcer can't be destroyed by lethal damage unless lethal damage dealt by a single source is marked on it.