diff options
| author | joffrey-bion <joffrey.bion@gmail.com> | 2020-12-12 02:03:45 +0100 |
|---|---|---|
| committer | joffrey-bion <joffrey.bion@gmail.com> | 2020-12-12 02:44:13 +0100 |
| commit | 9ba1b1251d16956fe3b9cd07f198577b63d4a486 (patch) | |
| tree | a780a985f022a8ab9699a8990174630089e5feb3 /sw-common-model/src/commonMain/kotlin/org | |
| parent | Improve score board tags colors (diff) | |
| download | seven-wonders-9ba1b1251d16956fe3b9cd07f198577b63d4a486.tar.gz seven-wonders-9ba1b1251d16956fe3b9cd07f198577b63d4a486.tar.bz2 seven-wonders-9ba1b1251d16956fe3b9cd07f198577b63d4a486.zip | |
Make ready button optional (server side)
Resolves:
https://github.com/joffrey-bion/seven-wonders/issues/63
Diffstat (limited to 'sw-common-model/src/commonMain/kotlin/org')
| -rw-r--r-- | sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Settings.kt | 1 | ||||
| -rw-r--r-- | sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Lobby.kt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Settings.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Settings.kt index a6c949ea..d2ff40be 100644 --- a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Settings.kt +++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Settings.kt @@ -7,6 +7,7 @@ import kotlin.random.Random data class Settings( val randomSeedForTests: Long? = null, val timeLimitInSeconds: Int = 45, + val askForReadiness: Boolean = false, val initialGold: Int = 3, val discardedCardGold: Int = 3, val defaultTradingCost: Int = 2, diff --git a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Lobby.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Lobby.kt index 62bac3b1..5a06fa63 100644 --- a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Lobby.kt +++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Lobby.kt @@ -2,6 +2,7 @@ package org.luxons.sevenwonders.model.api import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import org.luxons.sevenwonders.model.Settings import org.luxons.sevenwonders.model.wonders.PreGameWonder const val SEVEN_WONDERS_WS_ENDPOINT = "/seven-wonders-websocket" @@ -45,6 +46,7 @@ data class LobbyDTO( val players: List<PlayerDTO>, val allWonders: List<PreGameWonder>, val state: State, + val settings: Settings, val hasEnoughPlayers: Boolean, val maxPlayersReached: Boolean, ) { |