refactor(view): calculate round number on the fly

software-challenge · Jun 27, 2024 · 1d12fb9 · 1d12fb9
1 parent 186cabe
commit 1d12fb9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/backend b/backend
diff --git a/src/main/kotlin/sc/gui/model/GameModel.kt b/src/main/kotlin/sc/gui/model/GameModel.kt
@@ -25,7 +25,6 @@ class GameModel: ViewModel() {
     val stepSpeed = objectProperty(5.0)
 
     val currentTurn = integerBinding(gameState) { value?.turn ?: 0 }
-    val currentRound = integerBinding(gameState) { value?.round ?: 0 }
     val currentTeam = nonNullObjectBinding(gameState) { value?.currentTeam ?: Team.ONE }
 
     val isHumanTurn = booleanProperty(false)

diff --git a/src/main/kotlin/sc/gui/view/StatusView.kt b/src/main/kotlin/sc/gui/view/StatusView.kt
@@ -40,7 +40,7 @@ class ScoreBinding(private val game: GameModel): StringBinding() {
 
     override fun computeValue(): String =
         if(game.gameStarted.value)
-            "Runde ${game.currentRound.get()} - " +
+            "Runde ${(game.currentTurn.get() + 1) / 2} - " +
             (game.gameState.value?.let {
                 "${it.teamStats(it.startTeam).firstOrNull()?.value} : ${
                     it.teamStats(it.startTeam.opponent()).firstOrNull()?.value