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

add mushrooms, temporary disable snowy grass

Browse Source
This commit is contained in:
Monty Marz 2020-08-13 03:56:02 +02:00
parent 0bd0de613b
commit 54cba3e7f9
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/items/armor/neck/neck_0.ron
View File

@ -5,7 +5,7 @@ Item(
( (
kind: Neck("Neck0"), kind: Neck("Neck0"),
stats: ( stats: (
protection: Normal(0.0), protection: Normal(0.5),
), ),
) )
), ),

2
assets/common/items/armor/neck/neck_1.ron
View File

@ -5,7 +5,7 @@ Item(
( (
kind: Neck("Neck1"), kind: Neck("Neck1"),
stats: ( stats: (
protection: Normal(0.5), protection: Normal(1.0),
), ),
) )
), ),

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

@ -39,6 +39,7 @@ pub fn apply_scatter_to<'a>(
) { ) {
use BlockKind::*; use BlockKind::*;
#[allow(clippy::type_complexity)] #[allow(clippy::type_complexity)]
// TODO: Add back all sprites we had before
let scatter: &[(_, bool, fn(&SimChunk) -> (f32, Option<(f32, f32)>))] = &[ let scatter: &[(_, bool, fn(&SimChunk) -> (f32, Option<(f32, f32)>))] = &[
// (density, Option<(wavelen, threshold)>) // (density, Option<(wavelen, threshold)>)
(BlueFlower, false, |c| { (BlueFlower, false, |c| {
@ -60,10 +61,10 @@ pub fn apply_scatter_to<'a>(
) )
}), }),
(Twigs, false, |c| { (Twigs, false, |c| {
((c.tree_density - 0.5).max(0.0) * 0.0025, None) ((c.tree_density - 0.5).max(0.0) * 0.001, None)
}), }),
(Stones, false, |c| { (Stones, false, |c| {
((c.rockiness - 0.5).max(0.0) * 0.005, None) ((c.rockiness - 0.5).max(0.0) * 0.0008, None)
}), }),
(ShortGrass, false, |c| { (ShortGrass, false, |c| {
( (
@ -71,6 +72,12 @@ pub fn apply_scatter_to<'a>(
Some((48.0, 0.4)), Some((48.0, 0.4)),
) )
}), }),
(Mushroom, false, |c| {
(
close(c.temp, 0.3, 0.4).min(close(c.humidity, 0.6, 0.35)) * 0.04,
None,
)
}),
(MediumGrass, false, |c| { (MediumGrass, false, |c| {
( (
close(c.temp, 0.0, 0.6).min(close(c.humidity, 0.6, 0.35)) * 0.05, close(c.temp, 0.0, 0.6).min(close(c.humidity, 0.6, 0.35)) * 0.05,
@ -83,12 +90,12 @@ pub fn apply_scatter_to<'a>(
Some((48.0, 0.1)), Some((48.0, 0.1)),
) )
}), }),
(GrassSnow, false, |c| { /*(GrassSnow, false, |c| {
( (
close(c.temp, -0.4, 0.4).min(close(c.rockiness, 0.0, 0.5)) * 0.1, close(c.temp, -0.4, 0.4).min(close(c.rockiness, 0.0, 0.5)) * 0.1,
Some((48.0, 0.6)), Some((48.0, 0.6)),
) )
}), }),*/
]; ];
for y in 0..vol.size_xy().y as i32 { for y in 0..vol.size_xy().y as i32 {