diff options
Diffstat (limited to 'sw-engine')
| -rw-r--r-- | sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Military.kt | 8 | ||||
| -rw-r--r-- | sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/converters/Boards.kt | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Military.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Military.kt index a4cb4ee8..0b81f29d 100644 --- a/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Military.kt +++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/boards/Military.kt @@ -9,7 +9,10 @@ internal class Military( var nbShields = 0 private set - var totalPoints = 0 + val totalPoints + get() = victoryPoints + lostPointsPerDefeat * nbDefeatTokens + + var victoryPoints = 0 private set var nbDefeatTokens = 0 @@ -21,11 +24,10 @@ internal class Military( internal fun victory(age: Age) { val wonPoints = wonPointsPerVictoryPerAge[age] ?: throw UnknownAgeException(age) - totalPoints += wonPoints + victoryPoints += wonPoints } internal fun defeat() { - totalPoints -= lostPointsPerDefeat nbDefeatTokens++ } diff --git a/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/converters/Boards.kt b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/converters/Boards.kt index 0d8369ac..ba07ce3a 100644 --- a/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/converters/Boards.kt +++ b/sw-engine/src/main/kotlin/org/luxons/sevenwonders/engine/converters/Boards.kt @@ -87,7 +87,8 @@ internal fun Resources.toCountedResourcesList(): List<CountedResource> = .map { (type, count) -> CountedResource(count, type) } .sortedBy { it.type } -internal fun InternalMilitary.toApiMilitary(): ApiMilitary = ApiMilitary(nbShields, totalPoints, nbDefeatTokens) +internal fun InternalMilitary.toApiMilitary(): ApiMilitary = + ApiMilitary(nbShields, victoryPoints, totalPoints, nbDefeatTokens) internal fun InternalScience.toApiScience(): ApiScience = ApiScience( |