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 'npc_spawn_fixes' into 'master'

Browse Source 
npc_spawn_fixes

See merge request veloren/veloren!4161
This commit is contained in:
flo 2023-11-01 18:39:24 +00:00
commit 3332401ac4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/world/wildlife/spawn/desert/wasteland.ron
View File

@ -9,6 +9,7 @@ SpawnEntry (
(80, (1, 1, "common.entity.wild.peaceful.eagle")),
// Rare
(20, (1, 1, "common.entity.wild.aggressive.archaeos")),
(20, (1, 1, "common.entity.wild.aggressive.ntouka")),
(20, (1, 1, "common.entity.wild.aggressive.tarantula")),
(20, (1, 1, "common.entity.wild.aggressive.ogre")),
],

6
world/src/layer/spot.rs
View File

@ -529,7 +529,7 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
entity_radius: f32,
// The entities that should be spawned in the spot, from closest to furthest
// (count_range, spec)
// count_range = number of entities, chosen randomly within this range
// count_range = number of entities, chosen randomly within this range (not inclusive!)
// spec = Manifest spec for the entity kind
entities: &'a [(Range<i32>, &'a str)],
}
@ -576,7 +576,7 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
Spot::RockCircle => SpotConfig {
base_structures: Some("spots.rock-circle"),
entity_radius: 20.0,
entities: &[(-8..1, "common.entity.wild.aggressive.dullahan")],
entities: &[(-8..2, "common.entity.wild.aggressive.dullahan")],
},
Spot::MyrmidonTemple => SpotConfig {
base_structures: Some("spots.myrmidon-temple"),
@ -623,7 +623,7 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
entities: &[
(1..2, "common.entity.dungeon.gnarling.mandragora"),
(2..6, "common.entity.wild.aggressive.deadwood"),
(0..1, "common.entity.wild.aggressive.mossdrake"),
(0..2, "common.entity.wild.aggressive.mossdrake"),
],
},
Spot::TrollCave => SpotConfig {