fixed merge conflict from stash

2024-06-26 01:29:33 +00:00 · 2013-09-01 22:35:54 -04:00 · 2013-09-01 22:35:54 -04:00 · de127b654b
commit de127b654b
parent 078f927c29
1 changed files with 11 additions and 1 deletions
--- a/src/robotwar/browser.clj
+++ b/src/robotwar/browser.clj
@ -15,6 +15,11 @@
                                :aim
                                :damage
                                :shot-timer]))
+          (select-shell-keys [shell]
+            (select-keys shell [:id
+                                :pos-x
+                                :pos-y
+                                :exploded]))
          (three-sigs-map [m]
            (zipmap (keys m)
                    (map #(if (float? %)
@ -25,5 +30,10 @@
            (update-in 
              world 
              [:robots]
-              #(mapv (comp three-sigs-map select-robot-keys) %)))]
+              #(mapv (comp three-sigs-map select-robot-keys) %)))
+          (compact-shells [world]
+            (update-in
+              world
+              [:shells]
+              #(map (comp three-sigs-map select-shell-keys) %)))]
    (map compact-robots worlds)))