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

Merge branch 'juliancoffee/animal_trainer_transfer' into 'master'

Browse Source 
Transer Animal Trainers to lvl5 dungeons

See merge request veloren/veloren!2266
This commit is contained in:
Justin Shipsey
2021-05-07 14:13:10 +00:00
parent 67eff3d351 8dc032db4b
commit 0eb50bf316
1 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1007,6 +1007,36 @@ impl Floor {
}, },
3 => { 3 => {
let mut entities = Vec::new(); let mut entities = Vec::new();
entities.resize_with(6, || {
EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_body(comp::Body::QuadrupedLow(
comp::quadruped_low::Body::random_with(
dynamic_rng,
&comp::quadruped_low::Species::Hakulaq,
),
))
.with_name("Hakulaq".to_string())
.with_loot_drop(chosen.read().choose().to_item())
});
entities
},
4 => {
vec![
EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_body(comp::Body::BipedLarge(
comp::biped_large::Body::random_with(
dynamic_rng,
&comp::biped_large::Species::Dullahan,
),
))
.with_name("Dullahan Guard".to_string())
.with_loot_drop(chosen.read().choose().to_item()),
]
},
5 => {
let mut entities = Vec::new();
match dynamic_rng.gen_range(0..2) {
0 => {
entities.push( entities.push(
EntityInfo::at(tile_wcenter.map(|e| e as f32)) EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_body(comp::Body::Humanoid(comp::humanoid::Body::random())) .with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
@ -1039,23 +1069,8 @@ impl Floor {
.with_name("Tamed Darkhound".to_string()) .with_name("Tamed Darkhound".to_string())
.with_loot_drop(chosen.read().choose().to_item()) .with_loot_drop(chosen.read().choose().to_item())
}); });
entities
}, },
4 => { _ => {
vec![
EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_body(comp::Body::BipedLarge(
comp::biped_large::Body::random_with(
dynamic_rng,
&comp::biped_large::Species::Dullahan,
),
))
.with_name("Dullahan Guard".to_string())
.with_loot_drop(chosen.read().choose().to_item()),
]
},
5 => {
let mut entities = Vec::new();
entities.resize_with(10, || { entities.resize_with(10, || {
EntityInfo::at(tile_wcenter.map(|e| e as f32)) EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_body(comp::Body::BipedSmall( .with_body(comp::Body::BipedSmall(
@ -1065,11 +1080,15 @@ impl Floor {
), ),
)) ))
.with_name("Cultist Husk".to_string()) .with_name("Cultist Husk".to_string())
.with_loot_drop(chosen.read().choose().to_item()) .with_loot_drop(
chosen.read().choose().to_item(),
)
.with_loadout_config( .with_loadout_config(
loadout_builder::LoadoutConfig::Husk, loadout_builder::LoadoutConfig::Husk,
) )
}); });
},
}
entities entities
}, },
_ => { _ => {