Use vanilla ambient sound intervals for guardians, hoglins, shulkers and allays

A happy ghast with a passenger waits six times as long.
This commit is contained in:
Kacpherek
2026-10-26 15:16:06 +01:00
parent 8027cb4176
commit 728bf14aa7
3 changed files with 18 additions and 2 deletions
+11 -1
View File
@@ -1778,7 +1778,7 @@ impl Mob {
let dead = !self.alive();
let sound = ai::voice_sounds(self)[if dead { 2 } else { 1 }];
if !dead {
self.ambient_timer = -self.kind.ambient_interval;
self.ambient_timer = -self.ambient_interval();
}
if !sound.is_empty() {
let pitch = self.voice_pitch();
@@ -1874,6 +1874,16 @@ impl Mob {
let at = [self.position.x, self.eye_y(), self.position.z];
events.push(MobEvent::Sound(event, at, 1.0, 1.0));
}
/// `Mob.getAmbientSoundInterval`; `HappyGhast` waits six times as long
/// while it carries a passenger.
pub fn ambient_interval(&self) -> i32 {
let ridden = self.rider.is_some() || self.extra.rider.is_some();
if self.species() == Species::HappyGhast && ridden {
self.kind.ambient_interval * 6
} else {
self.kind.ambient_interval
}
}
/// LivingEntity.getVoicePitch.
pub fn voice_pitch(&mut self) -> f32 {
let pitch = (self.random.next_float() - self.random.next_float()) * 0.2
+1 -1
View File
@@ -547,7 +547,7 @@ fn base_tick(m: &mut Mob, w: &MobWorld, events: &mut Vec<MobEvent>) {
let t = m.ambient_timer;
m.ambient_timer += 1;
if roll < t {
m.ambient_timer = -m.kind.ambient_interval;
m.ambient_timer = -m.ambient_interval();
play_ambient(m, w, events);
}
}
@@ -1658,6 +1658,12 @@ impl Def {
| S::Camel
| S::CamelHusk => 400,
S::Ocelot => 900,
// Guardian.getAmbientSoundInterval (the elder too).
S::Guardian | S::ElderGuardian => 160,
// Hoglin extends Animal; Shulker extends AbstractGolem.
S::Hoglin | S::Shulker => 120,
// Allay is a PathfinderMob: the Mob default.
S::Allay => 80,
S::Squid
| S::GlowSquid
| S::Cod