From 3dd6fc9f377f2f5b44cae8064f5b08d3fd240cdc Mon Sep 17 00:00:00 2001
From: Felix Koppe <fkoppe@web.de>
Date: Mon, 9 Dec 2024 03:17:28 +0100
Subject: [PATCH] Add DEBUG_MULTIPLIER

---
 .../client/src/main/java/pp/mdga/client/MdgaApp.java     | 2 +-
 .../src/main/java/pp/mdga/client/ModelSynchronizer.java  | 2 ++
 .../java/pp/mdga/client/NotificationSynchronizer.java    | 7 +++++--
 .../src/main/java/pp/mdga/client/gui/DiceControl.java    | 9 ++++-----
 .../src/main/java/pp/mdga/client/gui/GuiHandler.java     | 1 +
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
index 6a69b6ba..9dcf17cc 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
@@ -66,7 +66,7 @@ public class MdgaApp extends SimpleApplication {
 
     private ServerConnection networkConnection;
 
-    public static final int DEBUG_MULTIPLIER = 0;
+    public static final int DEBUG_MULTIPLIER = 1;
 
     public MdgaApp() {
         networkConnection = new NetworkSupport(this);
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java
index cea98141..9971038b 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java
@@ -83,6 +83,8 @@ public void confirm() {
 
         GameView gameView = (GameView) app.getView();
 
+        gameView.getGuiHandler().hideText();
+
         if(a != null && b != null) {
             app.getGameLogic().selectPiece(a);
             app.getGameLogic().selectPiece(b);
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
index 7ae04de1..c90838de 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
@@ -69,7 +69,9 @@ public void update() {
                         throw new RuntimeException("no notification expected: " + n.getClass().getName());
                 }
 
-                delay = 0;
+                if(0 == MdgaApp.DEBUG_MULTIPLIER) {
+                    delay = 0;
+                }
             }
         }
     }
@@ -151,6 +153,7 @@ private void handleGame(Notification notification) {
             guiHandler.showDice();
         } else if (notification instanceof DrawCardNotification n) {
             guiHandler.drawCard(n.getColor());
+            delay = STANDARD_DELAY;
         } else if (notification instanceof HomeMoveNotification home) {
             boardHandler.movePieceHomeAnim(home.getPieceId(), home.getHomeIndex());
             guiHandler.hideText();
@@ -188,13 +191,13 @@ private void handleGame(Notification notification) {
             gameView.getGuiHandler().hideText();
             if(n.getColor() == ownColor){
                 guiHandler.rollDice(n.getEyes(), n.isTurbo() ? n.getMultiplier() : -1);
+                waitForAnimation = true;
             }
             else {
                 boardHandler.hideDice();
                 if (n.isTurbo()) guiHandler.showRolledDiceMult(n.getEyes(), n.getMultiplier(), n.getColor());
                 else guiHandler.showRolledDice(n.getEyes(), n.getColor());
             }
-            delay = 7;
         } else if (notification instanceof SelectableCardsNotification n) {
             guiHandler.setSelectableCards(n.getCards());
             gameView.showNoPower();
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 5c08d93d..42e356aa 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
@@ -11,6 +11,7 @@
 import com.jme3.scene.Spatial;
 import com.jme3.scene.control.AbstractControl;
 import pp.mdga.client.Asset;
+import pp.mdga.client.MdgaApp;
 
 import java.util.Random;
 
@@ -51,8 +52,7 @@ protected void controlUpdate(float tpf) {
                 );
 
                 // Stop rolling when angular velocity is close to zero
-//                if (angularVelocity.lengthSquared() < 3f) {
-                if(true){
+                if (angularVelocity.lengthSquared() <= 3f || MdgaApp.DEBUG_MULTIPLIER == 0) {
                     slerp = true;
                 }
             }
@@ -66,14 +66,13 @@ protected void controlUpdate(float tpf) {
                 spatial.setLocalRotation(interpolated);
 
                 // Stop rolling once duration is complete
-//                if (timeElapsed >= 1.0f) {
-                if(true){
+              if (timeElapsed >= 1.0f * MdgaApp.DEBUG_MULTIPLIER) {
                     isRolling = false;
                     slerp = false;
                     actionAfter.run();
                 }
             }
-        }else if(spin){
+        } else if(spin){
             spinWithAngularVelocity(clampedTpf);
         }
     }
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/GuiHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/GuiHandler.java
index c4024fbe..d57a99f1 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/GuiHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/GuiHandler.java
@@ -52,6 +52,7 @@ public void rollDice(int rollNum, int mult) {
             else actionTextHandler.ownDiceMult(rollNum, mult);
             hideDice();
             app.getModelSynchronize().animationEnd();
+            app.getModelSynchronize().animationEnd();
         });
     }