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

Only count enemy group members for combat music, and count bosses as high-intensity via an HP heuristic.

Browse Source
This commit is contained in:
Avi Weinstock 2021-04-06 22:32:16 -04:00
parent 5bfdd5f1af
commit 0e16c23707
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
voxygen/src/audio/music.rs
View File

@ -175,7 +175,7 @@ impl MusicMgr {
// player_alt = position.0.z;
//}
use common::comp::{Health, Pos};
use common::comp::{group::ENEMY, Group, Health, Pos};
use specs::{Join, WorldExt};
use MusicActivityState::*;
let mut activity_state = Explore;
@ -184,16 +184,18 @@ impl MusicMgr {
let entities = ecs.entities();
let positions = ecs.read_component::<Pos>();
let healths = ecs.read_component::<Health>();
let groups = ecs.read_component::<Group>();
if let Some(player_pos) = positions.get(player) {
const NEARBY_RADIUS: f32 = 50.0;
// TODO: consider filtering by Alignment::Enemy (requires sync changes)
let num_nearby_entities: u32 = (&entities, &positions, &healths)
const HEALTH_FACTOR: u32 = 100;
let num_nearby_entities: u32 = (&entities, &positions, &healths, &groups)
.join()
.map(|(entity, pos, _)| {
.map(|(entity, pos, health, group)| {
if entity != player
&& group == &ENEMY
&& (player_pos.0 - pos.0).magnitude_squared() < NEARBY_RADIUS.powf(2.0)
{
1
(health.maximum() / HEALTH_FACTOR).max(1)
} else {
0
}