From 78aff48d30f7943a720c2d0714d5fe304685c29b Mon Sep 17 00:00:00 2001 From: Joffrey Bion Date: Sat, 28 Mar 2020 23:00:18 +0100 Subject: Improve state updates for turn info --- .../src/commonMain/kotlin/org/luxons/sevenwonders/model/Moves.kt | 3 ++- .../src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Api.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sw-common-model/src/commonMain') diff --git a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Moves.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Moves.kt index 05b95b17..22cbfc8c 100644 --- a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Moves.kt +++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/Moves.kt @@ -8,6 +8,7 @@ import org.luxons.sevenwonders.model.resources.noTransactions import org.luxons.sevenwonders.model.wonders.WonderBuildability enum class Action(val message: String) { + SAY_READY("Say when you're ready to get your next hand"), PLAY("Pick the card you want to play or discard."), PLAY_2("Pick the first card you want to play or discard. Note that you have the ability to play these 2 last cards. You will choose how to play the last one during your next turn."), PLAY_LAST("You have the special ability to play your last card. Choose how you want to play it."), @@ -20,7 +21,7 @@ data class PlayerTurnInfo( val playerIndex: Int, val table: GameState, val action: Action, - val hand: List, + val hand: List?, val preparedMove: PlayedMove?, val neighbourGuildCards: List ) { diff --git a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Api.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Api.kt index aca9b140..d28c8ca3 100644 --- a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Api.kt +++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/api/Api.kt @@ -31,5 +31,6 @@ data class PlayerDTO( val displayName: String, val index: Int, val isGameOwner: Boolean, - val isMe: Boolean + val isMe: Boolean, + val isReady: Boolean ) -- cgit