Fix a few replay bugs

Author: Zomis

games-core/src/main/kotlin/net/zomis/games/dsl/impl/DslImpl.kt

@@ -145,12 +145,15 @@ class GameViewContext<T : Any>(val model: T, private val eliminations: PlayerEli
 
 class StateKeeper {
     private val currentAction = mutableMapOf<String, Any>()
+    var replayMode = false
 
     fun lastMoveState(): Map<String, Any?> = currentAction.toMap()
     fun clear() {
         currentAction.clear()
+        replayMode = false
     }
     fun setState(state: Map<String, Any>) {
+        replayMode = true
         currentAction.putAll(state)
     }
 
@@ -169,7 +172,6 @@ class StateKeeper {
 }
 class ReplayState(val stateKeeper: StateKeeper, override val playerEliminations: PlayerEliminations): EffectScope, ReplayScope, ReplayableScope {
     private val mostRecent = mutableMapOf<String, Any>()
-    private var replayMode = false
 
     override fun replayable(): ReplayableScope {
         return this
@@ -179,12 +181,11 @@ class ReplayState(val stateKeeper: StateKeeper, override val playerEliminations:
         stateKeeper.clear()
         if (state != null) {
             stateKeeper.setState(state)
-            replayMode = true
         }
     }
 
     private fun <T: Any> replayable(key: String, default: () -> T): T {
-        if (stateKeeper.containsKey(key) && !replayMode) {
+        if (stateKeeper.containsKey(key) && !stateKeeper.replayMode) {
             throw IllegalStateException("State was already saved once for key $key. Use a different key")
         }
         if (stateKeeper.containsKey(key)) {

games-vue-client/src/components/games/splendor/Splendor.vue

@@ -29,9 +29,10 @@
                             <v-col>
                                 <span :class="{
                                     ['bank-' + index]: true,
-                                    actionable: actions2.available.takeMoney['take-' + index],
+                                    actionable: actions2.available.takeMoney && actions2.available.takeMoney['take-' + index],
                                     'chosen-once': (actions2.chosen) ? actions2.chosen.choices.includes(index) : false,
-                                    'chose-again': (actions2.chosen) ? actions2.chosen.choices.includes(index) && actions2.available.takeMoney['take-' + index] : false}"
+                                    'chose-again': (actions2.chosen) ? actions2.chosen.choices.includes(index) && actions2.available.takeMoney
+                                        && actions2.available.takeMoney['take-' + index] : false}"
                                     @click="takeMoney(index)">{{ money }}</span>
                             </v-col>
                         </v-row>

games-vue-client/src/components/replays/GameReplay.vue

@@ -27,14 +27,13 @@
           <v-icon>mdi-skip-next</v-icon>
         </v-btn>
       </v-layout>
-      <v-flex grow>
+      <v-flex grow v-if="replay">
         <GameHead xs12 :gameInfo="gameInfo" :view="currentView" :eliminations="currentEliminations" v-if="gameInfo"></GameHead>
         <v-alert type="warning" v-for="error in replay.errors" :key="error">{{ error }}</v-alert>
         <div xs12>
             Started at {{ timeStarted }} - Ended at {{ timeLastAction }}
         </div>
-        <component xs12 :is="gameComponent" :actions="{}" :view="currentView" :players="players" />
-        <GameResult xs12 :gameInfo="gameInfo"></GameResult>
+        <component xs12 :is="gameComponent" :actions="{}" :actions2="actions2" :view="currentView" :players="players" />
       </v-flex>
     </v-layout>
     <AiQuery :gameInfo="gameInfo" :gamePosition="position" />
@@ -59,6 +58,13 @@ export default {
             running: false,
             timer: null,
             position: 0,
+            actions2: {
+                chosen: null,
+                perform: () => {},
+                available: {},
+                clear: () => {},
+                resetTo: () => {}
+            },
             replay: null
         }
     },