diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java index 89cc5e9..8e4be3a 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java @@ -288,13 +288,13 @@ public class LobbyMenu extends Dialog { app.getGameLogic().playSound(Sound.BUTTON); switch (selected) { case "[0]": - figure = "Laptop"; + figure = "Computer"; break; case "[1]": figure = "Flugzeug"; break; case "[2]": - figure = "Jägermeister"; + figure = "Jaegermeister"; break; case "[3]": figure = "Katze"; @@ -303,7 +303,7 @@ public class LobbyMenu extends Dialog { figure = "OOP"; break; case "[5]": - figure = "Handyholster"; + figure = "Holster"; break; default: break; diff --git a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java index deaa3f1..b1a02fb 100644 --- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java +++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java @@ -139,14 +139,14 @@ public class TestWorld implements GameEventListener { try { // Lade das Modell com.jme3.scene.Spatial model = app.getAssetManager().loadModel( - "models/" + player.getFigure().getType() + "/" + player.getFigure().getType() + ".j3o"); + "models/" + "Spielfiguren/" + player.getFigure().getType() + "/" + player.getFigure().getType() + ".j3o"); // Setze das Material mit silberner Farbe Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md"); - mat.setColor("Diffuse", new com.jme3.math.ColorRGBA(0.45f, 0.45f, 0.45f, 1.0f)); // Silberne Farbe - mat.setColor("Specular", new com.jme3.math.ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f)); // Glanzlicht - mat.setFloat("Shininess", 64f); // Höhere Werte machen das Material glänzender - model.setMaterial(mat); + //mat.setColor("Diffuse", new com.jme3.math.ColorRGBA(0.45f, 0.45f, 0.45f, 1.0f)); // Silberne Farbe + //mat.setColor("Specular", new com.jme3.math.ColorRGBA(0.6f, 0.6f, 0.6f, 1.0f)); // Glanzlicht + //mat.setFloat("Shininess", 64f); // Höhere Werte machen das Material glänzender + //model.setMaterial(mat); // Skaliere und positioniere das Modell model.setLocalScale(0.5f); @@ -489,8 +489,7 @@ public class TestWorld implements GameEventListener { com.jme3.scene.Spatial buildingModel = app.getAssetManager().loadModel(modelPath); Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md"); - Texture texture = app.getAssetManager().loadTexture("models/Haus/" + "Haus.png"); - mat.setTexture("DiffuseMap", texture); + buildingModel.setMaterial(mat); buildingModel.setLocalScale(0.5f); diff --git a/Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BuildingProperty.java b/Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BuildingProperty.java index f289e14..3fc9839 100644 --- a/Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BuildingProperty.java +++ b/Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BuildingProperty.java @@ -10,7 +10,7 @@ import pp.monopoly.game.server.Player; @Serializable public class BuildingProperty extends PropertyField { - private int houses = 2; + private int houses; private final int housePrice; private final FieldColor color; private final int rentFactor1 = 5;