Merge branch 'master' of ssh://cryps.gg:40022/~/cryps

client/package.json

@@ -20,7 +20,7 @@
     "key": "^0.1.11",
     "keymaster": "^1.6.2",
     "lodash": "^4.17.11",
-    "parcel": "^1.9.7",
+    "parcel": "^1.11.0",
     "phaser": "^3.16.1",
     "redux": "^4.0.0"
   },

server/COMBOS.md

@@ -1,3 +1,17 @@
+# Playthrough
+
+cryps join game
+    stats randomised
+
+initial stash drops
+    3 skills
+    3 colours
+    3 specs
+
+play first round
+    basically duke it out
+
+
 
 # Colours #
 
@@ -22,7 +36,7 @@ Slow & Reliable
 
 Class names to be changed
 ====================
-Pure Red `Nature` 
+Pure Red `Nature`
 Pure Green `Non-Violence`
 Pure Blue `Destruction`
 Hybrid Red / Blue `Chaos`

server/WORKLOG.md

@@ -55,7 +55,38 @@ taunt
 
 
 ## NOW
-* check zone completion
+
+inventory + drops table
+  id
+  data
+  game
+
+drops_buy(game_id, index)
+    drops_get()
+    inventory_get()
+
+    reduce balance
+    move drop into inventory
+
+    drops_update()
+    inventory_update()
+
+    -> inventory
+
+inventory_combine(game_id, [indices])
+    inventory_get()
+
+    new item =
+      match base item
+      match modifiers
+
+    update inventory[base_index]
+
+    inventory_update()
+
+    -> inventory
+
+
 
 ## SOON
 * clean up categories