Better wall glyphs and equip messages (#18)

* changing equip messaging but also ran into an glyph issue

* experiment with terminal

* disable debug prints for debugging terminal emulator backend

* tentative fix for cp 437 issue

* fix CP437 rendering issue

* rm commented code

* added a failing test for equip message issue (#19)

* fixed #19: equip messages issue

* add example story twee file; fix equip/unequip message

* drafted a macro for formatting action messages

* macro is working

* fixing warnings

* switched from tuple to struct for passing ecs data; updated death message

* utils_ecs -> util_ecs

* fixes for item removal messaging

* power and defense changes are now displayed when equipping and unequipping items

Author: bbarker

Cargo.lock

@@ -6,9 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bracket-lib = { git = "https://github.com/amethyst/bracket-lib.git", rev = "851f6f08675444fb6fa088b9e67bee9fd75554c6", features = [
+# bracket-lib = { path = "../bracket-lib/",  default-features = false, features = [
+bracket-lib = { git = "https://github.com/bbarker/bracket-lib.git", rev = "d85c17ac21ab1dc6f10e01cc4a7fd711e16fe7be", features = [
   "serde",
 ] }
+
 #have to use git rev to support wasm; see https://github.com/amethyst/bracket-lib/issues/301
 enum_derive = "0.1.7"
 frunk = "0.4.1"                                        # Note, currently not using this - but worth a look
@@ -22,3 +24,4 @@ once_cell = "1.5.2"
 indexmap = "1.9.3"
 # FunctionalRust = { git = "https://github.com/politrons/FunctionalRust.git", rev = "1f34793" }
 paste = "1.0.14"
+# lens-rs = "0.3.2"

Cargo.toml

@@ -0,0 +1,18 @@
+:: Start {"position":"150,25"}
+The hero receives a call to adventure.
+[[Accept the call->FirstChallenge]]
+
+:: FirstChallenge {"position":"425,25"}
+The hero faces their first challenge.
+[[Overcome the challenge->MentorMeeting]]
+
+:: MentorMeeting {"position":"550,250"}
+The hero meets a mentor who provides guidance.
+[[Learn from the mentor->Climax]]
+
+:: Climax {"position":"300,450"}
+The hero faces the ultimate challenge.
+[[Defeat the villain->Resolution]]
+
+:: Resolution {"position":"50,250"}
+The hero returns, transformed by the journey.

resources/example_story.tw

@@ -25,7 +25,12 @@
       # qemu
       llvmPackages_latest.lld
       python3
+      # Only for building bracket-lib, I think:
+      alsa-lib
+      systemd
     ];
+     # Only for building bracket-lib, I think:
+    nativeBuildInputs = [ pkgs.pkg-config ];
     RUSTC_VERSION = pkgs.lib.readFile ./rust-toolchain;
     # https://github.com/rust-lang/rust-bindgen#environment-variables
     LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ];

shell.nix

@@ -254,6 +254,14 @@ pub struct Name {
     pub name: String,
 }
 
+const DEBUG_NAME: &str = "<no name for entity>";
+
+pub fn debug_name() -> Name {
+    Name {
+        name: DEBUG_NAME.to_string(),
+    }
+}
+
 #[derive(Component, Deserialize, Serialize, Clone, Debug)]
 pub struct Player {}
 

src/components.rs

@@ -1,5 +1,6 @@
 use crate::{
     components::{Name, Player, Position, Positionable},
+    entity_action_msg,
     gamelog::GameLog,
     map::Map,
     RunState,
@@ -35,17 +36,16 @@ pub fn delete_the_dead(ecs: &mut World) -> Option<RunState> {
         let entities = ecs.entities();
         let mut log = ecs.write_resource::<GameLog>();
         let combat_stats = ecs.read_storage::<CombatStats>();
-        let names = ecs.read_storage::<Name>();
         let positions = ecs.read_storage::<Position>();
         let players = ecs.read_storage::<Player>();
         (&entities, &combat_stats, &positions)
             .join()
             .for_each(|(ent, stats, pos)| {
                 if stats.hp < 1 {
                     dead.push(ent);
-                    if let Some(victim_name) = names.get(ent) {
-                        log.entries.push(format!("{} is dead.", victim_name.name));
-                    }
+                    log.entries
+                        .push(entity_action_msg!(ecs, "<SUBJ> {} dead.", ent, "are"));
+
                     if let Some(_player) = players.get(ent) {
                         {
                             newrunstate_opt = Some(RunState::GameOver);

src/damage_system.rs

@@ -241,7 +241,7 @@ pub struct Equipment {
     pub allowed_slots: EquipSlotAllowed,
     pub material: Material,
     pub quality: u8,
-    pub special_melee_modifier: i16,
+    pub special_power_modifier: i16,
     pub special_defense_modifier: i16,
 }
 
@@ -257,7 +257,7 @@ impl Equipment {
             equipment_type,
             material,
             quality,
-            special_melee_modifier: 0,
+            special_power_modifier: 0,
             special_defense_modifier: 0,
         }
     }
@@ -304,12 +304,12 @@ impl Equipment {
         format!("{}{}{}", self.material, infix, self.equipment_type)
     }
 
-    pub fn melee_bonus(&self) -> i16 {
+    pub fn power_bonus(&self) -> i16 {
         let derived_bonus = match self.equipment_type {
             EquipmentType::Weapon(_) => self.equipment_type.bonus() + self.material.bonus(),
             _ => 0,
         };
-        derived_bonus + self.special_melee_modifier
+        derived_bonus + self.special_power_modifier
     }
 
     pub fn defense_bonus(&self) -> i16 {
@@ -336,25 +336,26 @@ impl Equipment {
     }
 }
 
-pub type EntityEquipmentMap = HashMap<EquipSlot, Equipment>;
+pub type EntityEquipmentMap = HashMap<EquipSlot, (Equipment, Entity)>;
 
 pub fn get_equipped_items<I: Join, E: Join>(
+    entities: &Entities,
     items: I,
     equipped: E,
-    entity: Entity,
+    owner: Entity,
 ) -> EntityEquipmentMap
 where
     I::Type: IsItem,
     E::Type: IsEquipped,
 {
     let mut equipped_items = HashMap::new();
     // Get all Equipped items and join with Items and filter those by the owner
-    (items, equipped)
+    (entities, items, equipped)
         .join()
-        .map(|(item, eqpd)| (item.from(), eqpd.from()))
-        .filter(|(_, eqpd)| eqpd.owner == entity)
-        .filter_map(|(item, eqpd)| match item {
-            Item::Equippable(equipment) => Some((equipment, eqpd)),
+        .map(|(ent, item, eqpd)| (ent, item.from(), eqpd.from()))
+        .filter(|(_, _, eqpd)| eqpd.owner == owner)
+        .filter_map(|(ent, item, eqpd)| match item {
+            Item::Equippable(equipment) => Some(((equipment, ent), eqpd)),
             _ => None,
         })
         .for_each(|(item, eqpd)| {