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 'zesterer/ice-spawning' into 'master'

Browse Source 
Added SpawnMode to allow for ice and water column spawning of wildlife

See merge request veloren/veloren!3358
This commit is contained in:
Joshua Barretto 2022-05-08 23:09:19 +00:00
commit 6b69fbe9c5
32 changed files with 129 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/lod-terrain-frag.glsl
View File

@ -342,7 +342,7 @@ void main() {
float side_factor = 1.0 - my_norm.z;
// min(dot(vec3(0, -sign(cam_dir.y), 0), -cam_dir), dot(vec3(-sign(cam_dir.x), 0, 0), -cam_dir))
if (max(abs(my_norm.x), abs(my_norm.y)) < 0.01 || fract(my_alt) * clamp(dot(normalize(vec3(cam_dir.xy, 0)), side_norm), 0, 1) < cam_dir.z / my_norm.z) {
f_ao *= mix(1.0, clamp(fract(my_alt) / length(my_norm.xy) + clamp(dot(side_norm, -cam_dir), 0, 1), 0, 1), voxelize_factor);
//f_ao *= mix(1.0, clamp(fract(my_alt) / length(my_norm.xy) + clamp(dot(side_norm, -cam_dir), 0, 1), 0, 1), voxelize_factor);
voxel_norm = top_norm;
} else {
f_ao *= mix(1.0, clamp(pow(fract(my_alt), 0.5), 0, 1), voxelize_factor);

20
assets/world/wildlife/spawn/arctic/ocean.ron Normal file
View File

@ -0,0 +1,20 @@
SpawnEntry (
name: "Arctic ocean water wildlife.",
note: "Arctic ocean inhabitants",
rules: [
Pack(
groups: [
(4, (1, 3, "common.entity.wild.aggressive.icepike")),
],
spawn_mode: Water,
day_period: [Night, Morning, Noon, Evening],
),
Pack(
groups: [
(2, (4, 12, "common.entity.wild.peaceful.penguin")),
],
spawn_mode: Ice,
day_period: [Night, Morning, Noon, Evening],
),
],
)

4
assets/world/wildlife/spawn/calendar/christmas/taiga/core_forest.ron
View File

@ -8,9 +8,9 @@ SpawnEntry (
(9, (1, 1, "common.entity.wild.aggressive.dreadhorn")),
(1, (1, 1, "common.entity.calendar.christmas.aggressive.yeti")),
],
is_underwater: false,
spawn_mode: Land,
calendar_events: Some([Christmas]),
day_period: [Night, Morning, Noon, Evening],
),
],
)
)

4
assets/world/wildlife/spawn/calendar/christmas/tundra/core.ron
View File

@ -10,9 +10,9 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.mountain_troll")),
(1, (1, 1, "common.entity.calendar.christmas.aggressive.yeti")),
],
is_underwater: false,
spawn_mode: Land,
calendar_events: Some([Christmas]),
day_period: [Night, Morning, Noon, Evening],
),
],
)
)

4
assets/world/wildlife/spawn/calendar/christmas/tundra/forest.ron
View File

@ -10,9 +10,9 @@ SpawnEntry (
(4, (1, 1, "common.entity.wild.aggressive.grolgar")),
(1, (1, 1, "common.entity.calendar.christmas.aggressive.yeti")),
],
is_underwater: false,
spawn_mode: Land,
calendar_events: Some([Christmas]),
day_period: [Night, Morning, Noon, Evening],
),
],
)
)

4
assets/world/wildlife/spawn/calendar/christmas/tundra/snow.ron
View File

@ -9,9 +9,9 @@ SpawnEntry (
(6, (1, 3, "common.entity.wild.aggressive.roshwalr")),
(1, (1, 1, "common.entity.calendar.christmas.aggressive.yeti")),
],
is_underwater: false,
spawn_mode: Land,
calendar_events: Some([Christmas]),
day_period: [Night, Morning, Noon, Evening],
),
],
)
)

2
assets/world/wildlife/spawn/desert/area.ron
View File

