From 99bac727c519752c67006b29a6bcbf374f5b1299 Mon Sep 17 00:00:00 2001 From: melvin Date: Sat, 14 Sep 2013 09:15:21 +0800 Subject: [PATCH] replace priority number with priority constant in MagicIfDamageWouldBeDealtTrigger --- release/Magarena/scripts/Daunting_Defender.groovy | 2 +- release/Magarena/scripts/Empyrial_Archangel.groovy | 2 +- release/Magarena/scripts/Fire_Servant.groovy | 2 +- release/Magarena/scripts/Gratuitous_Violence.groovy | 2 +- release/Magarena/scripts/Guardian_Seraph.groovy | 2 +- release/Magarena/scripts/Hedron_Field_Purists.groovy | 2 +- release/Magarena/scripts/Pariah.groovy | 2 +- src/magic/model/trigger/MagicTrigger.java | 1 + 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/release/Magarena/scripts/Daunting_Defender.groovy b/release/Magarena/scripts/Daunting_Defender.groovy index a24124cd85..fef9918953 100644 --- a/release/Magarena/scripts/Daunting_Defender.groovy +++ b/release/Magarena/scripts/Daunting_Defender.groovy @@ -1,5 +1,5 @@ [ - new MagicIfDamageWouldBeDealtTrigger(5) { + new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.PREVENT_DAMAGE) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { if (damage.getTarget().isCreature() && damage.getTarget().hasSubType(MagicSubType.Cleric) && permanent.isFriend(damage.getTarget())) { diff --git a/release/Magarena/scripts/Empyrial_Archangel.groovy b/release/Magarena/scripts/Empyrial_Archangel.groovy index b40e58a06f..32128cea13 100644 --- a/release/Magarena/scripts/Empyrial_Archangel.groovy +++ b/release/Magarena/scripts/Empyrial_Archangel.groovy @@ -1,5 +1,5 @@ [ - new MagicIfDamageWouldBeDealtTrigger(2) { + new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.REPLACE_DAMAGE) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { if (permanent.isController(damage.getTarget())) { diff --git a/release/Magarena/scripts/Fire_Servant.groovy b/release/Magarena/scripts/Fire_Servant.groovy index d8321acf03..2b370e3b61 100644 --- a/release/Magarena/scripts/Fire_Servant.groovy +++ b/release/Magarena/scripts/Fire_Servant.groovy @@ -1,5 +1,5 @@ [ - new MagicIfDamageWouldBeDealtTrigger(3) { + new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.INCREASE_DAMAGE) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { final MagicSource source=damage.getSource(); diff --git a/release/Magarena/scripts/Gratuitous_Violence.groovy b/release/Magarena/scripts/Gratuitous_Violence.groovy index ea6c280493..1dd4465eb6 100644 --- a/release/Magarena/scripts/Gratuitous_Violence.groovy +++ b/release/Magarena/scripts/Gratuitous_Violence.groovy @@ -1,5 +1,5 @@ [ - new MagicIfDamageWouldBeDealtTrigger(3) { + new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.INCREASE_DAMAGE) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { final MagicSource source = damage.getSource(); diff --git a/release/Magarena/scripts/Guardian_Seraph.groovy b/release/Magarena/scripts/Guardian_Seraph.groovy index d4da0ef9b6..091a5ef7cb 100644 --- a/release/Magarena/scripts/Guardian_Seraph.groovy +++ b/release/Magarena/scripts/Guardian_Seraph.groovy @@ -1,5 +1,5 @@ [ - new MagicIfDamageWouldBeDealtTrigger(5) { + new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.PREVENT_DAMAGE) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { if (permanent.isEnemy(damage.getSource()) && permanent.isController(damage.getTarget())) { diff --git a/release/Magarena/scripts/Hedron_Field_Purists.groovy b/release/Magarena/scripts/Hedron_Field_Purists.groovy index 981425a912..613b3bd395 100644 --- a/release/Magarena/scripts/Hedron_Field_Purists.groovy +++ b/release/Magarena/scripts/Hedron_Field_Purists.groovy @@ -13,7 +13,7 @@ } } }, - new MagicIfDamageWouldBeDealtTrigger(5) { + new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.PREVENT_DAMAGE) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { if (permanent.isFriend(damage.getTarget())) { diff --git a/release/Magarena/scripts/Pariah.groovy b/release/Magarena/scripts/Pariah.groovy index c134581439..84364dced2 100644 --- a/release/Magarena/scripts/Pariah.groovy +++ b/release/Magarena/scripts/Pariah.groovy @@ -1,5 +1,5 @@ [ - new MagicIfDamageWouldBeDealtTrigger(2) { + new MagicIfDamageWouldBeDealtTrigger(MagicTrigger.REPLACE_DAMAGE) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { if (permanent.isController(damage.getTarget()) && permanent.getEnchantedCreature().isValid()) { diff --git a/src/magic/model/trigger/MagicTrigger.java b/src/magic/model/trigger/MagicTrigger.java index cf38de0610..d9862bb0ae 100644 --- a/src/magic/model/trigger/MagicTrigger.java +++ b/src/magic/model/trigger/MagicTrigger.java @@ -12,6 +12,7 @@ public abstract class MagicTrigger implements MagicEventAction,MagicChangeCar public static final int REPLACEMENT = 1; public static final int CANT_BE_PREVENTED = 2; + public static final int INCREASE_DAMAGE = 3; public static final int PREVENT_DAMAGE = 4; public static final int REPLACE_DAMAGE = 6; private static final int DEFAULT_PRIORITY = 10;