diff --git a/common/src/sys/agent.rs b/common/src/sys/agent.rs index 4313851a92..67e9256de5 100644 --- a/common/src/sys/agent.rs +++ b/common/src/sys/agent.rs @@ -232,7 +232,7 @@ impl<'a> System<'a> for Sys { .unwrap_or(Vec2::zero()) * speed.min(agent.rtsim_controller.speed_factor); inputs.jump.set_state(bearing.z > 1.5); - inputs.climb = Some(comp::Climb::Up); + inputs.climb = Some(comp::Climb::Up).filter(|_| bearing.z > 1.5); inputs.move_z = bearing.z; } } else { diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs index 20d560290b..2c5fb14a4f 100644 --- a/server/src/rtsim/entity.rs +++ b/server/src/rtsim/entity.rs @@ -44,9 +44,11 @@ impl Entity { "common.items.weapons.bow.leafy_longbow-0", ]).choose(&mut rng).unwrap()); - let back = match rng.gen_range(0, 3) { - 0 => Some(comp::Item::new_from_asset_expect("common.items.npc_armor.back.leather_blue_0")), + let back = match rng.gen_range(0, 5) { + 0 => Some(comp::Item::new_from_asset_expect("common.items.armor.back.leather_adventurer")), 1 => Some(comp::Item::new_from_asset_expect("common.items.npc_armor.back.backpack_0")), + 2 => Some(comp::Item::new_from_asset_expect("common.items.npc_armor.back.backpack_blue_0")), + 3 => Some(comp::Item::new_from_asset_expect("common.items.npc_armor.back.leather_blue_0")), _ => None, }; @@ -103,7 +105,7 @@ impl Entity { let travel_to_alt = world.sim().get_alt_approx(travel_to.map(|e| e as i32)).unwrap_or(0.0) as i32; let travel_to = terrain.find_space(Vec3::new(travel_to.x as i32, travel_to.y as i32, travel_to_alt)).map(|e| e as f32) + Vec3::new(0.5, 0.5, 0.0); self.controller.travel_to = Some(travel_to); - self.controller.speed_factor = 0.75; + self.controller.speed_factor = 0.85; }); } }