From aff9c012e15286718ec6358b153dfabcc3e8d573 Mon Sep 17 00:00:00 2001 From: Joffrey Bion Date: Mon, 8 Mar 2021 00:09:30 +0100 Subject: Move GameState to the client --- .../org/luxons/sevenwonders/ui/components/game/GameScene.kt | 8 +++++++- .../kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt | 2 ++ .../src/main/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'sw-ui') diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt index 03ee881f..976bb2a6 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/GameScene.kt @@ -4,7 +4,13 @@ import com.palantir.blueprintjs.* import kotlinx.css.* import kotlinx.css.properties.transform import kotlinx.css.properties.translate -import org.luxons.sevenwonders.model.* +import org.luxons.sevenwonders.client.GameState +import org.luxons.sevenwonders.client.getBoard +import org.luxons.sevenwonders.client.getNonNeighbourBoards +import org.luxons.sevenwonders.client.getOwnBoard +import org.luxons.sevenwonders.model.MoveType +import org.luxons.sevenwonders.model.PlayerMove +import org.luxons.sevenwonders.model.TurnAction import org.luxons.sevenwonders.model.api.PlayerDTO import org.luxons.sevenwonders.model.boards.Board import org.luxons.sevenwonders.model.boards.RelativeBoardPosition diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt index 2d5d8b8d..1e60dcd4 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/components/game/Hand.kt @@ -4,6 +4,8 @@ import com.palantir.blueprintjs.* import kotlinx.css.* import kotlinx.css.properties.* import kotlinx.html.DIV +import org.luxons.sevenwonders.client.GameState +import org.luxons.sevenwonders.client.getOwnBoard import org.luxons.sevenwonders.model.* import org.luxons.sevenwonders.model.boards.Board import org.luxons.sevenwonders.model.cards.CardPlayability diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt index 082387c6..3fb72904 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Reducers.kt @@ -1,6 +1,6 @@ package org.luxons.sevenwonders.ui.redux -import org.luxons.sevenwonders.model.GameState +import org.luxons.sevenwonders.client.GameState import org.luxons.sevenwonders.model.api.ConnectedPlayer import org.luxons.sevenwonders.model.api.GameListEvent import org.luxons.sevenwonders.model.api.LobbyDTO -- cgit