From 36c2f2efec2454e02d1e5e57ef33b156672dade6 Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Tue, 10 Dec 2024 11:54:45 +0100 Subject: [PATCH] commit --- .../gamestate/turnstate/RollDiceState.java | 2 +- .../model/src/main/java/pp/mdga/game/Game.java | 4 +++- .../pp/mdga/server/automaton/LobbyState.java | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java index 0197a310..d12ff13b 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java @@ -40,7 +40,7 @@ public TurnState getParent() { @Override public void selectDice(){ if (!isRolled){ - isRolled=true; + isRolled = true; logic.send(new RequestDieMessage()); } } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java index 1a151a0f..6a16a760 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java @@ -87,7 +87,9 @@ public Game() { gameStatistics = new Statistic(); initializeDrawPile(); board = new Board(); - die = new Die(1,4); + die = new Die(1,2,3, + 5,1,1, //SHIELD + 3); //MODIFIER } /** diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java index d0c2995c..f5cce066 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java @@ -87,6 +87,22 @@ public void initializeGame() { player.addHandCard(new SwapCard()); player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); + player.addHandCard(new SwapCard()); Piece piece = player.getPieces()[0];