ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buy/combine from vbox wip

Browse Source
This commit is contained in:
Mashy 2019-11-19 13:09:50 +10:00
parent f2add9a836
commit 2ba8a63d81
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/components/vbox.component.jsx
View File

@ -33,7 +33,7 @@ const addState = connect(
} }
function sendVboxCombine() { function sendVboxCombine() {
return ws.sendVboxCombine(instance.id, combiner); return ws.sendVboxCombine(instance.id, combiner, vboxSelected);
} }
function sendVboxReclaim(i) { function sendVboxReclaim(i) {
@ -382,7 +382,6 @@ class Vbox extends preact.Component {
return ( return (
<button <button
class='vbox-btn' class='vbox-btn'
disabled={combiner.length !== 3}
onMouseOver={e => hoverInfo(e, comboItem)} onMouseOver={e => hoverInfo(e, comboItem)}
onClick={e => e.stopPropagation()} onClick={e => e.stopPropagation()}
onMouseDown={() => sendVboxCombine()}> onMouseDown={() => sendVboxCombine()}>

4
client/src/socket.jsx
View File

@ -107,8 +107,8 @@ function createSocket(events) {
events.clearInstance(); events.clearInstance();
} }
function sendVboxCombine(instanceId, invIndicies) { function sendVboxCombine(instanceId, invIndicies, vboxIndicies) {
send(['VboxCombine', { instance_id: instanceId, inv_indices: invIndicies, vbox_indices: [] }]); send(['VboxCombine', { instance_id: instanceId, inv_indices: invIndicies, vbox_indices: vboxIndicies }]);
events.clearInstance(); events.clearInstance();
} }

8
server/src/vbox.rs
View File

@ -142,10 +142,16 @@ impl Vbox {
Ok(self) 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()) { if !inv_indices.iter().all(|i| self.bound.get(*i).is_some()) {
return Err(err_msg("item missing index")); 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 // have to sort the indices and keep track of the iteration
// because when removing the elements the array shifts // because when removing the elements the array shifts
inv_indices.sort_unstable(); inv_indices.sort_unstable();