Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevented rtsim entities always climbing

Browse Source
This commit is contained in:
Joshua Barretto
2020-11-12 23:17:43 +00:00
parent 9e912babe9
commit 2ff9592b63
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/sys/agent.rs
View File

@ -232,7 +232,7 @@ impl<'a> System<'a> for Sys {
.unwrap_or(Vec2::zero()) .unwrap_or(Vec2::zero())
* speed.min(agent.rtsim_controller.speed_factor); * speed.min(agent.rtsim_controller.speed_factor);
inputs.jump.set_state(bearing.z > 1.5); 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; inputs.move_z = bearing.z;
} }
} else { } else {

8
server/src/rtsim/entity.rs
View File

@ -44,9 +44,11 @@ impl Entity {
"common.items.weapons.bow.leafy_longbow-0", "common.items.weapons.bow.leafy_longbow-0",
]).choose(&mut rng).unwrap()); ]).choose(&mut rng).unwrap());
let back = match rng.gen_range(0, 3) { let back = match rng.gen_range(0, 5) {
0 => Some(comp::Item::new_from_asset_expect("common.items.npc_armor.back.leather_blue_0")), 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")), 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, _ => 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_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); 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.travel_to = Some(travel_to);
self.controller.speed_factor = 0.75; self.controller.speed_factor = 0.85;
}); });
} }
} }