diff options
| author | Joffrey Bion <joffrey.bion@booking.com> | 2020-05-15 03:54:10 +0200 |
|---|---|---|
| committer | Joffrey Bion <joffrey.bion@booking.com> | 2020-05-15 03:54:10 +0200 |
| commit | 922faefc516126d8eae6c8ced960dfaa9ec2f25a (patch) | |
| tree | 553a9e55e5b643021ba70f70213f81eeaed7b9d3 | |
| parent | Make Lobby/player repository more thread safe (diff) | |
| download | seven-wonders-922faefc516126d8eae6c8ced960dfaa9ec2f25a.tar.gz seven-wonders-922faefc516126d8eae6c8ced960dfaa9ec2f25a.tar.bz2 seven-wonders-922faefc516126d8eae6c8ced960dfaa9ec2f25a.zip | |
Add player index in scoreboard
| -rw-r--r-- | sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt | 1 | ||||
| -rw-r--r-- | sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Board.kt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt index 10fe02e1..3f9dbe41 100644 --- a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt +++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/score/Score.kt @@ -7,6 +7,7 @@ class ScoreBoard(val scores: Collection<PlayerScore>) @Serializable data class PlayerScore( + val playerIndex: Int, val boardGold: Int, val pointsByCategory: Map<ScoreCategory, Int> ) : Comparable<PlayerScore> { diff --git a/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Board.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Board.kt index 8f683bd7..4c67be82 100644 --- a/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Board.kt +++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Board.kt @@ -73,6 +73,7 @@ internal class Board(val wonder: Wonder, val playerIndex: Int, settings: Setting } fun computeScore(player: Player): PlayerScore = PlayerScore( + playerIndex = playerIndex, boardGold = gold, pointsByCategory = mapOf( ScoreCategory.CIVIL to computePointsForCards(player, Color.BLUE), |