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

Added neutral NPC spawning

Browse Source
This commit is contained in:
Joshua Barretto 2020-01-26 01:11:32 +00:00
parent 723b578378
commit 7404800999
2 changed files with 14 additions and 4 deletions
common/src/comp
agent.rs
server/src/sys
terrain.rs

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

@ -13,7 +13,7 @@ pub enum Alignment {
impl Alignment {
pub fn hostile_towards(self, other: Alignment) -> bool {
match (self, other) {
(Alignment::Wild, Alignment::Npc) => true,
(Alignment::Wild, Alignment::Npc) => false,
_ => self != other,
}
}

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

@ -100,12 +100,18 @@ impl<'a> System<'a> for Sys {
if let EntityKind::Waypoint = entity.kind {
server_emitter.emit(ServerEvent::CreateWaypoint(entity.pos));
} else {
const SPAWN_NPCS: &'static [fn() -> (String, comp::Body, Option<comp::Item>)] = &[
const SPAWN_NPCS: &'static [fn() -> (
String,
comp::Body,
Option<comp::Item>,
comp::Alignment,
)] = &[
(|| {
(
"Traveler".into(),
comp::Body::Humanoid(comp::humanoid::Body::random()),
Some(assets::load_expect_cloned("common.items.weapons.staff_1")),
comp::Alignment::Enemy,
)
}) as _,
(|| {
@ -113,6 +119,7 @@ impl<'a> System<'a> for Sys {
"Wolf".into(),
comp::Body::QuadrupedMedium(comp::quadruped_medium::Body::random()),
None,
comp::Alignment::Enemy,
)
}) as _,
(|| {
@ -120,6 +127,7 @@ impl<'a> System<'a> for Sys {
"Duck".into(),
comp::Body::BirdMedium(comp::bird_medium::Body::random()),
None,
comp::Alignment::Wild,
)
}) as _,
(|| {
@ -127,6 +135,7 @@ impl<'a> System<'a> for Sys {
"Rat".into(),
comp::Body::Critter(comp::critter::Body::random()),
None,
comp::Alignment::Wild,
)
}) as _,
(|| {
@ -134,10 +143,11 @@ impl<'a> System<'a> for Sys {
"Pig".into(),
comp::Body::QuadrupedSmall(comp::quadruped_small::Body::random()),
None,
comp::Alignment::Wild,
)
}),
];
let (name, mut body, main) = SPAWN_NPCS
let (name, mut body, main, alignment) = SPAWN_NPCS
.choose(&mut rand::thread_rng())
.expect("SPAWN_NPCS is nonempty")(
);
@ -177,7 +187,7 @@ impl<'a> System<'a> for Sys {
pos: Pos(entity.pos),
stats,
body,
alignment: comp::Alignment::Enemy,
alignment,
agent: comp::Agent::default().with_patrol_origin(entity.pos),
scale: comp::Scale(scale),
})