merge dev into test #30

Merged
j23f0712 merged 45 commits from development into dev/test 2024-12-02 01:29:40 +01:00
31 changed files with 366 additions and 122 deletions
Showing only changes of commit a19ac2fc51 - Show all commits

View File

@@ -25,9 +25,9 @@ public class GameState extends ServerState {
* Create GameState states.
*/
private GameAutomatonState currentState;
private final GameAutomatonState determineStartPlayerState;
private final GameAutomatonState animationState;
private final GameAutomatonState turnState;
private final DetermineStartPlayerState determineStartPlayerState;
private final AnimationState animationState;
private final TurnState turnState;
/**
* Constructor.
@@ -122,27 +122,27 @@ public GameAutomatonState getCurrentState() {
/**
* This method will be used to return determineStartPlayerState attribute of GameState class.
*
* @return determineStartPlayerState as a GameAutomatonState object.
* @return determineStartPlayerState as a DetermineStartPlayerState object.
*/
public GameAutomatonState getDetermineStartPlayerState() {
public DetermineStartPlayerState getDetermineStartPlayerState() {
return this.determineStartPlayerState;
}
/**
* This method will be used to return animationState attribute of GameState class.
*
* @return animationState as a GameAutomatonState object.
* @return animationState as a AnimationState object.
*/
public GameAutomatonState getAnimationState() {
public AnimationState getAnimationState() {
return this.animationState;
}
/**
* This method will be used to return turnState attribute of GameState class.
*
* @return turnState as a GameAutomatonState object.
* @return turnState as a TurnState object.
*/
public GameAutomatonState getTurnState() {
public TurnState getTurnState() {
return this.turnState;
}