From 9b8dc12ddd0f245f6edd891da493157c7de8dee5 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 18 Mar 2019 12:43:00 +1100
Subject: [PATCH] fix bot instance join

---
 server/src/instance.rs |  7 ++++---
 server/src/vbox.rs     | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/server/src/instance.rs b/server/src/instance.rs
index dcb0eb16..70cc22e0 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -55,6 +55,7 @@ impl Instance {
 
     fn add_bots(mut self) -> Instance {
         self.pve = true;
+        self.open = false;
         self.players = iter::repeat_with(|| {
                 let bot_id = Uuid::new_v4();
                 let cryps = instance_mobs(bot_id);
@@ -304,13 +305,13 @@ pub fn instance_create(tx: &mut Transaction, instance: Instance) -> Result<Insta
     let instance_bytes = to_vec(&instance)?;
 
     let query = "
-        INSERT INTO instances (id, data)
-        VALUES ($1, $2)
+        INSERT INTO instances (id, data, open)
+        VALUES ($1, $2, $3)
         RETURNING id;
     ";
 
     let result = tx
-        .query(query, &[&instance.id, &instance_bytes])?;
+        .query(query, &[&instance.id, &instance_bytes, &instance.open])?;
 
     result.iter().next().ok_or(format_err!("no instances written"))?;
 
diff --git a/server/src/vbox.rs b/server/src/vbox.rs
index 99fc5bcd..8e0eaecc 100644
--- a/server/src/vbox.rs
+++ b/server/src/vbox.rs
@@ -35,7 +35,7 @@ pub enum Var {
     // specs
     Damage,
     Hp,
-    Speed,
+    SpeedI,
 
     LifeI,
     LRSI,
@@ -118,7 +118,7 @@ impl Var {
 
             Var::Damage => 3,
             Var::Hp => 3,
-            Var::Speed => 3,
+            Var::SpeedI => 3,
 
             _ => {
                 let combos = get_combos();
@@ -173,7 +173,7 @@ impl Var {
 
     fn into_spec(&self) -> Option<Spec> {
         match *self {
-            Var::Speed          => Some(Spec::SpeedI),
+            Var::SpeedI          => Some(Spec::SpeedI),
 
             Var::RedDamageI     => Some(Spec::RedDamageI),
             Var::BlueDamageI    => Some(Spec::BlueDamageI),
@@ -231,7 +231,7 @@ impl From<Skill> for Var {
 impl From<Spec> for Var {
     fn from(spec: Spec) -> Var {
         match spec {
-            Spec::SpeedI          => Var::Speed,
+            Spec::SpeedI         => Var::SpeedI,
 
             Spec::RedDamageI     => Var::RedDamageI,
             Spec::BlueDamageI    => Var::BlueDamageI,
@@ -330,7 +330,7 @@ impl Vbox {
             Var::Hp,
             Var::Green,
             Var::Attack,
-            Var::Speed,
+            Var::SpeedI,
             Var::Blue,
             Var::Attack,
             Var::Damage,
@@ -383,7 +383,7 @@ impl Vbox {
         let specs = vec![
             (Var::Damage, 1),
             (Var::Hp, 1),
-            (Var::Speed, 1),
+            (Var::SpeedI, 1),
         ];
 
         let mut rng = thread_rng();