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

Added function that returns the output of salvaging an item when result just needs to be checked.

Browse Source
This commit is contained in:
Sam 2021-10-11 19:29:50 -04:00
parent 26dfd961a8
commit b4b6eeb0d1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/src/comp/inventory/item/mod.rs
View File

@ -804,16 +804,8 @@ impl Item {
.any(|tag| matches!(tag, ItemTag::SalvageInto(_)))
}
// Attempts to salvage an item by consuming it, returns the salvaged items if
// salvageable, else the original item
pub fn try_salvage(self) -> Result<Vec<Item>, Item> {
if !self.is_salvageable() {
return Err(self);
}
// Creates one item for every salvage tag in the target item
let salvaged_items: Vec<_> = self
.item_def
pub fn salvage_output(&self) -> impl Iterator<Item = &str> {
self.item_def
.tags
.iter()
.filter_map(|tag| {
@ -824,6 +816,18 @@ impl Item {
}
})
.map(|material| material.asset_identifier())
}
// Attempts to salvage an item by consuming it, returns the salvaged items if
// salvageable, else the original item
pub fn try_salvage(self) -> Result<Vec<Item>, Item> {
if !self.is_salvageable() {
return Err(self);
}
// Creates one item for every salvage tag in the target item
let salvaged_items: Vec<_> = self
.salvage_output()
.map(|asset| Item::new_from_asset_expect(asset))
.collect();