From 737fe3a86fb494562ab1953150ca2deacf056432 Mon Sep 17 00:00:00 2001 From: Shagnor Date: Sat, 28 Jan 2023 18:34:32 +1100 Subject: [PATCH] Change parameters to reduce CPU usage growth and reduce message spam --- Cargo.toml | 4 ++++ blastmud_game/src/main.rs | 2 +- blastmud_game/src/static_content/npc.rs | 6 +++--- blastmud_game/src/static_content/npc/melbs_citizen.rs | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 57e4241b..8cc7a559 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,3 +7,7 @@ members = [ "ansi_macro", "ansi", ] + +[profile.release-with-debug] +inherits = "release" +debug = true diff --git a/blastmud_game/src/main.rs b/blastmud_game/src/main.rs index a3145946..b031620a 100644 --- a/blastmud_game/src/main.rs +++ b/blastmud_game/src/main.rs @@ -31,7 +31,7 @@ fn read_latest_config() -> DResult { map_err(|error| Box::new(error) as Box) } -#[tokio::main] +#[tokio::main(worker_threads = 2)] async fn main() -> DResult<()> { SimpleLogger::new().with_level(LevelFilter::Info).init().unwrap(); diff --git a/blastmud_game/src/static_content/npc.rs b/blastmud_game/src/static_content/npc.rs index f127d392..2c2beef2 100644 --- a/blastmud_game/src/static_content/npc.rs +++ b/blastmud_game/src/static_content/npc.rs @@ -197,8 +197,8 @@ pub fn npc_wander_tasks() -> Box> { meta: TaskMeta { task_code: c.code.to_owned(), is_static: true, - recurrence: Some(TaskRecurrence::FixedDuration { seconds: rng.gen_range(100..150) as u32 }), - next_scheduled: Utc::now() + chrono::Duration::seconds(rng.gen_range(0..30) as i64), + recurrence: Some(TaskRecurrence::FixedDuration { seconds: rng.gen_range(250..350) as u32 }), + next_scheduled: Utc::now() + chrono::Duration::seconds(rng.gen_range(0..300) as i64), ..TaskMeta::default() }, details: TaskDetails::NPCWander { @@ -216,7 +216,7 @@ pub fn npc_aggro_tasks() -> Box> { initial_task: Box::new( || { let mut rng = thread_rng(); - let aggro_time = (rng.gen_range(100..150) as u64) / c.aggression; + let aggro_time = (rng.gen_range(450..550) as u64) / c.aggression; Task { meta: TaskMeta { task_code: c.code.to_owned(), diff --git a/blastmud_game/src/static_content/npc/melbs_citizen.rs b/blastmud_game/src/static_content/npc/melbs_citizen.rs index 09df0fd4..ede80351 100644 --- a/blastmud_game/src/static_content/npc/melbs_citizen.rs +++ b/blastmud_game/src/static_content/npc/melbs_citizen.rs @@ -5,7 +5,7 @@ pub fn npc_list() -> Vec { use NPCSayType::FromFixedList; let melbs_citizen_stdsay = NPCSayInfo { say_code: "babble", - frequency_secs: 60, + frequency_secs: 120, talk_type: FromFixedList(vec!( (false, "I'm so sick of being cloned."), (false, "I hope I don't die again today."),