Merge pull request #6313 from jwarwick/replay

Get replay working

Author: jwarwick

src/clj/game/core/commands.clj

@@ -52,6 +52,9 @@
                       :choices {:card (fn [t] (same-side? (:side t) side))}}
                      (map->Card {:title "/adv-counter command"}) nil)))
 
+(defn command-save-replay [state _]
+  (swap! state assoc-in [:options :save-replay] true))
+
 (defn command-bug-report [state side]
   (swap! state update :bug-reported (fnil inc -1))
   (let [title "[EDITME] Please give a short description of your bug here"
@@ -388,6 +391,7 @@
                                          :choices {:card (fn [t] (same-side? (:side t) %2))}}
                                         (map->Card {:title "/rfg command"}) nil)
         "/roll"       #(command-roll %1 %2 value)
+        "/save-replay" command-save-replay
         "/summon"     #(command-summon %1 %2 args)
         "/swap-ice"   #(when (= %2 :corp)
                           (resolve-ability

src/clj/tasks/load_generator.clj

@@ -151,7 +151,7 @@
           (range 1 max-users)))
 
       (safe-println "Spectators connected")
-      (game-ws-handler/-msg-handler {:id :netrunner/start
+      (game-ws-handler/-msg-handler {:id :game/start
                                      :ring-req {:system/db db
                                                 :user {:username "TestCorp"}}
                                      :uid "TestCorp"

src/clj/web/stats.clj

@@ -264,7 +264,7 @@
 (defn publish-annotations
   [{db :system/db
     {username :username} :user
-    {:keys [gameid]} :params
+    {:keys [gameid]} :path-params
     body :body}]
   (let [{:keys [corp runner replay replay-shared annotations]}
         (mc/find-one-as-map db :game-logs {:gameid gameid} ["corp" "runner" "replay" "replay-shared" "annotations"])
@@ -291,7 +291,7 @@
 (defn delete-annotations
   [{db :system/db
     {username :username} :user
-    {:keys [gameid date]} :params}]
+    {:keys [gameid date]} :path-params}]
   (let [{:keys [corp runner replay annotations]}
         (mc/find-one-as-map db :game-logs {:gameid gameid} ["corp" "runner" "replay" "replay-shared" "annotations"])
         replay (or replay {})
@@ -316,7 +316,7 @@
 (defn fetch-replay
   [{db :system/db
     {username :username} :user
-    {:keys [gameid]} :params}]
+    {:keys [gameid]} :path-params}]
   (let [{:keys [corp runner replay replay-shared bug-reported]}
         (mc/find-one-as-map db :game-logs {:gameid gameid} ["corp" "runner" "replay" "replay-shared" "bug-reported"])
         replay (or replay {})]
@@ -332,7 +332,7 @@
 (defn share-replay
   [{db :system/db
     {username :username} :user
-    {:keys [gameid]} :params}]
+    {:keys [gameid]} :path-params}]
   (if username
     (try
       (mc/update db :game-logs
@@ -359,7 +359,7 @@
 
 (defn replay-handler
   [{db :system/db
-    {:keys [gameid bugid]}  :path-params
+    {:keys [gameid bugid]}        :path-params
     {:keys [n d b]}               :query-params
     scheme                        :scheme
     headers                       :headers

src/cljs/nr/gameboard/actions.cljs

@@ -22,7 +22,8 @@
     (reset! last-state @game-state)
     (reset! ws/lock false)
     (when (:replay-diffs state)
-      (init-replay app-state state))))
+      (init-replay app-state state)
+      (swap! app-state assoc-in [:current-game :started] true))))
 
 (defn launch-game! [state]
   (init-game! state)

src/cljs/nr/gameboard/state.cljs

@@ -16,11 +16,11 @@
   (js->clj (.parse js/JSON state) :keywordize-keys true))
 
 (defn get-side [state]
-  (r/with-let [user-id (r/cursor app-state [:user :_id])]
+  (let [user-id (get-in @app-state [:user :_id])]
     (cond
       (:replay state) @replay-side
-      (= @user-id (get-in state [:runner :user :_id])) :runner
-      (= @user-id (get-in state [:corp :user :_id])) :corp
+      (= user-id (get-in state [:runner :user :_id])) :runner
+      (= user-id (get-in state [:corp :user :_id])) :corp
       :else :spectator)))
 
 (defn not-spectator? []

src/cljs/nr/help.cljs

@@ -109,6 +109,9 @@
     :has-args :required
     :usage "/roll n"
     :help "Roll an n-sided die"}
+   {:name "/save-replay"
+    :usage "/save-replay"
+    :help "Save a replay of the game"}
    {:name "/summon"
     :has-args :required
     :usage "/summon n"

src/cljs/nr/lobby.cljs

@@ -24,9 +24,10 @@
   (swap! app-state assoc :games data))
 
 (defmethod ws/event-msg-handler :lobby/state [{data :?data}]
-  (swap! app-state assoc :current-game data)
-  (when (:started data)
-    (ws/ws-send! [:game/resync {:gameid (:gameid data)}])))
+  (when-not (= "local-replay" (:gameid @app-state))
+    (swap! app-state assoc :current-game data)
+    (when (:started data)
+      (ws/ws-send! [:game/resync {:gameid (:gameid data)}]))))
 
 (defmethod ws/event-msg-handler :lobby/notification [{data :?data}]
   (play-sound data))
@@ -74,7 +75,7 @@
                      diffs (rest history)
                      init-state (assoc init-state :replay-diffs diffs)]
                  (ws/event-msg-handler-wrapper
-                   {:id :netrunner/start
+                   {:id :game/start
                     :?data (.stringify js/JSON (clj->js
                                                  (if jump-to
                                                    (assoc init-state :replay-jump-to jump-to)
@@ -84,10 +85,14 @@
                                "error" {:time-out 0 :close-button true}))))))))
 
 (defn leave-game []
-  (ws/ws-send! [:game/leave {:gameid (current-gameid app-state)}]
-               8000
-               #(when (sente/cb-success? %)
-                  (leave-game!))))
+  (if (= "local-replay" (:gameid @app-state))
+    (do
+      (swap! app-state assoc :gameid nil)
+      (leave-game!))
+    (ws/ws-send! [:game/leave {:gameid (current-gameid app-state)}]
+                 8000
+                 #(when (sente/cb-success? %)
+                    (leave-game!)))))
 
 (defn- hidden-formats
   "Remove games which the user has opted to hide"

src/cljs/nr/replay_game.cljs

@@ -14,7 +14,7 @@
         diffs (rest history)
         init-state (assoc init-state :replay-diffs diffs :gameid "local-replay")]
     (ws/event-msg-handler-wrapper
-      {:id :netrunner/start
+      {:id :game/start
        :?data (.stringify js/JSON (clj->js init-state))})))
 
 (defn start-replay [replay-file]

src/cljs/nr/routes.cljs

@@ -40,6 +40,8 @@
                       :view deck-builder}]
      ["/play" {:name :nav/lobby
                :view lobby-or-game}]
+     ["/replay/:rid" {:name :nav/replay-lobby
+               :view lobby-or-game}]
      ["/help" {:name :nav/help
                :view help}]
      ["/account" {:name :nav/account

src/cljs/nr/status_bar.cljs

@@ -13,8 +13,9 @@
    (let [c (count (filter-games @user @games (:visible-formats @app-state)))]
      (tr [:nav/game-count] c))])
 
-(defn in-game-buttons [user current-game]
-  (when (:started @current-game)
+(defn in-game-buttons [user current-game gameid]
+  (when (and (:started @current-game)
+             (not= "local-replay" @gameid))
     (let [user-id (-> @user :_id)
           is-player (some #(= user-id (-> % :user :_id)) (:players @current-game))]
       [:div.float-right
@@ -66,6 +67,6 @@
                current-game (r/cursor app-state [:current-game])]
     [:div
      [current-game-count user games]
-     [in-game-buttons user current-game]
+     [in-game-buttons user current-game gameid]
      [replay-and-spectator-buttons gameid]
      [spectator-list current-game]]))