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/BoardAppState.java

@@ -95,7 +95,7 @@ public class BoardAppState extends MonopolyAppState {
         sceneNode.detachAllChildren();
         setupScene();
         if (bobTheBuilder == null) {
-            bobTheBuilder = new BobTheBuilder(getApp(), getApp().getRootNode());
+            bobTheBuilder = new BobTheBuilder(getApp(), sceneNode);
             System.out.println("LISTENER IS REGISTEDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
             getGameLogic().addListener(bobTheBuilder);
         }
@@ -120,7 +120,7 @@ public class BoardAppState extends MonopolyAppState {
         final float x = mx - cos;
         final float y = my - sin;
         final Camera camera = getApp().getCamera();
-        camera.setLocation(new Vector3f(x, ABOVE_SEA_LEVEL, y));
+        camera.setLocation(new Vector3f(0,40,0));
         camera.lookAt(new Vector3f(0,0, 0),
                                     Vector3f.UNIT_Y);
         camera.update();
@@ -210,6 +210,24 @@ public class BoardAppState extends MonopolyAppState {
         seaGeo.setMaterial(seaMat);
         seaGeo.setShadowMode(ShadowMode.CastAndReceive);
         TangentBinormalGenerator.generate(seaGeo);
+        sceneNode.attachChild(createCardDeck());
         sceneNode.attachChild(seaGeo);
     }
+
+    private Node createCardDeck() {
+        Node cardDeck = new Node("cardDeck");
+        Spatial card = getApp().getAssetManager().loadModel("models/Kartendecks/Ereigniskarten_Deck.j3o");
+        card.setLocalTranslation(5.5f, 0, 2.7f);
+        card.setLocalScale(4.1f);
+        card.setLocalRotation(new Quaternion().fromAngleAxis(FastMath.QUARTER_PI, Vector3f.UNIT_Y));
+
+        Spatial card2 = getApp().getAssetManager().loadModel("models/Kartendecks/Gemeinschaftskarten_Deck.j3o");
+        card2.setLocalTranslation(-1.4f, 0, -3.8f);
+        card2.setLocalScale(4.1f);
+        card2.setLocalRotation(new Quaternion().fromAngleAxis(FastMath.QUARTER_PI , Vector3f.UNIT_Y));
+
+        cardDeck.attachChild(card);
+        cardDeck.attachChild(card2);
+        return cardDeck;
+    }
 }

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

@@ -120,6 +120,7 @@ public class GameSound extends AbstractAppState implements GameEventListener {
         winnerSound = loadSound(app, "Sound/Effects/winner.ogg");
         looserSound = loadSound(app, "Sound/Effects/loser.ogg");
         buttonSound = loadSound(app, "Sound/Effects/button.ogg");
+        setVolume(volumeInPreferences());
     }
 
     /**

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

@@ -95,14 +95,14 @@ public class BuildingPropertyCard extends Dialog {
         buildingPropertyContainer.setLocalTranslation(
             (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y) / 2,
-            8
+            10
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buildingPropertyContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + buildingPropertyContainer.getPreferredSize().y+ padding) / 2,
-                7
+                9
         );
 
         app.getGuiNode().attachChild(buildingPropertyContainer);

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

@@ -125,13 +125,13 @@ public class BuyHouse extends Dialog {
         buyHouseContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x) / 2,
                 (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y) / 2,
-                11
+                9
         );
 
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - buyHouseContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + buyHouseContainer.getPreferredSize().y + padding) / 2,
-                10
+                8
         );
 
         app.getGuiNode().attachChild(buyHouseContainer);

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

@@ -69,7 +69,7 @@ public class EventCardPopup extends Dialog {
         Container propertyValuesContainer = eventCardContainer.addChild(new Container());
         propertyValuesContainer.addChild(new Label(description, new ElementId("label-Text")));
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
-        propertyValuesContainer.setPreferredSize(new Vector3f(300,200,10));
+        propertyValuesContainer.setPreferredSize(new Vector3f(300,200,0));
 
         // Beenden-Button
         Button quitButton = eventCardContainer.addChild(new Button("Jawohl", new ElementId("button")));
@@ -83,14 +83,14 @@ public class EventCardPopup extends Dialog {
         eventCardContainer.setLocalTranslation(
             (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x) / 2,
             (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y) / 2,
-            9
+            8
         );
 
         // Zentriere das Popup
         backgroundContainer.setLocalTranslation(
                 (app.getCamera().getWidth() - eventCardContainer.getPreferredSize().x - padding) / 2,
                 (app.getCamera().getHeight() + eventCardContainer.getPreferredSize().y+ padding) / 2,
-                8
+                7
         );
 
         app.getGuiNode().attachChild(eventCardContainer);

Projekte/monopoly/model/src/main/java/pp/monopoly/game/client/ClientGameLogic.java

@@ -4,6 +4,7 @@ import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.jme3.math.Vector3f;
 
@@ -318,10 +319,21 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
         if (msg.isAdded()) {
             BuildingProperty property = ((BuildingProperty)boardManager.getFieldAtIndex(msg.getId()));
             if (property.getHotel() == 1 ) {
+
+                for(int i = 0; i < 4; i++) {
+                    board.remove(board.getHouse(msg.getId(), i+1));
+                }
+                
                 board.add(new Hotel(property.getId()));
             } else {
                 board.add(new House( property.getHouses(), property.getId()));
             }
+        } else {
+            if( ((BuildingProperty)boardManager.getFieldAtIndex(msg.getId())).getHouses() == 4 ) {
+                board.remove(board.getHotel(msg.getId()));
+            } else {
+                board.remove(board.getHouse(msg.getId(), ((BuildingProperty)boardManager.getFieldAtIndex(msg.getId())).getHouses()+1));
+            }
         }
     }
 

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

@@ -454,13 +454,9 @@ public class ServerGameLogic implements ClientInterpreter {
     }
 
     private void generatePredefinedGameState() {
-        // Ensure at least two players exist
-        if (playerHandler.getPlayers().size() < 2) {
-            Player player1 = new Player(0, "Player1", playerHandler);
-            Player player2 = new Player(1, "Player2", playerHandler);
 
-            playerHandler.addPlayer(player1);
+        if(playerHandler.getPlayerCount() < 2) {
-            playerHandler.addPlayer(player2);
+            return;
         }
     
         Player p1 = playerHandler.getPlayerById(0);
@@ -484,10 +480,10 @@ public class ServerGameLogic implements ClientInterpreter {
         assignProperties(p2, p2Properties);
     
         // Player 1 builds houses on Gym and Sportplatz
-        buildHouses(p1, Set.of(1, 3));
+        // buildHouses(p1, Set.of(1, 3));
     
         // Player 2 builds houses on the Red set
-        buildHouses(p2, Set.of(21, 23, 24));
+        // buildHouses(p2, Set.of(21, 23, 24));
     
         // Set player balances
         p1.setAccountBalance(12325);

Projekte/monopoly/model/src/main/java/pp/monopoly/model/Board.java

@@ -139,6 +139,14 @@ public class Board {
         return getItems(House.class);
     }
 
+    public House getHouse(int fieldId, int stage) {
+        return getHouses().filter(house -> house.getFieldID() == fieldId && house.getStage() == stage).findFirst().orElse(null);
+    }
+
+    public Hotel getHotel(int fieldId) {
+        return getHotels().filter(hotel -> hotel.getFieldID() == fieldId).findFirst().orElse(null);
+    }
+
     /**
      * Returns a stream of all hotels currently on the map.
      * 

Projekte/monopoly/model/src/main/java/pp/monopoly/model/Hotel.java

@@ -96,4 +96,13 @@ public class Hotel implements Item{
         // TODO
         return Rotation.NORTH;        
     }
+
+    /**
+     * Returns the ID of the field the hotel is on.
+     *
+     * @return the ID of the field the hotel is on
+     */
+    public int getFieldID() {
+        return fieldID;
+    }
 }

Projekte/monopoly/model/src/main/java/pp/monopoly/model/House.java

@@ -24,6 +24,15 @@ public class House implements Item{
         this.fieldID = 0;
     }
 
+    /**
+     * Returns the field ID of the house.
+     *
+     * @return the field ID of the house
+     */
+    public int getFieldID() {
+        return fieldID;
+    }
+
     /**
      * Creates a new house with the given stage.
      *

Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BoardManager.java

@@ -146,9 +146,10 @@ public class BoardManager {
     }
 
     /**
-     * Checks if a House can be sold on the given Property
+     * Checks if a House or Hotel can be sold on the given Property.
+     *
      * @param field the Property to check
-     * @return true if a house can be sold on the property, false otherwise
+     * @return true if a house or hotel can be sold on the property, false otherwise
      */
     public boolean canSell(BuildingProperty field) {
         if (field == null) {
@@ -174,7 +175,7 @@ public class BoardManager {
         int currentHouses = field.getHouses();
         int currentHotel = field.getHotel();
 
-        // If there is a hotel, selling is allowed only if all other properties have max houses
+        // If there is a hotel, ensure all other properties have max houses (4) before selling it
         if (currentHotel > 0) {
             return groupProperties.stream()
                     .allMatch(bp -> bp.getHouses() == 4 || bp.equals(field));
@@ -185,6 +186,7 @@ public class BoardManager {
                 .allMatch(bp -> bp.getHouses() <= currentHouses);
     }
 
+
     /**
      * Gibt eine Liste von BuildingProperty-Feldern zurück, auf denen Häuser oder Hotels stehen.
      * @return Liste von BuildingProperty-Feldern mit Gebäuden
@@ -198,3 +200,10 @@ public class BoardManager {
     }
     
 }
+
+/* TODO:
+- Häuser beim bau eines Hotels entfernen
+- Alle texturen schwarz
+
+ * 
+ */