Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy

@@ -21,11 +21,9 @@ def sliderColor = color(0.6, 0.8, 0.8, 1)
 def sliderBgColor = color(0.5, 0.75, 0.75, 1)
 def gradientColor = color(0.5, 0.75, 0.85, 0.5)
 def tabbuttonEnabledColor = color(0.4, 0.45, 0.5, 1)
-def solidWhiteBackground = new QuadBackgroundComponent(new ColorRGBA(1, 1, 1, 1))
+def solidWhiteBackground = new QuadBackgroundComponent(color(1, 1, 1, 1)) // Solid white
-def greyBackground = new QuadBackgroundComponent(new ColorRGBA(0.1f, 0.1f, 0.1f, 1.0f));
+def greyBackground = color(0.8, 0.8, 0.8, 1)  // Grey background color
-def lightGreyBackground = new QuadBackgroundComponent(new ColorRGBA(0.4f, 0.4f, 0.4f, 1.0f));
+def redBorderColor = color(1, 0, 0, 1)        // Red border color
-def lightGrey = color(0.6, 0.6, 0.6, 1.0)
-
 
 
 
@@ -248,12 +246,7 @@ selector("tab.button", "pp") {
     buttonCommands = stdButtonCommands
 }
 selector("settings-title", "pp") {
-    def outerBackground = new QuadBackgroundComponent(color(1, 0.5, 0, 1)) // Grey inner border
+    fontSize = 48 // Set font size
-    def innerBackground = new QuadBackgroundComponent(buttonBgColor) // White outer border background
-
-    background = outerBackground
-    fontSize = 40
-    insets = new Insets3f(3, 3, 3, 3)
     textHAlignment = HAlignment.Center
     textVAlignment = VAlignment.Center
  }

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

@@ -34,7 +34,7 @@ public class GameMusic extends AbstractAppState{
         return PREFERENCES.getBoolean(ENABLED_PREF, true);
     }
 
-    /**
+        /**
      * Checks if sound is enabled in the preferences.
      *
      * @return float to which the volume is set

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

@@ -30,7 +30,6 @@ public class GameSound extends AbstractAppState implements GameEventListener {
     private static final Logger LOGGER = System.getLogger(GameSound.class.getName());
     private static final Preferences PREFERENCES = getPreferences(GameSound.class);
     private static final String ENABLED_PREF = "enabled"; //NON-NLS
-    private static final String VOLUME_PREF = "volume"; //NON-NLS
 
     private AudioNode passStartSound;
     private AudioNode eventCardSound;
@@ -60,15 +59,6 @@ public class GameSound extends AbstractAppState implements GameEventListener {
         setEnabled(!isEnabled());
     }
 
-    /**
-     * Checks if sound is enabled in the preferences.
-     *
-     * @return float to which the volume is set
-     */
-    public static float volumeInPreferences() {
-        return PREFERENCES.getFloat(VOLUME_PREF, 0.5f);
-    }
-
     /**
      * Sets the enabled state of this AppState.
      * Overrides {@link com.jme3.app.state.AbstractAppState#setEnabled(boolean)}
@@ -102,7 +92,7 @@ public class GameSound extends AbstractAppState implements GameEventListener {
         tradeAcceptedSound = loadSound(app, "Sound/Effects/tradeAccepted.ogg");
         tradeRejectedSound = loadSound(app, "Sound/Effects/tradeRejected.ogg");
         winnerSound = loadSound(app, "Sound/Effects/winner.ogg");
-        looserSound = loadSound(app, "Sound/Effects/loser.ogg");
+        looserSound = loadSound(app, "Sound/Effects/looser.ogg");
         buttonSound = loadSound(app, "Sound/Effects/button.ogg");
     }
 
@@ -203,40 +193,21 @@ public class GameSound extends AbstractAppState implements GameEventListener {
         if (isEnabled() && buttonSound != null)
             buttonSound.playInstance();
     }
-    /**
-     * Sets the volume of the sounds
-     * @param vol the volume to which the sounds should be set
-     */
-    public void setVolume(float vol){
-        passStartSound.setVolume(vol);
-        eventCardSound.setVolume(vol);
-        gulagSound.setVolume(vol);
-        diceRollSound.setVolume(vol);
-        moneyCollectSound.setVolume(vol);
-        moneyLostSound.setVolume(vol);
-        tradeAcceptedSound.setVolume(vol);
-        tradeRejectedSound.setVolume(vol);
-        winnerSound.setVolume(vol);
-        looserSound.setVolume(vol);
-        buttonSound.setVolume(vol);
-
-        PREFERENCES.putFloat(VOLUME_PREF, vol);
-    }
 
     @Override
     public void receivedEvent(SoundEvent event) {
         switch (event.sound()) {
             case PASS_START -> passStart();
             case EVENT_CARD -> eventCard();
-            case GULAG -> gulag();
+            case GULAG -> eventCard();
-            case DICE_ROLL -> diceRoll();
+            case DICE_ROLL -> eventCard();
-            case MONEY_COLLECTED -> moneyCollect();
+            case MONEY_COLLECTED -> eventCard();
-            case MONEY_LOST -> moneyLost();
+            case MONEY_LOST -> eventCard();
-            case TRADE_ACCEPTED -> tradeAccepted();
+            case TRADE_ACCEPTED -> eventCard();
-            case TRADE_REJECTED -> tradeRejected();
+            case TRADE_REJECTED -> eventCard();
-            case WINNER -> winner();
+            case WINNER -> eventCard();
-            case LOSER -> looser();
+            case LOSER -> eventCard();
-            case BUTTON -> button();
+            case BUTTON -> eventCard();
         }
     }
 }

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

