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

Move neutral agent block above enemy block

Browse Source
This commit is contained in:
holychowders 2021-05-23 15:38:39 -07:00 committed by Avi Weinstock
parent c2239daaa0
commit ad4bca3e52
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/sys/agent.rs
View File

@ -3870,6 +3870,14 @@ impl<'a> AgentData<'a> {
// TODO: Change this to a search action instead of idle
self.idle(agent, controller, &read_data);
}
} else if is_village_guard {
let sound_is_villager_alarm = matches!(sound.kind, SoundKind::VillagerAlarm);
if sound_is_villager_alarm {
self.follow(agent, controller, &read_data.terrain, &sound_pos);
} else {
self.idle(agent, controller, &read_data);
}
} else if is_neutral {
let aggro = agent.psyche.aggro;
let close_enough = dist_sqrd < 35.0_f32.powi(2);
@ -3880,14 +3888,6 @@ impl<'a> AgentData<'a> {
} else {
self.idle(agent, controller, read_data);
}
} else if is_village_guard {
let sound_is_villager_alarm = matches!(sound.kind, SoundKind::VillagerAlarm);
if sound_is_villager_alarm {
self.follow(agent, controller, &read_data.terrain, &sound_pos);
} else {
self.idle(agent, controller, &read_data);
}
} else {
// TODO: Change this to a search action instead of idle
self.idle(agent, controller, read_data);