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

Cultist enemies are now spawned by rtsim.

Browse Source
This commit is contained in:
Sam 2021-09-04 00:05:48 -04:00
parent 311fb251c1
commit 57ba9a0300
5 changed files with 111 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/common/entity/dungeon/tier-5/cultist.ron
View File

@ -8,6 +8,7 @@ EntityConfig (
hands: TwoHanded(Choice([
(2.0, Some(Item("common.items.weapons.axe_1h.orichalcum-0"))),
(4.0, Some(Item("common.items.weapons.sword.cultist"))),
(2.0, Some(Item("common.items.weapons.staff.cultist_staff"))),
(2.0, Some(Item("common.items.weapons.hammer.cultist_purp_2h-0"))),
(2.0, Some(Item("common.items.weapons.hammer_1h.orichalcum-0"))),
(2.0, Some(Item("common.items.weapons.bow.velorite"))),

10
assets/common/loadout/dungeon/tier-5/cultist.ron
View File

@ -14,4 +14,14 @@
]),
Glider: Item("common.items.glider.glider_purp"),
ActiveMainhand: Choice([
(2.0, Some(Item("common.items.weapons.axe_1h.orichalcum-0"))),
(4.0, Some(Item("common.items.weapons.sword.cultist"))),
(2.0, Some(Item("common.items.weapons.staff.cultist_staff"))),
(2.0, Some(Item("common.items.weapons.hammer.cultist_purp_2h-0"))),
(2.0, Some(Item("common.items.weapons.hammer_1h.orichalcum-0"))),
(2.0, Some(Item("common.items.weapons.bow.velorite"))),
(1.0, Some(Item("common.items.weapons.sceptre.sceptre_velorite_0"))),
]),
})

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

