From 0e8a4814dd326ceb4c734e05bff71113ffe4ea8b Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 28 Nov 2011 18:02:48 +0000 Subject: [PATCH] Removing heal effect after trigger. --- .../logic/effects/HealCharactersEffect.java | 3 --- .../lotro/logic/timing/EffectResult.java | 5 ++++- .../logic/timing/results/HealResult.java | 19 ------------------- 3 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/HealResult.java diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java index 289f86dc2..6b3932ef7 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/HealCharactersEffect.java @@ -9,7 +9,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; import com.gempukku.lotro.logic.timing.Effect; -import com.gempukku.lotro.logic.timing.results.HealResult; import java.util.Collection; @@ -58,8 +57,6 @@ public class HealCharactersEffect extends AbstractPreventableCardEffect { for (PhysicalCard cardToHeal : cardsToHeal) { game.getGameState().removeWound(cardToHeal); } - - game.getActionsEnvironment().emitEffectResult(new HealResult(cardsToHeal)); } } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java index fbece8fb7..5f07828d2 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/EffectResult.java @@ -2,9 +2,12 @@ package com.gempukku.lotro.logic.timing; public abstract class EffectResult { public enum Type { + // Translated to new format ANY_NUMBER_KILLED, FOR_EACH_KILLED, + FOR_EACH_WOUNDED, - FOR_EACH_WOUNDED, HEAL, EXERT, DISCARD_FROM_PLAY, DISCARD_FROM_HAND, + // Old format + EXERT, DISCARD_FROM_PLAY, DISCARD_FROM_HAND, FREE_PEOPLE_PLAYER_STARTS_ASSIGNING, diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/HealResult.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/HealResult.java deleted file mode 100644 index 8f2300995..000000000 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/results/HealResult.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gempukku.lotro.logic.timing.results; - -import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.logic.timing.EffectResult; - -import java.util.Collection; - -public class HealResult extends EffectResult { - private Collection _cards; - - public HealResult(Collection cards) { - super(Type.HEAL); - _cards = cards; - } - - public Collection getCards() { - return _cards; - } -}