@ -7,7 +7,7 @@ SpawnEntry (
(1, (3, 6, "common.entity.wild.peaceful.zebra")),
(1, (3, 6, "common.entity.wild.peaceful.antelope")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

4
assets/world/wildlife/spawn/desert/hot.ron
View File

@ -12,7 +12,7 @@ SpawnEntry (
// Rare
(1, (1, 1, "common.entity.wild.peaceful.crawler_sand")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Morning, Noon, Evening],
),
Pack(
@ -21,7 +21,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.peaceful.porcupine")),
(1, (1, 1, "common.entity.wild.peaceful.pangolin")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night],
),
],

2
assets/world/wildlife/spawn/desert/river.ron
View File

@ -6,7 +6,7 @@ SpawnEntry (
groups: [
(1, (1, 1, "common.entity.wild.aggressive.crocodile")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

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

@ -18,7 +18,7 @@ SpawnEntry (
// Ultra_rare
(1, (1, 1, "common.entity.wild.aggressive.roshwalr_boss")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

4
assets/world/wildlife/spawn/jungle/rainforest.ron
View File

@ -15,7 +15,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.occult_saurok")),
(1, (1, 1, "common.entity.wild.aggressive.sly_saurok")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Morning, Noon, Evening],
),
Pack(
@ -24,7 +24,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.maneater")),
(1, (1, 1, "common.entity.wild.aggressive.cockatrice")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night],
),
],

4
assets/world/wildlife/spawn/jungle/rainforest_area.ron
View File

@ -14,7 +14,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.stag_beetle")),
(1, (1, 1, "common.entity.wild.peaceful.crawler_moss")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Morning, Noon, Evening],
),
Pack(
@ -22,7 +22,7 @@ SpawnEntry (
(5, (1, 1, "common.entity.wild.peaceful.quokka")),
(1, (1, 1, "common.entity.wild.peaceful.tortoise")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night],
),
],

2
assets/world/wildlife/spawn/taiga/area.ron
View File

@ -11,7 +11,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.peaceful.arctic_hare")),
(1, (1, 1, "common.entity.wild.peaceful.tuskram")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/taiga/core.ron
View File

@ -10,7 +10,7 @@ SpawnEntry (
(1, (1, 3, "common.entity.wild.peaceful.alpaca")),
(1, (1, 3, "common.entity.wild.peaceful.highland")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/taiga/core_forest.ron
View File

@ -7,7 +7,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.wendigo")),
(1, (1, 1, "common.entity.wild.aggressive.dreadhorn")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/taiga/forest.ron
View File

@ -6,7 +6,7 @@ SpawnEntry (
groups: [
(1, (3, 7, "common.entity.wild.aggressive.wolf")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/taiga/water.ron
View File

@ -6,7 +6,7 @@ SpawnEntry (
groups: [
(1, (1, 2, "common.entity.wild.aggressive.icepike")),
],
is_underwater: true,
spawn_mode: Water,
day_period: [Night, Morning, Noon, Evening],
),
],

4
assets/world/wildlife/spawn/temperate/rainforest.ron
View File

@ -33,7 +33,7 @@ SpawnEntry (
(2, (1, 1, "common.entity.wild.peaceful.leaf_beetle")),
(2, (1, 1, "common.entity.wild.aggressive.weevil")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Morning, Noon, Evening],
),
Pack(
@ -46,7 +46,7 @@ SpawnEntry (
(5, (1, 3, "common.entity.wild.peaceful.rat")),
(5, (1, 3, "common.entity.wild.peaceful.squirrel")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night],
),
],

2
assets/world/wildlife/spawn/temperate/rare.ron
View File

@ -8,7 +8,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.swamp_troll")),
(1, (1, 1, "common.entity.wild.aggressive.cyclops")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/temperate/river.ron
View File

@ -10,7 +10,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.peaceful.kelpie")),
(1, (1, 1, "common.entity.wild.aggressive.hakulaq")),
],
is_underwater: false,
spawn_mode: Water,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/temperate/water.ron
View File

@ -8,7 +8,7 @@ SpawnEntry (
(1, (3, 4, "common.entity.wild.peaceful.piranha")),
(1, (3, 4, "common.entity.wild.peaceful.clownfish")),
],
is_underwater: true,
spawn_mode: Water,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/temperate/wood.ron
View File

@ -12,7 +12,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.weevil")),
(1, (1, 1, "common.entity.wild.peaceful.leaf_beetle")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tropical/ocean.ron
View File

@ -6,7 +6,7 @@ SpawnEntry (
groups: [
(1, (1, 3, "common.entity.wild.aggressive.sea_crocodile")),
],
is_underwater: true,
spawn_mode: Water,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tropical/rainforest.ron
View File

@ -7,7 +7,7 @@ SpawnEntry (
(1, (1, 2, "common.entity.wild.aggressive.male_lion")),
(1, (1, 3, "common.entity.wild.aggressive.hyena")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tropical/river.ron
View File

@ -8,7 +8,7 @@ SpawnEntry (
(1, (1, 2, "common.entity.wild.peaceful.axolotl")),
(1, (1, 2, "common.entity.wild.peaceful.fungome")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tropical/river_rare.ron
View File

@ -6,7 +6,7 @@ SpawnEntry (
groups: [
(1, (1, 2, "common.entity.wild.aggressive.alligator")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tropical/rock.ron
View File

@ -6,7 +6,7 @@ SpawnEntry (
groups: [
(1, (1, 1, "common.entity.wild.aggressive.dodarock")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tundra/core.ron
View File

@ -9,7 +9,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.mammoth")),
(1, (1, 1, "common.entity.wild.aggressive.mountain_troll")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tundra/forest.ron
View File

@ -9,7 +9,7 @@ SpawnEntry (
(1, (1, 1, "common.entity.wild.aggressive.yale")),
(1, (1, 1, "common.entity.wild.aggressive.grolgar")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tundra/rock.ron
View File

@ -6,7 +6,7 @@ SpawnEntry (
groups: [
(1, (1, 1, "common.entity.wild.aggressive.rocksnapper")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

2
assets/world/wildlife/spawn/tundra/snow.ron
View File

@ -11,7 +11,7 @@ SpawnEntry (
(1, (1, 3, "common.entity.wild.aggressive.roshwalr")),
(5, (5, 20, "common.entity.wild.peaceful.penguin")),
],
is_underwater: false,
spawn_mode: Land,
day_period: [Night, Morning, Noon, Evening],
),
],

128
world/src/layer/wildlife.rs
View File

@ -43,7 +43,8 @@ impl SpawnEntry {
&self,
requested_period: DayPeriod,
calendar: Option<&Calendar>,
underwater: bool,
is_underwater: bool,
is_ice: bool,
) -> Option<Pack> {
self.rules
.iter()
@ -59,8 +60,13 @@ impl SpawnEntry {
} else {
false
};
let water_match = pack.is_underwater == underwater;
time_match && calendar_match && water_match
let mode_match = match pack.spawn_mode {
SpawnMode::Land => !is_underwater,
SpawnMode::Ice => is_ice,
SpawnMode::Water | SpawnMode::Underwater => is_underwater,
SpawnMode::Air(_) => true,
};
time_match && calendar_match && mode_match
})
.cloned()
}
@ -77,7 +83,7 @@ impl SpawnEntry {
/// (1, (1, 1, "common.entity.wild.aggressive.yale")),
/// (1, (1, 1, "common.entity.wild.aggressive.grolgar")),
/// ],
/// is_underwater: false,
/// spawn_mode: Land,
/// day_period: [Night, Morning, Noon, Evening],
/// ),
/// ```
@ -95,9 +101,13 @@ impl SpawnEntry {
/// to `assets/common/entity/wild/aggressive/frostfang.ron` file with
/// EntityConfig
///
/// Underwater:
/// `is_underwater: false` means mobs from this pack can't be spawned underwater
/// in rivers, lakes or ocean
/// Spawn mode:
/// `spawn_mode: Land` means mobs spawn on land at the surface (i.e: cows)
/// `spawn_mode: means mobs spawn on the surface of water ice
/// `spawn_mode: Water` means mobs spawn *in* water at a random depth (i.e:
/// fish) `spawn_mode: Underwater` means mobs spawn at the bottom of a body of
/// water (i.e: crabs) `spawn_mode: Air(32)` means mobs spawn in the air above
/// either land or water, with a maximum altitude of 32
///
/// Day period:
/// `day_period: [Night, Morning, Noon, Evening]`
@ -106,13 +116,22 @@ impl SpawnEntry {
#[derive(Clone, Debug, Deserialize)]
pub struct Pack {
pub groups: Vec<(Weight, (Min, Max, String))>,
pub is_underwater: bool,
pub spawn_mode: SpawnMode,
pub day_period: Vec<DayPeriod>,
#[serde(default)]
pub calendar_events: Option<Vec<CalendarEvent>>, /* None implies that the group isn't
* limited by calendar events */
}
#[derive(Copy, Clone, Debug, Deserialize)]
pub enum SpawnMode {
Land,
Ice,
Water,
Underwater,
Air(f32),
}
impl Pack {
pub fn generate(&self, pos: Vec3<f32>, dynamic_rng: &mut impl Rng) -> (EntityInfo, u8) {
let (_, (from, to, entity_asset)) = self
@ -273,6 +292,15 @@ pub fn spawn_manifest() -> Vec<(&'static str, DensityFn)> {
0.0
}
}),
// Arctic ocean animals
("world.wildlife.spawn.arctic.ocean", |_c, col| {
close(col.temp, 0.0, 0.25) / 10.0
* if matches!(col.chunk.get_biome(), BiomeKind::Ocean) {
0.001
} else {
0.0
}
}),
// Rainforest area animals
("world.wildlife.spawn.tropical.rainforest", |c, _col| {
close(c.temp, CONFIG.tropical_temp + 0.1, 0.4)
@ -343,7 +371,8 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
continue;
};
let underwater = col_sample.water_level > col_sample.alt;
let is_underwater = col_sample.water_level > col_sample.alt;
let is_ice = col_sample.ice_depth > 0.5 && is_underwater;
let (current_day_period, calendar) = if let Some((time, calendar)) = time {
(DayPeriod::from(time.0), Some(calendar))
} else {
@ -353,13 +382,13 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
let entity_group = scatter
.iter()
.enumerate()
.find_map(|(_i, (entry, get_density))| {
.filter_map(|(_i, (entry, get_density))| {
let density = get_density(chunk, col_sample) * wildlife_density_modifier;
(density > 0.0)
.then(|| {
entry
.read()
.request(current_day_period, calendar, underwater)
.request(current_day_period, calendar, is_underwater, is_ice)
.and_then(|pack| {
(dynamic_rng.gen::<f32>() < density * col_sample.spawn_rate
&& col_sample.gradient < Some(1.3))
@ -367,13 +396,26 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
})
})
.flatten()
});
let alt = col_sample.alt as i32;
})
.collect::<Vec<_>>() // TODO: Don't allocate
.choose(dynamic_rng)
.cloned();
if let Some(pack) = entity_group {
let desired_alt = match pack.spawn_mode {
SpawnMode::Land | SpawnMode::Underwater => col_sample.alt,
SpawnMode::Ice => col_sample.water_level + 1.0 + col_sample.ice_depth,
SpawnMode::Water => dynamic_rng.gen_range(
col_sample.alt..col_sample.water_level.max(col_sample.alt + 0.1),
),
SpawnMode::Air(height) => {
col_sample.alt.max(col_sample.water_level)
+ dynamic_rng.gen::<f32>() * height
},
};
let (entity, group_size) = pack.generate(
(wpos2d.map(|e| e as f32) + 0.5).with_z(alt as f32),
(wpos2d.map(|e| e as f32) + 0.5).with_z(desired_alt),
dynamic_rng,
);
for e in 0..group_size {
@ -390,15 +432,22 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
// Find the intersection between ground and air, if there is one near the
// surface
if let Some(solid_end) = (-8..8).find(|z| {
(0..2).all(|z2| {
vol.get(Vec3::new(offs.x, offs.y, alt) + offs_wpos2d.with_z(z + z2))
let z_offset = (0..16)
.map(|z| if z % 2 == 0 { z } else { -z } / 2)
.find(|z| {
(0..2).all(|z2| {
vol.get(
Vec3::new(offs.x, offs.y, desired_alt as i32)
+ offs_wpos2d.with_z(z + z2),
)
.map(|b| !b.is_solid())
.unwrap_or(true)
})
}) {
})
});
if let Some(z_offset) = z_offset {
let mut entity = entity.clone();
entity.pos += offs_wpos2d.with_z(solid_end).map(|e| e as f32);
entity.pos += offs_wpos2d.with_z(z_offset).map(|e| e as f32);
supplement.add_entity(entity);
}
}
@ -410,7 +459,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
#[cfg(test)]
mod tests {
use super::*;
use hashbrown::{HashMap, HashSet};
use hashbrown::HashMap;
// Checks that each entry in spawn manifest is loadable
#[test]
@ -434,41 +483,6 @@ mod tests {
}
}
// Checks that day_period aren't overlapping
// Quite strict rule, but otherwise may produce unexpected behaviour
#[test]
fn test_check_day_periods() {
let scatter = spawn_manifest();
for (entry, _) in scatter.into_iter() {
let mut day_periods = HashSet::with_capacity(4);
let SpawnEntry { rules, .. } = SpawnEntry::from(entry);
for pack in rules {
let Pack {
day_period,
is_underwater,
..
} = pack;
for period in day_period {
if !day_periods.insert((period, is_underwater)) {
panic!(
r#"
== {}: ==
Found rules with duplicated `day_period` and `is_underwater`
If you have two of such entries,
there are big chances that second rule will be unreachable.
If you want some animals spawned in different Packs
with same day_period, add those animals to both Packs
and choose day_period to not overlap.
"#,
entry
)
}
}
}
}
}
// Checks that each entity is loadable
#[test]
fn test_load_entities() {