From c92cd26ff1d90c1bc6e52f8acd22a23325e2b6ba Mon Sep 17 00:00:00 2001
From: Makselord <stormrider121@aol.com>
Date: Fri, 27 May 2022 21:01:20 -0400
Subject: [PATCH 1/3] bamboo collectibles spawn near rivers

---
 world/src/layer/scatter.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs
index 7bbacd644e..eb4a43662f 100644
--- a/world/src/layer/scatter.rs
+++ b/world/src/layer/scatter.rs
@@ -664,6 +664,17 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
                     * ((col.alt - CONFIG.sea_level) / 12.0).clamped(0.0, 1.0),
                 Some((0.2, 128.0, 0.5)),
             )
+        }),
+		(Bamboo, Ground, |_, col| {
+            (
+                0.35 * 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)),
+            )
         }),
     ];
 

From 60c2d7d96833b340f727867deb64ea5594d520e2 Mon Sep 17 00:00:00 2001
From: Makselord <stormrider121@aol.com>
Date: Fri, 27 May 2022 21:20:28 -0400
Subject: [PATCH 2/3] updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbebb7eae9..e0ee67ab93 100644
--- a/CHANGELOG.md
+++ b/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
 

From 69041137a0b2a12d6aab025c4e678f6309c22e9b Mon Sep 17 00:00:00 2001
From: Makselord <stormrider121@aol.com>
Date: Sat, 28 May 2022 17:41:46 -0400
Subject: [PATCH 3/3] reduced bamboo spawn rates

---
 world/src/layer/scatter.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs
index eb4a43662f..b758a270e1 100644
--- a/world/src/layer/scatter.rs
+++ b/world/src/layer/scatter.rs
@@ -665,9 +665,10 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
                 Some((0.2, 128.0, 0.5)),
             )
         }),
-		(Bamboo, Ground, |_, col| {
+        (Bamboo, Ground, |_, col| {
             (
-                0.35 * close(col.humidity, CONFIG.jungle_hum, 0.9)
+                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)))