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

Prevent safezoned villagers from spamming messages upon seeing an enemy

Browse Source
This commit is contained in:
holychowders 2021-04-25 21:24:06 +00:00 committed by Samuel Keiffer
parent ecb176158c
commit 5488f9f525
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -102,6 +102,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Staff fire shockwave ability no longer has an unlimited vertical range - Staff fire shockwave ability no longer has an unlimited vertical range
- Skillbar buttons correctly account for skill points when checking if player has enough stamina for the ability. - Skillbar buttons correctly account for skill points when checking if player has enough stamina for the ability.
- Burning Debuff icon is now displayed correctly. - Burning Debuff icon is now displayed correctly.
- Villagers in safezones no longer spam messages upon seeing an enemy
## [0.9.0] - 2021-03-20 ## [0.9.0] - 2021-03-20

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

@ -619,23 +619,25 @@ impl<'a> AgentData<'a> {
self.idle(agent, controller, &read_data); self.idle(agent, controller, &read_data);
} }
// If not fleeing, attack the hostile // If not fleeing, attack the hostile entity!
// entity!
} else { } else {
// If the hostile entity is dead or in a safezone, return to idle // If the hostile entity is dead or has an invulnerability buff (eg, those
// applied in safezones), return to idle
if should_stop_attacking( if should_stop_attacking(
read_data.healths.get(target), read_data.healths.get(target),
read_data.buffs.get(target), read_data.buffs.get(target),
) { ) {
agent.target = None;
if agent.behavior.can(BehaviorCapability::SPEAK) { if agent.behavior.can(BehaviorCapability::SPEAK) {
let msg = "npc.speech.villager_enemy_killed".to_string(); let msg = "npc.speech.villager_enemy_killed".to_string();
event_emitter event_emitter
.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg))); .emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg)));
} }
agent.target = None;
// Choose a new target every 10 seconds, but only for // Choose a new target every 10 seconds, but only for
// enemies // enemies
// TODO: This should be more principled. Consider factoring // TODO: This should be more
// principled. Consider factoring
// health, combat rating, wielded weapon, etc, into the // health, combat rating, wielded weapon, etc, into the
// decision to change target. // decision to change target.
} else if read_data.time.0 - selected_at > RETARGETING_THRESHOLD_SECONDS } else if read_data.time.0 - selected_at > RETARGETING_THRESHOLD_SECONDS
@ -1411,6 +1413,7 @@ impl<'a> AgentData<'a> {
|| e_pos.0.distance_squared(self.pos.0) < listen_dist.powi(2)) // TODO implement proper sound system for agents || e_pos.0.distance_squared(self.pos.0) < listen_dist.powi(2)) // TODO implement proper sound system for agents
&& e != self.entity && e != self.entity
&& !e_health.is_dead && !e_health.is_dead
&& !invulnerability_is_in_buffs(read_data.buffs.get(*e))
&& (try_owner_alignment(self.alignment, &read_data).and_then(|a| try_owner_alignment(*e_alignment, &read_data).map(|b| a.hostile_towards(*b))).unwrap_or(false) || ( && (try_owner_alignment(self.alignment, &read_data).and_then(|a| try_owner_alignment(*e_alignment, &read_data).map(|b| a.hostile_towards(*b))).unwrap_or(false) || (
if let Some(rtsim_entity) = &self.rtsim_entity { if let Some(rtsim_entity) = &self.rtsim_entity {
if rtsim_entity.brain.remembers_fight_with_character(&e_stats.name) { if rtsim_entity.brain.remembers_fight_with_character(&e_stats.name) {
@ -2868,8 +2871,11 @@ fn can_see_tgt(terrain: &TerrainGrid, pos: &Pos, tgt_pos: &Pos, dist_sqrd: f32)
// If target is dead or has invulnerability buff, returns true // If target is dead or has invulnerability buff, returns true
fn should_stop_attacking(health: Option<&Health>, buffs: Option<&Buffs>) -> bool { fn should_stop_attacking(health: Option<&Health>, buffs: Option<&Buffs>) -> bool {
health.map_or(true, |a| a.is_dead) health.map_or(true, |a| a.is_dead) || invulnerability_is_in_buffs(buffs)
|| buffs.map_or(false, |b| b.kinds.contains_key(&BuffKind::Invulnerability)) }
fn invulnerability_is_in_buffs(buffs: Option<&Buffs>) -> bool {
buffs.map_or(false, |b| b.kinds.contains_key(&BuffKind::Invulnerability))
} }
/// Attempts to get alignment of owner if entity has Owned alignment /// Attempts to get alignment of owner if entity has Owned alignment