From fcb8bf779ebcac808fb6338e42cfa01a50563531 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 19 Feb 2019 12:10:44 +1100
Subject: [PATCH 1/2] fix statbar

---
 client/src/scenes/elements/combat.statbar.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/scenes/elements/combat.statbar.js b/client/src/scenes/elements/combat.statbar.js
index 0f8b29ea..285f1460 100644
--- a/client/src/scenes/elements/combat.statbar.js
+++ b/client/src/scenes/elements/combat.statbar.js
@@ -29,17 +29,17 @@ class StatBar extends Phaser.GameObjects.Graphics {
             this.val = this.crypObj.cryp.hp.base;
             this.max = this.crypObj.cryp.stamina.base;
             this.margin = 0;
-        } else if (type === 'RedShield') {
+        } else if (type === 'Red Shield') {
             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);

From 8a9fa4b6fb6f69b10a812a93dc932ebeb6d330c3 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 19 Feb 2019 13:38:21 +1100
Subject: [PATCH 2/2] drop fix

---
 server/WORKLOG.md  | 34 ----------------------------------
 server/src/vbox.rs |  4 ++--
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/server/WORKLOG.md b/server/WORKLOG.md
index 8eb9771a..7922daf0 100644
--- a/server/WORKLOG.md
+++ b/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?
diff --git a/server/src/vbox.rs b/server/src/vbox.rs
index c335d297..5e99357c 100644
--- a/server/src/vbox.rs
+++ b/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)
     }