Compare commits

..

No commits in common. "e98e17f6d798171b78d3396d948e9df2b6aae8a9" and "96a78ee61b4ba96369b1d7d1ff86a34147e5bd03" have entirely different histories.

13 changed files with 44 additions and 37 deletions

View File

@ -67,7 +67,7 @@ public class BoardAppState extends MonopolyAppState {
*/ */
private PopUpManager popUpManager;; private PopUpManager popUpManager;;
private Vector3f currentTarget = new Vector3f(0f,0,0f); private Vector3f currentTarget = new Vector3f(-10f,0,-10f);
/** /**
* Initializes the state by setting up the sky, lights, and other visual components. * Initializes the state by setting up the sky, lights, and other visual components.
@ -99,6 +99,7 @@ public class BoardAppState extends MonopolyAppState {
setupScene(); setupScene();
if (bobTheBuilder == null) { if (bobTheBuilder == null) {
bobTheBuilder = new BobTheBuilder(getApp(), sceneNode); bobTheBuilder = new BobTheBuilder(getApp(), sceneNode);
System.out.println("LISTENER IS REGISTEDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
getGameLogic().addListener(bobTheBuilder); getGameLogic().addListener(bobTheBuilder);
} }
getApp().getRootNode().attachChild(viewNode); getApp().getRootNode().attachChild(viewNode);
@ -122,7 +123,7 @@ public class BoardAppState extends MonopolyAppState {
final float x = mx - cos; final float x = mx - cos;
final float y = my - sin; final float y = my - sin;
final Camera camera = getApp().getCamera(); final Camera camera = getApp().getCamera();
camera.setLocation(new Vector3f(30,20,0)); camera.setLocation(new Vector3f(0,30,0));
camera.lookAt(new Vector3f(getCurrentTarget()), camera.lookAt(new Vector3f(getCurrentTarget()),
Vector3f.UNIT_Y); Vector3f.UNIT_Y);
camera.update(); camera.update();

View File

@ -44,7 +44,7 @@ public class BobTheBuilder extends GameBoardSynchronizer {
// Setze die Rotation basierend auf der Feld-ID // Setze die Rotation basierend auf der Feld-ID
node.setLocalRotation(figure.getRot().toQuaternion()); node.setLocalRotation(figure.getRot().toQuaternion());
node.addControl(new FigureControl(node, figure, app)); node.addControl(new FigureControl(spatial, figure, app));
return node; return node;
} }

View File

@ -1,29 +1,25 @@
package pp.monopoly.client.gui; package pp.monopoly.client.gui;
import com.jme3.math.FastMath; import com.jme3.math.FastMath;
import com.jme3.math.Quaternion;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;
import com.jme3.renderer.RenderManager; import com.jme3.renderer.RenderManager;
import com.jme3.renderer.ViewPort; import com.jme3.renderer.ViewPort;
import com.jme3.scene.Node; import com.jme3.scene.Spatial;
import com.jme3.scene.control.AbstractControl; import com.jme3.scene.control.AbstractControl;
import pp.monopoly.client.MonopolyApp; import pp.monopoly.client.MonopolyApp;
import pp.monopoly.game.client.ClientGameLogic;
import pp.monopoly.model.Figure; import pp.monopoly.model.Figure;
import pp.monopoly.notification.GameEventListener; import pp.monopoly.notification.GameEventListener;
import pp.monopoly.notification.UpdatePlayerView; import pp.monopoly.notification.UpdatePlayerView;
import java.lang.System.Logger;
import java.lang.System.Logger.Level;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Queue; import java.util.Queue;
public class FigureControl extends AbstractControl implements GameEventListener { public class FigureControl extends AbstractControl implements GameEventListener {
private static final Logger LOGGER = System.getLogger(FigureControl.class.getName());
private final Figure figure; private final Figure figure;
private final Node spatial; private final Spatial spatial;
private final MonopolyApp app; private final MonopolyApp app;
private Queue<Vector3f> path; // Path to follow private Queue<Vector3f> path; // Path to follow
private Vector3f currentTarget; private Vector3f currentTarget;
@ -33,7 +29,7 @@ public class FigureControl extends AbstractControl implements GameEventListener
private float delayElapsed = 0f; // Zeit, die seit dem Start der Verzögerung vergangen ist private float delayElapsed = 0f; // Zeit, die seit dem Start der Verzögerung vergangen ist
public FigureControl(Node spatial, Figure figure, MonopolyApp app) { public FigureControl(Spatial spatial, Figure figure, MonopolyApp app) {
super(); super();
this.figure = figure; this.figure = figure;
this.spatial = spatial; this.spatial = spatial;
@ -50,14 +46,14 @@ public class FigureControl extends AbstractControl implements GameEventListener
return; // Warte, bis die Verzögerung abgeschlossen ist return; // Warte, bis die Verzögerung abgeschlossen ist
} }
delayTime = 0; // Verzögerung abgeschlossen delayTime = 0; // Verzögerung abgeschlossen
LOGGER.log(Level.DEBUG, "Delay completed. Starting animation..."); System.out.println("Delay completed. Starting animation...");
} }
if (currentTarget == null && !path.isEmpty()) { if (currentTarget == null && !path.isEmpty()) {
// Hole das nächste Ziel aus dem Pfad // Hole das nächste Ziel aus dem Pfad
currentTarget = path.poll(); currentTarget = path.poll();
animationTime = 0f; animationTime = 0f;
LOGGER.log(Level.DEBUG, "Next target: {0}", currentTarget); System.out.println("Next target: " + currentTarget);
} }
if (currentTarget != null) { if (currentTarget != null) {
@ -79,19 +75,18 @@ public class FigureControl extends AbstractControl implements GameEventListener
spatial.setLocalTranslation(currentTarget); spatial.setLocalTranslation(currentTarget);
figure.moveTo(currentTarget); // Synchronisiere die interne Position figure.moveTo(currentTarget); // Synchronisiere die interne Position
currentTarget = null; // Setze Ziel zurück currentTarget = null; // Setze Ziel zurück
System.out.println("Target reached.");
LOGGER.log(Level.DEBUG, "Target reached. Remaining path: {0}", path.size());
} }
} }
} }
// Beispiel: Berechnung des nächsten Feldes // Beispiel: Berechnung des nächsten Feldes
private int nextField() { private int nextField() {
int currentField = figure.getCurrentFieldID(); int currentField = figure.getCurrentFieldID();
return (currentField + 1) % 40; // Weiter zum nächsten Feld return (currentField + 1) % 40; // Weiter zum nächsten Feld
} }
@ -101,35 +96,33 @@ public class FigureControl extends AbstractControl implements GameEventListener
} }
public void setPath(int startField, int endField) { public void setPath(int startField, int endField) {
LOGGER.log(Level.TRACE, "setPath called with startField: {0} to endField {1}", startField, endField); System.out.println("setPath called with startField: " + startField + ", endField: " + endField);
path.clear(); path.clear();
for (int fieldId = startField; fieldId != endField; fieldId = (fieldId + 1) % 40) { for (int fieldId = startField; fieldId != endField; fieldId = (fieldId + 1) % 40) {
Vector3f position = figure.calculateFieldPosition(fieldId); Vector3f position = figure.calculateFieldPosition(fieldId);
LOGGER.log(Level.DEBUG, "Adding postition to path: {0}", position); System.out.println("Adding position to path: " + position);
path.add(position); path.add(position);
} }
Vector3f finalPosition = figure.calculateFieldPosition(endField); Vector3f finalPosition = figure.calculateFieldPosition(endField);
path.add(finalPosition); path.add(finalPosition);
LOGGER.log(Level.DEBUG, "Final position added to path: {0}", finalPosition); System.out.println("Final position added to path: " + finalPosition);
System.out.println("Path size: " + path.size());
LOGGER.log(Level.TRACE, "Path size: {0}", path.size());
} }
@Override @Override
public void receivedEvent(UpdatePlayerView event) { public void receivedEvent(UpdatePlayerView event) {
LOGGER.log(Level.TRACE, "receivedEvent called with event: {0}", event); System.out.println("Event received: " + event);
int newPos = app.getGameLogic().getPlayerHandler().getPlayerById(figure.getId()).getFieldID(); int newPos = app.getGameLogic().getPlayerHandler().getPlayerById(figure.getId()).getFieldID();
int currentField = figure.getCurrentFieldID(); int currentField = figure.getCurrentFieldID();
if (currentField == newPos) { if (currentField == newPos) {
LOGGER.log(Level.DEBUG, "No movement required. Current field: {0}, New field: {1}", currentField, newPos); System.out.println("Figure is already at the correct position. No path set.");
return; return;
} }
LOGGER.log(Level.DEBUG, "Movement required. Current field: {0}, New field: {1}", currentField, newPos); System.out.println("Movement required. Current field: " + currentField + ", New field: " + newPos);
setPath(currentField, newPos); setPath(currentField, newPos);
delayTime = 3f; // Verzögerung zurücksetzen delayTime = 3f; // Verzögerung zurücksetzen

View File

@ -325,6 +325,7 @@ public class LobbyMenu extends Dialog {
figure = selector.getSelectedItem(); figure = selector.getSelectedItem();
break; break;
} }
System.out.println("FIGUR:::::"+figure);
} }
/** /**

View File

@ -381,7 +381,7 @@ public class Toolbar extends Dialog implements GameEventListener {
showFinalDiceResult(latestDiceRollEvent); showFinalDiceResult(latestDiceRollEvent);
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); System.err.println("Dice animation interrupted: " + e.getMessage());
} }
}).start(); }).start();
} }
@ -527,6 +527,7 @@ public class Toolbar extends Dialog implements GameEventListener {
*/ */
@Override @Override
public void receivedEvent(ButtonStatusEvent event) { public void receivedEvent(ButtonStatusEvent event) {
System.out.println("Button status event received: " + event.buttonsEnabled()+ "GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
boolean enabled = event.buttonsEnabled(); boolean enabled = event.buttonsEnabled();
canRollDice = enabled; canRollDice = enabled;
tradeButton.setEnabled(enabled); tradeButton.setEnabled(enabled);

View File

@ -910,6 +910,7 @@
} }
sliderhorsetup(); sliderhorsetup();
adjustothercolumnmodel(); adjustothercolumnmodel();
// System.out.println("Columns available: " +availableColumns);
} }
@StyleAttribute(value="visibleColumns") @StyleAttribute(value="visibleColumns")
@ -922,6 +923,7 @@
sliderhorsetup(); sliderhorsetup();
grid.refreshGrid(); grid.refreshGrid();
refreshSelector(); refreshSelector();
// System.out.println("Columns visble: " +grid.getVisibleColumns());
} }
// Column Operations // Column Operations

