From ce55ca8bb573f838302def45a412a1ec5270da48 Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Sun, 8 Dec 2024 11:39:37 +0100 Subject: [PATCH] added further node select implementation --- .../client/src/main/java/pp/mdga/client/InputSynchronizer.java | 1 + .../client/src/main/java/pp/mdga/client/board/BoardHandler.java | 2 ++ .../client/src/main/java/pp/mdga/client/gui/DiceControl.java | 1 + 3 files changed, 4 insertions(+) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java index bda4c252..090261ad 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java @@ -156,6 +156,7 @@ else if(boardSelect != null) { p = UUID.randomUUID(); gameView.getBoardHandler().addPlayer(Color.AIRFORCE,List.of(p,UUID.randomUUID(),UUID.randomUUID(),UUID.randomUUID())); gameView.getBoardHandler().movePieceStartAnim(p,0); + gameView.getBoardHandler().outlineMove(List.of(p),List.of(2),List.of(false)); //gameView.getBoardHandler().movePieceAnim(p,0, 8); } else { gameView.getBoardHandler().throwPiece(p, Color.ARMY); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java index 27723109..7b97c327 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java @@ -676,6 +676,7 @@ public void pieceSelect(PieceControl pieceSelected) { } else { pieceSelected.unSelect(); + selectedPieceNodeMap.get(pieceSelected).highlight(); selectedOwnPiece = null; } } @@ -717,6 +718,7 @@ public void clearSelectable(){ outlineNodes.clear(); selectableEnemyPieces.clear(); selectableOwnPieces.clear(); + selectedPieceNodeMap.clear(); selectedEnemyPiece = null; selectedOwnPiece = null; } diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java index 1bc83d8e..cf044203 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/DiceControl.java @@ -96,6 +96,7 @@ public void rollDice(int diceNum, Runnable actionAfter) { if (isRolling) return; spin = false; slerp = false; + timeElapsed = 0; this.actionAfter = actionAfter; angularVelocity.set( FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX),