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 cacti

Browse Source
This commit is contained in:
Joshua Barretto 2019-08-21 19:18:16 +01:00
parent 6ff264d982
commit 7ceccfecc3
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
world/src/block/mod.rs
View File

@ -154,7 +154,7 @@ impl<'a> BlockGen<'a> {
//cliffs,
cliff_hill,
close_cliffs,
//temp,
temp,
..
} = &z_cache?.sample;
@ -257,6 +257,7 @@ impl<'a> BlockGen<'a> {
saturate_srgb(col, 0.45).map(|e| (e * 255.0) as u8),
))
} else if (wposf.z as f32) < height + 0.9
&& temp < CONFIG.desert_temp
&& (wposf.z as f32 > water_height + 3.0)
&& marble > 0.68
&& marble_small > 0.65
@ -286,6 +287,18 @@ impl<'a> BlockGen<'a> {
},
Rgb::broadcast(0),
))
} else if (wposf.z as f32) < height + 0.9
&& temp > CONFIG.desert_temp
&& (marble * 4423.5).fract() < 0.0005
{
Some(Block::new(
if (height * 1271.0).fract() < 0.5 {
BlockKind::LargeCactus
} else {
BlockKind::BarrelCactus
},
Rgb::broadcast(0),
))
} else {
None
};