diff --git a/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy b/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy index 85b874f..195746e 100644 --- a/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy +++ b/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy @@ -64,6 +64,16 @@ selector("label-Bold", "pp") { textHAlignment = HAlignment.Center textVAlignment = VAlignment.Center +} + +selector("label-toolbar", "pp") { + insets = new Insets3f(2, 2, 2, 2) + font = font("Interface/Fonts/Metropolis/Metropolis-Bold-32.fnt") + fontSize = 30 + color = new ColorRGBA(ColorRGBA.White) + textHAlignment = HAlignment.Center + textVAlignment = VAlignment.Center + } selector("label-Text", "pp") { insets = new Insets3f(2, 2, 2, 2) @@ -74,7 +84,7 @@ selector("label-Text", "pp") { selector("label-account", "pp") { insets = new Insets3f(2, 2, 2, 2) fontSize = 25 - color = buttonEnabledColor + color = new ColorRGBA(ColorRGBA.White) textHAlignment = HAlignment.Center textVAlignment = VAlignment.Center } diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java index 2d4f342..9f89bba 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/Toolbar.java @@ -66,7 +66,7 @@ public class Toolbar extends Dialog implements GameEventListener { Container playerColorBar = new Container(); playerColorBar.setPreferredSize(new Vector3f(app.getCamera().getWidth(), 15, 0)); // Höhe des oberen Balkens playerColorBar.setBackground(new QuadBackgroundComponent(playerColor)); - playerColorBar.setLocalTranslation(0, 210, 1); // Position über der Toolbar + playerColorBar.setLocalTranslation(0, 210, 3); // Position über der Toolbar app.getGuiNode().attachChild(playerColorBar); // unterer Balken @@ -113,6 +113,7 @@ public class Toolbar extends Dialog implements GameEventListener { private Container createDiceSection() { Container diceContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y)); diceContainer.addChild(createDiceDisplay()); + diceContainer.setBackground(null); diceButton = new Button("Würfeln", new ElementId("button-toolbar")); diceButton.setPreferredSize(new Vector3f(200, 50, 0)); @@ -130,6 +131,7 @@ public class Toolbar extends Dialog implements GameEventListener { private Container createDiceDisplay() { Container horizontalContainer = new Container(new SpringGridLayout(Axis.X, Axis.Y)); horizontalContainer.setPreferredSize(new Vector3f(200, 150, 0)); + horizontalContainer.setBackground(null); imageLabel = createDiceLabel("Pictures/dice/one.png"); imageLabel2 = createDiceLabel("Pictures/dice/two.png"); @@ -150,6 +152,7 @@ public class Toolbar extends Dialog implements GameEventListener { private Container createDiceContainer(Label label) { Container container = new Container(); + container.setBackground(null); container.setPreferredSize(new Vector3f(100, 150, 0)); container.addChild(label); return container; @@ -171,13 +174,14 @@ public class Toolbar extends Dialog implements GameEventListener { propertyMenuButton.setFontSize(30); propertyMenuButton.addClickCommands(s -> ifTopDialog(() -> { app.getGameLogic().playSound(Sound.BUTTON); - new BuildingAdminMenu(app).open(); + new PropertyOverviewMenu(app).open(); })); return propertyMenuButton; } private Button createEndTurnButton() { endTurnButton = new Button("Zug beenden", new ElementId("button-toolbar")); + endTurnButton.setFontSize(28); endTurnButton.setPreferredSize(new Vector3f(150, 50, 0)); endTurnButton.addClickCommands(s -> ifTopDialog(() -> { app.getGameLogic().playSound(Sound.BUTTON); @@ -263,19 +267,19 @@ public class Toolbar extends Dialog implements GameEventListener { accountContainer.clearChildren(); overviewContainer.clearChildren(); - accountContainer.addChild(new Label("Kontostand", new ElementId("label-Bold"))); + accountContainer.addChild(new Label("Kontostand", new ElementId("label-toolbar"))); accountContainer.addChild(new Label( playerHandler.getPlayerById(app.getId()).getAccountBalance() + " EUR", new ElementId("label-account") )); - accountContainer.addChild(new Label("Gulag Karten", new ElementId("label-Bold"))); + accountContainer.addChild(new Label("Gulag Karten", new ElementId("label-toolbar"))); accountContainer.addChild(new Label( playerHandler.getPlayerById(app.getId()).getNumJailCard() + "", new ElementId("label-account") )); - accountContainer.setBackground(createBackground()); + accountContainer.setBackground(null); - overviewContainer.addChild(new Label("Übersicht", new ElementId("label-Bold"))); + overviewContainer.addChild(new Label("Übersicht", new ElementId("label-toolbar"))); for (Player player : playerHandler.getPlayers()) { if (player.getId() != app.getId()) { // Spielerfarbe abrufen @@ -294,7 +298,7 @@ public class Toolbar extends Dialog implements GameEventListener { overviewContainer.addChild(playerLabel); } } - overviewContainer.setBackground(createBackground()); + overviewContainer.setBackground(null); } @Override diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java index 76f85eb..5b96163 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/BuyHouse.java @@ -97,7 +97,7 @@ public class BuyHouse extends Dialog { downContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile - downContainer.addChild(new Label("Erstattung:", new ElementId("label-Text")));// Leerzeile + downContainer.addChild(new Label("Kosten:", new ElementId("label-Text")));// Leerzeile downContainer.addChild(new Label("Hier die tätsächliche Erstattung", new ElementId("label-Text"))); downContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/RepayMortage.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/RepayMortage.java index 8afa4a0..14a9487 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/RepayMortage.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/RepayMortage.java @@ -46,7 +46,7 @@ public class RepayMortage extends Dialog { backgroundContainer.setPreferredSize(repayMortageContainer.getPreferredSize().addLocal(padding, padding, 0)); // Titel - Label title = repayMortageContainer.addChild(new Label( "Gebäude Abreißen", new ElementId("warining-Bold"))); + Label title = repayMortageContainer.addChild(new Label( "Hypothek Abbezahlen", new ElementId("warining-Bold"))); title.setFontSize(48); title.setColor(ColorRGBA.Black); @@ -97,7 +97,7 @@ public class RepayMortage extends Dialog { downContainer.addChild(new Label("", new ElementId("label-Text")));// Leerzeile - downContainer.addChild(new Label("Erstattung:", new ElementId("label-Text")));// Leerzeile + downContainer.addChild(new Label("Kosten:", new ElementId("label-Text")));// Leerzeile downContainer.addChild(new Label("Hier die tätsächliche Erstattung", new ElementId("label-Text"))); downContainer.setBackground(new QuadBackgroundComponent(new ColorRGBA(0.4657f, 0.4735f, 0.4892f, 1.0f))); diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/TakeMortage.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/TakeMortage.java index 332fba9..f2c615a 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/TakeMortage.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/TakeMortage.java @@ -46,7 +46,7 @@ public class TakeMortage extends Dialog { backgroundContainer.setPreferredSize(takeMortageContainer.getPreferredSize().addLocal(padding, padding, 0)); // Titel - Label title = takeMortageContainer.addChild(new Label( "Gebäude Abreißen", new ElementId("warining-Bold"))); + Label title = takeMortageContainer.addChild(new Label( "Hypothek aufnehmen", new ElementId("warining-Bold"))); title.setFontSize(48); title.setColor(ColorRGBA.Black);