From b34dc48b11d3cff64e81fabf6d0a9e28fd728ff8 Mon Sep 17 00:00:00 2001
From: melvin <melvinzhang@gmail.com>
Date: Fri, 8 Nov 2013 10:46:02 +0800
Subject: [PATCH] replace MagicPermanentState.PreventAllDamage with
 MagicIfDamageWouldBeDealtTrigger.PreventDamageDealtTo

---
 release/Magarena/scripts/Elvish_Scout.groovy        |  2 +-
 release/Magarena/scripts/Fog_Bank.groovy            |  2 +-
 release/Magarena/scripts/Godtoucher.groovy          |  4 ++--
 release/Magarena/scripts/Leap_of_Faith.groovy       |  4 ++--
 src/magic/model/MagicPermanentState.java            |  1 -
 src/magic/model/action/MagicDealDamageAction.java   |  3 +--
 .../trigger/MagicIfDamageWouldBeDealtTrigger.java   | 13 +++++++++++--
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/release/Magarena/scripts/Elvish_Scout.groovy b/release/Magarena/scripts/Elvish_Scout.groovy
index 22c27c92ad..6b9d1122dd 100644
--- a/release/Magarena/scripts/Elvish_Scout.groovy
+++ b/release/Magarena/scripts/Elvish_Scout.groovy
@@ -41,7 +41,7 @@ def TARGET_ATTACKING_CREATURE_YOU_CONTROL = new MagicTargetChoice(
                     game.doAction(new MagicUntapAction(creature));
                     game.doAction(new MagicAddTurnTriggerAction(
                         creature,
-                        MagicIfDamageWouldBeDealtTrigger.PreventDamageDealtToDealtBy
+                        MagicIfDamageWouldBeDealtTrigger.PreventCombatDamageDealtToDealtBy
                     ));
                 }
             });
diff --git a/release/Magarena/scripts/Fog_Bank.groovy b/release/Magarena/scripts/Fog_Bank.groovy
index 4ac821a79a..fce1b828aa 100644
--- a/release/Magarena/scripts/Fog_Bank.groovy
+++ b/release/Magarena/scripts/Fog_Bank.groovy
@@ -1,3 +1,3 @@
 [
-    MagicIfDamageWouldBeDealtTrigger.PreventDamageDealtToDealtBy
+    MagicIfDamageWouldBeDealtTrigger.PreventCombatDamageDealtToDealtBy
 ]
diff --git a/release/Magarena/scripts/Godtoucher.groovy b/release/Magarena/scripts/Godtoucher.groovy
index a0ff50349c..f8998e71dd 100644
--- a/release/Magarena/scripts/Godtoucher.groovy
+++ b/release/Magarena/scripts/Godtoucher.groovy
@@ -36,9 +36,9 @@ def CREATURE_POWER_5_OR_MORE = new MagicPermanentFilterImpl() {
         public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPermanent(game, new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
-                    game.doAction(MagicChangeStateAction.Set(
+                    game.doAction(new MagicAddTurnTriggerAction(
                         creature,
-                        MagicPermanentState.PreventAllDamage
+                        MagicIfDamageWouldBeDealtTrigger.PreventDamageDealtTo
                     ));
                 }
             });
diff --git a/release/Magarena/scripts/Leap_of_Faith.groovy b/release/Magarena/scripts/Leap_of_Faith.groovy
index 5619896af1..ab5ffe9271 100644
--- a/release/Magarena/scripts/Leap_of_Faith.groovy
+++ b/release/Magarena/scripts/Leap_of_Faith.groovy
@@ -17,9 +17,9 @@
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicGainAbilityAction(creature,MagicAbility.Flying));
-                    game.doAction(MagicChangeStateAction.Set(
+                    game.doAction(new MagicAddTurnTriggerAction(
                         creature,
-                        MagicPermanentState.PreventAllDamage
+                        MagicIfDamageWouldBeDealtTrigger.PreventDamageDealtTo
                     ));
                 }
             });
diff --git a/src/magic/model/MagicPermanentState.java b/src/magic/model/MagicPermanentState.java
index 923d2b2be8..211966ebe2 100644
--- a/src/magic/model/MagicPermanentState.java
+++ b/src/magic/model/MagicPermanentState.java
@@ -16,7 +16,6 @@ public enum MagicPermanentState {
     CannotAttack("can't attack",""),
     NoCombatDamage("assigns no combat damage",""),
     MustPayEchoCost("echo",""),
-    PreventAllDamage("prevent all damage that would be dealt this turn",""),
     Monstrous("monstrous", "")
     ;
 
diff --git a/src/magic/model/action/MagicDealDamageAction.java b/src/magic/model/action/MagicDealDamageAction.java
index c12cf34aa2..01f1d65822 100644
--- a/src/magic/model/action/MagicDealDamageAction.java
+++ b/src/magic/model/action/MagicDealDamageAction.java
@@ -44,8 +44,7 @@ public class MagicDealDamageAction extends MagicAction {
         
         if (target.isPermanent()) {
             final MagicPermanent targetPermanent = (MagicPermanent)target;
-            if (targetPermanent.hasProtectionFrom(damage.getSource()) ||
-                targetPermanent.hasState(MagicPermanentState.PreventAllDamage)) {
+            if (targetPermanent.hasProtectionFrom(damage.getSource())) {
                 return 0;
             }
         }
diff --git a/src/magic/model/trigger/MagicIfDamageWouldBeDealtTrigger.java b/src/magic/model/trigger/MagicIfDamageWouldBeDealtTrigger.java
index bf19329927..38a2028a18 100644
--- a/src/magic/model/trigger/MagicIfDamageWouldBeDealtTrigger.java
+++ b/src/magic/model/trigger/MagicIfDamageWouldBeDealtTrigger.java
@@ -21,12 +21,21 @@ public abstract class MagicIfDamageWouldBeDealtTrigger extends MagicTrigger<Magi
         return MagicTriggerType.IfDamageWouldBeDealt;
     }
     
-    public static final MagicIfDamageWouldBeDealtTrigger PreventDamageDealtToDealtBy = new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.PREVENT_DAMAGE) {
+    public static final MagicIfDamageWouldBeDealtTrigger PreventCombatDamageDealtToDealtBy = new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.PREVENT_DAMAGE) {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
             if (damage.isCombat() && 
                 (damage.getTarget() == permanent || damage.getSource() == permanent)) {
-                // Replacement effect. Generates no event or action.
+                damage.prevent();
+            }
+            return MagicEvent.NONE;
+        }
+    };
+    
+    public static final MagicIfDamageWouldBeDealtTrigger PreventDamageDealtTo = new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.PREVENT_DAMAGE) {
+        @Override
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
+            if (damage.getTarget() == permanent) {
                 damage.prevent();
             }
             return MagicEvent.NONE;