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

client/src/scenes/elements/combat.statbar.js

@@ -34,13 +34,13 @@ class StatBar extends Phaser.GameObjects.Graphics {
             this.val = this.crypObj.cryp.red_shield.base;
             this.max = this.crypObj.cryp.red_shield.base;
             this.margin = 1;
-        } else if (type === 'Evasion') {
-            this.val = this.crypObj.cryp.evasion.base;
-            this.max = this.crypObj.cryp.evasion.base;
-            this.margin = 2;
         } else if (type === 'Blue Shield') {
             this.val = this.crypObj.cryp.blue_shield.base;
             this.max = this.crypObj.cryp.blue_shield.base;
+            this.margin = 2;
+        } else if (type === 'Evasion') {
+            this.val = this.crypObj.cryp.evasion.base;
+            this.max = this.crypObj.cryp.evasion.base;
             this.margin = 3;
         }
         const { statTextX, statTextY } = statTextCoord(cryp.team, cryp.iter, this.margin);

server/WORKLOG.md

@@ -56,40 +56,6 @@ taunt
 
 ## NOW
 
-inventory + drops table
-  id
-  account
-  data
-  game ref games
-  index on game,account
-
-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
 * why is the text fucked?

server/src/vbox.rs

@@ -129,8 +129,8 @@ impl Vbox {
     }
 
     pub fn drop(&mut self, i: usize) -> Result<&mut Vbox, Error> {
-        self.free.get(i).ok_or(format_err!("no var at index {:?}", i))?;
-        self.free.remove(i);
+        self.bound.get(i).ok_or(format_err!("no var at index {:?}", i))?;
+        self.bound.remove(i);
         // balance update
         Ok(self)
     }