peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-09-17 16:47:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: peet:demo
Branches Tags
peet:main peet:gui peet:demo peet:reworkedGui peet:Testhandbuch peet:logic peet:connect peet:client_logic peet:b_szepielewicz_filip peet:b_puderbach_luca peet:b_wilkening_simon peet:b_schmidt_yvonne peet:b_schmelz_johannes peet:revert-f248a77c peet:b_Mueller_Tamino peet:b_malkmus_dennis peet:revert-71a4ac8d peet:b_Schmelz_Johannes
...
compare: peet:7c79bb77e77cff540913540219bc04501313503c
Branches Tags
peet:main peet:gui peet:demo peet:reworkedGui peet:Testhandbuch peet:logic peet:connect peet:client_logic peet:b_szepielewicz_filip peet:b_puderbach_luca peet:b_wilkening_simon peet:b_schmidt_yvonne peet:b_schmelz_johannes peet:revert-f248a77c peet:b_Mueller_Tamino peet:b_malkmus_dennis peet:revert-71a4ac8d peet:b_Schmelz_Johannes

3 Commits
demo ... 7c79bb77e7

Author SHA1 Message Date
Johannes Schmelz
7c79bb77e7 Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui 2024-12-12 16:13:55 +01:00
Johannes Schmelz
444cf9db4e fixed names in Player Popups 2024-12-12 16:13:50 +01:00
Simon Wilkening
9e199d677e Bahnhöfe --> Tore 2024-12-10 13:46:35 +01:00
3 changed files with 12 additions and 12 deletions
Expand all files Collapse all files

6
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/PropertyOverviewMenu.java
View File

@@ -206,11 +206,11 @@ public class PropertyOverviewMenu extends Dialog {
propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14); propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))).setFontSize(14);
propertyValuesContainer.addChild(new Label("Miete: 250 EUR", new ElementId("label-Text"))).setFontSize(14); propertyValuesContainer.addChild(new Label("Miete: 250 EUR", new ElementId("label-Text"))).setFontSize(14);
propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14); propertyValuesContainer.addChild(new Label("Wenn man", 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("2 Tore besitzt: 500 EUR", new ElementId("label-Text"))).setFontSize(14);
propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14); propertyValuesContainer.addChild(new Label("Wenn man", 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("3 Tore besitzt: 1000 EUR", new ElementId("label-Text"))).setFontSize(14);
propertyValuesContainer.addChild(new Label("Wenn man", new ElementId("label-Text"))).setFontSize(14); propertyValuesContainer.addChild(new Label("Wenn man", 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("4 Tore besitzt: 2000 EUR", new ElementId("label-Text"))).setFontSize(14);
propertyValuesContainer.addChild(new Label("", 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.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 propertyValuesContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); // Dark grey background

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

@@ -76,11 +76,11 @@ public class GateFieldCard extends Dialog implements PopupDialog {
propertyValuesContainer.addChild(new Label("„Preis: " + field.getPrice() + " EUR", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("„Preis: " + field.getPrice() + " EUR", new ElementId("label-Text")));
propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Empty line propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Empty line
propertyValuesContainer.addChild(new Label("Miete: 250 EUR", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("Miete: 250 EUR", new ElementId("label-Text")));
propertyValuesContainer.addChild(new Label("Wenn man 2 Bahnhöfe", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("Wenn man 2 Tore", new ElementId("label-Text")));
propertyValuesContainer.addChild(new Label("besitzt: 500 EUR", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("besitzt: 500 EUR", new ElementId("label-Text")));
propertyValuesContainer.addChild(new Label("Wenn man 3 Bahnhöfe", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("Wenn man 3 Tore", new ElementId("label-Text")));
propertyValuesContainer.addChild(new Label("besitzt: 1000 EUR", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("besitzt: 1000 EUR", new ElementId("label-Text")));
propertyValuesContainer.addChild(new Label("Wenn man 4 Bahnhöfe", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("Wenn man 4 Tore", new ElementId("label-Text")));
propertyValuesContainer.addChild(new Label("besitzt: 2000 EUR", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("besitzt: 2000 EUR", new ElementId("label-Text")));
propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Empty line propertyValuesContainer.addChild(new Label("", new ElementId("label-Text"))); // Empty line
propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text"))); propertyValuesContainer.addChild(new Label("„Hypothek: " + field.getHypo() + " EUR", new ElementId("label-Text")));

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

@@ -351,8 +351,8 @@ public class Player implements FieldVisitor<Void>{
int rent = field.calcRent(); int rent = field.calcRent();
field.getOwner().earnMoney(rent); field.getOwner().earnMoney(rent);
pay(rent); pay(rent);
sendRentNotification("ReceivedRent", field.getOwner(), rent); sendRentNotification("ReceivedRent", this, rent);
sendRentNotification("rent", this, rent); sendRentNotification("rent", field.getOwner(), rent);
} }
return null; return null;
} }
@@ -369,8 +369,8 @@ public class Player implements FieldVisitor<Void>{
int rent = rollResult.calcTotal()*factor; int rent = rollResult.calcTotal()*factor;
field.getOwner().earnMoney(rent); field.getOwner().earnMoney(rent);
pay(rent); pay(rent);
sendRentNotification("ReceivedRent", field.getOwner(), rent); sendRentNotification("ReceivedRent", this, rent);
sendRentNotification("rent", this, rent); sendRentNotification("rent", field.getOwner(), rent);
} }
return null; return null;
} }
@@ -384,8 +384,8 @@ public class Player implements FieldVisitor<Void>{
field.getOwner().earnMoney(rent); field.getOwner().earnMoney(rent);
pay(rent); pay(rent);
sendRentNotification("ReceivedRent", field.getOwner(), rent); sendRentNotification("ReceivedRent", this, rent);
sendRentNotification("rent", this, rent); sendRentNotification("rent", field.getOwner(), rent);
} }
return null; return null;
} }