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 haniwa sentries to level 3 dungeons.

Browse Source
This commit is contained in:
Sam 2021-05-06 19:26:39 -04:00
parent 58e5b1fdf5
commit 9bbdc26089
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/comp/body.rs
View File

@ -606,6 +606,7 @@ impl Body {
BuffKind::Burning => match self { BuffKind::Burning => match self {
Body::Golem(g) => matches!(g.species, golem::Species::ClayGolem), Body::Golem(g) => matches!(g.species, golem::Species::ClayGolem),
Body::BipedSmall(b) => matches!(b.species, biped_small::Species::Haniwa), Body::BipedSmall(b) => matches!(b.species, biped_small::Species::Haniwa),
Body::Object(object::Body::HaniwaSentry) => true,
_ => false, _ => false,
}, },
_ => false, _ => false,

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

@ -671,34 +671,43 @@ impl Floor {
}, },
}, },
)), )),
3 => entity 3 => match dynamic_rng.gen_range(0..4) {
.with_body(comp::Body::BipedSmall( 0 => entity
comp::biped_small::Body::random_with( .with_body(comp::Body::Object(comp::object::Body::HaniwaSentry))
dynamic_rng, .with_name("Haniwa Sentry".to_string())
&comp::biped_small::Species::Haniwa, .with_loot_drop(comp::Item::new_from_asset_expect(
), "common.items.crafting_ing.stones",
)) )),
.with_name("Haniwa") _ => entity
.with_loadout_config(loadout_builder::LoadoutConfig::Haniwa) .with_body(comp::Body::BipedSmall(
.with_skillset_config( comp::biped_small::Body::random_with(
common::skillset_builder::SkillSetConfig::Haniwa, dynamic_rng,
) &comp::biped_small::Species::Haniwa,
.with_loot_drop(chosen.read().choose().to_item()) ),
.with_main_tool(comp::Item::new_from_asset_expect( ))
match dynamic_rng.gen_range(0..5) { .with_name("Haniwa")
0 => { .with_loadout_config(loadout_builder::LoadoutConfig::Haniwa)
"common.items.npc_weapons.biped_small.haniwa.adlet_bow" .with_skillset_config(
common::skillset_builder::SkillSetConfig::Haniwa,
)
.with_loot_drop(chosen.read().choose().to_item())
.with_main_tool(comp::Item::new_from_asset_expect(
match dynamic_rng.gen_range(0..5) {
0 => {
"common.items.npc_weapons.biped_small.haniwa.\
adlet_bow"
},
1 => {
"common.items.npc_weapons.biped_small.haniwa.\
gnoll_staff"
},
_ => {
"common.items.npc_weapons.biped_small.haniwa.\
wooden_spear"
},
}, },
1 => { )),
"common.items.npc_weapons.biped_small.haniwa.\ },
gnoll_staff"
},
_ => {
"common.items.npc_weapons.biped_small.haniwa.\
wooden_spear"
},
},
)),
4 => entity 4 => entity
.with_body(comp::Body::BipedSmall( .with_body(comp::Body::BipedSmall(
comp::biped_small::Body::random_with( comp::biped_small::Body::random_with(