Mobs float in water instead of bouncing
FloatGoal's constructor lets the navigation float, so Mob.jumpInLiquid adds 0.04F a tick; Horizon set that flag only for a few species, and every other FloatGoal user (pigs, cows, wolves, cats, horses, witches, illagers...) got the non-floater 0.3 and bounced out of the water. Register it from the goal (and from the constructors that set it: allay, armadillo, camel, goat, parrot, wither), and add 0.04 as the float vanilla adds. Mobs that drop back into water now splash (Entity.doWaterSplashEffect from updateFluidInteraction, skipped on the first tick), with their swim splash sound. The new mob_ai deep_water scenarios also caught: horses register addBehaviourGoals last (none for the skeleton horse, no mount panic for the zombie horse), RandomStandGoal waits the horse ambient interval (400 for every AbstractHorse), and the cat's sit-on- block goal draws its delay only for tame cats once the last ran out. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -807,6 +807,8 @@ pub struct Mob {
|
||||
/// Entity.wasEyeInWater: the eyes were in water before this tick's fluid
|
||||
/// update (`isUnderWater` reads it).
|
||||
pub was_eye_in_water: bool,
|
||||
/// `Entity.firstTick`: no splash for a mob that appears in water.
|
||||
pub first_tick: bool,
|
||||
pub no_gravity: bool,
|
||||
/// `Entity.mainSupportingBlockPos`: the block it stood on after its last
|
||||
/// move.
|
||||
@@ -1484,6 +1486,7 @@ impl Mob {
|
||||
extra: Extra::default(),
|
||||
fluids: living::Fluids::default(),
|
||||
was_eye_in_water: false,
|
||||
first_tick: true,
|
||||
no_gravity: false,
|
||||
supporting: None,
|
||||
no_ai: false,
|
||||
|
||||
@@ -225,6 +225,22 @@ pub fn register(m: &mut Mob) {
|
||||
Family::Bat => super::bat::register(m),
|
||||
Family::Bee => super::bee::register(m),
|
||||
}
|
||||
// FloatGoal's constructor lets the navigation float, as do the
|
||||
// constructors of these brain-driven and flying mobs. A floater rises
|
||||
// 0.04 a tick in Mob.jumpInLiquid, the others 0.3 (the bounce of #542).
|
||||
if m.ai.goals.has("Float")
|
||||
|| matches!(
|
||||
m.species(),
|
||||
Species::Allay
|
||||
| Species::Armadillo
|
||||
| Species::Camel
|
||||
| Species::Goat
|
||||
| Species::Parrot
|
||||
| Species::Wither
|
||||
)
|
||||
{
|
||||
m.ai.nav.can_float = true;
|
||||
}
|
||||
}
|
||||
/// Mob.tick additions that run before the entity tick (creeper fuse, puffing).
|
||||
fn pre_tick(m: &mut Mob, events: &mut Vec<MobEvent>) {
|
||||
@@ -428,10 +444,7 @@ fn tick_swing(m: &mut Mob) {
|
||||
/// Entity.baseTick + LivingEntity.baseTick + Mob.baseTick.
|
||||
fn base_tick(m: &mut Mob, w: &MobWorld, events: &mut Vec<MobEvent>) {
|
||||
m.was_eye_in_water = m.fluids.eye_in_water;
|
||||
m.fluids = w.fluids(m.bounds(), m.eye_y());
|
||||
if m.fluids.in_water {
|
||||
m.fall_distance = 0.0;
|
||||
}
|
||||
m.update_fluids(w, events);
|
||||
let fire = crate::motion::environment::fire_contact(w.world, w.registry, m.bounds());
|
||||
if fire > 0.0 {
|
||||
m.ticks_frozen = 0;
|
||||
@@ -474,6 +487,7 @@ fn base_tick(m: &mut Mob, w: &MobWorld, events: &mut Vec<MobEvent>) {
|
||||
if m.position.y < f64::from(crate::chunk::MIN_Y - 64) {
|
||||
m.damage(4.0, Damage::of(DamageKind::OutOfWorld));
|
||||
}
|
||||
m.first_tick = false;
|
||||
if m.alive() {
|
||||
// LivingEntity.baseTick: suffocation inside full blocks.
|
||||
let (ex, ey, ez) = (
|
||||
|
||||
@@ -83,19 +83,33 @@ pub fn register(m: &mut Mob) {
|
||||
return super::llama::register(m);
|
||||
}
|
||||
let tempt = m.kind.tempt.clone();
|
||||
let rears = can_rear(m.species());
|
||||
let species = m.species();
|
||||
let rears = can_rear(species);
|
||||
let stand_interval = m.kind.ambient_interval;
|
||||
let g = &mut m.ai.goals;
|
||||
g.add(0, Float);
|
||||
g.add(1, MountPanic(Panic::new(1.2)));
|
||||
g.add(1, RunAroundLikeCrazy);
|
||||
g.add(2, Breed::new(1.0));
|
||||
g.add(3, Tempt::new(1.25, tempt, false));
|
||||
g.add(4, FollowParent::new(1.0));
|
||||
g.add(6, Stroll::avoiding_water(0.7));
|
||||
g.add(7, LookAtPlayer::new(6.0));
|
||||
g.add(8, RandomLookAround::default());
|
||||
if rears {
|
||||
g.add(9, RandomStand { next: -80 });
|
||||
// resetStandInterval: -getAmbientStandInterval (400 for every horse).
|
||||
g.add(
|
||||
9,
|
||||
RandomStand {
|
||||
next: -stand_interval,
|
||||
},
|
||||
);
|
||||
}
|
||||
// addBehaviourGoals, after the rest: none for the skeleton horse (it
|
||||
// sinks), no mount panic for the zombie horse.
|
||||
if species != Species::SkeletonHorse {
|
||||
g.add(0, Float);
|
||||
if species != Species::ZombieHorse {
|
||||
g.add(1, MountPanic(Panic::new(1.2)));
|
||||
}
|
||||
g.add(3, Tempt::new(1.25, tempt, false));
|
||||
}
|
||||
}
|
||||
/// `generateMaxHealth`, `generateSpeed`, `generateJumpStrength` and the coat.
|
||||
@@ -285,7 +299,7 @@ impl Goal for RandomStand {
|
||||
fn can_use(&mut self, m: &mut Mob, _: &mut Cx) -> bool {
|
||||
self.next += 1;
|
||||
if self.next > 0 && m.random.next_int_bound(1000).unwrap_or(1000) < self.next {
|
||||
self.next = -80;
|
||||
self.next = -m.kind.ambient_interval;
|
||||
return m.random.next_int_bound(10).unwrap_or(1) == 0;
|
||||
}
|
||||
false
|
||||
|
||||
@@ -94,6 +94,10 @@ impl GoalSelector {
|
||||
.map(|g| g.goal.name())
|
||||
.collect()
|
||||
}
|
||||
/// Whether a goal of this name is registered, running or not.
|
||||
pub fn has(&self, name: &str) -> bool {
|
||||
self.goals.iter().any(|g| g.goal.name() == name)
|
||||
}
|
||||
pub fn is_running(&self, name: &str) -> bool {
|
||||
self.goals
|
||||
.iter()
|
||||
|
||||
@@ -398,10 +398,7 @@ impl Mob {
|
||||
/// (touching water resets the fall), then Entity.checkFallDamage.
|
||||
fn check_fall_damage(&mut self, w: &MobWorld, moved: Vec3, events: &mut Vec<MobEvent>) {
|
||||
if !self.fluids.in_water {
|
||||
self.fluids = w.fluids(self.bounds(), self.eye_y());
|
||||
if self.fluids.in_water {
|
||||
self.fall_distance = 0.0;
|
||||
}
|
||||
self.update_fluids(w, events);
|
||||
}
|
||||
if !self.fluids.in_water && moved.y < 0.0 {
|
||||
self.fall_distance -= f64::from(moved.y as f32);
|
||||
@@ -413,6 +410,23 @@ impl Mob {
|
||||
self.fall_distance = 0.0;
|
||||
}
|
||||
}
|
||||
/// Entity.updateFluidInteraction: the fluid state, then touching water
|
||||
/// resets the fall and entering it (after the first tick) splashes.
|
||||
pub(super) fn update_fluids(&mut self, w: &MobWorld, events: &mut Vec<MobEvent>) {
|
||||
let was_touching_water = self.fluids.in_water;
|
||||
self.fluids = w.fluids(self.bounds(), self.eye_y());
|
||||
if self.fluids.in_water {
|
||||
self.fall_distance = 0.0;
|
||||
if !was_touching_water && !self.first_tick {
|
||||
// The splash is the mob's own: Horizon's mobs carry no
|
||||
// controlling passenger here.
|
||||
let _ = horizon_world::water_splash::water_splash(
|
||||
&mut Splash { mob: self, events },
|
||||
1_000_000,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Entity.applyMovementEmissionAndPlaySound: walked distance, footsteps
|
||||
/// and swimming sounds.
|
||||
fn movement_emission(&mut self, w: &MobWorld, moved: Vec3, events: &mut Vec<MobEvent>) {
|
||||
@@ -811,7 +825,8 @@ impl Mob {
|
||||
self.velocity.y += if self.species() == super::Species::Bee {
|
||||
0.01
|
||||
} else if self.ai.nav.can_float {
|
||||
0.04
|
||||
// LivingEntity.jumpInLiquid adds 0.04F.
|
||||
f64::from(0.04_f32)
|
||||
} else {
|
||||
0.3
|
||||
};
|
||||
@@ -915,3 +930,93 @@ fn free_position(
|
||||
let free = allowed_shape.join(&collisions, ShapeOp::ONLY_FIRST).ok()?;
|
||||
free.closest_point(preferred)
|
||||
}
|
||||
|
||||
/// `Entity.doWaterSplashEffect` for a mob: its own random, its splash sound
|
||||
/// (`getSwimSplashSound`), particles for the client and the SPLASH game event.
|
||||
struct Splash<'a> {
|
||||
mob: &'a mut Mob,
|
||||
events: &'a mut Vec<MobEvent>,
|
||||
}
|
||||
impl horizon_world::water_splash::WaterSplashWorld for Splash<'_> {
|
||||
type Error = std::convert::Infallible;
|
||||
type Entity = ();
|
||||
type Sound = &'static str;
|
||||
fn this_entity(&self) {}
|
||||
fn controlling_passenger(&mut self) -> Result<Option<()>, Self::Error> {
|
||||
Ok(None)
|
||||
}
|
||||
fn velocity(&mut self, _: ()) -> Result<Vec3, Self::Error> {
|
||||
Ok(self.mob.velocity)
|
||||
}
|
||||
fn splash_sound(&mut self, _high_speed: bool) -> Result<&'static str, Self::Error> {
|
||||
use super::Species;
|
||||
// Entity.getSwimSplashSound and getSwimHighSpeedSplashSound: the
|
||||
// overrides are Monster's, the hoglin's, the dolphin's and the axolotl's.
|
||||
let species = self.mob.species();
|
||||
Ok(match species {
|
||||
Species::Dolphin => "entity.dolphin.splash",
|
||||
Species::Axolotl => "entity.axolotl.splash",
|
||||
_ if species == Species::Hoglin || super::ai::is_monster(species) => {
|
||||
"entity.hostile.splash"
|
||||
}
|
||||
_ => "entity.generic.splash",
|
||||
})
|
||||
}
|
||||
fn random_float(&mut self) -> Result<f32, Self::Error> {
|
||||
Ok(self.mob.random.next_float())
|
||||
}
|
||||
fn random_double(&mut self) -> Result<f64, Self::Error> {
|
||||
Ok(self.mob.random.next_double())
|
||||
}
|
||||
fn play_sound(
|
||||
&mut self,
|
||||
sound: &'static str,
|
||||
volume: f32,
|
||||
pitch: f32,
|
||||
) -> Result<(), Self::Error> {
|
||||
if !self.mob.silent {
|
||||
let at = [
|
||||
self.mob.position.x,
|
||||
self.mob.position.y,
|
||||
self.mob.position.z,
|
||||
];
|
||||
self.events.push(MobEvent::Sound(sound, at, volume, pitch));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
fn position(&self) -> Vec3 {
|
||||
self.mob.position
|
||||
}
|
||||
fn width(&self) -> f32 {
|
||||
self.mob.width()
|
||||
}
|
||||
fn particle(
|
||||
&mut self,
|
||||
kind: horizon_world::water_splash::SplashParticle,
|
||||
position: Vec3,
|
||||
velocity: Vec3,
|
||||
) -> Result<(), Self::Error> {
|
||||
self.events.push(MobEvent::ParticleAt {
|
||||
kind: match kind {
|
||||
horizon_world::water_splash::SplashParticle::Bubble => "bubble",
|
||||
horizon_world::water_splash::SplashParticle::Splash => "splash",
|
||||
},
|
||||
at: [position.x, position.y, position.z],
|
||||
velocity: [velocity.x, velocity.y, velocity.z],
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
fn splash_event(&mut self) -> Result<(), Self::Error> {
|
||||
self.events.push(MobEvent::GameEvent {
|
||||
event: "minecraft:splash",
|
||||
at: [
|
||||
self.mob.position.x,
|
||||
self.mob.position.y,
|
||||
self.mob.position.z,
|
||||
],
|
||||
source: self.mob.id,
|
||||
state: horizon_world::registry::BlockStateId(0),
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1634,7 +1634,16 @@ impl Def {
|
||||
use Species as S;
|
||||
match self.species {
|
||||
S::Turtle => 200,
|
||||
S::Horse | S::Donkey | S::Mule | S::Llama | S::TraderLlama => 400,
|
||||
// AbstractHorse.getAmbientSoundInterval, for every subclass.
|
||||
S::Horse
|
||||
| S::Donkey
|
||||
| S::Mule
|
||||
| S::ZombieHorse
|
||||
| S::SkeletonHorse
|
||||
| S::Llama
|
||||
| S::TraderLlama
|
||||
| S::Camel
|
||||
| S::CamelHusk => 400,
|
||||
S::Ocelot => 900,
|
||||
S::Squid
|
||||
| S::GlowSquid
|
||||
|
||||
@@ -855,8 +855,17 @@ impl Goal for CatSitOnBlock {
|
||||
JUMP | MOVE
|
||||
}
|
||||
fn can_use(&mut self, m: &mut Mob, cx: &mut Cx) -> bool {
|
||||
if !m.extra.tame || m.extra.sitting {
|
||||
return false;
|
||||
}
|
||||
// MoveToBlockGoal.canUse draws the next delay only once the last one
|
||||
// has run out.
|
||||
if self.0.next_start > 0 {
|
||||
self.0.next_start -= 1;
|
||||
return false;
|
||||
}
|
||||
let next = reduced(200 + m.random.next_int_bound(200).unwrap_or(0));
|
||||
m.extra.tame && !m.extra.sitting && self.0.can_use(m, cx.w, next, can_sit_on)
|
||||
self.0.can_use(m, cx.w, next, can_sit_on)
|
||||
}
|
||||
fn can_continue(&mut self, _: &mut Mob, cx: &mut Cx) -> bool {
|
||||
self.0.can_continue(cx.w, can_sit_on)
|
||||
|
||||
@@ -262,6 +262,12 @@ def scenarios():
|
||||
add('bee_hive_rain', 300, [HIVE, 'mob minecraft:bee 0.5 -58 0.5 0 162 persistent'], 'rain')
|
||||
add('bee_hive_morning', 1000, [HIVE, 'mob minecraft:bee 0.5 -58 0.5 0 163 persistent'], 'time=22900 daycycle')
|
||||
add('bee_hive_honey', 2600, [HIVE, 'mob minecraft:bee 0.5 -58 0.5 0 164 persistent nectar'])
|
||||
# Mobs dropped into deep water (#542): FloatGoal users float at the surface (their navigation
|
||||
# can float, so Mob.jumpInLiquid adds 0.04 a tick), zombies sink.
|
||||
for species, seed in [('pig', 171), ('cow', 172), ('wolf', 173), ('cat', 174), ('horse', 175),
|
||||
('witch', 176), ('vindicator', 177), ('zombie', 178)]:
|
||||
add(f'{species}_deep_water', 160, ['fill -4 -64 -4 4 -61 4 minecraft:water',
|
||||
f'mob minecraft:{species} 0.5 -62 0.5 0 {seed} persistent'])
|
||||
return s
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user