From 2ba8a63d81d3e2672b580cb1ab989b9da168e040 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Tue, 19 Nov 2019 13:09:50 +1000
Subject: [PATCH] buy/combine from vbox wip

---
 client/src/components/vbox.component.jsx | 3 +--
 client/src/socket.jsx                    | 4 ++--
 server/src/vbox.rs                       | 8 +++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 4cafc89d..c442cb28 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -33,7 +33,7 @@ const addState = connect(
         }
 
         function sendVboxCombine() {
-            return ws.sendVboxCombine(instance.id, combiner);
+            return ws.sendVboxCombine(instance.id, combiner, vboxSelected);
         }
 
         function sendVboxReclaim(i) {
@@ -382,7 +382,6 @@ class Vbox extends preact.Component {
             return (
                 <button
                     class='vbox-btn'
-                    disabled={combiner.length !== 3}
                     onMouseOver={e => hoverInfo(e, comboItem)}
                     onClick={e => e.stopPropagation()}
                     onMouseDown={() => sendVboxCombine()}>
diff --git a/client/src/socket.jsx b/client/src/socket.jsx
index fe9db53b..681869ac 100644
--- a/client/src/socket.jsx
+++ b/client/src/socket.jsx
@@ -107,8 +107,8 @@ function createSocket(events) {
         events.clearInstance();
     }
 
-    function sendVboxCombine(instanceId, invIndicies) {
-        send(['VboxCombine', { instance_id: instanceId, inv_indices: invIndicies, vbox_indices: [] }]);
+    function sendVboxCombine(instanceId, invIndicies, vboxIndicies) {
+        send(['VboxCombine', { instance_id: instanceId, inv_indices: invIndicies, vbox_indices: vboxIndicies }]);
         events.clearInstance();
     }
 
diff --git a/server/src/vbox.rs b/server/src/vbox.rs
index df785bae..3b49d27a 100644
--- a/server/src/vbox.rs
+++ b/server/src/vbox.rs
@@ -142,10 +142,16 @@ impl Vbox {
         Ok(self)
     }
 
-    pub fn combine(&mut self, mut inv_indices: Vec<usize>, mut vbox_indicies: Vec<Vec<usize>>) -> Result<&mut Vbox, Error> {
+    pub fn combine(&mut self, mut inv_indices: Vec<usize>, vbox_indicies: Vec<Vec<usize>>) -> Result<&mut Vbox, Error> {
         if !inv_indices.iter().all(|i| self.bound.get(*i).is_some()) {
             return Err(err_msg("item missing index"));
         }
+        // try to buy up the vbox indicies and add them to the inventory indicies for combining
+        for vi in vbox_indicies.iter() {
+            inv_indices.push(self.bound.len());
+            self.accept(vi[0], vi[1], Some(Uuid::nil()))?;
+        } 
+
         // have to sort the indices and keep track of the iteration
         // because when removing the elements the array shifts
         inv_indices.sort_unstable();