feat: add inventory and power-ups

Author: mdssjc

books/hands-on-rust/dungeoncrawl/src/components.rs

@@ -1,11 +1,10 @@
-use std::collections::HashSet;
-
 pub use crate::prelude::*;
+use std::collections::HashSet;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Render {
-    pub color: ColorPair,
-    pub glyph: FontCharType,
+    pub color : ColorPair,
+    pub glyph : FontCharType
 }
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -20,46 +19,64 @@ pub struct Item;
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct AmuletOfYala;
 
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct ProvidesHealing{
+    pub amount: i32
+}
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct ProvidesDungeonMap;
+
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct MovingRandomly;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct ChasingPlayer;
 
+
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct WantsToMove {
-    pub entity: Entity,
-    pub destination: Point,
+    pub entity : Entity,
+    pub destination : Point
 }
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct WantsToAttack {
-    pub attacker: Entity,
-    pub victim: Entity,
+    pub attacker : Entity,
+    pub victim : Entity
 }
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Health {
     pub current: i32,
-    pub max: i32,
+    pub max: i32
 }
 
 #[derive(Clone, PartialEq)]
 pub struct Name(pub String);
 
+#[derive(Clone, PartialEq)]
+pub struct Carried(pub Entity);
+
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct ActivateItem {
+    pub used_by : Entity,
+    pub item : Entity
+}
+
 #[derive(Clone, Debug, PartialEq)]
