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

Updated 'DetermineStartPlayerState' class.

Browse Source 
Updated the 'DetermineStartPlayerState' class by updating the 'AnimationEndMessage' handling in it. In Addition, the 'RequestDieMessage' handling was updated as well.
This commit is contained in:
Daniel Grigencha
2024-12-06 02:55:14 +01:00
parent a6205c982a
commit 8470a96908
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/DetermineStartPlayerState.java
View File

@@ -1,6 +1,5 @@
package pp.mdga.server.automaton.game; package pp.mdga.server.automaton.game;
import pp.mdga.game.Player;
import pp.mdga.message.client.AnimationEndMessage; import pp.mdga.message.client.AnimationEndMessage;
import pp.mdga.message.client.RequestDieMessage; import pp.mdga.message.client.RequestDieMessage;
import pp.mdga.message.server.ActivePlayerMessage; import pp.mdga.message.server.ActivePlayerMessage;
@@ -15,8 +14,6 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
public class DetermineStartPlayerState extends GameAutomatonState { public class DetermineStartPlayerState extends GameAutomatonState {
/** /**
@@ -29,6 +26,7 @@ public class DetermineStartPlayerState extends GameAutomatonState {
*/ */
private Map<Integer, Integer> diceResults = new HashMap<>(); private Map<Integer, Integer> diceResults = new HashMap<>();
private Map<Integer, Integer> rankedResults = new HashMap<>(); private Map<Integer, Integer> rankedResults = new HashMap<>();
private final List<Integer> playersHaveToRoll = new ArrayList<>();
private Map<Integer, Boolean> messageReceived = new HashMap<>(); private Map<Integer, Boolean> messageReceived = new HashMap<>();
/** /**
@@ -67,32 +65,20 @@ public void received(RequestDieMessage msg, int from) {
this.diceResults.put(from, roll); this.diceResults.put(from, roll);
if (this.diceResults.size() == this.logic.getGame().getPlayers().size()) { if (this.diceResults.size() == this.logic.getGame().getPlayers().size()) {
int maximumRoll = 0; int maximumRoll = 0;
List<Integer> playersHaveToRoll = new ArrayList<>();
for (Map.Entry<Integer, Integer> entry : this.diceResults.entrySet()) { for (Map.Entry<Integer, Integer> entry : this.diceResults.entrySet()) {
if (maximumRoll == entry.getKey()) { if (maximumRoll == entry.getKey()) {
playersHaveToRoll.add(entry.getKey()); this.playersHaveToRoll.add(entry.getKey());
} }
else if (maximumRoll < entry.getKey()) { else if (maximumRoll < entry.getKey()) {
maximumRoll = entry.getValue(); maximumRoll = entry.getValue();
playersHaveToRoll.clear(); this.playersHaveToRoll.clear();
playersHaveToRoll.add(entry.getKey()); this.playersHaveToRoll.add(entry.getKey());
} }
else { else {
this.logic.getServerSender().send(entry.getKey(), new EndOfTurnMessage()); this.logic.getServerSender().send(entry.getKey(), new EndOfTurnMessage());
} }
} }
if (playersHaveToRoll.size() > 1) {
for (Integer id : playersHaveToRoll) {
this.logic.getServerSender().send(id, new DiceNowMessage());
}
}
else {
this.logic.getServerSender().broadcast(new RankingResponseMessage(this.diceResults));
this.logic.getServerSender().broadcast(new ActivePlayerMessage(this.logic.getGame().getPlayerById(playersHaveToRoll.get(0)).getColor()));
this.gameAutomaton.setCurrentState(this.gameAutomaton.getAnimationState());
}
} }
} }
@@ -105,12 +91,18 @@ else if (maximumRoll < entry.getKey()) {
*/ */
@Override @Override
public void received(AnimationEndMessage msg, int from) { public void received(AnimationEndMessage msg, int from) {
if (this.messageReceived.size() == this.logic.getGame().getPlayers().size()) {
this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new DiceNowMessage());
this.gameAutomaton.setCurrentState(this.gameAutomaton.getTurnState());
this.gameAutomaton.getTurnState().setCurrentState(this.gameAutomaton.getTurnState().getPowerCardState());
} else {
this.messageReceived.put(from, true); this.messageReceived.put(from, true);
if (this.messageReceived.size() == this.logic.getGame().getPlayers().size()) {
if (this.playersHaveToRoll.size() > 1) {
for (Integer id : this.playersHaveToRoll) {
this.logic.getServerSender().send(id, new DiceNowMessage());
}
}
else {
this.logic.getServerSender().broadcast(new RankingResponseMessage(this.diceResults));
this.logic.getServerSender().broadcast(new ActivePlayerMessage(this.logic.getGame().getPlayerById(this.playersHaveToRoll.get(0)).getColor()));
this.gameAutomaton.setCurrentState(this.gameAutomaton.getTurnState());
}
} }
} }
} }