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

@@ -280,7 +280,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 FoodFieldCard(this);
+            Dialog tmp = new NoMoneyWarning(this);
             tmp.open();
         }
     }

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

@@ -130,7 +130,7 @@ public class PropertyOverviewMenu extends Dialog {
         // Add property details
         Container propertyValuesContainer = card.addChild(new Container());
         propertyValuesContainer.addChild(new Label("Grundstückswert: €" + field.getPrice(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
         propertyValuesContainer.addChild(new Label("Miete allein: €" + field.getAllRent().get(0), new ElementId("label-Text"))).setFontSize(14);
         propertyValuesContainer.addChild(new Label("- mit 1 Haus: €" + field.getAllRent().get(1), new ElementId("label-Text"))).setFontSize(14);
         propertyValuesContainer.addChild(new Label("- mit 2 Häuser: €" + field.getAllRent().get(2), new ElementId("label-Text"))).setFontSize(14);
@@ -138,7 +138,7 @@ public class PropertyOverviewMenu extends Dialog {
         propertyValuesContainer.addChild(new Label("- mit 4 Häuser: €" + field.getAllRent().get(4), new ElementId("label-Text"))).setFontSize(14);
         propertyValuesContainer.addChild(new Label("- mit 1 Hotel: €" + field.getAllRent().get(5), new ElementId("label-Text"))).setFontSize(14);
         propertyValuesContainer.addChild(new Label("- 1 Haus kostet: €" + field.getHousePrice(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
         propertyValuesContainer.addChild(new Label("Hypothek: €" + field.getHypo(), new ElementId("label-Text"))).setFontSize(14);
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));
 
@@ -163,15 +163,16 @@ public class PropertyOverviewMenu extends Dialog {
         Container propertyValuesContainer = card.addChild(new Container());
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Grey background
         propertyValuesContainer.addChild(new Label("Preis: €" + field.getPrice(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
-        propertyValuesContainer.addChild(new Label("Wenn man Besitzer der", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("Wenn man Besitzer des", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label(field.getName() + " ist, so ist", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label(field.getName() + " ist,", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("die Miete 40x Würfelwert.", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("so ist die Miete", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
+        propertyValuesContainer.addChild(new Label("40x Würfelwert.", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
         propertyValuesContainer.addChild(new Label("Besitzer beider", new ElementId("label-Text"))).setFontSize(14);
         propertyValuesContainer.addChild(new Label("Restaurants zahlt", new ElementId("label-Text"))).setFontSize(14);
         propertyValuesContainer.addChild(new Label("100x Würfelwert.", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); // Leerzeile
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
         propertyValuesContainer.addChild(new Label("Hypothek: €" + field.getHypo(), new ElementId("label-Text"))).setFontSize(14);
 
         return card;
@@ -194,16 +195,13 @@ public class PropertyOverviewMenu extends Dialog {
         // Property Values Section
         Container propertyValuesContainer = card.addChild(new Container());
         propertyValuesContainer.addChild(new Label("Preis: €" + field.getPrice(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
-        propertyValuesContainer.addChild(new Label("Miete: 250 EUR", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("1 Bahnhof: €250", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("2 Bahnhöfe: €500", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("2 Bahnhof besitzt: 500 EUR", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("3 Bahnhöfe: €1000", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("4 Bahnhöfe: €2000", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("3 Bahnhof besitzt: 1000 EUR", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Leerzeile
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14);
+        propertyValuesContainer.addChild(new Label("Hypothek: €" + field.getHypo(), new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("4 Bahnhof besitzt: 2000 EUR", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14);
-        propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text"))).setFontSize(14);
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Dark grey background
 
         return card;

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

@@ -38,7 +38,6 @@ public class BuyCard extends Dialog {
 
         // Hauptcontainer für die Gebäudekarte
         buyCardContainer = new Container();
-        buyCardContainer.setBackground(new QuadBackgroundComponent(field.getColor().getColor())); // Ändert den Rahmen und die Hintergrundfarbe der Karten
 
         float padding = 10; // Passt den backgroundContainer an die Größe des buyCardContainers an
         backgroundContainer.setPreferredSize(buyCardContainer.getPreferredSize().addLocal(padding, padding, 0));

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

@@ -54,7 +54,6 @@ public class FoodFieldCard extends Dialog {
         // Titel, bestehend aus dynamischen Namen anhand der ID und der Schriftfarbe/größe
         Label settingsTitle = foodFieldContainer.addChild(new Label(field.getName(), new ElementId("settings-title")));
         settingsTitle.setFontSize(48);
-        settingsTitle.setColor(ColorRGBA.White);
 
         // Text, der auf der Karte steht
         Container propertyValuesContainer = foodFieldContainer.addChild(new Container());

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

@@ -50,23 +50,22 @@ public class GateFieldCard extends Dialog {
         float padding = 10; // Passt den backgroundContainer an die Größe des gateFieldContainers an
         backgroundContainer.setPreferredSize(gateFieldContainer.getPreferredSize().addLocal(padding, padding, 0));
 
-        // Titel, bestehend aus dynamischen Namen anhand der ID und der Schriftfarbe/größe
+
+        // Titel
+        // Die Namen werden dynamisch dem BoardManager entnommen
         Label gateFieldTitle = gateFieldContainer.addChild(new Label(field.getName(), new ElementId("settings-title")));
         gateFieldTitle.setFontSize(48);
-        gateFieldTitle.setColor(ColorRGBA.White);
+        gateFieldTitle.setColor(ColorRGBA.Black);
 
         // Text, der auf der Karte steht
         // Die Preise werden dynamisch dem BoardManager entnommen
         Container propertyValuesContainer = gateFieldContainer.addChild(new Container());
         propertyValuesContainer.addChild(new Label("„Preis: " + field.getPrice() + " EUR", new ElementId("label-Text")));
         propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Miete: 250 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 1 Bahnhof besitzt: 250 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 2 Bahnhöfe besitzt: 500 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("2 Bahnhof besitzt: 500 EUR", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 3 Bahnhöfe besitzt: 1000 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
+        propertyValuesContainer.addChild(new Label("Wenn man 4 Bahnhöfe besitzt: 2000 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("3 Bahnhof besitzt: 1000 EUR", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text")));
-        propertyValuesContainer.addChild(new Label("4 Bahnhof besitzt: 2000 EUR", new ElementId("label-Text")));
         propertyValuesContainer.addChild(new Label("", new ElementId("label-Text")));
         propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));
         propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f)));

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

@@ -161,10 +161,10 @@ public class Player implements FieldVisitor<Void>{
      * @return the new position
      */
     public int move(int steps) {
+        fieldID = (fieldID + steps) % 40;
         if (fieldID + steps >= 40) {
             earnMoney(2000); // Passing GO gives money
         }
-        fieldID = (fieldID + steps) % 40;
         figure.moveTo(fieldID);
         handler.getLogic().send(this, new PlayerStatusUpdate(handler));
         handler.getLogic().getBoardManager().getFieldAtIndex(fieldID).accept(this);
@@ -180,7 +180,6 @@ public class Player implements FieldVisitor<Void>{
         if(position < 40 && position > 0) {
             fieldID = position;
             figure.moveTo(fieldID);
-            handler.getLogic().send(this, new PlayerStatusUpdate(handler));
             handler.getLogic().getBoardManager().getFieldAtIndex(fieldID).accept(this);
         }
         return fieldID;

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

@@ -256,41 +256,38 @@ public class ServerGameLogic implements ClientInterpreter {
 
         TradeHandler tradeHandler = msg.getTradeHandler();
 
-        
-        
         Player receiver = playerHandler.getPlayerById(tradeHandler.getReceiver().getId());
         Player sender = playerHandler.getPlayerById(tradeHandler.getSender().getId());
-        
-        if(msg.isAccepted()) {
-            Set<PropertyField> offered = new HashSet<>();
 
-            for (PropertyField propertyField : tradeHandler.getOfferedProperties()) {
+        Set<PropertyField> offered = new HashSet<>();
-                offered.add( (PropertyField) boardManager.getFieldAtIndex(propertyField.getId()));
-            }
 
-            Set<PropertyField> requested = new HashSet<>();
+        for (PropertyField propertyField : tradeHandler.getOfferedProperties()) {
-
+            offered.add( (PropertyField) boardManager.getFieldAtIndex(propertyField.getId()));
-            for (PropertyField propertyField : tradeHandler.getRequestedProperties()) {
-                requested.add( (PropertyField) boardManager.getFieldAtIndex(propertyField.getId()));
-            }
-
-            executeTrade(sender, receiver, offered, requested);
-
-            sender.earnMoney(tradeHandler.getRequestedAmount());
-            sender.pay(tradeHandler.getOfferedAmount());
-            receiver.earnMoney(tradeHandler.getOfferedAmount());
-            receiver.pay(tradeHandler.getRequestedAmount());
-
-            for (int i = 0; i < tradeHandler.getOfferedJailCards(); i++) {
-                sender.removeJailCard();
-                receiver.addJailCard();
-            }
-
-            for (int i = 0; i < tradeHandler.getRequestedAmount(); i++) {
-                sender.addJailCard();
-                receiver.removeJailCard();
-            }
         }
+
+        Set<PropertyField> requested = new HashSet<>();
+
+        for (PropertyField propertyField : tradeHandler.getRequestedProperties()) {
+            requested.add( (PropertyField) boardManager.getFieldAtIndex(propertyField.getId()));
+        }
+
+        executeTrade(sender, receiver, offered, requested);
+
+        sender.earnMoney(tradeHandler.getRequestedAmount());
+        sender.pay(tradeHandler.getOfferedAmount());
+        receiver.earnMoney(tradeHandler.getOfferedAmount());
+        receiver.pay(tradeHandler.getRequestedAmount());
+
+        for (int i = 0; i < tradeHandler.getOfferedJailCards(); i++) {
+            sender.removeJailCard();
+            receiver.addJailCard();
+        }
+
+        for (int i = 0; i < tradeHandler.getRequestedAmount(); i++) {
+            sender.addJailCard();
+            receiver.removeJailCard();
+        }
+
         updateAllPlayers();
         
         if (receiver != null && sender != null) {

Projekte/monopoly/model/src/main/java/pp/monopoly/model/card/DeckHelper.java

@@ -236,7 +236,9 @@ public class DeckHelper{
         }
     
         private void dienstsportGym(Player player) {
-            player.setPosition(1);
+            for (Player p : player.getHandler().getPlayers()) {
+                p.setPosition(1);
+            }
         }
     
         private void schimmelGulak(Player player) {

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

@@ -60,7 +60,7 @@ public class BoardManager {
         fields.add(new BuildingProperty("Prüfungsamt", 29, 2800, 240, 1500, FieldColor.YELLOW));
         fields.add(new WacheField());
         fields.add(new BuildingProperty("Feuerwehr", 31, 3000, 260, 2000, FieldColor.GREEN));
-        fields.add(new BuildingProperty("SanZ", 32, 3000, 260, 2000, FieldColor.GREEN));
+        fields.add(new BuildingProperty("SanZ", 32, 300, 260, 2000, FieldColor.GREEN));
         fields.add(new EventField("Maibock", 33));
         fields.add(new BuildingProperty("Rechenzentrum", 34, 3200, 280, 2000, FieldColor.GREEN));
         fields.add(new GateField("Osttor", 35));