@@ -146,7 +146,7 @@ public class LobbyMenu extends Dialog {
         readyButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image
         readyButton.setFontSize(18); // Adjust font size
         readyButton.setBackground(new QuadBackgroundComponent(ColorRGBA.Green)); // Add color to match the style
-        readyButton.addClickCommands(source -> toggleReady()); // Add functionality
+        readyButton.addClickCommands(source -> toggleReady(null)); // Add functionality
         lowerRightMenu.addChild(readyButton);
 
         // Position the container near the bottom-right corner
@@ -204,7 +204,7 @@ public class LobbyMenu extends Dialog {
     /**
      * Schaltet den "Bereit"-Status um.
      */
-    private void toggleReady() {
+    private void toggleReady(Label playersLabel) {
         app.getGameLogic().send(new PlayerReady(true, playerInputField.getText(), figure, Integer.parseInt(startingCapital.getText())));
     }
 

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

@@ -31,8 +31,7 @@ public class SettingsMenu extends Dialog {
     private static final Preferences PREFERENCES = getPreferences(SettingsMenu.class);
     private static final String LAST_PATH = "last.file.path";
     private final MonopolyApp app;
-    private final VolumeSlider musicSlider;
+    private final VolumeSlider slider;
-    private final SoundSlider soundSlider;
 
     /**
      * Constructs the Menu dialog for the Battleship application.
@@ -42,22 +41,18 @@ public class SettingsMenu extends Dialog {
     public SettingsMenu(MonopolyApp app) {
         super(app.getDialogManager());
         this.app = app;
-        musicSlider = new VolumeSlider(app.getStateManager().getState(GameMusic.class));
+        slider = new VolumeSlider(app.getStateManager().getState(GameMusic.class));
-        soundSlider = new SoundSlider(app.getStateManager().getState(GameSound.class));
+        addChild(new Label("Einstellungen", new ElementId("header"))); //NON-NLS
-        addChild(new Label("Einstellungen", new ElementId("settings-title"))); //NON-NLS
         addChild(new Label("Sound Effekte", new ElementId("label"))); //NON-NLS
-
-        addChild(soundSlider);
-
         addChild(new Checkbox("Soundeffekte an / aus", new StateCheckboxModel(app, GameSound.class)));
         
         addChild(new Label("Hintergrund Musik", new ElementId("label"))); //NON-NLS
         addChild(new Checkbox("Musik an / aus", new StateCheckboxModel(app, GameMusic.class)));
         
-        addChild(musicSlider);
+        addChild(slider);
 
-        addChild(new Button("Zurück zum Spiel", new ElementId("button"))).addClickCommands(s -> ifTopDialog(this::close));
+        addChild(new Button("Zurück zum Spiel")).addClickCommands(s -> ifTopDialog(this::close));
-        addChild(new Button("Beenden", new ElementId("button"))).addClickCommands(s -> ifTopDialog(app::closeApp));
+        addChild(new Button("Beenden")).addClickCommands(s -> ifTopDialog(app::closeApp));
         
         update();
     }
@@ -71,8 +66,7 @@ public class SettingsMenu extends Dialog {
 
     @Override
     public void update(float delta) {
-        musicSlider.update();
+        slider.update();
-        soundSlider.update();
     }
 
     /**

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

@@ -1,32 +0,0 @@
-package pp.monopoly.client.gui;
-
-import com.simsilica.lemur.Slider;
-import pp.monopoly.client.GameMusic;
-import pp.monopoly.client.GameSound;
-
-public class SoundSlider extends Slider {
-
-    private final pp.monopoly.client.GameSound sound;
-    private double vol;
-
-    /**
-     * Constructs the Volume Slider for the Menu dialog
-     * @param sound the Effects sound instance
-     */
-    public SoundSlider(GameSound sound) {
-        super();
-        this.sound = sound;
-        vol = GameSound.volumeInPreferences();
-        getModel().setPercent(vol);
-    }
-
-    /**
-     * when triggered it updates the volume to the value set with the slider
-     */
-    public void update() {
-        if (vol != getModel().getPercent()) {
-            vol = getModel().getPercent();
-            sound.setVolume( (float) vol);
-        }
-    }
-}

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

@@ -14,7 +14,6 @@ import com.simsilica.lemur.component.SpringGridLayout;
 
 import pp.dialog.Dialog;
 import pp.monopoly.client.MonopolyApp;
-import pp.monopoly.notification.Sound;
 
 /**
  * Constructs the startup menu dialog for the Monopoly application.
@@ -55,11 +54,7 @@ public class StartMenu extends Dialog {
         startButton.setFontSize(40); // Set the font size for the button text
         startButton.setTextHAlignment(HAlignment.Center); // Center the text horizontally
 
-        startButton.addClickCommands(s -> ifTopDialog(() -> {
+        startButton.addClickCommands(s -> app.connect());
-            this.close();  // Close the StartMenu dialog
-            app.connect(); // Perform the connection logic
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
         centerMenu.addChild(startButton);
 
         // Position the center container in the middle of the screen
@@ -117,12 +112,6 @@ public class StartMenu extends Dialog {
 
     @Override
     public void escape() {
-        super.close();
+        close();
-    }
-
-    @Override
-    public void close() {
-        app.getGuiNode().detachAllChildren();
-        super.close();
     }
 }