Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update site populations when NPCs move home

Browse Source
This commit is contained in:
Joshua Barretto 2023-04-13 12:22:28 +01:00
parent d8702f128b
commit d26a711469
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtsim/src/rule/npc_ai.rs
View File

@ -715,8 +715,8 @@ fn villager(visiting_site: SiteId) -> impl Action {
}
} else if matches!(ctx.npc.profession, Some(Profession::Guard)) && ctx.rng.gen_bool(0.5) {
if let Some(plaza_wpos) = choose_plaza(ctx, visiting_site) {
return important(
travel_to_point(plaza_wpos, 0.45)
return casual(
travel_to_point(plaza_wpos, 0.4)
.debug(|| "patrol")
.interrupt_with(|ctx| {
if ctx.rng.gen_bool(0.0003) {

12
rtsim/src/rule/simulate_npcs.rs
View File

@ -151,7 +151,7 @@ fn on_death(ctx: EventCtx<SimulateNpcs, OnDeath>) {
fn on_tick(ctx: EventCtx<SimulateNpcs, OnTick>) {
let data = &mut *ctx.state.data_mut();
for npc in data.npcs.npcs.values_mut().filter(|npc| !npc.is_dead) {
for (npc_id, npc) in data.npcs.npcs.iter_mut().filter(|(_, npc)| !npc.is_dead) {
if matches!(npc.mode, SimulationMode::Simulated) {
// Simulate NPC movement when riding
if let Some(riding) = &npc.riding {
@ -273,6 +273,16 @@ fn on_tick(ctx: EventCtx<SimulateNpcs, OnTick>) {
// Move home if required
if let Some(new_home) = npc.controller.new_home.take() {
// Remove the NPC from their old home population
if let Some(old_home) = npc.home {
if let Some(old_home) = data.sites.get_mut(old_home) {
old_home.population.remove(&npc_id);
}
}
// Add the NPC to their new home population
if let Some(new_home) = data.sites.get_mut(new_home) {
new_home.population.insert(npc_id);
}
npc.home = Some(new_home);
}
}