From a520382eb19e4234ed52fd1eb9fb965b5967d522 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 5 Mar 2020 14:47:48 +0100 Subject: equipment is now a part of the inventory --- src/playerstate.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/playerstate.rs') diff --git a/src/playerstate.rs b/src/playerstate.rs index acf718a..0e4fd3d 100644 --- a/src/playerstate.rs +++ b/src/playerstate.rs @@ -131,7 +131,7 @@ impl PlayerState { let item_ent = encyclopedia.construct(template).unwrap(); for component in item_ent { if let ComponentWrapper::Item(item) = component { - return item; + return (item, false); } } panic!("Item in inventory does not have item component") @@ -144,7 +144,7 @@ impl PlayerState { ComponentWrapper::Movable(Movable{cooldown: 2}), ComponentWrapper::Autofight(Autofight::default()), ComponentWrapper::Faction(Faction::Good), - ComponentWrapper::Equipment(Equipment{equipment: hashmap!(Slot::Hand => None, Slot::Body => None)}) + ComponentWrapper::Equipment(Equipment{slots: vec!(Slot::Hand, Slot::Body)}) ] } } -- cgit