From d9726e5b9012aae55b0303d7748b8f905a23b66a Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Sat, 5 Feb 2022 13:47:18 +0200 Subject: [PATCH] Define 4 traveler kinds in RtSim --- server/src/rtsim/entity.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs index f901b0a8ca..82c844ee41 100644 --- a/server/src/rtsim/entity.rs +++ b/server/src/rtsim/entity.rs @@ -125,8 +125,11 @@ impl Entity { pub fn get_entity_config(&self) -> &str { match self.get_body() { comp::Body::Humanoid(_) => { - let rank = match self.rng(PERM_LEVEL).gen_range(0..=0) { - _ => TravelerRank::Rank0, + let rank = match self.rng(PERM_LEVEL).gen_range::(0..=20) { + 0..=2 => TravelerRank::Rank0, + 3..=9 => TravelerRank::Rank1, + 10..=17 => TravelerRank::Rank2, + 18.. => TravelerRank::Rank3, }; humanoid_config(self.kind, rank) }, @@ -794,6 +797,9 @@ impl Brain { #[derive(strum::EnumIter)] enum TravelerRank { Rank0, + Rank1, + Rank2, + Rank3, } fn humanoid_config(kind: RtSimEntityKind, rank: TravelerRank) -> &'static str { @@ -801,6 +807,9 @@ fn humanoid_config(kind: RtSimEntityKind, rank: TravelerRank) -> &'static str { RtSimEntityKind::Cultist => "common.entity.dungeon.tier-5.cultist", RtSimEntityKind::Wanderer => match rank { TravelerRank::Rank0 => "common.entity.world.traveler0", + TravelerRank::Rank1 => "common.entity.world.traveler1", + TravelerRank::Rank2 => "common.entity.world.traveler2", + TravelerRank::Rank3 => "common.entity.world.traveler3", }, RtSimEntityKind::Villager => "common.entity.village.villager", RtSimEntityKind::Merchant => "common.entity.village.merchant",