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

Allowed players to assist NPCs in fights without problems by tweaking aggro rules

Browse Source
This commit is contained in:
Joshua Barretto 2021-09-08 13:17:53 +01:00
parent 00062bd6e0
commit 003e071e91
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,8 +160,7 @@ pub struct ReadData<'a> {
combos: ReadStorage<'a, Combo>, combos: ReadStorage<'a, Combo>,
} }
// This is 3.1 to last longer than the last damage timer (3.0 seconds) const DAMAGE_MEMORY_DURATION: f64 = 0.25;
const DAMAGE_MEMORY_DURATION: f64 = 3.1;
const FLEE_DURATION: f32 = 3.0; const FLEE_DURATION: f32 = 3.0;
const MAX_FOLLOW_DIST: f32 = 12.0; const MAX_FOLLOW_DIST: f32 = 12.0;
const MAX_PATH_DIST: f32 = 170.0; const MAX_PATH_DIST: f32 = 170.0;
@ -507,10 +506,20 @@ impl<'a> System<'a> for Sys {
// than the old target, or if the old target // than the old target, or if the old target
// had not triggered aggro (the new target // had not triggered aggro (the new target
// has because damage always triggers it) // has because damage always triggers it)
!old_tgt.aggro_on let old_tgt_not_threat = !old_tgt.aggro_on;
|| tgt_pos.0.distance(pos.0) let old_tgt_further =
tgt_pos.0.distance(pos.0)
< old_tgt_pos.0.distance(pos.0) < old_tgt_pos.0.distance(pos.0)
* FUZZY_DIST_COMPARISON * FUZZY_DIST_COMPARISON;
let new_tgt_hostile = read_data
.alignments
.get(attacker)
.zip(alignment)
.map_or(false, |(attacker, us)| {
us.hostile_towards(*attacker)
});
old_tgt_not_threat
|| (old_tgt_further && new_tgt_hostile)
} else { } else {
true true
} }