ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing unused Effect types (start/end of phase and end of turn).

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-02 16:56:40 +00:00
parent 996b6f907e
commit b749cfec07
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/Effect.java
View File

@@ -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
}
/**

3
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java
View File

@@ -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

3
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java
View File

@@ -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

3
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java
View File

@@ -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);
}