diff --git a/crates/horizon-client/src/mobs/ai.rs b/crates/horizon-client/src/mobs/ai.rs index 258c1ccc7..cd0986f9a 100644 --- a/crates/horizon-client/src/mobs/ai.rs +++ b/crates/horizon-client/src/mobs/ai.rs @@ -1591,8 +1591,20 @@ pub fn step_sound( S::Husk => quiet("entity.husk.step"), S::Drowned => quiet("entity.drowned.step"), S::ZombieVillager => quiet("entity.zombie_villager.step"), - S::CamelHusk => Some(("entity.camel_husk.step", 0.4, 1.0)), - S::Camel => Some(("entity.camel.step", 1.0, 1.0)), + // Camel.playStepSound and CamelHusk.playStepSound: sand and concrete + // powder have their own step. + S::CamelHusk | S::Camel => { + let sand = w.has_tag( + "minecraft:camel_sand_step_sound_blocks", + &w.facts.get(state).name, + ); + Some(match (m.species(), sand) { + (S::Camel, true) => ("entity.camel.step_sand", 1.0, 1.0), + (S::Camel, false) => ("entity.camel.step", 1.0, 1.0), + (_, true) => ("entity.camel_husk.step_sand", 0.4, 1.0), + (_, false) => ("entity.camel_husk.step", 0.4, 1.0), + }) + } S::IronGolem => Some(("entity.iron_golem.step", 1.0, 1.0)), // CopperGolem.playStepSound: its oxidation level's step. S::CopperGolem => Some((super::copper_golem::sound(m, "step"), 1.0, 1.0)), diff --git a/crates/horizon-client/src/mobs/living.rs b/crates/horizon-client/src/mobs/living.rs index 394821ace..ca9f92892 100644 --- a/crates/horizon-client/src/mobs/living.rs +++ b/crates/horizon-client/src/mobs/living.rs @@ -529,13 +529,15 @@ impl Mob { } } /// `Entity.nextStep`: the next whole metre walked; a warden's steps come - /// every 0.55, a strider's every 0.6. + /// every 0.55, a strider's every 0.6, a turtle's every 0.15. fn next_step(&self) -> f32 { let walked = self.ai.steps.move_dist; if self.kind.species == super::Species::Warden { walked + 0.55 } else if self.kind.species == super::Species::Strider { walked + 0.6 + } else if self.kind.species == super::Species::Turtle { + walked + 0.15 } else { (walked as i32).wrapping_add(1) as f32 }