From a667af5a469bc6ce0d78fffbe5a28e6d880767f8 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Fri, 25 Jul 2014 13:41:37 +0000 Subject: [PATCH] Introducing adventures. --- .../src/main/java/com/gempukku/lotro/game/Adventure.java | 4 +++- .../com/gempukku/lotro/game/adventure/DefaultAdventure.java | 6 ++++++ .../logic/timing/processes/turn/FellowshipGameProcess.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/Adventure.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/Adventure.java index 957c1aecf..06880a214 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/Adventure.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/Adventure.java @@ -12,6 +12,8 @@ import java.util.Set; public interface Adventure { public void applyAdventureRules(LotroGame game, DefaultActionsEnvironment actionsEnvironment, ModifiersLogic modifiersLogic); + GameProcess getStartingGameProcess(Set players, PlayerOrderFeedback playerOrderFeedback); + public void appendNextSiteAction(SystemQueueAction action); public GameProcess getAfterFellowshipArcheryGameProcess(int fellowshipArcheryTotal, GameProcess followingProcess); @@ -22,5 +24,5 @@ public interface Adventure { GameProcess getPlayerStaysGameProcess(LotroGame game, GameProcess followingProcess); - GameProcess getStartingGameProcess(Set players, PlayerOrderFeedback playerOrderFeedback); + GameProcess getAfterFellowshipPhaseGameProcess(); } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/adventure/DefaultAdventure.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/adventure/DefaultAdventure.java index b7abae98f..cd2dba1e4 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/adventure/DefaultAdventure.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/adventure/DefaultAdventure.java @@ -14,6 +14,7 @@ import com.gempukku.lotro.logic.timing.PlayerOrderFeedback; import com.gempukku.lotro.logic.timing.UnrespondableEffect; import com.gempukku.lotro.logic.timing.processes.GameProcess; import com.gempukku.lotro.logic.timing.processes.pregame.BiddingGameProcess; +import com.gempukku.lotro.logic.timing.processes.turn.ShadowPhasesGameProcess; import com.gempukku.lotro.logic.timing.processes.turn.archery.FellowshipPlayerChoosesShadowPlayerToAssignDamageToGameProcess; import com.gempukku.lotro.logic.timing.processes.turn.assign.ShadowPlayersAssignTheirMinionsGameProcess; import com.gempukku.lotro.logic.timing.processes.turn.regroup.DiscardAllMinionsGameProcess; @@ -83,6 +84,11 @@ public class DefaultAdventure implements Adventure { new DiscardAllMinionsGameProcess(followingProcess))); } + @Override + public GameProcess getAfterFellowshipPhaseGameProcess() { + return new ShadowPhasesGameProcess(); + } + @Override public GameProcess getStartingGameProcess(Set players, PlayerOrderFeedback playerOrderFeedback) { return new BiddingGameProcess(players, playerOrderFeedback); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/FellowshipGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/FellowshipGameProcess.java index 463fd2d5f..04ed0688a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/FellowshipGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/FellowshipGameProcess.java @@ -20,7 +20,7 @@ public class FellowshipGameProcess implements GameProcess { new PlayerPlaysPhaseActionsUntilPassesGameProcess(game.getGameState().getCurrentPlayerId(), new MovementGameProcess( new EndOfPhaseGameProcess(Phase.FELLOWSHIP, - new ShadowPhasesGameProcess())))); + game.getFormat().getAdventure().getAfterFellowshipPhaseGameProcess())))); } @Override