From d65c6acdf42d2af55713a98806b4ab25eeded653 Mon Sep 17 00:00:00 2001
From: Duane Robertson <duane@duanerobertson.com>
Date: Sat, 21 May 2016 10:53:00 -0500
Subject: [PATCH] Adjust heightmap compensation.

---
 mapgen.lua                                       |   4 ++--
 textures/fun_caves_sand_with_rocks.png           | Bin 0 -> 2087 bytes
 ...small_rocks.png => fun_caves_small_rocks.png} | Bin
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 textures/fun_caves_sand_with_rocks.png
 rename textures/{vmg_small_rocks.png => fun_caves_small_rocks.png} (100%)

diff --git a/mapgen.lua b/mapgen.lua
index 3c17190..2ffe364 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -140,7 +140,7 @@ function fun_caves.generate(p_minp, p_maxp, seed)
 			for y = minp.y, maxp.y do
 				if (y < min_surface or bullshit_heightmap or y < heightmap[index] - cave_3[index]) and cave_1[index3d] * cave_2[index3d] > 0.05 then
 					data[ivm] = node("air")
-					if y > min_surface and cave_3[index] < 1 and heightmap[index] == y and not bullshit_heightmap then
+					if y > min_surface and cave_3[index] < 1 and heightmap[index] == y and y > 0 then
 						local ivm2 = ivm
 						for y2 = y + 1, maxp.y + 8 do
 							ivm2 = ivm2 + area.ystride
@@ -168,7 +168,7 @@ function fun_caves.generate(p_minp, p_maxp, seed)
 			local ivm = area:index(x, minp.y, z)
 
 			for y = minp.y, maxp.y do
-				if y < min_surface or bullshit_heightmap or y <= heightmap[index] - 20 then
+				if y < min_surface or (bullshit_heightmap and y < 0) or (not bullshit_heightmap and y <= heightmap[index] - 20) then
 					local i = fun_caves.decorate_cave(data, area, minp, y, ivm, biome_n[index3d])
 					if i then
 						data[ivm] = i
diff --git a/textures/fun_caves_sand_with_rocks.png b/textures/fun_caves_sand_with_rocks.png
new file mode 100644
index 0000000000000000000000000000000000000000..6869706585d0d41f9e3eb6e8bd347c2207f7bf1d
GIT binary patch
literal 2087
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
RPWk`<002ovPDHLkV1guI5r6;y

literal 0
HcmV?d00001

diff --git a/textures/vmg_small_rocks.png b/textures/fun_caves_small_rocks.png
similarity index 100%
rename from textures/vmg_small_rocks.png
rename to textures/fun_caves_small_rocks.png