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

Comment out unused awareness increment/decrement calls and un-nest conditional for early return.

Browse Source
This commit is contained in:
holychowders 2022-03-19 12:02:29 -05:00
parent 30af95942a
commit a88d8ada0f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,7 +501,8 @@ impl<'a> AgentData<'a> {
event_emitter: &mut Emitter<'_, ServerEvent>, event_emitter: &mut Emitter<'_, ServerEvent>,
rng: &mut impl Rng, rng: &mut impl Rng,
) { ) {
agent.decrement_awareness(read_data.dt.0); // TODO: Awareness currently doesn't influence anything.
//agent.decrement_awareness(read_data.dt.0);
let small_chance = rng.gen_bool(0.1); let small_chance = rng.gen_bool(0.1);
// Set owner if no target // Set owner if no target
@ -2152,6 +2153,11 @@ impl<'a> AgentData<'a> {
) { ) {
agent.forget_old_sounds(read_data.time.0); agent.forget_old_sounds(read_data.time.0);
if is_invulnerable(*self.entity, read_data) {
self.idle(agent, controller, read_data, rng);
return;
}
if let Some(sound) = agent.sounds_heard.last() { if let Some(sound) = agent.sounds_heard.last() {
let sound_pos = Pos(sound.pos); let sound_pos = Pos(sound.pos);
let dist_sqrd = self.pos.0.distance_squared(sound_pos.0); let dist_sqrd = self.pos.0.distance_squared(sound_pos.0);
@ -2176,12 +2182,7 @@ impl<'a> AgentData<'a> {
let follows_threatening_sounds = is_enemy || is_village_guard; let follows_threatening_sounds = is_enemy || is_village_guard;
// TODO: Awareness currently doesn't influence anything. // TODO: Awareness currently doesn't influence anything.
agent.awareness += 0.5 * sound.vol; //agent.awareness += 0.5 * sound.vol;
if is_invulnerable(*self.entity, read_data) {
self.idle(agent, controller, read_data, rng);
return;
}
if sound_was_threatening && is_close { if sound_was_threatening && is_close {
if !self.below_flee_health(agent) && follows_threatening_sounds { if !self.below_flee_health(agent) && follows_threatening_sounds {