From e95d559edd7782331e57465a136bdac2f970d464 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sun, 21 Jul 2019 20:38:01 +1000
Subject: [PATCH] wht

---
 client/src/components/instance.constructs.jsx | 17 ++++++++---------
 client/src/keyboard.jsx                       |  2 ++
 server/src/instance.rs                        |  8 +++++++-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx
index 5f92db4c..22b62b63 100644
--- a/client/src/components/instance.constructs.jsx
+++ b/client/src/components/instance.constructs.jsx
@@ -81,15 +81,10 @@ function Construct(props) {
         sendUnequip,
     } = props;
 
-    const fullInfo = itemInfo.items.find(i => i.item === itemEquip);
-    const isSkill = fullInfo && fullInfo.skill;
-    const isSpec = fullInfo && fullInfo.spec;
-    const equipping = itemEquip && (isSkill || isSpec);
-
     function onClick(e) {
         e.stopPropagation();
         e.preventDefault();
-        if (equipping) sendVboxApply(construct.id, itemEquip);
+        if (itemEquip !== null) sendVboxApply(construct.id, itemEquip);
         setItemEquip(null);
         return setActiveConstruct(construct);
     }
@@ -128,11 +123,13 @@ function Construct(props) {
             return true;
         }
 
-        const classes = `${equipping ? 'equipping' : ''}`;
+        // const action = skill ? '' : 'action';
+        const equip = skillList.includes(vbox.bound[itemEquip]) && !skill ? 'equipping' : '';
+        const classes = `${equip}`;
         return (
             <button
                 key={i}
-                disabled={!skill && !equipping}
+                disabled={!skill && itemEquip === null}
                 class={classes}
                 onClick={skillClick}
                 onDblClick={skillDblClick}
@@ -142,7 +139,7 @@ function Construct(props) {
         );
     });
 
-    const specs = range(0, 3).map(i => {
+    const specs = range(0, 6).map(i => {
         const s = construct.specs[i];
 
         if (!s) {
@@ -155,6 +152,8 @@ function Construct(props) {
             );
         }
 
+        const specInfo = itemInfo.items.find(i => i.item === s);
+
         function specClick(e) {
             e.stopPropagation();
             setItemUnequip(s);
diff --git a/client/src/keyboard.jsx b/client/src/keyboard.jsx
index 8964cec5..7f651e6c 100644
--- a/client/src/keyboard.jsx
+++ b/client/src/keyboard.jsx
@@ -4,6 +4,8 @@ const actions = require('./actions');
 function setupKeys(store) {
     console.log('binding keys');
     key.unbind('esc');
+
+    key('esc', () => document.activeElement.blur());
     key('esc', () => store.dispatch(actions.setCombiner([])));
     key('esc', () => store.dispatch(actions.setReclaiming(false)));
     key('esc', () => store.dispatch(actions.setActiveSkill(null)));
diff --git a/server/src/instance.rs b/server/src/instance.rs
index 57440456..ec8432d4 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -697,7 +697,7 @@ pub fn instances_idle(tx: &mut Transaction) -> Result<Vec<Instance>, Error> {
 }
 
 
-pub fn instance_new(tx: &mut Transaction, account: &Account, construct_ids: Vec<Uuid>, name: String, pve: bool, password: Option<String>) -> Result<Instance, Error> {
+pub fn instance_new(tx: &mut Transaction, account: &Account, construct_ids: Vec<Uuid>, name: String, pve: bool, _password: Option<String>) -> Result<Instance, Error> {
     let mut instance = match pve {
         true => {
             let bot = bot_player();
@@ -716,6 +716,8 @@ pub fn instance_new(tx: &mut Transaction, account: &Account, construct_ids: Vec<
             instance.add_player(bot)?;
             instance.player_ready(bot_id)?;
 
+            instance.open = false;
+
             instance
         },
         false => Instance::new()
@@ -738,6 +740,10 @@ pub fn instance_join(tx: &mut Transaction, account: &Account, instance_id: Uuid,
         return Err(format_err!("incorrect player size. ({:})", 3));
     }
 
+    if instance.players.len() >= instance.max_players {
+        return Err(err_msg("game is full"));
+    }
+
     let player = player_create(tx, Player::new(account.id, &account.name, constructs), instance.id, account)?;
 
     instance.add_player(player)?;