From d10ecc0ddff1b3799024b0055071ab4d54bd2d69 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Sun, 29 Aug 2021 13:08:13 +0100
Subject: [PATCH] Better spot density

---
 assets/world/structure/natural/shipwreck.vox | Bin 44712 -> 44728 bytes
 world/src/layer/spot.rs                      |  18 +++++++++---------
 world/src/sim/mod.rs                         |   2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/assets/world/structure/natural/shipwreck.vox b/assets/world/structure/natural/shipwreck.vox
index 7ea6bb735c796bb2d57a8a3c9db3593c8ddab527..d9f49f85196fa317c38eb7e43592874721a89fe0 100644
GIT binary patch
delta 385
zcmWlUKS;ws9EFqSnp{lOyNGDhziHB{gLX(#6&)&qBGihaA}S~-bad&U&{3RR%7GN=
zpinh-QhtkrgM)*EgCK&7n}eW32M33O#^K|8%Y*m4x4_L?fG*FiB#t<ao1K^`_~Pmn
z8kb9r|HyH*>(S2`^v8EaoS;Foj|NrnQdJ41x<v(YgZmvQ+9@k=KSp?X9q(1(d%BKL
zvPV@|HE+RP{*gxmYP$l5h1&qj&%dMYwhjxNg*$=$EPcVpGC{1h+Jxp>U0~IXGKz?F
ziX}D|VRy4%VD+sNV#u12l(mrQW67Eh>)R25m5XI)6`LwFORp4R8dKrn!0Uq2aVP+l
z+E@^tPICfpLi^bc&s(r}KFOmL9W>eP#R&VkxI$?<WHQe?#A%xGuVqYdF7y04Cbl6H
z+mfgq#y;}DHQQfc>k@IIm^g++oe1`kG)Kpp6A_6Ul89?y;#wkgbxd8q<LV;Gh9#1X
WN;Df1$*{(14M+Ipe&M<CBK!eECu*Yr

delta 366
zcmdmSmubaaCc!ZO2!&}33=F=Go_;`zVah~7dCrtoASMIDjE$DB<ybg`Ok_5z$XBp&
za0trrC<wADZ(gE0gMG7uZVTV$6V?KZENp_NQk!qsNN}@o2%1W7{@}iZW%3Lk6`)R_
z_#U4#jGKG>_As%q37APw_6U5!qAaMbyxAb=05c1_fSK&%520^ZR0MUDH{S^pU}0ew
zG?SeCCh7x=C>Ni~<~z|#n1LEiB_}t;*YI!%m?+Ay3A(Whn#fE_2w_nb)K%UblAyuN
zq9&-XJh>)$fdmIoN|94YQHfJXQW=O<IEAFt1of0R>!ipqv#5iVd8F4cvkRGQKAirM
zhlNAHRAuv)k{g1XC$y~)X5kbvmfCDFOOlCMz(jU)z#JP^pf8M-Huo%aVBUOTNe<&?
zhh+|olUtTs09|D+G<nbR4U-F2^lWBX>B9*0jj7_~fK?(uYgl<EuUTcnoMof3`SGf&
F%m8{KWmf<I

diff --git a/world/src/layer/spot.rs b/world/src/layer/spot.rs
index 1b54965728..932424e356 100644
--- a/world/src/layer/spot.rs
+++ b/world/src/layer/spot.rs
@@ -77,7 +77,7 @@ impl Spot {
         Self::generate_spots(
             Spot::WitchHouse,
             world,
-            2.0,
+            1.0,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -94,7 +94,7 @@ impl Spot {
         Self::generate_spots(
             Spot::DwarvenGrave,
             world,
-            2.0,
+            1.0,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -108,7 +108,7 @@ impl Spot {
         Self::generate_spots(
             Spot::SaurokAltar,
             world,
-            2.0,
+            1.0,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -122,7 +122,7 @@ impl Spot {
         Self::generate_spots(
             Spot::RockCircle,
             world,
-            2.0,
+            0.5,
             |g, c| {
                 g < 0.1
                     && !c.near_cliffs()
@@ -135,7 +135,7 @@ impl Spot {
         Self::generate_spots(
             Spot::MyrmidonTemple,
             world,
-            3.0,
+            1.0,
             |g, c| {
                 g < 0.1
                     && !c.near_cliffs()
@@ -149,7 +149,7 @@ impl Spot {
         Self::generate_spots(
             Spot::GnarlingTotem,
             world,
-            2.0,
+            1.0,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -165,7 +165,7 @@ impl Spot {
         Self::generate_spots(
             Spot::LionRock,
             world,
-            1.0,
+            1.5,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -207,7 +207,7 @@ impl Spot {
         Self::generate_spots(
             Spot::AirshipCrash,
             world,
-            1.0,
+            0.5,
             |g, c| {
                 g < 0.25
                     && !c.near_cliffs()
@@ -235,7 +235,7 @@ impl Spot {
         Self::generate_spots(
             Spot::Shipwreck,
             world,
-            4.0,
+            2.0,
             |g, c| {
                 g < 0.25 && c.is_underwater() && c.sites.is_empty() && c.water_alt > c.alt + 30.0
             },
diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs
index ba80fd76fb..744ff14488 100644
--- a/world/src/sim/mod.rs
+++ b/world/src/sim/mod.rs
@@ -2067,7 +2067,7 @@ impl WorldSim {
                     temp: chunk.temp,
                     near_water: if chunk.river.is_lake()
                         || chunk.river.near_river()
-                        || chunk.alt < CONFIG.sea_level + 3.0
+                        || chunk.alt < CONFIG.sea_level + 6.0
                     {
                         1.0
                     } else {