diff options
| author | joffrey-bion <joffrey.bion@gmail.com> | 2021-02-08 19:17:34 +0100 |
|---|---|---|
| committer | joffrey-bion <joffrey.bion@gmail.com> | 2021-02-08 19:54:05 +0100 |
| commit | 65d04e2f10050c2b10899d7bc3a91a9e64268867 (patch) | |
| tree | 0bf4af8b187b914444229b988a5e5a2930487021 | |
| parent | Add Kotlinx Serialization converter for HTTP traffic (diff) | |
| download | seven-wonders-65d04e2f10050c2b10899d7bc3a91a9e64268867.tar.gz seven-wonders-65d04e2f10050c2b10899d7bc3a91a9e64268867.tar.bz2 seven-wonders-65d04e2f10050c2b10899d7bc3a91a9e64268867.zip | |
Remove unnecessary image input in AssignedWonder
Resolves:
https://github.com/joffrey-bion/seven-wonders/issues/88
| -rw-r--r-- | sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/wonders/Wonders.kt | 3 | ||||
| -rw-r--r-- | sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/wonders/Wonders.kt b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/wonders/Wonders.kt index dbca061e..778c8b80 100644 --- a/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/wonders/Wonders.kt +++ b/sw-common-model/src/commonMain/kotlin/org/luxons/sevenwonders/model/wonders/Wonders.kt @@ -20,7 +20,6 @@ data class PreGameWonder( data class AssignedWonder( val name: WonderName, val side: WonderSide, - val image: String, ) enum class WonderSide { @@ -33,7 +32,7 @@ fun List<PreGameWonder>.deal(nbPlayers: Int, random: Random = Random): List<Assi fun PreGameWonder.withRandomSide(random: Random = Random): AssignedWonder = withSide(WonderSide.values().random(random)) -fun PreGameWonder.withSide(side: WonderSide): AssignedWonder = AssignedWonder(name, side, images.getValue(side)) +fun PreGameWonder.withSide(side: WonderSide): AssignedWonder = AssignedWonder(name, side) @Serializable data class ApiWonder( diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt index e0dba284..7774d517 100644 --- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt +++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/lobby/Lobby.kt @@ -4,9 +4,7 @@ import org.luxons.sevenwonders.engine.Game import org.luxons.sevenwonders.engine.data.GameDefinition import org.luxons.sevenwonders.model.Settings import org.luxons.sevenwonders.model.api.State -import org.luxons.sevenwonders.model.wonders.AssignedWonder -import org.luxons.sevenwonders.model.wonders.PreGameWonder -import org.luxons.sevenwonders.model.wonders.withRandomSide +import org.luxons.sevenwonders.model.wonders.* class Lobby( val id: Long, @@ -87,7 +85,7 @@ class Lobby( fun reassignWonders(wonders: List<AssignedWonder>) { require(wonders.size == players.size) wonders.forEach { - require(it.name in allWonders.map { w -> w.name }) + require(it.name in allWonders.map { w -> w.name }) { "Unknown wonder '${it.name}'" } } assignedWonders.clear() assignedWonders.addAll(wonders) |