From e255ae4e85fdefca963e775434d698e409ef34d7 Mon Sep 17 00:00:00 2001
From: shylie <shylie@shylie.info>
Date: Fri, 18 Jul 2025 20:12:16 -0400
Subject: [PATCH] Add beaches and use different sprites

---
 atlas.png  | Bin 0 -> 302 bytes
 circle.png | Bin 124 -> 0 bytes
 main.lua   |  48 +++++++++++++++++++++++++++++++++++++++++++-----
 zprite     |   2 +-
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 atlas.png
 delete mode 100644 circle.png

diff --git a/atlas.png b/atlas.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7ed724d92020c4e627ec437593379d388ffa0f8
GIT binary patch
literal 302
zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px#=t)FDR9J=WltB)JAPhzOCvz~5#?iQ0XCsq>g~CK)GWl<#l!{MU5&1V%HK}TH
z;@Xa#*wnM5msg8A<K*Rgaw{(n^CPh+-;<xg?r86Rb;0SfwbIc?-%cwQ?f6WdmjiDC
z06OEZ5P(!Ibmpw0stN$*YGYN>FFhFb$;3~V+G`tI{#sAm>%-Nul3kRhJcda?mY|_8
zjeQfZV7?OfM0Uz~f`^ehL?qiuyIZ5!oxB@4Ii)UgV$M1%WMjJpbLak1q7qk>T`Og^
zJGraGR<M*c_avYANtR0d#4$q%A%qY@2q9#^2ijzO0AP8Q%K!iX07*qoM6N<$g6bfG
AkpKVy

literal 0
HcmV?d00001

diff --git a/circle.png b/circle.png
deleted file mode 100644
index ed34f113798083c53c023fef2ae7e30bc69ec31a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|%sgEjLnNk_
z_IdI#DDW^X{P;iqSht#}=J7<%BNJ5?cB&Z8<o8bFpUSL%CER%J#|Rq{iRBk!Z(p6Q
W{{GDQquYTdFnGH9xvX<aXaWF-&n9dD

diff --git a/main.lua b/main.lua
index 2335d72..df1ee37 100644
--- a/main.lua
+++ b/main.lua
@@ -1,4 +1,4 @@
-local tex = love.graphics.newImage("circle.png")
+local tex = love.graphics.newImage("atlas.png")
 tex:setFilter("nearest", "nearest")
 
 local function water_color(layer)
@@ -6,6 +6,10 @@ local function water_color(layer)
 	return value / 4, value / 2, value
 end
 
+local function sand_color(layer)
+	return layer / 32 + 0.2, layer / 32 + 0.15, 0.4
+end
+
 local function dirt_color(layer)
 	if layer < 32 then
 		return layer / 40 / 2.5, layer / 80 / 2.5, 0.1
@@ -16,7 +20,7 @@ end
 
 local function mountain_color(layer)
 	if layer < 58 then
-		local value = layer / 64 / 2.5
+		local value = layer / 64 / 2 - 0.1
 		return value, value, value
 	else
 		local value = (layer - 58) / 20 + 0.7
@@ -27,6 +31,8 @@ end
 local function pick_colorfn(maxlayer)
 	if maxlayer < 16 then
 		return water_color
+	elseif maxlayer < 22 then
+		return sand_color
 	elseif maxlayer < 46 then
 		return dirt_color
 	else
@@ -38,9 +44,41 @@ local function ease(n)
 	return 5 ^ (3.1 * (n ^ 0.3) - 3) + 1 - 1.1 ^ n
 end
 
-local BIG_BLOCK = love.graphics.newQuad(0, 0, 8, 8, tex)
+local WATER = love.graphics.newQuad(1, 1, 8, 8, tex)
+local SAND = love.graphics.newQuad(11, 1, 8, 8, tex)
+local DIRT = love.graphics.newQuad(21, 1, 8, 8, tex)
+local GRASS = love.graphics.newQuad(31, 1, 8, 8, tex)
+local STONE = love.graphics.newQuad(1, 11, 8, 8, tex)
+local SNOW = love.graphics.newQuad(11, 11, 8, 8, tex)
 
-local z = require("zprite").zchunk.new(tex, 128, 32)
+local function dirt_sprite(layer)
+	if layer < 32 then
+		return DIRT
+	end
+	return GRASS
+end
+
+local function mountain_sprite(layer)
+	if layer < 58 then
+		return STONE
+	end
+	return SNOW
+end
+
+local function pick_sprite(maxlayer)
+	if maxlayer < 16 then
+		return WATER
+	end
+	if maxlayer < 22 then
+		return SAND
+	end
+	if maxlayer < 46 then
+		return dirt_sprite
+	end
+	return mountain_sprite
+end
+
+local z = require("zprite").zchunk.new(tex, 128, 64)
 
 local function update_map()
 	z:clear()
@@ -48,7 +86,7 @@ local function update_map()
 		for j = -160, 160 do
 			local noise_value = love.math.simplexNoise(i * 0.008, j * 0.008)
 			local layers = ease(noise_value) * 64
-			z:put(i * 8, j * 8, BIG_BLOCK, math.floor(layers) + 1, pick_colorfn(layers))
+			z:put(i * 8, j * 8, pick_sprite(layers), math.floor(layers) + 1, pick_colorfn(layers))
 			coroutine.yield()
 		end
 	end
diff --git a/zprite b/zprite
index 6eba579..ccfa075 160000
--- a/zprite
+++ b/zprite
@@ -1 +1 @@
-Subproject commit 6eba579c969700428afdfe4d67c670d5400405ae
+Subproject commit ccfa075d244c87171799941125decd143c3fb37a