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

Better biome distribution

Browse Source
This commit is contained in:
Joshua Barretto 2022-07-15 17:53:24 +01:00
parent 5b8bdb9c9c
commit 26202c294f
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
world/src/layer/cave.rs
View File

@ -157,7 +157,7 @@ impl Tunnel {
let Some(col) = info.col_or_gen(wpos.xy()) else { return Biome::default() }; let Some(col) = info.col_or_gen(wpos.xy()) else { return Biome::default() };
// Below the ground // Below the ground
let below = ((col.alt - wpos.z as f32) / 50.0).clamped(0.0, 1.0); let below = ((col.alt - wpos.z as f32) / 200.0).clamped(0.0, 1.0);
let depth = (col.alt - wpos.z as f32) / (AVG_LEVEL_DEPTH as f32 * LAYERS as f32); let depth = (col.alt - wpos.z as f32) / (AVG_LEVEL_DEPTH as f32 * LAYERS as f32);
let humidity = Lerp::lerp( let humidity = Lerp::lerp(
@ -199,13 +199,13 @@ impl Tunnel {
* close(humidity, 1.0, 0.75) * close(humidity, 1.0, 0.75)
* close(temp, 0.25, 1.2) * close(temp, 0.25, 1.2)
* close(depth, 1.0, 0.6); * close(depth, 1.0, 0.6);
let fire = underground * close(humidity, 0.0, 0.75) * close(temp, 2.0, 0.6); let fire = underground * close(humidity, 0.0, 0.85) * close(temp, 2.0, 0.6);
let leafy = underground let leafy = underground
* close(humidity, 1.0, 0.75) * close(humidity, 1.0, 0.75)
* close(temp, 0.1, 0.75) * close(temp, 0.35, 1.0)
* close(depth, 0.0, 0.6); * close(depth, 0.0, 0.8);
let dusty = close(humidity, 0.0, 0.5) * close(temp, -0.3, 0.65); let dusty = close(humidity, 0.0, 0.5) * close(temp, -0.3, 0.65);
let icy = close(temp, -1.0, 0.7); let icy = close(temp, -1.0, 0.5);
let biomes = [barren, mushroom, fire, leafy, dusty, icy]; let biomes = [barren, mushroom, fire, leafy, dusty, icy];
let max = biomes let max = biomes
@ -235,7 +235,7 @@ fn tunnels_at<'a>(
land: &'a Land, land: &'a Land,
) -> impl Iterator<Item = Tunnel> + 'a { ) -> impl Iterator<Item = Tunnel> + 'a {
let rand = RandomField::new(37 + level); let rand = RandomField::new(37 + level);
let col_cell = to_cell(wpos, level); let col_cell = to_cell(wpos - CELL_SIZE as i32 / 2, level);
LOCALITY LOCALITY
.into_iter() .into_iter()
.filter_map(move |rpos| { .filter_map(move |rpos| {
@ -774,7 +774,7 @@ fn write_column<R: Rng>(
[ [
(Some(SpriteKind::Copper), shallow), (Some(SpriteKind::Copper), shallow),
(Some(SpriteKind::Tin), shallow), (Some(SpriteKind::Tin), shallow),
(Some(SpriteKind::Iron), shallow * 0.3), (Some(SpriteKind::Iron), shallow * 0.5),
(Some(SpriteKind::Coal), middle * 0.25), (Some(SpriteKind::Coal), middle * 0.25),
(Some(SpriteKind::Cobalt), middle * 0.05), (Some(SpriteKind::Cobalt), middle * 0.05),
(Some(SpriteKind::Silver), middle * 0.05), (Some(SpriteKind::Silver), middle * 0.05),
@ -929,19 +929,19 @@ fn apply_entity_spawns<R: Rng>(canvas: &mut Canvas, wpos: Vec3<i32>, biome: &Bio
// Lava biome // Lava biome
( (
Some("common.entity.wild.aggressive.lavadrake"), Some("common.entity.wild.aggressive.lavadrake"),
(biome.fire + 0.0) * 0.2,
),
(
Some("common.entity.wild.aggressive.basilisk"),
(biome.fire + 0.1) * 0.05,
),
(
Some("common.entity.wild.peaceful.crawler_molten"),
(biome.fire + 0.0) * 0.5, (biome.fire + 0.0) * 0.5,
), ),
(
Some("common.entity.wild.aggressive.basilisk"),
(biome.fire + 0.1) * 0.1,
),
(
Some("common.entity.wild.peaceful.crawler_molten"),
(biome.fire + 0.0) * 0.75,
),
( (
Some("common.entity.wild.aggressive.red_oni"), Some("common.entity.wild.aggressive.red_oni"),
(biome.fire + 0.0) * 0.02, (biome.fire + 0.0) * 0.05,
), ),
// With depth // With depth
( (