From a95bcf35c818a42629ec02abe8b502ec62f75c18 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 28 Oct 2020 20:15:00 -0300 Subject: [PATCH] andypls --- src/ship/items/inventory.rs | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/ship/items/inventory.rs b/src/ship/items/inventory.rs index 8094216..b4dcc58 100644 --- a/src/ship/items/inventory.rs +++ b/src/ship/items/inventory.rs @@ -408,9 +408,13 @@ impl CharacterInventory { let (slot, _) = self.items.iter() .enumerate() .filter(|(_, item)| { - if let InventoryItem::Individual(individual_inventory_item) = item {if let ItemDetail::Mag(_) = &individual_inventory_item.item {return individual_inventory_item.equipped }} + if let InventoryItem::Individual(individual_inventory_item) = item { + if let ItemDetail::Mag(_) = &individual_inventory_item.item { + return individual_inventory_item.equipped + } + } false - }) + }) .nth(0)?; Some(InventoryItemHandle { inventory: self, @@ -440,9 +444,13 @@ impl CharacterInventory { let (slot, _) = self.items.iter() .enumerate() .filter(|(_, item)| { - if let InventoryItem::Individual(individual_inventory_item) = item {if let ItemDetail::Shield(_) = &individual_inventory_item.item {return individual_inventory_item.equipped }} + if let InventoryItem::Individual(individual_inventory_item) = item { + if let ItemDetail::Shield(_) = &individual_inventory_item.item { + return individual_inventory_item.equipped + } + } false - }) + }) .nth(0)?; Some(InventoryItemHandle { inventory: self, @@ -454,9 +462,13 @@ impl CharacterInventory { let (slot, _) = self.items.iter() .enumerate() .filter(|(_, item)| { - if let InventoryItem::Individual(individual_inventory_item) = item {if let ItemDetail::Weapon(_) = &individual_inventory_item.item {return individual_inventory_item.equipped }} + if let InventoryItem::Individual(individual_inventory_item) = item { + if let ItemDetail::Weapon(_) = &individual_inventory_item.item { + return individual_inventory_item.equipped + } + } false - }) + }) .nth(0)?; Some(InventoryItemHandle { inventory: self,