Merge remote-tracking branch 'origin/gui' into gui

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java

@@ -134,6 +134,7 @@ public class TestWorld implements GameEventListener {
     private com.jme3.math.Quaternion calculateRotationForField(int fieldID) {
         com.jme3.math.Quaternion rotation = new com.jme3.math.Quaternion();
     
+        // Berechne die Rotation basierend auf der Feld-ID
         if (fieldID >= 0 && fieldID <= 9) {
             // Untere Seite (0-9)
             rotation.fromAngleAxis(0, Vector3f.UNIT_Y); // Richtung: nach oben
@@ -148,6 +149,18 @@ public class TestWorld implements GameEventListener {
             rotation.fromAngleAxis(3 * FastMath.HALF_PI, Vector3f.UNIT_Y); // Richtung: nach rechts
         }
     
+        // Korrigiere die Richtung für die Quadranten 10–19 und 30–39 (gegenüberliegende Richtung)
+        if ((fieldID >= 10 && fieldID <= 19) || (fieldID >= 30 && fieldID <= 39)) {
+            com.jme3.math.Quaternion oppositeDirection = new com.jme3.math.Quaternion();
+            oppositeDirection.fromAngleAxis(FastMath.PI, Vector3f.UNIT_Y); // 180° drehen
+            rotation = rotation.multLocal(oppositeDirection);
+        }
+    
+        // Füge zusätzliche 90° nach links hinzu
+        com.jme3.math.Quaternion leftTurn = new com.jme3.math.Quaternion();
+        leftTurn.fromAngleAxis(FastMath.HALF_PI, Vector3f.UNIT_Y); // 90° nach links
+        rotation = rotation.multLocal(leftTurn);
+    
         return rotation;
     }
 

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuildingPropertyCard.java

@@ -67,7 +67,7 @@ public class BuildingPropertyCard extends Dialog {
         // Beenden-Button
         Button quitButton = buildingPropertyContainer.addChild(new Button("Beenden", new ElementId("button")));
         quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
+        quitButton.addClickCommands(s -> ifTopDialog( () -> {
             System.err.println("Button does something?");
             app.getGameLogic().playSound(Sound.BUTTON);
             close();

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java

@@ -13,6 +13,7 @@ import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.notification.Sound;
 
 /**
  * EventCardPopup is a popup which appears when a certain EventCard is triggered by entering a EventCardField
@@ -62,7 +63,10 @@ public class EventCardPopup extends Dialog {
         // Beenden-Button
         Button quitButton = eventCardContainer.addChild(new Button("Jawohl", new ElementId("button")));
         quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
+        quitButton.addClickCommands(source -> ifTopDialog( () -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
 
         // Zentriere das Popup
         eventCardContainer.setLocalTranslation(

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/FoodFieldCard.java

@@ -77,7 +77,7 @@ public class FoodFieldCard extends Dialog {
         // Beenden-Button
         Button quitButton = foodFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
         quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
+        quitButton.addClickCommands(s -> ifTopDialog( () -> {
             app.getGameLogic().playSound(Sound.BUTTON);
             close();
         }));

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/GateFieldCard.java

@@ -69,14 +69,14 @@ public class GateFieldCard extends Dialog {
         // Beenden-Button
         Button quitButton = gateFieldContainer.addChild(new Button("Beenden", new ElementId("button")));
         quitButton.setFontSize(32);
-        quitButton.addClickCommands(s -> ifTopDialog(() -> {
+        quitButton.addClickCommands(s -> ifTopDialog( () -> {
             app.getGameLogic().playSound(Sound.BUTTON);
             close();
         }));
         // Kaufen-Button
         Button buyButton = gateFieldContainer.addChild(new Button("Kaufen", new ElementId("button")));
         buyButton.setFontSize(32);
-        buyButton.addClickCommands(s -> ifTopDialog(() -> {
+        buyButton.addClickCommands(s -> ifTopDialog( () -> {
             app.getGameLogic().playSound(Sound.BUTTON);
             app.getGameLogic().send(new BuyPropertyResponse());
             close();

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/Gulag.java

@@ -13,6 +13,7 @@ import com.simsilica.lemur.component.QuadBackgroundComponent;
 import com.simsilica.lemur.style.ElementId;
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.notification.Sound;
 
 /**
  * Gulag is a warning popup that is triggered when a certain player enters the "Wache" field
@@ -54,17 +55,13 @@ public class Gulag extends Dialog {
         gateFieldTitle.setFontSize(48);
         gateFieldTitle.setColor(ColorRGBA.Black);
 
-        // Text, der auf der Karte steht
-        /* Container textContainer = gulagContainer.addChild(new Container());
-        textContainer.addChild(new Label("Du hast die Verbindung verloren und kannst nichts dagegen machen. Akzeptiere einfach, dass du verloren hast!", new ElementId("label-Text")));
-        textContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        textContainer.setPreferredSize(gulagContainer.getPreferredSize().addLocal(-250,-200,0));
-        */
-
         // Beenden-Button
         Button quitButton = gulagContainer.addChild(new Button("Jawohl Gulag", new ElementId("button")));
         quitButton.setFontSize(32);
-        quitButton.addClickCommands(source -> close());
+        quitButton.addClickCommands(source -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
 
 
         // Zentriere das Popup