View File

@ -78,6 +78,7 @@ public class BuildingPropertyCard extends Dialog {
Button quitButton = buildingPropertyContainer.addChild(new Button("Beenden", new ElementId("button"))); Button quitButton = buildingPropertyContainer.addChild(new Button("Beenden", new ElementId("button")));
quitButton.setFontSize(32); quitButton.setFontSize(32);
quitButton.addClickCommands(s -> ifTopDialog( () -> { quitButton.addClickCommands(s -> ifTopDialog( () -> {
System.err.println("Button does something?");
app.getGameLogic().playSound(Sound.BUTTON); app.getGameLogic().playSound(Sound.BUTTON);
close(); close();
})); }));

View File

@ -119,7 +119,13 @@ public class SellHouse extends Dialog {
confirmButton.addClickCommands(s -> ifTopDialog( () -> { confirmButton.addClickCommands(s -> ifTopDialog( () -> {
app.getGameLogic().playSound(Sound.BUTTON); app.getGameLogic().playSound(Sound.BUTTON);
AlterProperty msg = new AlterProperty("SellHouse"); AlterProperty msg = new AlterProperty("SellHouse");
for (String string : selectedProperties) {
System.out.println(string);
}
msg.setProperties(selectedProperties.stream().map(p -> app.getGameLogic().getBoardManager().getFieldByName(p).getId()).map(p -> (Integer) p).collect(Collectors.toSet())); msg.setProperties(selectedProperties.stream().map(p -> app.getGameLogic().getBoardManager().getFieldByName(p).getId()).map(p -> (Integer) p).collect(Collectors.toSet()));
for (Integer integer : msg.getProperties()) {
System.out.println("ID des verkaufs: "+integer);
}
app.getGameLogic().send(msg); app.getGameLogic().send(msg);
close(); close();
})); }));

View File

@ -253,7 +253,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
@Override @Override
public void received(PlayerStatusUpdate msg) { public void received(PlayerStatusUpdate msg) {
playerHandler = msg.getPlayerHandler(); playerHandler = msg.getPlayerHandler();
LOGGER.log(Level.TRACE, "Update Player View triggerd with message: {0}", msg); System.out.println("Update Player");
notifyListeners(new UpdatePlayerView()); notifyListeners(new UpdatePlayerView());
} }
@ -317,6 +317,7 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
@Override @Override
public void received(BuildInfo msg) { public void received(BuildInfo msg) {
System.out.println("TRIGGER BUILD INFO");
if (msg.isAdded()) { if (msg.isAdded()) {
BuildingProperty property = ((BuildingProperty)boardManager.getFieldAtIndex(msg.getId())); BuildingProperty property = ((BuildingProperty)boardManager.getFieldAtIndex(msg.getId()));
if (property.getHotel() == 1 ) { if (property.getHotel() == 1 ) {

View File

@ -168,6 +168,7 @@ public class ServerGameLogic implements ClientInterpreter {
PropertyField property = (PropertyField) boardManager.getFieldAtIndex(player.getFieldID()); // Assuming player position for property PropertyField property = (PropertyField) boardManager.getFieldAtIndex(player.getFieldID()); // Assuming player position for property
player.buyProperty(property); player.buyProperty(property);
System.out.println("Properties:" +player.getProperties().toString());
LOGGER.log(Level.INFO, "Player {0} bought property {1}", player.getName(), property.getName()); LOGGER.log(Level.INFO, "Player {0} bought property {1}", player.getName(), property.getName());
} }
updateAllPlayers(); updateAllPlayers();

View File

@ -150,7 +150,7 @@ public class Figure implements Item{
float zOffset = new Random().nextFloat(); float zOffset = new Random().nextFloat();
//TODO adjust y pos //TODO adjust y pos
return new Vector3f(baseX , 0, baseZ ); return new Vector3f(baseX , 1, baseZ );
} }
public int getCurrentFieldID() { public int getCurrentFieldID() {
@ -158,6 +158,7 @@ public class Figure implements Item{
for (int fieldID = 0; fieldID < 40; fieldID++) { for (int fieldID = 0; fieldID < 40; fieldID++) {
Vector3f fieldPosition = calculateFieldPosition(fieldID); Vector3f fieldPosition = calculateFieldPosition(fieldID);
if (pos.distance(fieldPosition) < 0.1f) { // Toleranz für Positionsvergleich if (pos.distance(fieldPosition) < 0.1f) { // Toleranz für Positionsvergleich
System.out.println("Current field ID: " + fieldID);
return fieldID; return fieldID;
} }
} }

View File

@ -274,7 +274,6 @@ public class DeckHelper{
private void dienstreiseLourd(Player player) { private void dienstreiseLourd(Player player) {
player.pay(1000); player.pay(1000);
player.getHandler().getLogic().received(new EndTurn(), player.getId()); player.getHandler().getLogic().received(new EndTurn(), player.getId());
player.getHandler().getLogic().send(player, new NotificationMessage("aussetzen"));
} }
private void blutspendenSonderurlaub(Player player) { private void blutspendenSonderurlaub(Player player) {
@ -299,7 +298,6 @@ public class DeckHelper{
private void partyEskaliert(Player player) { private void partyEskaliert(Player player) {
player.getHandler().getLogic().received(new EndTurn(), player.getId()); player.getHandler().getLogic().received(new EndTurn(), player.getId());
player.getHandler().getLogic().send(player, new NotificationMessage("aussetzen"));
} }
private void vpEinstandsparty(Player player) { private void vpEinstandsparty(Player player) {
@ -312,7 +310,6 @@ public class DeckHelper{
private void bergmarsch(Player player) { private void bergmarsch(Player player) {
player.getHandler().getLogic().received(new EndTurn(), player.getId()); player.getHandler().getLogic().received(new EndTurn(), player.getId());
player.getHandler().getLogic().send(player, new NotificationMessage("aussetzen"));
} }
private void jodelEispenis(Player player) { private void jodelEispenis(Player player) {

View File

@ -801,6 +801,8 @@ public class ServerGameLogicTest {
player.buyProperty(property); player.buyProperty(property);
System.out.println("Player Balance: " + player.getAccountBalance());
System.out.println("Player Properties: " + player.getProperties());
assertEquals(14000, player.getAccountBalance()); assertEquals(14000, player.getAccountBalance());
assertTrue(player.getProperties().contains(property.getId())); assertTrue(player.getProperties().contains(property.getId()));
} }