From ba26e273744148dd5a8cd3addc0f9cb415ef9d70 Mon Sep 17 00:00:00 2001
From: Dirkfried <>
Date: Mon, 3 Jan 2022 12:24:59 +0100
Subject: [PATCH] tin: fix 'clust_size' and adapt to default

---
 _config.txt | 35 ++++++++++++++++++++++++++++++-----
 init.lua    | 16 +++++++++++++++-
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/_config.txt b/_config.txt
index ce7c812..0db26c8 100644
--- a/_config.txt
+++ b/_config.txt
@@ -7,39 +7,64 @@
 ------------------------------------------------------------------------------
 
 -- Chunk sizes for ore generation (bigger = ore deposits are more scattered around)
-moreores.tin_chunk_size = 10
+-- Tin
+moreores.tin_chunk_size_high = 10
+moreores.tin_chunk_size = 13
+moreores.tin_chunk_size_deep = 10
+
+-- Silver
 moreores.silver_chunk_size_high = 11
 moreores.silver_chunk_size = 13
 moreores.silver_chunk_size_deep = 11
+
+-- Mithril
 moreores.mithril_chunk_size_high = 19
 moreores.mithril_chunk_size = 21
 moreores.mithril_chunk_size_deep = 19
 
 -- Amount of ore per chunk (higher = bigger ore deposits)
-moreores.tin_ore_per_chunk = 5
+-- Tin
+moreores.tin_ore_per_chunk_high = 5
+moreores.tin_ore_per_chunk = 4
+moreores.tin_ore_per_chunk_deep = 5
+
+-- Silver
 moreores.silver_ore_per_chunk_high = 4
 moreores.silver_ore_per_chunk = 2
 moreores.silver_ore_per_chunk_deep = 4
+
+-- Mithril
 moreores.mithril_ore_per_chunk_high = 3
 moreores.mithril_ore_per_chunk = 2
 moreores.mithril_ore_per_chunk_deep = 4
 
 -- Clust sizes for ore generation (bigger = ores in ore deposits are less bound together)
+-- Tin
+moreores.tin_clust_size_high = 3
 moreores.tin_clust_size = 3
+moreores.tin_clust_size_deep = 3
+
+-- Silver
 moreores.silver_clust_size_high = 3
 moreores.silver_clust_size = 3
 moreores.silver_clust_size_deep = 3
+
+-- Mithril
 moreores.mithril_clust_size_high = 3
 moreores.mithril_clust_size = 3
 moreores.mithril_clust_size_deep = 3
 
 -- Maximal and minimal depths of ore generation (Y coordinate, 0 being sea level by default)
 -- Tin
-moreores.tin_max_depth = -64
-moreores.tin_min_depth = -31000
+moreores.tin_max_depth_high = 31000
+moreores.tin_min_depth_high = 1025
+moreores.tin_max_depth = -64           -- For v6 mapgen, -32 fits better
+moreores.tin_min_depth = -127
+moreores.tin_max_depth_deep = -128
+moreores.tin_min_depth_deep = -31000
 
 -- Silver
-moreores.silver_max_depth_high = 31000 
+moreores.silver_max_depth_high = 31000
 moreores.silver_min_depth_high = 1025
 moreores.silver_max_depth = -64         -- For v6 mapgen, -32 fits better
 moreores.silver_min_depth = -127        -- For v6 mapgen, -63 fits better
diff --git a/init.lua b/init.lua
index 4ffdb56..482a5e9 100644
--- a/init.lua
+++ b/init.lua
@@ -386,13 +386,27 @@ else
 	oredefs.tin = {
 		description = "Tin",
 		makes = {ore = true, block = true, lump = true, ingot = true, chest = false},
+		oredef_high = {
+			clust_scarcity = moreores.tin_chunk_size_high ^ 3,
+			clust_num_ores = moreores.tin_ore_per_chunk_high,
+			clust_size = moreores.tin_clust_size_high,
+			y_min = moreores.tin_min_depth_high,
+			y_max = moreores.tin_max_depth_high,
+		},
 		oredef = {
 			clust_scarcity = moreores.tin_chunk_size ^ 3,
 			clust_num_ores = moreores.tin_ore_per_chunk,
-			clust_size = moreores.tin_chunk_size,
+			clust_size = moreores.tin_clust_size,
 			y_min = moreores.tin_min_depth,
 			y_max = moreores.tin_max_depth,
 		},
+		oredef_deep = {
+			clust_scarcity = moreores.tin_chunk_size_deep ^ 3,
+			clust_num_ores = moreores.tin_ore_per_chunk_deep,
+			clust_size = moreores.tin_clust_size_deep,
+			y_min = moreores.tin_min_depth_deep,
+			y_max = moreores.tin_max_depth_deep,
+		},
 		tools = {},
 	}