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

Improved NPC spawning and names, made idle NPCs stop before hitting things

Browse Source
This commit is contained in:
Joshua Barretto 2020-01-27 10:02:36 +00:00
parent 4eb5b76d5f
commit 09f0a5744f
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ use crate::{
path::Chaser,
state::Time,
sync::UidAllocator,
vol::ReadVol,
};
use rand::{seq::SliceRandom, thread_rng, Rng};
use specs::{
@ -93,9 +94,29 @@ impl<'a> System<'a> for Sys {
} else {
Vec2::zero()
};
// Stop if we're too close to a wall
*bearing *= 0.1
+ if terrain
.ray(
pos.0 + Vec3::unit_z(),
pos.0
+ Vec3::from(*bearing).normalized() * 1.5
+ Vec3::unit_z(),
)
.until(|block| block.is_solid())
.cast()
.1
.map(|b| b.is_none())
.unwrap_or(true)
{
0.9
} else {
0.0
};
if bearing.magnitude_squared() > 0.25f32.powf(2.0) {
inputs.move_dir = bearing.normalized() * 0.65;
inputs.move_dir =
bearing.try_normalized().unwrap_or(Vec2::zero()) * 0.65;
}
// Sometimes try searching for new targets

18
server/src/sys/terrain.rs
View File

@ -111,6 +111,14 @@ impl<'a> System<'a> for Sys {
"Traveler".into(),
comp::Body::Humanoid(comp::humanoid::Body::random()),
Some(assets::load_expect_cloned("common.items.weapons.staff_1")),
comp::Alignment::Npc,
)
}) as _,
(|| {
(
"Bandit".into(),
comp::Body::Humanoid(comp::humanoid::Body::random()),
Some(assets::load_expect_cloned("common.items.weapons.staff_1")),
comp::Alignment::Enemy,
)
}) as _,
@ -147,7 +155,7 @@ impl<'a> System<'a> for Sys {
)
}),
];
let (name, mut body, main, alignment) = SPAWN_NPCS
let (name, mut body, main, mut alignment) = SPAWN_NPCS
.choose(&mut rand::thread_rng())
.expect("SPAWN_NPCS is nonempty")(
);
@ -159,11 +167,11 @@ impl<'a> System<'a> for Sys {
stats.level.set_level(rand::thread_rng().gen_range(1, 4));
if let EntityKind::Boss = entity.kind {
if rand::random::<f32>() < 0.8 {
let hbody = comp::humanoid::Body::random();
body = comp::Body::Humanoid(hbody);
if rand::random::<f32>() < 0.65 {
body = comp::Body::Humanoid(comp::humanoid::Body::random());
alignment = comp::Alignment::Npc;
stats = comp::Stats::new(
"Fearless Wanderer".to_string(),
"Fearless Giant".to_string(),
body,
Some(assets::load_expect_cloned("common.items.weapons.hammer_1")),
);