peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2

Browse Source
This commit is contained in:
Benjamin Feyer
2024-12-10 21:03:21 +01:00
parent f23f1f5abc 8d7701cbf2
commit cc756453a1
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
View File

@@ -89,7 +89,7 @@ public Game() {
gameStatistics = new Statistic();
initializeDrawPile();
board = new Board();
die = new Die(1,2,4,4,1,5,5,5,4,6,1,5,6,4,3,4,6,4,1,1,2,5,1,6,5,6,1,4,2,5,1,3,2,2,4,6,6,5);
die = new Die();
}
/**

15
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java
View File

@@ -56,11 +56,6 @@ public void initializeGame() {
for (var player : this.logic.getGame().getPlayers().values()) {
player.initialize();
player.addHandCard(this.logic.getGame().draw());
//TODO
player.addHandCard(new TurboCard());
player.addHandCard(new ShieldCard());
player.addHandCard(new SwapCard());
Piece piece = player.getPieces()[0];
player.getWaitingArea()[0] = null;
@@ -169,9 +164,13 @@ public void received(LobbyNotReadyMessage msg, int from) {
@Override
public void received(StartGameMessage msg, int from) {
if (this.logic.getGame().areAllReady()) {
this.initializeGame();
this.logic.getServerSender().broadcast(new ServerStartGameMessage(this.logic.getGame().getPlayersAsList(), this.logic.getGame().getBoard()));
this.logic.setCurrentState(this.logic.getGameState());
if (this.logic.getGame().getPlayers().size() >= 2) {
this.initializeGame();
this.logic.getServerSender().broadcast(new ServerStartGameMessage(this.logic.getGame().getPlayersAsList(), this.logic.getGame().getBoard()));
this.logic.setCurrentState(this.logic.getGameState());
} else {
this.logic.getServerSender().send(from, new IncorrectRequestMessage(6));
}
}
else {
this.logic.getServerSender().send(from, new IncorrectRequestMessage(5));

1
Projekte/mdga/model/src/main/resources/mdga.properties
View File

@@ -6,6 +6,7 @@ incorrect.request.2=Chosen PowerCard cannot be played.
incorrect.request.3=Selected to many or wrong pieces.
incorrect.request.4=Did not select exactly 2 pieces or selected wrong pieces.
incorrect.request.5=Cannot start game because not everyone is ready.
incorrect.request.6=You are alone in this Lobby.

3
Projekte/mdga/model/src/main/resources/mdga_de.properties
View File

@@ -3,6 +3,7 @@ server.shutdown=Der Server wurde heruntergefahren.
incorrect.request.0=Die ausgewählte TSK ist bereits belegt.
incorrect.request.1=Es gibt keine freie TSK mehr, welche ausgewählt werden kann.
incorrect.request.2=Die ausgewälte Powerkarte kann nicht eingesetzt werden.
incorrect.request.3=Du hast zuviele, oder eine falsche Figur ausgewählt.
incorrect.request.3=Du hast zuviele, oder eine falsche Figur ausgew<EFBFBD>hlt.
incorrect.request.4=Du hast nicht genau zwei Figuren, oder falsche Figuren ausgewählt.
incorrect.request.5=Du kannst das Spiel nicht starten, da nicht alle Spieler bereit sind.
incorrect.request.6=Du bist alleine in dieser Lobby.