Complete changes for #13.

Update version number.
RUSTFMT --ALL.

Author: MichelV69

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "fantasy-tavern-maker-tui"
-version = "0.13.1-191"
+version = "0.13.2-195"
 edition = "2024"
 
 [dev-dependencies]

Cargo.toml

@@ -5,7 +5,7 @@
 
 ## Current Version
 
-0.13.1-191
+0.13.2-195
 
 [![forthebadge made-with-rust](http://ForTheBadge.com/images/badges/made-with-rust.svg)](https://www.rust-lang.org/)
 [![made-with-Markdown](https://img.shields.io/badge/Made%20with-Markdown-1f425f.svg)](http://commonmark.org)

README.md

@@ -2,15 +2,15 @@
 
 mod suite {
     use crate::dice_bag::tower::{DiceResult, RollDice};
-    use tracing::{Level, event};
     use pretty_assertions::{assert_eq, assert_ne};
+    use tracing::{Level, event};
 
     #[test]
     fn does_flip_coin() {
         let request: &str = "1d2";
         let valid_scope = (1..=2);
 
-        for _ in (0..valid_scope.len() as i16*2)  {
+        for _ in (0..valid_scope.len() as i16 * 2) {
             let resulting_roll = <DiceResult as RollDice>::from_string(request);
             let roll_value = resulting_roll.get_total();
             event!(Level::INFO, "roll_value[{}]", roll_value);
@@ -23,7 +23,7 @@ mod suite {
         let request: &str = "1d4";
         let valid_scope = (1..=4);
 
-        for _ in (0..valid_scope.len() as i16*2)  {
+        for _ in (0..valid_scope.len() as i16 * 2) {
             let resulting_roll = <DiceResult as RollDice>::from_string(request);
             let roll_value = resulting_roll.get_total();
             event!(Level::INFO, "roll_value[{}]", roll_value);
@@ -36,7 +36,7 @@ mod suite {
         let request: &str = "4d8";
         let valid_scope = (4..=32);
 
-        for _ in (0..valid_scope.len() as i16*2)  {
+        for _ in (0..valid_scope.len() as i16 * 2) {
             let resulting_roll = <DiceResult as RollDice>::from_string(request);
             let roll_value = resulting_roll.get_total();
             event!(Level::INFO, "roll_value[{}]", roll_value);
@@ -49,25 +49,25 @@ mod suite {
         let request: &str = "1d6+3";
         let valid_scope = (4..=9);
 
-        for _ in (0..valid_scope.len() as i16*2)  {
+        for _ in (0..valid_scope.len() as i16 * 2) {
             let resulting_roll = <DiceResult as RollDice>::from_string(request);
             let roll_value = resulting_roll.get_total();
             event!(Level::INFO, "roll_value[{}]", roll_value);
             assert!(valid_scope.contains(&roll_value));
-        }        
+        }
     }
 
     #[test]
     fn rolls_respect_neg_modifiers() {
         let request: &str = "1d6-3";
         let valid_scope = (-2..=3);
 
-        for _ in (0..valid_scope.len() as i16*2)  {
+        for _ in (0..valid_scope.len() as i16 * 2) {
             let resulting_roll = <DiceResult as RollDice>::from_string(request);
             let roll_value = resulting_roll.get_total();
             event!(Level::INFO, "roll_value[{}]", roll_value);
             assert!(valid_scope.contains(&roll_value));
-        }        
+        }
     }
 
     #[test]

src/dice_bag/tests.rs

@@ -7,22 +7,19 @@ use cursive::views::LinearLayout;
 use cursive::views::TextView;
 
 // --- my stuff ---
-use dice_bag::tower::DiceResult;
-use dice_bag::tower::RollDice;
-use npc::build::NpcTypeCode;
-use npc::build::Profile as npc_Profile;
-use tavern::enums::list::EstablishmentQualityLevel;
-use tavern::enums::list::SizeList;
-use text_postproc::tpp::l1_heading;
-
-use crate::dice_bag;
+use crate::dice_bag::tower::{DiceResult, RollDice};
 use crate::fn_save_pbhouse_to_file::save_pbhouse_to_file;
 use crate::fn_view_npc_block::view_npc_block;
 use crate::npc;
 use crate::tavern;
 use crate::tavern::structs::list::App;
 use crate::tavern::structs::list::PBHouse;
 use crate::text_postproc;
+use npc::build::NpcTypeCode;
+use npc::build::Profile as npc_Profile;
+use tavern::enums::list::EstablishmentQualityLevel;
+use tavern::enums::list::SizeList;
+use text_postproc::tpp::l1_heading;
 
 pub fn make_pbhouse(s: &mut Cursive, app: App) {
     let pbh = PBHouse::new();
@@ -84,7 +81,6 @@ pub fn make_pbhouse(s: &mut Cursive, app: App) {
                 let mut npc_bouncer: npc_Profile = npc_Profile::new();
                 npc_bouncer.task_description = "Bouncer".into();
                 npc_bouncer.npc_type = NpcTypeCode::Staff;
-
             }
         }
     }
@@ -128,7 +124,6 @@ pub fn make_pbhouse(s: &mut Cursive, app: App) {
 
     let npc_notable_patrons_count: i16 =
         <DiceResult as RollDice>::from_string(&roll_string).get_total();
-    //println!("npc_notable_patrons_count [{npc_notable_patrons_count}]");
 
     for _c in 1..npc_notable_patrons_count {
         let mut npc_patron: npc_Profile = npc_Profile::new();
@@ -141,6 +136,39 @@ pub fn make_pbhouse(s: &mut Cursive, app: App) {
         npc_notable_patrons_list.push(npc_patron);
     }
 
+    if pbh.establishment_quality.level == EstablishmentQualityLevel::Wealthy {
+        for np in &mut npc_notable_patrons_list {
+            if np.task_description.contains("Farmer") || np.task_description.contains("Commonfolk")
+            {
+                np.task_description = match <DiceResult as RollDice>::from_string("1d4").get_total()
+                {
+                    1 => "Merchant accompanied by [1d4+1] guards".into(),
+                    2 => "Entertainer accompanied by [1d4+1] carousers".into(),
+                    3 => "Courtesan accompanied by [1d4] entourage".into(),
+                    _ => "Farmer or Fisher accompanied by [1d4-1] workers".into(),
+                }
+            }
+        }
+    };
+
+    if pbh.establishment_quality.level == EstablishmentQualityLevel::Aristocratic {
+        for np in &mut npc_notable_patrons_list {
+            if np.task_description.contains("Farmer") || np.task_description.contains("Commonfolk")
+            {
+                np.task_description = match <DiceResult as RollDice>::from_string("1d4").get_total()
+                {
+                    1 => "Merchant accompanied by [1d4+1] guards".into(),
+                    2 => "Entertainer accompanied by [1d4+1] carousers".into(),
+                    3 => "Courtesan accompanied by [1d4] entourage".into(),
+                    _ => {
+                        "Noble accompanied by [1d4+1] entourage and [1d4+] henchmen ([1d4+1] level)"
+                            .into()
+                    }
+                }
+            }
+        }
+    };
+
     //todo!("redlight_services ?? \"specific\" NPCs such as extra bouncer, wealthy gladiator, cardshark, healer ??")
     use crate::npc::build::Profile;
     let mut npc_select = cursive::views::SelectView::new();
@@ -177,10 +205,10 @@ pub fn make_pbhouse(s: &mut Cursive, app: App) {
                 LinearLayout::horizontal()
                     .child(
                         Dialog::text(gm_text)
-                        .title("GM Notes")
-                        .fixed_width(32)
-                        .scrollable()
-                        .scroll_y(true),
+                            .title("GM Notes")
+                            .fixed_width(32)
+                            .scrollable()
+                            .scroll_y(true),
                     )
                     .child(
                         Dialog::text(player_text)

src/fn_make_pbhouse.rs

@@ -1,5 +1,5 @@
-use crate::{npc::build::Profile, text_postproc::tpp::l2_heading};
 use crate::npc::build::NpcTypeCode;
+use crate::{npc::build::Profile, text_postproc::tpp::l2_heading};
 
 pub fn view_npc_block(npc_data: &Profile) -> String {
     let npc_type = &npc_data.npc_type;
@@ -19,7 +19,7 @@ pub fn view_npc_block(npc_data: &Profile) -> String {
     let mut text_block = l2_heading(format!("{npc_type} {task}"));
 
     let ects = &npc_data.encounter_slots;
-    
+
     let encounter_text: String = match npc_data.npc_type {
         NpcTypeCode::StoryCharacter | NpcTypeCode::Patron => {
             let temp_text: String = format!(
@@ -29,21 +29,25 @@ pub fn view_npc_block(npc_data: &Profile) -> String {
                 ects[2].name.to_string(),
             );
             temp_text.to_string()
-        },
+        }
         NpcTypeCode::Staff => {
             let mut temp_text: String = "".into();
             for ts in ects {
-                temp_text =  temp_text + &format!(" {} 8+ |", ts.name.to_string());
+                temp_text = temp_text + &format!(" {} 8+ |", ts.name.to_string());
             }
             temp_text.trim_end_matches("|").to_string()
-        },
+        }
     };
-    
-    text_block += &format!("\n\n _[chance of being currently present (2d6): {:?}]_", encounter_text);
+
+    text_block += &format!(
+        "\n\n _[chance of being currently present (2d6): {:?}]_",
+        encounter_text
+    );
     text_block += &format!(
         "\n\n {species:?} with {eye_color} eyes and {hair_color} hair in {hair_style} style."
     );
-    text_block += &format!("\n They are {height_desc} with a {build_desc}, and present as {gender}.");
+    text_block +=
+        &format!("\n They are {height_desc} with a {build_desc}, and present as {gender}.");
 
     text_block += "\n\n Quirks:";
     if quirk_emotional.is_empty() && quirk_physical.is_empty() {

src/fn_view_npc_block.rs

@@ -23,10 +23,10 @@ use tavern::traits::list::AppFn;
 fn main() {
     let mut app: App = App::new();
     app.name = "fantasy-tavern-maker-tui".into();
-    app.version_major = 0; //0.13.1-191
+    app.version_major = 0; //0.13.2-195
     app.version_minor = 13;
-    app.version_fix = 01;
-    app.version_build = 191;
+    app.version_fix = 02;
+    app.version_build = 195;
 
     let mut siv = cursive::default();
 
@@ -38,7 +38,9 @@ fn main() {
             })
             .button("Quit", |s| s.quit()),
     );
-    siv.add_global_callback(Key::Esc , |s|{ s.pop_layer(); });
+    siv.add_global_callback(Key::Esc, |s| {
+        s.pop_layer();
+    });
 
     siv.run()
 }

src/main.rs

@@ -7,9 +7,8 @@ pub mod ntm {
     use rand::Rng;
     use rand::distr::{Distribution, StandardUniform};
 
-    #[derive(Clone, Copy, PartialEq)]
-    #[derive(Debug)]
-pub enum Hour {
+    #[derive(Clone, Copy, PartialEq, Debug)]
+    pub enum Hour {
         H00,
         H01,
         H02,

src/narrative_time_manager/mod.rs

@@ -4,8 +4,8 @@ mod suite {
         narrative_time_manager::ntm::{self, SlotNames},
         npc::build::Profile,
     };
-    use std::mem;
     use pretty_assertions::{assert_eq, assert_ne};
+    use std::mem;
 
     #[test]
     fn number_of_timeslots() {

src/narrative_time_manager/tests.rs

@@ -58,13 +58,13 @@ impl Profile {
             let resulting_roll = <DiceResult as RollDice>::from_string(request);
 
             let slot_list: Vec<i8> = match resulting_roll.get_total() {
-                1 =>  [1, 2, 3, 4, 5].to_vec(),
-                2 =>  [4, 5, 6, 7, 8].to_vec(),
-                3 =>  [7, 8, 9, 10, 11].to_vec(),
-                4 =>  [10, 11, 12, 13, 14].to_vec(),
-                5 =>  [13, 14, 15, 16, 17].to_vec(),
-                6 =>  [3, 4, 5, 8, 9].to_vec(),
-                _ =>  [3, 4, 5, 6, 7].to_vec(),
+                1 => [1, 2, 3, 4, 5].to_vec(),
+                2 => [4, 5, 6, 7, 8].to_vec(),
+                3 => [7, 8, 9, 10, 11].to_vec(),
+                4 => [10, 11, 12, 13, 14].to_vec(),
+                5 => [13, 14, 15, 16, 17].to_vec(),
+                6 => [3, 4, 5, 8, 9].to_vec(),
+                _ => [3, 4, 5, 6, 7].to_vec(),
             };
 
             for this_slot in slot_list.iter() {

src/npc/impls.rs

@@ -12,8 +12,8 @@ mod suite {
         },
         tavern::structs::list::App,
     };
-    use tracing::{Level, event};
     use pretty_assertions::{assert_eq, assert_ne};
+    use tracing::{Level, event};
 
     #[test]
     fn profile_new() {

src/npc/tests.rs

@@ -109,7 +109,7 @@ pub mod list {
         OilLamps,
     }
 
-    #[derive(Debug, Display, Clone, Copy)]
+    #[derive(Debug, Display, Clone, Copy, PartialEq)]
     pub enum EstablishmentQualityLevel {
         Aristocratic,
         Comfortable,

src/tavern/enums.rs

@@ -1,8 +1,8 @@
 use inflector::string::singularize::to_singular;
-use rand::{random_range, SeedableRng};
 use rand::distr::Distribution;
 use rand::distr::weighted::WeightedIndex;
 use rand::seq::IndexedRandom;
+use rand::{SeedableRng, random_range};
 use rand_chacha::ChaCha20Rng;
 use std::cmp::*;
 use strum::IntoEnumIterator;
@@ -19,7 +19,9 @@ use super::enums::list::{
     HouseDishWhatCooked, HouseDishWhatSide, LightingAdjectives, LightingSources, LightingVerb,
     MoodData, PostedSignLocation, PostedSignMessage, SecondSmell, SizeList,
 };
-use super::structs::list::{EstablishmentQuality, HouseDish, HouseDrink, PBHouseSize, RedlightService};
+use super::structs::list::{
+    EstablishmentQuality, HouseDish, HouseDrink, PBHouseSize, RedlightService,
+};
 
 // ---
 pub fn get_name() -> String {
@@ -397,13 +399,13 @@ pub fn get_establishment_reputation() -> String {
     result.into()
 }
 
-pub fn get_red_light_services_list(size_code: SizeList  ) -> Option<Vec<RedlightService>> {
+pub fn get_red_light_services_list(size_code: SizeList) -> Option<Vec<RedlightService>> {
     if tower::DiceResult::from_string("flip coin").get_total() == 2 {
         return None;
     }
-    let mut red_light_services_list:Vec<RedlightService > = vec![];
-    let max_range:i16 = (RSLCode::VARIANT_COUNT as f64 * 2.5) as i16;
-    let mut current_roll_chance:i16 = (RSLCode::VARIANT_COUNT as f64 * 2.0) as i16;
+    let mut red_light_services_list: Vec<RedlightService> = vec![];
+    let max_range: i16 = (RSLCode::VARIANT_COUNT as f64 * 2.5) as i16;
+    let mut current_roll_chance: i16 = (RSLCode::VARIANT_COUNT as f64 * 2.0) as i16;
 
     let roll_chance_delta = match size_code {
         SizeList::Massive => 1,
@@ -415,10 +417,13 @@ pub fn get_red_light_services_list(size_code: SizeList  ) -> Option<Vec<Redlight
 
     RSLCode::iter().for_each(|rsl_code| {
         let test_roll = random_range(1..=max_range);
-        let mut rl_service: RedlightService = RedlightService { service: RSLCode::None, dc:0 };
+        let mut rl_service: RedlightService = RedlightService {
+            service: RSLCode::None,
+            dc: 0,
+        };
 
         match rsl_code {
-            RSLCode::None => {},
+            RSLCode::None => {}
             _ => {
                 if test_roll <= current_roll_chance {
                     current_roll_chance -= roll_chance_delta;