Browse Source

andypls

pbs
andy 4 years ago
parent
commit
a95bcf35c8
  1. 24
      src/ship/items/inventory.rs

24
src/ship/items/inventory.rs

@ -408,9 +408,13 @@ impl CharacterInventory {
let (slot, _) = self.items.iter() let (slot, _) = self.items.iter()
.enumerate() .enumerate()
.filter(|(_, item)| { .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 false
})
})
.nth(0)?; .nth(0)?;
Some(InventoryItemHandle { Some(InventoryItemHandle {
inventory: self, inventory: self,
@ -440,9 +444,13 @@ impl CharacterInventory {
let (slot, _) = self.items.iter() let (slot, _) = self.items.iter()
.enumerate() .enumerate()
.filter(|(_, item)| { .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 false
})
})
.nth(0)?; .nth(0)?;
Some(InventoryItemHandle { Some(InventoryItemHandle {
inventory: self, inventory: self,
@ -454,9 +462,13 @@ impl CharacterInventory {
let (slot, _) = self.items.iter() let (slot, _) = self.items.iter()
.enumerate() .enumerate()
.filter(|(_, item)| { .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 false
})
})
.nth(0)?; .nth(0)?;
Some(InventoryItemHandle { Some(InventoryItemHandle {
inventory: self, inventory: self,

Loading…
Cancel
Save