From b8402f636fc45bae4ccb8a338068083617b42602 Mon Sep 17 00:00:00 2001 From: punchready Date: Mon, 7 Jun 2021 15:16:37 +0200 Subject: [PATCH] fix: turns out turn count means something totally different --- .../teamname/marvelous/gamelibrary/gamelogic/GameLogic.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java index f513ba9..62e2990 100644 --- a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java +++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java @@ -960,7 +960,7 @@ public class GameLogic { .withEntity(new NPC(goose, position, inventory)) .buildEntityEvent()); result.add(new EventBuilder(EventType.TurnEvent) - .withTurnCount(state.turnOrder.size()) + .withTurnCount(1) .withNextCharacter(goose) .buildGameEvent()); result.add(new EventBuilder(EventType.SpawnEntityEvent) @@ -1014,7 +1014,7 @@ public class GameLogic { .withEntity(new NPC(stan, spawnPosition)) .buildEntityEvent()); result.add(new EventBuilder(EventType.TurnEvent) - .withTurnCount(state.turnOrder.size()) + .withTurnCount(1) .withNextCharacter(stan) .buildGameEvent()); @@ -1218,7 +1218,7 @@ public class GameLogic { } result.add(new EventBuilder(EventType.TurnEvent) - .withTurnCount(state.turnOrder.size()) + .withTurnCount(state.turnOrder.indexOf(state.activeCharacter) + 1) .withNextCharacter(state.activeCharacter) .buildGameEvent());