From ed9a8e9ba11f098580ca1cffa3c100739cf3452b Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Fri, 9 Oct 2026 01:55:37 +0200 Subject: [PATCH] Add zombie horses, skeleton horses and giants Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/mobs/ai.rs | 4 +++ crates/horizon-client/src/mobs/species.rs | 43 +++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/crates/horizon-client/src/mobs/ai.rs b/crates/horizon-client/src/mobs/ai.rs index ed86f7834..81f754589 100644 --- a/crates/horizon-client/src/mobs/ai.rs +++ b/crates/horizon-client/src/mobs/ai.rs @@ -65,6 +65,8 @@ pub enum Family { Hostile, Aquatic, Generic, + /// No goals at all (Giant). + Inert, } pub fn family(s: Species) -> Family { use Species as S; @@ -86,6 +88,7 @@ pub fn family(s: Species) -> Family { | S::TropicalFish | S::Pufferfish | S::Dolphin => Family::Aquatic, + S::Giant => Family::Inert, _ => Family::Generic, } } @@ -96,6 +99,7 @@ pub fn register(m: &mut Mob) { Family::Hostile => hostile::register(m), Family::Aquatic => aquatic::register(m), Family::Generic => generic(m), + Family::Inert => {} } } /// Mob.tick additions that run before the entity tick (creeper fuse, puffing). diff --git a/crates/horizon-client/src/mobs/species.rs b/crates/horizon-client/src/mobs/species.rs index a8b568e3b..bdce3b729 100644 --- a/crates/horizon-client/src/mobs/species.rs +++ b/crates/horizon-client/src/mobs/species.rs @@ -5,6 +5,9 @@ use super::{Brain, Flags, anim::Anim}; #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub enum Species { + ZombieHorse, + SkeletonHorse, + Giant, Pig, Cow, Mooshroom, @@ -178,6 +181,44 @@ pub const ALL: &[Def] = &[ None, Baby::Abs(0.24, 0.4, 0.39) ), + def!( + ZombieHorse, + "zombie_horse", + "zombie_horse#main", + "entity/horse/horse_zombie", + A::Horse, + [ + "entity.zombie_horse.ambient", + "entity.zombie_horse.hurt", + "entity.zombie_horse.death" + ], + Some("entity.horse.step"), + Baby::Scale(0.7, None) + ), + def!( + SkeletonHorse, + "skeleton_horse", + "skeleton_horse#main", + "entity/horse/horse_skeleton", + A::Horse, + [ + "entity.skeleton_horse.ambient", + "entity.skeleton_horse.hurt", + "entity.skeleton_horse.death" + ], + Some("entity.horse.step"), + Baby::Scale(0.7, None) + ), + def!( + Giant, + "giant", + "giant#main", + "entity/zombie/zombie", + A::Humanoid { zombie_arms: true }, + ["", "entity.generic.hurt", "entity.generic.death"], + None, + Baby::None + ), def!( Horse, "horse", @@ -1026,6 +1067,8 @@ impl Def { | S::Stray | S::Bogged | S::WitherSkeleton + | S::ZombieHorse + | S::SkeletonHorse | S::Phantom | S::ZombifiedPiglin | S::Zoglin