Yandrik/Gamelib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: add more necessary getters to GameStateView

Browse Source
This commit is contained in:
punchready 2021-05-18 18:44:01 +02:00
parent 1348e342d6
commit 588633fe46
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateView.java
View File

@ -5,6 +5,7 @@ import uulm.teamname.marvelous.gamelibrary.entities.Entity;
import uulm.teamname.marvelous.gamelibrary.entities.EntityID; import uulm.teamname.marvelous.gamelibrary.entities.EntityID;
import uulm.teamname.marvelous.gamelibrary.entities.StoneType; import uulm.teamname.marvelous.gamelibrary.entities.StoneType;
import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
/** Represents a game state view containing getters for all the properties of a {@link GameState}. */ /** Represents a game state view containing getters for all the properties of a {@link GameState}. */
@ -40,6 +41,10 @@ public class GameStateView {
return state.activeCharacter; return state.activeCharacter;
} }
public ArrayList<EntityID> getTurnOrder() {
return state.turnOrder;
}
public boolean isWon() { public boolean isWon() {
return state.won; return state.won;
} }
@ -47,4 +52,8 @@ public class GameStateView {
public int getStoneCooldown(StoneType stone) { public int getStoneCooldown(StoneType stone) {
return state.stoneCooldown.getCooldown(stone); return state.stoneCooldown.getCooldown(stone);
} }
public ParticipantType getWinnerAccordingToWinConditions() {
return GameLogic.checkWinConditions(state);
}
} }

4
src/test/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameStateTest.java
View File

@ -5,6 +5,10 @@ import uulm.teamname.marvelous.gamelibrary.IntVector2;
import uulm.teamname.marvelous.gamelibrary.entities.EntityID; import uulm.teamname.marvelous.gamelibrary.entities.EntityID;
import uulm.teamname.marvelous.gamelibrary.entities.EntityType; import uulm.teamname.marvelous.gamelibrary.entities.EntityType;
import uulm.teamname.marvelous.gamelibrary.entities.Rock; import uulm.teamname.marvelous.gamelibrary.entities.Rock;
import uulm.teamname.marvelous.gamelibrary.events.Event;
import uulm.teamname.marvelous.gamelibrary.requests.CharacterRequest;
import java.util.ArrayList;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;