Merge branch 'makselord/bamboo' into 'master'

Makselord/bamboo

See merge request veloren/veloren!3407

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added Thai translation
 - Skiing and ice skating
 - Added loot ownership for NPC drops
+- Bamboo collectibles now spawn near rivers
 
 ### Changed
 

world/src/layer/scatter.rs

@@ -665,6 +665,18 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
                 Some((0.2, 128.0, 0.5)),
             )
         }),
+        (Bamboo, Ground, |_, col| {
+            (
+                0.014
+                    * close(col.humidity, CONFIG.jungle_hum, 0.9)
+                    * col
+                        .water_dist
+                        .map(|wd| Lerp::lerp(0.2, 0.0, (wd / 8.0).clamped(0.0, 1.0)))
+                        .unwrap_or(0.0)
+                    * ((col.alt - CONFIG.sea_level) / 12.0).clamped(0.0, 1.0),
+                Some((0.2, 128.0, 0.5)),
+            )
+        }),
     ];
 
     canvas.foreach_col(|canvas, wpos2d, col| {