quentinlegot/turn-based-strategy-game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Katchan 2021-12-07 15:56:03 +01:00
commit db2e2e1f7a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/main/java/fr/lnl/game/client/listener/ButtonListener.java
View File

@ -31,11 +31,12 @@ public class ButtonListener extends AbstractModelListening {
public void updateModel(Object event) { public void updateModel(Object event) {
Player player = game.getCurrentPlayer(); Player player = game.getCurrentPlayer();
game.play(); game.play();
/*
Alert alert = new Alert(Alert.AlertType.INFORMATION); Alert alert = new Alert(Alert.AlertType.INFORMATION);
alert.setTitle("Un joueur ordinateur a joué"); alert.setTitle("Un joueur ordinateur a joué");
alert.setHeaderText("Le joueur ordinateur numéro" + player.getId() + " a joué"); alert.setHeaderText("Le joueur ordinateur numéro" + player.getId() + " a joué");
alert.setContentText("Il a joué l'action: " + game.getSelectedAction()); alert.setContentText("Il a joué l'action: " + game.getSelectedAction());*/
App.viewManager.updateView(); App.viewManager.updateView();
alert.showAndWait(); //alert.showAndWait();
} }
} }

2
client/src/main/java/fr/lnl/game/client/view/Window.java
View File

@ -105,7 +105,7 @@ public class Window extends AbstractView {
StackPane subSp = new StackPane(); StackPane subSp = new StackPane();
String s = "Joueur " + (playerNumber+1) + "\n" + String s = "Joueur " + (playerNumber+1) + "\n" +
"Energie : " + game.getPlayers().get(playerNumber).getEnergy() + "\n" + "Energie : " + game.getPlayers().get(playerNumber).getEnergy() + "\n" +
"Arme : " + game.getPlayers().get(playerNumber).getWeapon() + "\n"; "Arme : " + game.getPlayers().get(playerNumber).getWeapon().getClass().getSimpleName() + "\n";
Text t = new Text(s); Text t = new Text(s);
Rectangle r = new Rectangle(); Rectangle r = new Rectangle();
r.setWidth(500); r.setWidth(500);