add actions

Author: Androz2091

src/ch/epfl/chacun/Main.java

@@ -32,6 +32,17 @@ public static void main(String[] args) {
         launch(args);
     }
 
+    private void saveState(
+        ActionEncoder.StateAction stateAction,
+        SimpleObjectProperty<GameState> gameStateO,
+        SimpleObjectProperty<List<String>> actionsO
+    ) {
+        gameStateO.setValue(stateAction.gameState());
+        List<String> newActions = new ArrayList<>(actionsO.getValue());
+        newActions.add(stateAction.action());
+        actionsO.setValue(newActions);
+    }
+
     private TileDecks getShuffledTileDecks(Long seed) {
         List<Tile> tiles = new ArrayList<>(Tiles.TILES);
         if (seed != null) {
@@ -73,7 +84,6 @@ public void start(Stage primaryStage) {
             tileDecks,
             textMaker
         );
-        gameState = gameState.withStartingTilePlaced();
 
         SimpleObjectProperty<GameState> gameStateO = new SimpleObjectProperty<>(gameState);
         ObservableValue<List<MessageBoard.Message>> observableMessagesO = gameStateO.map(
@@ -85,42 +95,44 @@ public void start(Stage primaryStage) {
         ObservableValue<TileDecks> tileDecksO = gameStateO.map(GameState::tileDecks);
         ObservableValue<Integer> leftNormalTilesO = tileDecksO.map(tDecks -> tDecks.normalTiles().size());
         ObservableValue<Integer> leftMenhirTilesO = tileDecksO.map(tDecks -> tDecks.menhirTiles().size());
-        ObservableValue<String> textToDisplayO = gameStateO.map(gameState1 ->
-            switch (gameState1.nextAction()){
+        ObservableValue<String> textToDisplayO = gameStateO.map(gState ->
+            switch (gState.nextAction()){
                 case GameState.Action.OCCUPY_TILE -> textMaker.clickToOccupy();
                 case GameState.Action.RETAKE_PAWN -> textMaker.clickToUnoccupy();
                 default -> "";
             }
         );
 
+        SimpleObjectProperty<List<String>> actionsO = new SimpleObjectProperty<>(List.of());
+
         Consumer<Occupant> onOccupantClick = occupant -> {
             // todo handle things
             GameState currentGameState = gameStateO.getValue();
             if (currentGameState.nextAction() == GameState.Action.OCCUPY_TILE) {
                 assert currentGameState.board().lastPlacedTile() != null;
                 int lastPlacedTileId = currentGameState.board().lastPlacedTile().id();
                 if (occupant != null && Zone.tileId(occupant.zoneId()) != lastPlacedTileId) return;
-                gameStateO.setValue(currentGameState.withNewOccupant(occupant));
+                ActionEncoder.StateAction stateAction = ActionEncoder.withNewOccupant(currentGameState, occupant);
+                saveState(stateAction, gameStateO, actionsO);
             }
             else if (currentGameState.nextAction() == GameState.Action.RETAKE_PAWN) {
                 // todo check owner stuff etc
-                gameStateO.setValue(currentGameState.withOccupantRemoved(occupant));
+                ActionEncoder.StateAction stateAction = ActionEncoder.withOccupantRemoved(currentGameState, occupant);
+                saveState(stateAction, gameStateO, actionsO);
             }
         };
 
-        SimpleObjectProperty<List<String>> actions = new SimpleObjectProperty<>(List.of());
-
         Consumer<String> onEnteredAction = action -> {
             ActionEncoder.StateAction newSt = ActionEncoder.decodeAndApply(gameStateO.getValue(), action);
             if (newSt != null) {
-                gameStateO.setValue(newSt.gameState());
+                saveState(newSt, gameStateO, actionsO);
             }
         };
 
         Node playersNode = PlayersUI.create(gameStateO, new TextMakerFr(playersNames));
         Node messagesNode = MessageBoardUI.create(observableMessagesO, highlightedTilesO);
         Node decksNode = DecksUI.create(tileToPlaceO, leftNormalTilesO, leftMenhirTilesO, textToDisplayO, onOccupantClick);
-        Node actionsNode = ActionsUI.create(actions, onEnteredAction);
+        Node actionsNode = ActionsUI.create(actionsO, onEnteredAction);
 
         SimpleObjectProperty<Rotation> nextRotationO = new SimpleObjectProperty<>(Rotation.NONE);
         Consumer<Rotation> onRotationClick = r -> {
@@ -139,7 +151,8 @@ else if (currentGameState.nextAction() == GameState.Action.RETAKE_PAWN) {
                 nextRotationO.getValue(),
                 pos
             );
-            gameStateO.setValue(currentGameState.withPlacedTile(placedTile));
+            ActionEncoder.StateAction stateAction = ActionEncoder.withPlacedTile(currentGameState, placedTile);
+            saveState(stateAction, gameStateO, actionsO);
         };
 
         ObservableValue<Set<Occupant>> visibleOccupants = gameStateO.map(gState -> {
@@ -179,5 +192,7 @@ else if (currentGameState.nextAction() == GameState.Action.RETAKE_PAWN) {
         primaryStage.setTitle("ChaCuN");
         primaryStage.show();
 
+        gameStateO.setValue(gameStateO.getValue().withStartingTilePlaced());
+
     }
 }

src/ch/epfl/chacun/gui/BoardUI.java

@@ -87,7 +87,11 @@ public static Node create(
         // the fringe only exists when the next action is to place a tile
         ObservableValue<Set<Pos>> fringeTilesO = gameStateO.map(
                 state -> state.nextAction() == GameState.Action.PLACE_TILE
-                        ? boardO.getValue().insertionPositions()
+                        // important to understand
+                        // we can not use boardO.getValue() here!
+                        // because this map may be triggered before boardO gets updated!
+                        // therefore we would be using the old board
+                        ? state.board().insertionPositions()
                         : Set.of()
         );
 
@@ -168,7 +172,7 @@ public static Node create(
                 placedTileO.addListener((_, oldPlacedTile, placedTile) -> {
                     if (oldPlacedTile != null || placedTile == null) return;
 
-                    double negatedTileRotation = placedTile.rotation().negated().quarterTurnsCW();
+                    double negatedTileRotation = placedTile.rotation().negated().degreesCW();
 
                     // handle "jeton d'annulation", a marker that signals that an animal is cancelled
                     placedTile.meadowZones().stream()

src/ch/epfl/chacun/gui/DecksUI.java

@@ -51,7 +51,10 @@ public static Node create(
 
         // ImageView of the next tile to place, which has to be shown in large size
         ImageView view = new ImageView();
-        view.setImage(ImageLoader.largeImageForTile(tileO.getValue().id()));
+        view.imageProperty().bind(tileO.map(t ->
+            t == null
+                ? ImageLoader.EMPTY_IMAGE
+                : ImageLoader.largeImageForTile(t.id())));
         view.setFitHeight(ImageLoader.LARGE_TILE_FIT_SIZE);
         view.setFitWidth(ImageLoader.LARGE_TILE_FIT_SIZE);
         // Text, occupy tile (only visible if textToDisplay is not empty,