Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui

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

@@ -114,8 +114,8 @@ public class Toolbar extends Dialog implements GameEventListener {
     private void setupBorders(Container container) {
         addBorder(0, 205, app.getCamera().getWidth(), 5, ColorRGBA.DarkGray); // Top
         addBorder(0, 5, app.getCamera().getWidth(), 10, ColorRGBA.DarkGray); // Bottom
-        addBorder(0, 200, 5, 210, ColorRGBA.DarkGray); // Left
+        addBorder(0, 200, 8, 210, ColorRGBA.DarkGray); // Left
-        addBorder(app.getCamera().getWidth() - 5, 200, 5, 210, ColorRGBA.DarkGray); // Right
+        addBorder(app.getCamera().getWidth() - 5, 200, 8, 210, ColorRGBA.DarkGray); // Right
     }
 
     /**
@@ -455,11 +455,21 @@ public class Toolbar extends Dialog implements GameEventListener {
         } + ".png";
     }
 
+    /**
+     * Handles dice roll events and updates the dice display.
+     *
+     * @param event the dice roll event containing dice values
+     */
     @Override
     public void receivedEvent(DiceRollEvent event) {
         latestDiceRollEvent = event;
     }
 
+    /**
+     * Updates the player view by refreshing the player information displayed on the toolbar.
+     *
+     * @param event the update player view event
+     */
     @Override
     public void receivedEvent(UpdatePlayerView event) {
         playerHandler = app.getGameLogic().getPlayerHandler();
@@ -508,6 +518,12 @@ public class Toolbar extends Dialog implements GameEventListener {
         }
     }
 
+    /**
+     * Updates the status of toolbar buttons based on the provided button status event.
+     * Disables or enables buttons such as trade, property menu, and end turn based on the player's turn status.
+     *
+     * @param event the button status event indicating whether the buttons should be enabled
+     */
     @Override
     public void receivedEvent(ButtonStatusEvent event) {
         System.out.println("Button status event received: " + event.buttonsEnabled()+ "GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
@@ -518,17 +534,26 @@ public class Toolbar extends Dialog implements GameEventListener {
         endTurnButton.setEnabled(false);
     }
 
+    /**
+     * Closes the toolbar, detaching it from the GUI.
+     */
     @Override
     public void close() {
         app.getGuiNode().detachChild(toolbarContainer);
         super.close();
     }
 
+    /**
+     * Opens the settings menu when the escape key is pressed.
+     */
     @Override
     public void escape() {
         new SettingsMenu(app).open();
     }
 
+    /**
+     * Updates the toolbar by refreshing player information.
+     */
     @Override
     public void update() {
         refreshPlayerView();

Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/PlayerColor.java

@@ -6,12 +6,14 @@ import com.jme3.math.ColorRGBA;
  * Enum representing six distinct colors for players in the game.
  */
 public enum PlayerColor {
-    CYAN(new ColorRGBA(1 / 255f, 190 / 255f, 254 / 255f, 1), "Cyan"),
+    CYAN(new ColorRGBA(69 / 255f, 205 / 255f, 205 / 255f, 1), "Cyan"),
-    YELLOW(new ColorRGBA(255 / 255f, 255 / 255f, 0 / 255f, 1), "Yellow"),
+    YELLOW(new ColorRGBA(225 / 255f, 201 / 255f, 44 / 255f, 1), "Yellow"),
-    RED(new ColorRGBA(255 / 255f, 0 / 255f, 0 / 255f, 1), "Red"),
+    RED(new ColorRGBA(255 / 255f, 33 / 255f, 33 / 255f, 1), "Red"),
-    PINK(new ColorRGBA(255 / 255f, 77 / 255f, 166 / 255f, 1), "Pink"),
+    PINK(new ColorRGBA(196 / 255f, 73 / 255f, 240 / 255f, 1), "Pink"),
-    GREEN(new ColorRGBA(0 / 255f, 204 / 255f, 0 / 255f, 1), "Green"),
+    GREEN(new ColorRGBA(61 / 255f, 227 / 255f, 58 / 255f, 1), "Green"),
-    PURPLE(new ColorRGBA(143 / 255f, 0 / 255f, 255 / 255f, 1), "Purple");
+    PURPLE(new ColorRGBA(60 / 255f, 74 / 255f, 223 / 255f, 1), "Purple");
+
+
 
     private final ColorRGBA color;
     private final String colorName;