diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java index 2ae2627a3..6506b77a6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java @@ -9,8 +9,7 @@ public interface Effect { BEFORE_WOUND, BEFORE_EXERT, BEFORE_ADD_BURDENS, BEFORE_DISCARD_FROM_PLAY, BEFORE_ADD_TWILIGHT, BEFORE_KILLED, BEFORE_HEALED, BEFORE_TAKE_CONTROL_OF_A_SITE, - BEFORE_SKIRMISH_RESOLVED, - START_OF_PHASE, END_OF_PHASE, END_OF_TURN + BEFORE_SKIRMISH_RESOLVED } /** diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java index d0357c2bf..425aab53f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java @@ -6,7 +6,6 @@ import com.gempukku.lotro.logic.actions.SystemQueueAction; import com.gempukku.lotro.logic.effects.TriggeringResultEffect; import com.gempukku.lotro.logic.modifiers.ModifiersLogic; import com.gempukku.lotro.logic.timing.AbstractSuccessfulEffect; -import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.processes.GameProcess; import com.gempukku.lotro.logic.timing.results.EndOfTurnResult; @@ -29,7 +28,7 @@ public class EndOfTurnGameProcess implements GameProcess { } }; action.appendEffect( - new TriggeringResultEffect(Effect.Type.END_OF_TURN, new EndOfTurnResult(), "End of turn")); + new TriggeringResultEffect(null, new EndOfTurnResult(), "End of turn")); action.appendEffect( new AbstractSuccessfulEffect() { @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java index b2d7d5bb0..c07af44d2 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java @@ -7,7 +7,6 @@ import com.gempukku.lotro.logic.actions.SystemQueueAction; import com.gempukku.lotro.logic.effects.TriggeringResultEffect; import com.gempukku.lotro.logic.modifiers.ModifiersLogic; import com.gempukku.lotro.logic.timing.AbstractSuccessfulEffect; -import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.processes.GameProcess; import com.gempukku.lotro.logic.timing.results.EndOfPhaseResult; @@ -34,7 +33,7 @@ public class EndOfPhaseGameProcess implements GameProcess { } }; action.appendEffect( - new TriggeringResultEffect(Effect.Type.END_OF_PHASE, new EndOfPhaseResult(_phase), "End of " + _phase + " phase")); + new TriggeringResultEffect(null, new EndOfPhaseResult(_phase), "End of " + _phase + " phase")); action.appendEffect( new AbstractSuccessfulEffect() { @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java index 51ef5dd1b..e489d5d2d 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java @@ -7,7 +7,6 @@ import com.gempukku.lotro.logic.actions.SystemQueueAction; import com.gempukku.lotro.logic.effects.TriggeringResultEffect; import com.gempukku.lotro.logic.modifiers.ModifiersLogic; import com.gempukku.lotro.logic.timing.AbstractSuccessfulEffect; -import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.processes.GameProcess; import com.gempukku.lotro.logic.timing.results.StartOfPhaseResult; @@ -54,7 +53,7 @@ public class StartOfPhaseGameProcess implements GameProcess { } }); action.appendEffect( - new TriggeringResultEffect(Effect.Type.START_OF_PHASE, new StartOfPhaseResult(_phase), "Start of " + _phase + " phase")); + new TriggeringResultEffect(null, new StartOfPhaseResult(_phase), "Start of " + _phase + " phase")); _game.getActionsEnvironment().addActionToStack(action); }