finished adding ability to drop items

Author: bbarker

src/gui.rs

@@ -137,8 +137,13 @@ pub enum ItemMenuResult {
     Selected,
 }
 
-pub fn show_inventory(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Option<Entity>) {
+pub fn show_inventory(
+    gs: &mut State,
+    ctx: &mut BTerm,
+    title: impl Into<String>,
+) -> (ItemMenuResult, Option<Entity>) {
     const ESCAPE_MSG: &str = "ESCAPE to cancel";
+    let title_str = title.into();
     let entities = gs.ecs.entities();
     let names = gs.ecs.read_storage::<Name>();
     let backpack = gs.ecs.read_storage::<InBackpack>();
@@ -153,7 +158,7 @@ pub fn show_inventory(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Optio
         .fold((0, 0), |(size, max_length), (_item, name)| {
             (size + 1, max_length.max(name.name.len()))
         });
-    let box_width = max(max_item_name_length, ESCAPE_MSG.len()) + 3 + 1;
+    let box_width = max(max(max_item_name_length, ESCAPE_MSG.len()), title_str.len()) + 4;
 
     // (start at: mid height - half of item size):
     let x_init = 15;
@@ -172,7 +177,7 @@ pub fn show_inventory(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Optio
         y_box_init,
         RGB::named(YELLOW),
         RGB::named(BLACK),
-        "Inventory",
+        title_str,
     );
     ctx.print_color(
         x_init + 3,

src/main.rs

@@ -127,7 +127,7 @@ impl GameState for State {
                 newrunstate = RunState::AwaitingInput;
             }
             RunState::ShowInventory => {
-                let result = show_inventory(self, ctx);
+                let result = show_inventory(self, ctx, "Inventory: Use Item");
                 match result.0 {
                     gui::ItemMenuResult::Cancel => newrunstate = RunState::AwaitingInput,
                     gui::ItemMenuResult::NoResponse => {}
@@ -147,16 +147,38 @@ impl GameState for State {
                         let names = self.ecs.read_storage::<Name>();
                         let mut gamelog = self.ecs.fetch_mut::<gamelog::GameLog>();
                         gamelog.entries.push(format!(
-                            "You try to use the {}, but it isn't written yet!",
+                            "You use the {}.",
                             names.get(item_entity).unwrap().name,
                         ));
                         newrunstate = RunState::PlayerTurn;
                     }
                 }
             }
             RunState::ShowDropItem => {
-                let todo = true;
-                todo!()
+                let result = gui::show_inventory(self, ctx, "Inventory: Drop Item");
+                match result.0 {
+                    gui::ItemMenuResult::Cancel => newrunstate = RunState::AwaitingInput,
+                    gui::ItemMenuResult::NoResponse => {}
+                    gui::ItemMenuResult::Selected => {
+                        let item_entity = result
+                            .1
+                            .unwrap_or_else(|| panic!("Item selected but not found!"));
+                        let mut intent = self.ecs.write_storage::<EventWantsToDropItem>();
+                        intent
+                            .insert(
+                                get_player_unwrap(&self.ecs, PLAYER_NAME),
+                                EventWantsToDropItem { item: item_entity },
+                            )
+                            .unwrap_or_else(|_| panic!("Tried to drop item but failed!"));
+                        let names = self.ecs.read_storage::<Name>();
+                        let mut gamelog = self.ecs.fetch_mut::<gamelog::GameLog>();
+                        gamelog.entries.push(format!(
+                            "You drop the {}.",
+                            names.get(item_entity).unwrap().name,
+                        ));
+                        newrunstate = RunState::PlayerTurn;
+                    }
+                }
             }
         }
         {