peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2025-01-18 22:56:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lets GO

Browse Source
This commit is contained in:
Luca Puderbach 2024-12-02 04:35:55 +01:00
parent 07fd92c9b2
commit f317d7723e
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,13 +288,13 @@ public class LobbyMenu extends Dialog {
app.getGameLogic().playSound(Sound.BUTTON); app.getGameLogic().playSound(Sound.BUTTON);
switch (selected) { switch (selected) {
case "[0]": case "[0]":
figure = "Laptop"; figure = "Computer";
break; break;
case "[1]": case "[1]":
figure = "Flugzeug"; figure = "Flugzeug";
break; break;
case "[2]": case "[2]":
figure = "Jägermeister"; figure = "Jaegermeister";
break; break;
case "[3]": case "[3]":
figure = "Katze"; figure = "Katze";
@ -303,7 +303,7 @@ public class LobbyMenu extends Dialog {
figure = "OOP"; figure = "OOP";
break; break;
case "[5]": case "[5]":
figure = "Handyholster"; figure = "Holster";
break; break;
default: default:
break; break;

13
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TestWorld.java
View File

@ -139,14 +139,14 @@ public class TestWorld implements GameEventListener {
try { try {
// Lade das Modell // Lade das Modell
com.jme3.scene.Spatial model = app.getAssetManager().loadModel( 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 // Setze das Material mit silberner Farbe
Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md"); 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("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.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 //mat.setFloat("Shininess", 64f); // Höhere Werte machen das Material glänzender
model.setMaterial(mat); //model.setMaterial(mat);
// Skaliere und positioniere das Modell // Skaliere und positioniere das Modell
model.setLocalScale(0.5f); model.setLocalScale(0.5f);
@ -489,8 +489,7 @@ public class TestWorld implements GameEventListener {
com.jme3.scene.Spatial buildingModel = app.getAssetManager().loadModel(modelPath); com.jme3.scene.Spatial buildingModel = app.getAssetManager().loadModel(modelPath);
Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md"); 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.setMaterial(mat);
buildingModel.setLocalScale(0.5f); buildingModel.setLocalScale(0.5f);

2
Projekte/monopoly/model/src/main/java/pp/monopoly/model/fields/BuildingProperty.java
View File

@ -10,7 +10,7 @@ import pp.monopoly.game.server.Player;
@Serializable @Serializable
public class BuildingProperty extends PropertyField { public class BuildingProperty extends PropertyField {
private int houses = 2; private int houses;
private final int housePrice; private final int housePrice;
private final FieldColor color; private final FieldColor color;
private final int rentFactor1 = 5; private final int rentFactor1 = 5;