-pub struct FieldOfView {
-    pub visible_tiles: HashSet<Point>,
+pub struct FieldOfView{
+    pub visible_tiles : HashSet<Point>,
     pub radius: i32,
-    pub is_dirty: bool,
+    pub is_dirty: bool
 }
 
 impl FieldOfView {
     pub fn new(radius: i32) -> Self {
-        Self {
+        Self{
             visible_tiles: HashSet::new(),
             radius,
-            is_dirty: true,
+            is_dirty: true
         }
     }
 

books/hands-on-rust/dungeoncrawl/src/spawner.rs

@@ -1,42 +1,55 @@
 use crate::prelude::*;
 
-pub fn spawn_player(ecs: &mut World, pos: Point) {
-    ecs.push((
-        Player,
-        pos,
-        Render {
-            color: ColorPair::new(WHITE, BLACK),
-            glyph: to_cp437('@'),
-        },
-        Health {
-            current: 10,
-            max: 10,
-        },
-        FieldOfView::new(8),
-    ));
-}
-
-pub fn spawn_monster(ecs: &mut World, rng: &mut RandomNumberGenerator, pos: Point) {
-    let (hp, name, glyph) = match rng.roll_dice(1, 10) {
+pub fn spawn_player(ecs : &mut World, pos : Point) {
+    ecs.push(
+        (Player,
+         pos,
+         Render{
+             color: ColorPair::new(WHITE, BLACK),
+             glyph : to_cp437('@')
+         },
+         Health{ current: 10, max: 10 },
+         FieldOfView::new(8)
+        )
+    );
+}
+
+pub fn spawn_entity(
+    ecs: &mut World,
+    rng: &mut RandomNumberGenerator,
+    pos: Point
+) {
+    let roll = rng.roll_dice(1, 6);
+    match roll {
+        1 => spawn_healing_potion(ecs, pos),
+        2 => spawn_magic_mapper(ecs, pos),
+        _ => spawn_monster(ecs, rng, pos)
+    }
+}
+
+pub fn spawn_monster(
+    ecs: &mut World,
+    rng: &mut RandomNumberGenerator,
+    pos : Point
+) {
+    let (hp, name, glyph) = match rng.roll_dice(1,10) {
         1..=8 => goblin(),
-        _ => orc(),
+        _ => orc()
     };
 
-    ecs.push((
-        Enemy,
-        pos,
-        Render {
-            color: ColorPair::new(WHITE, BLACK),
-            glyph,
-        },
-        ChasingPlayer {},
-        Health {
-            current: hp,
-            max: hp,
-        },
-        Name(name),
-        FieldOfView::new(6),
-    ));
+    ecs.push(
+        (Enemy,
+         pos,
+         Render{
+             color: ColorPair::new(WHITE, BLACK),
+             glyph,
+         },
+         ChasingPlayer{},
+         Health{current: hp, max: hp},
+         Name(name),
+         FieldOfView::new(6)
+        )
+    );
 }
 
 fn goblin() -> (i32, String, FontCharType) {
@@ -47,15 +60,43 @@ fn orc() -> (i32, String, FontCharType) {
     (2, "Orc".to_string(), to_cp437('o'))
 }
 
-pub fn spawn_amulet_of_yala(ecs: &mut World, pos: Point) {
-    ecs.push((
-        Item,
-        AmuletOfYala,
-        pos,
-        Render {
-            color: ColorPair::new(WHITE, BLACK),
-            glyph: to_cp437('|'),
-        },
-        Name("Amulet of Yala".to_string()),
-    ));
+pub fn spawn_amulet_of_yala(ecs : &mut World, pos : Point) {
+    ecs.push(
+        (Item, AmuletOfYala,
+         pos,
+         Render{
+             color: ColorPair::new(WHITE, BLACK),
+             glyph : to_cp437('|')
+         },
+         Name("Amulet of Yala".to_string())
+        )
+    );
+}
+
+pub fn spawn_healing_potion(ecs: &mut World, pos: Point) {
+    ecs.push(
+        (Item,
+         pos,
+         Render{
+             color: ColorPair::new(WHITE, BLACK),
+             glyph : to_cp437('!')
+         },
+         Name("Healing Potion".to_string()),
+         ProvidesHealing{amount: 6}
+        )
+    );
+}
+
+pub fn spawn_magic_mapper(ecs: &mut World, pos: Point) {
+    ecs.push(
+        (Item,
+         pos,
+         Render{
+             color: ColorPair::new(WHITE, BLACK),
+             glyph : to_cp437('{')
+         },
+         Name("Dungeon Map".to_string()),
+         ProvidesDungeonMap{}
+        )
+    );
 }

books/hands-on-rust/dungeoncrawl/src/systems/hud.rs

@@ -3,27 +3,58 @@ use crate::prelude::*;
 #[system]
 #[read_component(Health)]
 #[read_component(Player)]
+#[read_component(Item)]
+#[read_component(Carried)]
+#[read_component(Name)]
 pub fn hud(ecs: &SubWorld) {
     let mut health_query = <&Health>::query().filter(component::<Player>());
-    let player_health = health_query.iter(ecs).nth(0).unwrap();
-    let mut draw_batch = DrawBatch::new();
+    let player_health = health_query
+        .iter(ecs)
+        .nth(0)
+        .unwrap();
 
+    let mut draw_batch = DrawBatch::new();
     draw_batch.target(2);
-    draw_batch.print_centered(1, "Explore the Dungeon. Cursor keys to move.");
+    draw_batch.print_centered(1,
+                              "Explore the Dungeon. Cursor keys to move.");
     draw_batch.bar_horizontal(
         Point::zero(),
-        SCREEN_WIDTH * 2,
+        SCREEN_WIDTH*2,
         player_health.current,
         player_health.max,
-        ColorPair::new(RED, BLACK),
+        ColorPair::new(RED, BLACK)
     );
     draw_batch.print_color_centered(
         0,
-        format!(
-            " Health: {} / {} ",
-            player_health.current, player_health.max
+        format!(" Health: {} / {} ",
+                player_health.current,
+                player_health.max
         ),
-        ColorPair::new(WHITE, RED),
+        ColorPair::new(WHITE, RED)
     );
+
+    let player = <(Entity, &Player)>::query()
+        .iter(ecs)
+        .find_map(|(entity, _player)| Some(*entity))
+        .unwrap();
+    let mut item_query = <(&Item, &Name, &Carried)>::query();
+    let mut y = 3;
+    item_query
+        .iter(ecs)
+        .filter(|(_, _, carried)| carried.0 == player)
+        .for_each(|(_, name, _)| {
+            draw_batch.print(
+                             Point::new(3, y),
+                             format!("{} : {}", y-2, &name.0)
+            );
+            y += 1;
+        }
+        );
+    if y > 3 {
+        draw_batch.print_color(Point::new(3, 2), "Items carried",
+                               ColorPair::new(YELLOW, BLACK)
+        );
+    }
+
     draw_batch.submit(10000).expect("Batch error");
 }

books/hands-on-rust/dungeoncrawl/src/systems/mod.rs

@@ -1,16 +1,17 @@
 use crate::prelude::*;
 
-mod chasing;
-mod combat;
-mod end_turn;
-mod entity_render;
-mod hud;
 mod map_render;
-mod movement;
+mod entity_render;
 mod player_input;
 mod random_move;
+mod chasing;
+mod end_turn;
+mod movement;
+mod hud;
 mod tooltips;
+mod combat;
 mod fov;
+mod use_items;
 
 pub fn build_input_scheduler() -> Schedule {
     Schedule::builder()
@@ -26,6 +27,7 @@ pub fn build_input_scheduler() -> Schedule {
 
 pub fn build_player_scheduler() -> Schedule {
     Schedule::builder()
+        .add_system(use_items::use_items_system())
         .add_system(combat::combat_system())
         .flush()
         .add_system(movement::movement_system())
@@ -44,6 +46,7 @@ pub fn build_monster_scheduler() -> Schedule {
         .add_system(random_move::random_move_system())
         .add_system(chasing::chasing_system())
         .flush()
+        .add_system(use_items::use_items_system())
         .add_system(combat::combat_system())
         .flush()
         .add_system(movement::movement_system())