adding different shift schedules for Staff vs Patron NPCs

Author: MichelV69

src/narrative_time_manager/mod.rs

@@ -38,22 +38,22 @@ pub mod ntm {
     #[derive(Clone, Copy, Debug, PartialEq)]
     pub enum SlotNames {
         Twilight,
-        Sunrise,
-        EarlyMorning,
-        MidMorning,
-        LateMorning,
-        Midday,
-        EarlyAfternoon,
-        MidAfternoon,
-        LateAfternoon,
-        Dusk,
-        Sunset,
-        LateEvening,
-        EarlyEvening,
-        MidEvening,
-        Night,
-        Midnight,
-        LateNight,
+        Sunrise,        // 1 *
+        EarlyMorning,   // 2 *
+        MidMorning,     // 3 *
+        LateMorning,    // 4 * *
+        Midday,         // 5 * *
+        EarlyAfternoon, // 6   *
+        MidAfternoon,   // 7   *
+        LateAfternoon,  // 8   * *
+        Dusk,           // 9   * *
+        Sunset,         // 10    *
+        LateEvening,    // 11    *
+        EarlyEvening,   // 12 *  *
+        MidEvening,     // 13 *  *
+        Night,          // 14 *
+        Midnight,       // 15 *
+        LateNight,      // 16 *
         LongDark,
     }
 

src/npc/impls.rs

@@ -53,29 +53,49 @@ impl Profile {
         let all_slots: Vec<TimeSlot> = crate::narrative_time_manager::ntm::load();
         let mut encounter_chance_timeslots: Vec<TimeSlot> = vec![];
 
-        let center_slot_name: SlotNames = rand::random();
-        let mut middle_index: usize = 0;
-        for this_slot in all_slots.iter() {
-            if this_slot.name == center_slot_name {
-                // check if night before
-                let mut early_index = (middle_index as i8) - 1;
-                if early_index <= 0 && all_slots.get(early_index as usize).is_none() {
-                    early_index = all_slots.iter().count() as i8 - 1;
-                };
-
-                // check if runs into next morning
-                let mut late_index: usize = middle_index + 1;
-                if all_slots.get(late_index).is_none() {
-                    late_index = 0
-                };
-
-                let early_slot = all_slots[early_index as usize];
-                let normal_slot = all_slots[middle_index];
-                let late_slot = all_slots[late_index];
-
-                encounter_chance_timeslots = vec![early_slot, normal_slot, late_slot];
+        if self.npc_type == NpcTypeCode::Staff {
+            let request: &str = "1d4";
+            let resulting_roll = <DiceResult as RollDice>::from_string(request);
+
+            let mut slot_list: Vec<i8> = vec![];
+            match resulting_roll.get_total() {
+                1 => slot_list = [1, 2, 3, 4, 5].to_vec(),
+                2 => slot_list = [4, 5, 6, 7, 8, 9].to_vec(),
+                3 => slot_list = [8, 9, 10, 11, 12, 13].to_vec(),
+                4 => slot_list = [12, 13, 14, 15, 16].to_vec(),
+                _ => slot_list = [3, 4, 5, 6, 7, 8].to_vec(),
+            }
+
+            for this_slot in slot_list.iter() {
+                encounter_chance_timeslots.push(all_slots[*this_slot as usize]);
+            }
+        }
+
+        if self.npc_type == NpcTypeCode::Patron {
+            let center_slot_name: SlotNames = rand::random();
+            let mut middle_index: usize = 0;
+            for this_slot in all_slots.iter() {
+                if this_slot.name == center_slot_name {
+                    // check if night before
+                    let mut early_index = (middle_index as i8) - 1;
+                    if early_index <= 0 && all_slots.get(early_index as usize).is_none() {
+                        early_index = all_slots.iter().count() as i8 - 1;
+                    };
+
+                    // check if runs into next morning
+                    let mut late_index: usize = middle_index + 1;
+                    if all_slots.get(late_index).is_none() {
+                        late_index = 0
+                    };
+
+                    let early_slot = all_slots[early_index as usize];
+                    let normal_slot = all_slots[middle_index];
+                    let late_slot = all_slots[late_index];
+
+                    encounter_chance_timeslots = vec![early_slot, normal_slot, late_slot];
+                }
+                middle_index += 1;
             }
-            middle_index += 1;
         }
 
         self.encounter_slots = encounter_chance_timeslots;

src/npc/tests.rs

@@ -299,5 +299,14 @@ mod suite {
         assert!(!ects[1].name.to_string().is_empty());
         assert!(!ects[2].name.to_string().is_empty());
     }
+
+    #[test]
+    fn set_rect_for_staff() {
+        let mut new_npc: Profile = Profile::new();
+        new_npc.npc_type = NpcTypeCode::Staff;
+        new_npc.set_random_encounter_chance_timeslots();
+
+        assert_eq!(5, new_npc.encounter_slots.iter().count())
+    }
 } // mod suite
 // ---- end of file ----

src/tavern/implementations.rs

@@ -19,7 +19,9 @@ pub mod list {
     };
     use crate::tavern::structs::list::{App, PBHouse};
     use crate::tavern::traits::list::{AppFn, ToCapitalized};
-    use crate::text_postproc::tpp::{enum_string_to_phrase, is_a_an, l1_heading, l2_heading, l3_heading, tidy, trim_whitespace};
+    use crate::text_postproc::tpp::{
+        enum_string_to_phrase, is_a_an, l1_heading, l2_heading, l3_heading, tidy, trim_whitespace,
+    };
 
     impl Distribution<HouseDishWhatSide> for StandardUniform {
         fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> HouseDishWhatSide {
@@ -498,42 +500,26 @@ pub mod list {
     }
 
     impl fmt::Display for PBHouse {
-
         fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            writeln!(
-                f,
-                "{}", l1_heading("Narrative Information".to_string())
-            )?;
+            writeln!(f, "{}", l1_heading("Narrative Information".to_string()))?;
             writeln!(f, " ")?;
 
-            writeln!(
-                f,
-                "{}",  l2_heading("For the Characters".to_string())
-            )?;
+            writeln!(f, "{}", l2_heading("For the Characters".to_string()))?;
             writeln!(f, " ")?;
             for line in &self.general_info() {
-                write!(f, "{}",  line)?;
+                write!(f, "{}", line)?;
             }
 
-            writeln!(
-                f,
-                "{}", l2_heading("GM Notes".to_string())
-            )?;
+            writeln!(f, "{}", l2_heading("GM Notes".to_string()))?;
             writeln!(f, " ")?;
-            writeln!(
-                f,
-                "{}", l3_heading("Establishment History".to_string())
-            )?;
+            writeln!(f, "{}", l3_heading("Establishment History".to_string()))?;
             writeln!(f, " ")?;
             for line in &self.establishment_history_notes {
                 writeln!(f, "{}", line)?;
             }
             writeln!(f, " ")?;
 
-            writeln!(
-                f,
-                "{}", l3_heading("Redlight Services".to_string())
-            )?;
+            writeln!(f, "{}", l3_heading("Redlight Services".to_string()))?;
             for line in &self.redlight_services {
                 writeln!(f, "{}", line)?;
             }

src/text_postproc/mod.rs

@@ -45,7 +45,6 @@ pub mod tpp {
         format!("\n==={}===\n", s).trim().to_string()
     }
 
-
     pub fn is_a_an(test: &str) -> String {
         use ::is_vowel::IsRomanceVowel;
         if test