Merge pull request #2192 from kacpherek/fix/piglin-soul-fire-repellents
🤖 Agent: Gate check by Ludovic's AI agent (Claude). Checked against 26.3: `PiglinSpecificSensor` finds the nearest `#piglin_repellents` block (a soul campfire only while lit), and the piglin walks away from it. I pushed one rename: this PR and #2191 each added a `find_repellent` to piglin.rs, so this one is now `find_piglin_repellent`. Gate: this wave's 55 PRs merged on main in one tree: clippy `-D warnings` clean, 1186 horizon-client and 163 horizon-world tests pass, and of the 101 harnesses `parity.py --changed-files` picked, 100 pass (`block_removal` failed on one spawner case from #2199's orb merging, fixed there). `lan_e2e.py` passes 24 checks with the host on its server thread and in-frame (chest, xp, pvp, doors, villagers, beds, frames, projectiles, arrows, fishing, damage, mobs, blast, drops, elytra, breath, predict, cracks, barter, kills, hurt, contacts, underwater, plates), plus forced-levels on the server thread. Thanks @kacpherek!
This commit is contained in:
@@ -45,6 +45,7 @@ pub fn register_piglin(m: &mut Mob) {
|
||||
g.add(3, super::illager::crossbow_goal(1.0, 8.0));
|
||||
}
|
||||
g.add(3, MeleeAttack::new(1.0, true));
|
||||
g.add(4, PiglinAvoidRepellent);
|
||||
g.add(4, GoToWantedItem);
|
||||
g.add(5, Stroll::avoiding_water(0.6));
|
||||
g.add(6, LookAtPlayer::new(8.0));
|
||||
@@ -176,6 +177,54 @@ impl Goal for BabyPanic {
|
||||
self.0.stop(m, cx)
|
||||
}
|
||||
}
|
||||
/// `PiglinAi.avoidRepellent`: `SetWalkTargetAwayFrom.pos(NEAREST_REPELLENT, 1.0, 8, false)`
|
||||
/// of the idle activity. Closer than 8 blocks to a repellent and not walking
|
||||
/// anywhere, walk away from it.
|
||||
#[derive(Clone, Debug)]
|
||||
struct PiglinAvoidRepellent;
|
||||
impl Goal for PiglinAvoidRepellent {
|
||||
goal_clone!();
|
||||
fn flags(&self) -> u8 {
|
||||
MOVE
|
||||
}
|
||||
fn can_use(&mut self, m: &mut Mob, cx: &mut Cx) -> bool {
|
||||
let Some(r) = m.extra.repellent else {
|
||||
return false;
|
||||
};
|
||||
// The idle activity: not fighting or admiring, and no walk target yet.
|
||||
if m.ai.target.is_some() || m.extra.using_item > 0 || !m.ai.nav.is_done() {
|
||||
return false;
|
||||
}
|
||||
// Vec3.atBottomCenterOf.
|
||||
let avoid = [
|
||||
f64::from(r[0]) + 0.5,
|
||||
f64::from(r[1]),
|
||||
f64::from(r[2]) + 0.5,
|
||||
];
|
||||
if m.distance_sqr(Vec3::new(avoid[0], avoid[1], avoid[2])) >= 64.0 {
|
||||
return false;
|
||||
}
|
||||
for _ in 0..10 {
|
||||
if let Some(p) = m.land_random_pos_away(cx.w, 16, 7, avoid) {
|
||||
let at = [
|
||||
p[0].floor() as i32,
|
||||
p[1].floor() as i32,
|
||||
p[2].floor() as i32,
|
||||
];
|
||||
m.ai.pending_path = m.create_path_to(cx.w, at, 0);
|
||||
return m.ai.pending_path.is_some();
|
||||
}
|
||||
}
|
||||
false
|
||||
}
|
||||
fn can_continue(&mut self, m: &mut Mob, _: &mut Cx) -> bool {
|
||||
!m.ai.nav.is_done()
|
||||
}
|
||||
fn start(&mut self, m: &mut Mob, _: &mut Cx) {
|
||||
let path = m.ai.pending_path.take();
|
||||
m.nav_move_to_path(path, 1.0);
|
||||
}
|
||||
}
|
||||
/// Admiring a gold item held in the off hand: stand and look at it.
|
||||
#[derive(Clone, Debug)]
|
||||
struct Admire;
|
||||
@@ -299,6 +348,26 @@ pub fn ai_step(m: &mut Mob, w: &MobWorld, events: &mut Vec<MobEvent>) {
|
||||
} else {
|
||||
m.extra.counter2 = 0;
|
||||
}
|
||||
// PiglinSpecificSensor (every 20 ticks): the nearest repelling block.
|
||||
if m.species() == Species::Piglin && m.alive() && m.age.wrapping_add(m.id).is_multiple_of(20) {
|
||||
m.extra.repellent = find_piglin_repellent(m, w);
|
||||
}
|
||||
}
|
||||
/// `PiglinSpecificSensor.findNearestRepellent`: the nearest `#piglin_repellents`
|
||||
/// block within 8 blocks sideways and 4 up or down; a soul campfire only
|
||||
/// counts while lit.
|
||||
fn find_piglin_repellent(m: &Mob, w: &MobWorld) -> Option<[i32; 3]> {
|
||||
let tag = w.block_tags.get("minecraft:piglin_repellents")?;
|
||||
let at = [
|
||||
m.position.x.floor() as i32,
|
||||
m.position.y.floor() as i32,
|
||||
m.position.z.floor() as i32,
|
||||
];
|
||||
w.nearest_block(at, 8, 4, |p, name| {
|
||||
tag.contains(name)
|
||||
&& (name != "minecraft:soul_campfire"
|
||||
|| w.prop(p[0], p[1], p[2], "lit") == Some("true"))
|
||||
})
|
||||
}
|
||||
/// `HoglinBase.hurtAndThrowTarget`.
|
||||
pub fn hoglin_hurt_target(m: &mut Mob, who: Who, cx: &mut Cx) {
|
||||
|
||||
Reference in New Issue
Block a user