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

Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java

@@ -279,7 +279,7 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
     //logik zum wechselnden erscheinen und verschwinden beim drücken von B //TODO süäter entfernen
     private void handleB(boolean isPressed) {
         if (isPressed) {
-            Dialog tmp = new Gulag(this);
+            Dialog tmp = new GulagInfo(this);
             tmp.open();
         }
     }

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

@@ -43,7 +43,7 @@ public class ConfirmTrade extends Dialog {
         backgroundContainer.setPreferredSize(confirmTradeContainer.getPreferredSize().addLocal(padding, padding, 0));
         
         // Titel
-        Label title = confirmTradeContainer.addChild(new Label( "Handel", new ElementId("label-Bold")));
+        Label title = confirmTradeContainer.addChild(new Label( "Handel", new ElementId("warning-title")));
         title.setFontSize(48);
         title.setColor(ColorRGBA.Black);
 

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

@@ -0,0 +1,119 @@
+package pp.monopoly.client.gui.popups;
+
+import com.jme3.math.ColorRGBA;
+import com.simsilica.lemur.Button;
+import com.simsilica.lemur.Container;
+import com.simsilica.lemur.Label;
+import com.simsilica.lemur.component.QuadBackgroundComponent;
+import com.simsilica.lemur.style.ElementId;
+import pp.dialog.Dialog;
+import pp.monopoly.client.MonopolyApp;
+import pp.monopoly.client.gui.SettingsMenu;
+import pp.monopoly.client.gui.TradeMenu;
+import pp.monopoly.message.client.TradeResponse;
+import pp.monopoly.model.TradeHandler;
+import pp.monopoly.model.fields.PropertyField;
+import pp.monopoly.notification.Sound;
+
+/**
+ * ConfirmTrade is a popup which appears when a trade is proposed to this certain player.
+ */
+public class GulagInfo extends Dialog {
+    private final MonopolyApp app;
+    private final Container confirmTradeContainer;
+    private final Container backgroundContainer;
+
+
+    public GulagInfo(MonopolyApp app) {
+        super(app.getDialogManager());
+        this.app = app;
+
+        // Create the background container
+        backgroundContainer = new Container();
+        backgroundContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.8657f, 0.8735f, 0.8892f, 1.0f))); // Darker background
+        attachChild(backgroundContainer);
+
+        // Hauptcontainer für das Bestätigungspopup
+        confirmTradeContainer = new Container();
+
+        float padding = 10; // Passt den backgroundContainer an die Größe des confirmTradeContainer an
+        backgroundContainer.setPreferredSize(confirmTradeContainer.getPreferredSize().addLocal(padding, padding, 0));
+        
+        // Titel
+        Label title = confirmTradeContainer.addChild(new Label( "Gulag", new ElementId("warning-title")));
+        title.setFontSize(48);
+        title.setColor(ColorRGBA.Black);
+
+        // Text, der auf der Karte steht
+        // Die Werte werden dem Handel entnommen (Iwas auch immer da dann ist)
+        Container propertyValuesContainer = confirmTradeContainer.addChild(new Container());
+        propertyValuesContainer.addChild(new Label("„Du sitzt im Gefänginis und kommst nicht raus ...", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Es sei denn, du ...", new ElementId("label-Text")));// Leerzeile
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("- bestichst die Wache mit 500 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("- löst eine Gulag-Frei-Karte ein", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("- wartest 3 Runden und bezahlst dann", new ElementId("label-Text")));// Leerzeile
+        propertyValuesContainer.addChild(new Label("- oder du würfelst einen Pasch", new ElementId("label-Text")));
+        /*propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
+        propertyValuesContainer.addChild(new Label("- ", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("-  EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("- Sonderkaten", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile
+        propertyValuesContainer.addChild(new Label("tauschen, willst du das Angebot annehmen?", new ElementId("label-Text")));*/
+        propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
+
+
+        // Bezahlen-Button
+        Button negotiateButton = confirmTradeContainer.addChild(new Button("Bestechungsgeld bezahlen", new ElementId("button")));
+        negotiateButton.setFontSize(32);
+        negotiateButton.addClickCommands(s -> ifTopDialog( () -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
+        // Ereigniskarte-Button
+        Button confirmButton = confirmTradeContainer.addChild(new Button("Ereigniskarte nutzen", new ElementId("button")));
+        confirmButton.setFontSize(32);
+        confirmButton.addClickCommands(s -> ifTopDialog( () -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
+        // Schließen-Button
+        Button declineButton = confirmTradeContainer.addChild(new Button("Schließen", new ElementId("button")));
+        declineButton.setFontSize(32);
+        declineButton.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            close();
+        }));
+
+        // Zentriere das Menü
+        confirmTradeContainer.setLocalTranslation(
+            (app.getCamera().getWidth() - confirmTradeContainer.getPreferredSize().x) / 2,
+            (app.getCamera().getHeight() + confirmTradeContainer.getPreferredSize().y) / 2,
+            8
+        );
+
+        // Zentriere das Menü
+        backgroundContainer.setLocalTranslation(
+                (app.getCamera().getWidth() - confirmTradeContainer.getPreferredSize().x - padding) / 2,
+                (app.getCamera().getHeight() + confirmTradeContainer.getPreferredSize().y+ padding) / 2,
+                7
+        );
+
+        app.getGuiNode().attachChild(confirmTradeContainer);
+    }
+
+    /**
+     * Schließt das Menü und entfernt die GUI-Elemente.
+     */
+    @Override
+    public void close() {
+        app.getGuiNode().detachChild(confirmTradeContainer);  // Entferne das Menü
+        app.getGuiNode().detachChild(backgroundContainer); //Entfernt Rand
+        super.close();
+    }
+
+    @Override
+    public void escape() {
+        new SettingsMenu(app).open();
+    }
+}