Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

#612 Fixed utility items not being removed from inventory/hotbar

Browse Source
This commit is contained in:
Nemanja 2020-07-18 02:41:45 +00:00 committed by Imbris
parent 446923f7d8
commit 5caa6a07b0
2 changed files with 128 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
common/src/comp/inventory/mod.rs
View File

@ -241,6 +241,132 @@ impl Inventory {
}
}
/// Checks if inserting item exists in given cell. Inserts an item if it
/// exists.
pub fn insert_or_stack(&mut self, cell: usize, item: Item) -> Result<Option<Item>, Item> {
match &item.kind {
ItemKind::Tool(_) | ItemKind::Armor { .. } | ItemKind::Lantern(_) => {
self.insert(cell, item)
},
ItemKind::Utility {
amount: new_amount, ..
} => match self.slots.get_mut(cell) {
Some(Some(slot_item)) => {
if slot_item.name() == item.name()
&& slot_item.description() == item.description()
{
if let Item {
kind: ItemKind::Utility { amount, .. },
..
} = slot_item
{
*amount += *new_amount;
self.recount_items();
Ok(None)
} else {
let old_item = std::mem::replace(slot_item, item);
self.recount_items();
Ok(Some(old_item))
}
} else {
let old_item = std::mem::replace(slot_item, item);
self.recount_items();
Ok(Some(old_item))
}
},
Some(None) => self.insert(cell, item),
None => Err(item),
},
ItemKind::Ingredient {
amount: new_amount, ..
} => match self.slots.get_mut(cell) {
Some(Some(slot_item)) => {
if slot_item.name() == item.name()
&& slot_item.description() == item.description()
{
if let Item {
kind: ItemKind::Ingredient { amount, .. },
..
} = slot_item
{
*amount += *new_amount;
self.recount_items();
Ok(None)
} else {
let old_item = std::mem::replace(slot_item, item);
self.recount_items();
Ok(Some(old_item))
}
} else {
let old_item = std::mem::replace(slot_item, item);
self.recount_items();
Ok(Some(old_item))
}
},
Some(None) => self.insert(cell, item),
None => Err(item),
},
ItemKind::Consumable {
amount: new_amount, ..
} => match self.slots.get_mut(cell) {
Some(Some(slot_item)) => {
if slot_item.name() == item.name()
&& slot_item.description() == item.description()
{
if let Item {
kind: ItemKind::Consumable { amount, .. },
..
} = slot_item
{
*amount += *new_amount;
self.recount_items();
Ok(None)
} else {
let old_item = std::mem::replace(slot_item, item);
self.recount_items();
Ok(Some(old_item))
}
} else {
let old_item = std::mem::replace(slot_item, item);
self.recount_items();
Ok(Some(old_item))
}
},
Some(None) => self.insert(cell, item),
None => Err(item),
},
ItemKind::Throwable {
amount: new_amount, ..
} => match self.slots.get_mut(cell) {
Some(Some(slot_item)) => {
if slot_item.name() == item.name()
&& slot_item.description() == item.description()
{
if let Item {
kind: ItemKind::Throwable { amount, .. },
..
} = slot_item
{
*amount += *new_amount;
self.recount_items();
Ok(None)
} else {
let old_item = std::mem::replace(slot_item, item);
self.recount_items();
Ok(Some(old_item))
}
} else {
let old_item = std::mem::replace(slot_item, item);
self.recount_items();
Ok(Some(old_item))
}
},
Some(None) => self.insert(cell, item),
None => Err(item),
},
}
}
pub fn is_full(&self) -> bool { self.slots.iter().all(|slot| slot.is_some()) }
/// O(n) count the number of items in this inventory.

5
server/src/events/inventory_manip.rs
View File

@ -240,14 +240,13 @@ pub fn handle_inventory(server: &mut Server, entity: EcsEntity, manip: comp::Inv
};
if reinsert {
let _ = inventory.insert(slot, item);
let _ = inventory.insert_or_stack(slot, item);
}
Some(comp::InventoryUpdateEvent::Used)
},
_ => {
// TODO: this doesn't work for stackable items
inventory.insert(slot, item).unwrap();
inventory.insert_or_stack(slot, item).unwrap();
None
},
}