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

Move body to EntityConfig assets

Browse Source 
* currently works only for random and random_with, uses FromStr for
NpcKind
This commit is contained in:
juliancoffee 2021-06-09 00:58:15 +03:00
parent 229b253a17
commit a4cc1e24ee
26 changed files with 61 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/common/entity/dungeon/tier-0/bow.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Gnarling Stalker"),
body: Some(RandomWith("gnarling")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.adlet_bow")),
second_tool: None,

1
assets/common/entity/dungeon/tier-0/spear.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Gnarling Mugger"),
body: Some(RandomWith("gnarling")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.wooden_spear")),
second_tool: None,

1
assets/common/entity/dungeon/tier-0/staff.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Gnarling Shaman"),
body: Some(RandomWith("gnarling")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.gnoll_staff")),
second_tool: None,

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

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Adlet Tracker"),
body: Some(RandomWith("adlet")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.adlet.adlet_bow")),
second_tool: None,

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

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Adlet Hunter"),
body: Some(RandomWith("adlet")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.adlet.wooden_spear")),
second_tool: None,

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

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Adlet Shaman"),
body: Some(RandomWith("adlet")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.adlet.gnoll_staff")),
second_tool: None,

1
assets/common/entity/dungeon/tier-2/bow.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Sahagin Sniper"),
body: Some(RandomWith("sahagin")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.sahagin.adlet_bow")),
second_tool: None,

1
assets/common/entity/dungeon/tier-2/spear.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Sahagin Spearman"),
body: Some(RandomWith("sahagin")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.sahagin.wooden_spear")),
second_tool: None,

1
assets/common/entity/dungeon/tier-2/staff.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Sahagin Sorcerer"),
body: Some(RandomWith("sahagin")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.sahagin.gnoll_staff")),
second_tool: None,

1
assets/common/entity/dungeon/tier-3/bow.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Haniwa Archer"),
body: Some(RandomWith("haniwa")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.haniwa.adlet_bow")),
second_tool: None,

1
assets/common/entity/dungeon/tier-3/spear.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Haniwa Guard"),
body: Some(RandomWith("haniwa")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.haniwa.wooden_spear")),
second_tool: None,

1
assets/common/entity/dungeon/tier-3/staff.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Haniwa Sorcerer"),
body: Some(RandomWith("haniwa")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.haniwa.gnoll_staff")),
second_tool: None,

1
assets/common/entity/dungeon/tier-4/bow.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Myrmidon Marksman"),
body: Some(RandomWith("myrmidon")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.myrmidon.adlet_bow")),
second_tool: None,

1
assets/common/entity/dungeon/tier-4/spear.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Myrmidon Hoplite"),
body: Some(RandomWith("myrmidon")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.myrmidon.wooden_spear")),
second_tool: None,

1
assets/common/entity/dungeon/tier-4/staff.ron
View File

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Myrmidon Wizard"),
body: Some(RandomWith("myrmidon")),
main_tool: Some(Item("common.items.npc_weapons.biped_small.myrmidon.gnoll_staff")),
second_tool: None,

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

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Beastmaster"),
body: Some(RandomWith("humanoid")),
main_tool: Some(Choice([
(1.0, Some(Item("common.items.weapons.axe.malachite_axe-0"))),

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

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Mindflayer"),
body: Some(RandomWith("mindflayer")),
main_tool: None,
second_tool: None,

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

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Cultist Husk"),
body: Some(RandomWith("husk")),
main_tool: None,
second_tool: None,

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

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Cultist Warlock"),
body: Some(RandomWith("humanoid")),
main_tool: Some(Item("common.items.weapons.staff.cultist_staff")),
second_tool: None,

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

@ -1,5 +1,6 @@
EntityConfig (
name: Some("Cultist Warlord"),
body: Some(RandomWith("humanoid")),
main_tool: Some(Choice([
(1.0, Some(Item("common.items.weapons.axe_1h.orichalcum-0"))),

2
assets/common/entity/test.ron
View File

@ -6,7 +6,7 @@ EntityConfig (
/// Can be Exact (Body with all fields e.g BodyType, Species, Hair color and such)
/// or Random (will use random if available for this Body)
/// or RandomWith (will use random_with if available for this Body)
// body: Humanoid(Random),
body: Some(RandomWith("humanoid")),
/// Main and second tools
/// Can be Option<Item> (with asset_specifier for item)

2
assets/common/entity/village/guard.ron
View File

@ -1,5 +1,7 @@
EntityConfig (
name: Some("Guard"),
// body is specified outsite
body: None,
main_tool: Some(Item("common.items.weapons.sword.iron-4")),
second_tool: None,

2
assets/common/entity/village/merchant.ron
View File

@ -1,5 +1,7 @@
EntityConfig (
name: Some("Merchant"),
// body is specified outsite
body: None,
main_tool: Some(Item("common.items.weapons.bow.eldwood-0")),
second_tool: None,

2
assets/common/entity/village/villager.ron
View File

@ -1,5 +1,7 @@
EntityConfig (
name: None,
// body is specified outsite
body: None,
main_tool: Some(Choice([
(1.0, Some(Item("common.items.weapons.tool.broom"))),

35
common/src/generation.rs
View File

@ -12,9 +12,15 @@ use crate::{
use serde::Deserialize;
use vek::*;
#[derive(Debug, Deserialize, Clone)]
enum BodyKind {
RandomWith(String),
}
#[derive(Debug, Deserialize, Clone)]
struct EntityConfig {
name: Option<String>,
body: Option<BodyKind>,
main_tool: Option<ItemSpec>,
second_tool: Option<ItemSpec>,
loadout_asset: Option<String>,
@ -86,6 +92,7 @@ impl EntityInfo {
fn with_entity_config(mut self, config: EntityConfig, asset_specifier: Option<&str>) -> Self {
let EntityConfig {
name,
body,
main_tool,
second_tool,
loadout_asset,
@ -96,6 +103,19 @@ impl EntityInfo {
self = self.with_name(name);
}
if let Some(body) = body {
match body {
BodyKind::RandomWith(string) => {
let npc::NpcBody(_body_kind, mut body_creator) =
string.parse::<npc::NpcBody>().unwrap_or_else(|err| {
panic!("failed to parse body {:?}. Err: {:?}", &string, err)
});
let body = body_creator();
self = self.with_body(body);
},
}
}
let rng = &mut rand::thread_rng();
if let Some(main_tool) =
main_tool.and_then(|i| i.try_to_item(asset_specifier.unwrap_or("??"), rng))
@ -296,7 +316,8 @@ mod tests {
second_tool,
loadout_asset,
skillset_asset,
..
name: _name,
body,
} = config;
if let Some(main_tool) = main_tool {
@ -307,6 +328,18 @@ mod tests {
second_tool.validate(EquipSlot::ActiveOffhand);
}
if let Some(body) = body {
match body {
BodyKind::RandomWith(string) => {
let npc::NpcBody(_body_kind, mut body_creator) =
string.parse::<npc::NpcBody>().unwrap_or_else(|err| {
panic!("failed to parse body {:?}. Err: {:?}", &string, err)
});
std::mem::drop(body_creator());
},
}
}
if let Some(loadout_asset) = loadout_asset {
let rng = &mut rand::thread_rng();
let builder = LoadoutBuilder::default();

28
world/src/site/dungeon/mod.rs
View File

@ -926,12 +926,6 @@ fn enemy_0(dynamic_rng: &mut impl Rng, entity: EntityInfo) -> EntityInfo {
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.dungeon.tier-0.enemy");
let gnarling = entity
.with_body(comp::Body::BipedSmall(
comp::biped_small::Body::random_with(
dynamic_rng,
&comp::biped_small::Species::Gnarling,
),
))
.with_loot_drop(chosen.read().choose().to_item());
match dynamic_rng.gen_range(0..5) {
@ -945,9 +939,6 @@ fn enemy_1(dynamic_rng: &mut impl Rng, entity: EntityInfo) -> EntityInfo {
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.dungeon.tier-1.enemy");
let adlet = entity
.with_body(comp::Body::BipedSmall(
comp::biped_small::Body::random_with(dynamic_rng, &comp::biped_small::Species::Adlet),
))
.with_loot_drop(chosen.read().choose().to_item());
match dynamic_rng.gen_range(0..5) {
@ -961,9 +952,6 @@ fn enemy_2(dynamic_rng: &mut impl Rng, entity: EntityInfo) -> EntityInfo {
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.dungeon.tier-2.enemy");
let sahagin = entity
.with_body(comp::Body::BipedSmall(
comp::biped_small::Body::random_with(dynamic_rng, &comp::biped_small::Species::Sahagin),
))
.with_loot_drop(chosen.read().choose().to_item());
match dynamic_rng.gen_range(0..5) {
@ -985,12 +973,6 @@ fn enemy_3(dynamic_rng: &mut impl Rng, entity: EntityInfo) -> EntityInfo {
)),
_ => {
let haniwa = entity
.with_body(comp::Body::BipedSmall(
comp::biped_small::Body::random_with(
dynamic_rng,
&comp::biped_small::Species::Haniwa,
),
))
.with_loot_drop(chosen.read().choose().to_item());
match dynamic_rng.gen_range(0..5) {
@ -1005,12 +987,6 @@ fn enemy_4(dynamic_rng: &mut impl Rng, entity: EntityInfo) -> EntityInfo {
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.dungeon.tier-4.enemy");
let myrmidon = entity
.with_body(comp::Body::BipedSmall(
comp::biped_small::Body::random_with(
dynamic_rng,
&comp::biped_small::Species::Myrmidon,
),
))
.with_loot_drop(chosen.read().choose().to_item());
match dynamic_rng.gen_range(0..5) {
@ -1031,11 +1007,9 @@ fn enemy_5(dynamic_rng: &mut impl Rng, entity: EntityInfo) -> EntityInfo {
"common.items.crafting_ing.twigs",
)),
1 => entity
.with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
.with_loot_drop(chosen.read().choose().to_item())
.with_asset_expect("common.entity.dungeon.tier-5.warlock"),
_ => entity
.with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
.with_loot_drop(chosen.read().choose().to_item())
.with_asset_expect("common.entity.dungeon.tier-5.warlord"),
}
@ -1308,7 +1282,6 @@ mod tests {
boss_fallback(&mut dynamic_rng, tile_wcenter);
}
//FIXME: it will miss items with rng branching
#[test]
fn test_creating_enemies() {
let mut dynamic_rng = rand::thread_rng();
@ -1322,7 +1295,6 @@ mod tests {
enemy_fallback(&mut dynamic_rng, raw_entity);
}
//FIXME: it will miss items with rng branching
#[test]
fn test_creating_minibosses() {
let mut dynamic_rng = rand::thread_rng();