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

fix: fix turn count

Browse Source
This commit is contained in:
punchready 2021-07-02 15:39:21 +02:00
parent bacb6a65df
commit a7b0514bd8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java
View File

@ -873,7 +873,7 @@ public class GameLogic {
turns.add(id); turns.add(id);
}else { // send empty turn for knocked out characters }else { // send empty turn for knocked out characters
result.add(new EventBuilder(EventType.TurnEvent) result.add(new EventBuilder(EventType.TurnEvent)
.withTurnCount(state.turnOrder.size()) .withTurnCount(state.turnOrder.indexOf(id) + 1)
.withNextCharacter(id) .withNextCharacter(id)
.buildGameEvent()); .buildGameEvent());
} }
@ -950,7 +950,7 @@ public class GameLogic {
break; break;
}else { // again send empty turns for knocked out characters }else { // again send empty turns for knocked out characters
result.add(new EventBuilder(EventType.TurnEvent) result.add(new EventBuilder(EventType.TurnEvent)
.withTurnCount(state.turnOrder.size()) .withTurnCount(state.turnOrder.indexOf(id) + 1)
.withNextCharacter(id) .withNextCharacter(id)
.buildGameEvent()); .buildGameEvent());
} }
@ -1127,7 +1127,7 @@ public class GameLogic {
ArrayList<Event> result = new ArrayList<>(); ArrayList<Event> result = new ArrayList<>();
result.add(new EventBuilder(EventType.TurnEvent) result.add(new EventBuilder(EventType.TurnEvent)
.withTurnCount(state.turnOrder.size()) .withTurnCount(state.turnOrder.indexOf(thanos.id) + 1)
.withNextCharacter(thanos.id) .withNextCharacter(thanos.id)
.buildGameEvent()); .buildGameEvent());