Merge branch 'isse/better-cave-entrances' into 'master'

Better cave entrances

See merge request veloren/veloren!4244

CHANGELOG.md

@@ -94,6 +94,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed bug where airship captains would mass generate after using /reload_chunks
 - Fixed french translation "Énergie Consommée" -> "Regain d'Énergie"
 - Fixed Perforate icon not displaying
+- Make cave entrances easier to follow
 
 ## [0.15.0] - 2023-07-01
 

world/src/layer/cave.rs

@@ -124,11 +124,12 @@ impl Tunnel {
                         * 96.0
                         * ((1.0 - (t - 0.5).abs() * 2.0) * 8.0).min(1.0);
                     let alt_here = info.land().get_alt_approx(closest.map(|e| e as i32));
-                    let base = Lerp::lerp(
+                    let base = (Lerp::lerp(
                         alt_here as f64 - self.a.depth as f64,
                         alt_here as f64 - self.b.depth as f64,
                         t,
-                    ) + z_offs;
+                    ) + z_offs)
+                        .min(alt_here as f64);
                     Some((
                         (base - height_here * 0.3) as i32..(base + height_here * 1.35) as i32,
                         radius,