@ -21,10 +21,15 @@ pub struct Entity {
pub seed: u32,
pub last_time_ticked: f64,
pub controller: RtSimController,
pub kind: RtSimEntityKind,
pub brain: Brain,
}
pub enum RtSimEntityKind {
Random,
Cultist,
}
const PERM_SPECIES: u32 = 0;
const PERM_BODY: u32 = 1;
const PERM_LOADOUT: u32 = 2;
@ -35,22 +40,34 @@ impl Entity {
pub fn rng(&self, perm: u32) -> impl Rng { RandomPerm::new(self.seed + perm) }
pub fn get_body(&self) -> comp::Body {
match self.rng(PERM_GENUS).gen::<f32>() {
// we want 5% airships, 45% birds, 50% humans
x if x < 0.05 => comp::ship::Body::random_with(&mut self.rng(PERM_BODY)).into(),
x if x < 0.45 => {
let species = *(&comp::bird_medium::ALL_SPECIES)
.choose(&mut self.rng(PERM_SPECIES))
.unwrap();
comp::bird_medium::Body::random_with(&mut self.rng(PERM_BODY), &species).into()
match self.kind {
RtSimEntityKind::Random => {
match self.rng(PERM_GENUS).gen::<f32>() {
// we want 5% airships, 45% birds, 50% humans
x if x < 0.05 => comp::ship::Body::random_with(&mut self.rng(PERM_BODY)).into(),
x if x < 0.45 => {
let species = *(&comp::bird_medium::ALL_SPECIES)
.choose(&mut self.rng(PERM_SPECIES))
.unwrap();
comp::bird_medium::Body::random_with(&mut self.rng(PERM_BODY), &species)
.into()
},
x if x < 0.50 => {
let species = *(&comp::bird_large::ALL_SPECIES)
.choose(&mut self.rng(PERM_SPECIES))
.unwrap();
comp::bird_large::Body::random_with(&mut self.rng(PERM_BODY), &species)
.into()
},
_ => {
let species = *(&comp::humanoid::ALL_SPECIES)
.choose(&mut self.rng(PERM_SPECIES))
.unwrap();
comp::humanoid::Body::random_with(&mut self.rng(PERM_BODY), &species).into()
},
}
},
x if x < 0.50 => {
let species = *(&comp::bird_large::ALL_SPECIES)
.choose(&mut self.rng(PERM_SPECIES))
.unwrap();
comp::bird_large::Body::random_with(&mut self.rng(PERM_BODY), &species).into()
},
_ => {
RtSimEntityKind::Cultist => {
let species = *(&comp::humanoid::ALL_SPECIES)
.choose(&mut self.rng(PERM_SPECIES))
.unwrap();
@ -60,30 +77,47 @@ impl Entity {
}
pub fn get_name(&self) -> String {
use common::{generation::get_npc_name, npc::NPC_NAMES};
let npc_names = NPC_NAMES.read();
match self.get_body() {
comp::Body::BirdMedium(b) => {
get_npc_name(&npc_names.bird_medium, b.species).to_string()
match self.kind {
RtSimEntityKind::Random => {
use common::{generation::get_npc_name, npc::NPC_NAMES};
let npc_names = NPC_NAMES.read();
match self.get_body() {
comp::Body::BirdMedium(b) => {
get_npc_name(&npc_names.bird_medium, b.species).to_string()
},
comp::Body::BirdLarge(b) => {
get_npc_name(&npc_names.bird_large, b.species).to_string()
},
comp::Body::Dragon(b) => get_npc_name(&npc_names.dragon, b.species).to_string(),
comp::Body::Humanoid(b) => {
get_npc_name(&npc_names.humanoid, b.species).to_string()
},
comp::Body::Ship(_) => "Veloren Air".to_string(),
//TODO: finish match as necessary
_ => unimplemented!(),
}
},
comp::Body::BirdLarge(b) => get_npc_name(&npc_names.bird_large, b.species).to_string(),
comp::Body::Dragon(b) => get_npc_name(&npc_names.dragon, b.species).to_string(),
comp::Body::Humanoid(b) => get_npc_name(&npc_names.humanoid, b.species).to_string(),
comp::Body::Ship(_) => "Veloren Air".to_string(),
//TODO: finish match as necessary
_ => unimplemented!(),
RtSimEntityKind::Cultist => "Cultist Raider".to_string(),
}
}
pub fn get_loadout(&self) -> comp::inventory::loadout::Loadout {
let mut rng = self.rng(PERM_LOADOUT);
LoadoutBuilder::from_asset_expect("common.loadout.world.traveler", Some(&mut rng))
.bag(
comp::inventory::slot::ArmorSlot::Bag1,
Some(comp::inventory::loadout_builder::make_potion_bag(100)),
match self.kind {
RtSimEntityKind::Random => {
LoadoutBuilder::from_asset_expect("common.loadout.world.traveler", Some(&mut rng))
.bag(
comp::inventory::slot::ArmorSlot::Bag1,
Some(comp::inventory::loadout_builder::make_potion_bag(100)),
)
.build()
},
RtSimEntityKind::Cultist => LoadoutBuilder::from_asset_expect(
"common.loadout.dungeon.tier-5.cultist",
Some(&mut rng),
)
.build()
.build(),
}
}
pub fn tick(&mut self, time: &Time, terrain: &TerrainGrid, world: &World, index: &IndexRef) {

49
server/src/rtsim/mod.rs
View File

@ -20,7 +20,7 @@ use slab::Slab;
use specs::{DispatcherBuilder, WorldExt};
use vek::*;
pub use self::entity::{Entity, Brain};
pub use self::entity::{Brain, Entity, RtSimEntityKind};
pub struct RtSim {
tick: u64,
@ -104,7 +104,11 @@ pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) {
]);
}
pub fn init(state: &mut State, #[cfg(feature = "worldgen")] world: &world::World, #[cfg(feature = "worldgen")] index: world::IndexRef) {
pub fn init(
state: &mut State,
#[cfg(feature = "worldgen")] world: &world::World,
#[cfg(feature = "worldgen")] index: world::IndexRef,
) {
#[cfg(feature = "worldgen")]
let mut rtsim = RtSim::new(world.sim().get_size());
#[cfg(not(feature = "worldgen"))]
@ -128,30 +132,35 @@ pub fn init(state: &mut State, #[cfg(feature = "worldgen")] world: &world::World
seed: thread_rng().gen(),
controller: RtSimController::default(),
last_time_ticked: 0.0,
kind: RtSimEntityKind::Random,
brain: Default::default(),
});
}
for site in world.civs().sites.iter().filter_map(|(_, site)| site.site_tmp.map(|id| &index.sites[id])) {
for site in world
.civs()
.sites
.iter()
.filter_map(|(_, site)| site.site_tmp.map(|id| &index.sites[id]))
{
use world::site::SiteKind;
match &site.kind {
SiteKind::Dungeon(dungeon) => {
match dungeon.dungeon_difficulty() {
Some(5) => {
let pos = site.get_origin();
SiteKind::Dungeon(dungeon) => match dungeon.dungeon_difficulty() {
Some(5) => {
let pos = site.get_origin();
for _ in 0..25 {
rtsim.entities.insert(Entity {
is_loaded: false,
pos: Vec3::from(pos.map(|e| e as f32)),
seed: thread_rng().gen(),
controller: RtSimController::default(),
last_time_ticked: 0.0,
brain: Brain::idle(),
});
}
},
_ => {},
}
for _ in 0..25 {
rtsim.entities.insert(Entity {
is_loaded: false,
pos: Vec3::from(pos.map(|e| e as f32)),
seed: thread_rng().gen(),
controller: RtSimController::default(),
last_time_ticked: 0.0,
kind: RtSimEntityKind::Cultist,
brain: Brain::idle(),
});
}
},
_ => {},
},
_ => {},
}

5
server/src/rtsim/tick.rs
View File

@ -146,7 +146,10 @@ impl<'a> System<'a> for Sys {
body,
agent,
alignment: match body {
comp::Body::Humanoid(_) => comp::Alignment::Npc,
comp::Body::Humanoid(_) => match entity.kind {
RtSimEntityKind::Random => comp::Alignment::Npc,
RtSimEntityKind::Cultist => comp::Alignment::Enemy,
},
comp::Body::BirdLarge(bird_large) => match bird_large.species {
comp::bird_large::Species::Roc => comp::Alignment::Enemy,
comp::bird_large::Species::Cockatrice => comp::Alignment::Enemy,