From 7814cbc6067dfbbcaec6824e6ae582d3a9d7db83 Mon Sep 17 00:00:00 2001
From: Dirkfried <>
Date: Sun, 3 Oct 2021 21:38:38 +0200
Subject: [PATCH] Fitting ore generation to default

---
 _config.txt | 54 +++++++++++++++++++++++++++++++++++++++--------------
 init.lua    | 44 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 81 insertions(+), 17 deletions(-)

diff --git a/_config.txt b/_config.txt
index 42e7b37..a7d3529 100644
--- a/_config.txt
+++ b/_config.txt
@@ -7,21 +7,47 @@
 ------------------------------------------------------------------------------
 
 -- Chunk sizes for ore generation (bigger = ore deposits are more scattered around)
-moreores.tin_chunk_size = 7
-moreores.silver_chunk_size = 11
-moreores.mithril_chunk_size = 11
+moreores.tin_chunk_size = 10
+moreores.silver_chunk_size_high = 11
+moreores.silver_chunk_size = 13
+moreores.silver_chunk_size_deep = 11
+moreores.mithril_chunk_size_high = 17
+moreores.mithril_chunk_size = 21
+moreores.mithril_chunk_size_deep = 21
 
 -- Amount of ore per chunk (higher = bigger ore deposits)
-moreores.tin_ore_per_chunk = 3
-moreores.silver_ore_per_chunk = 4
-moreores.mithril_ore_per_chunk = 1
+moreores.tin_ore_per_chunk = 5
+moreores.silver_ore_per_chunk_high = 4
+moreores.silver_ore_per_chunk = 2
+moreores.silver_ore_per_chunk_deep = 4
+moreores.mithril_ore_per_chunk_high = 3
+moreores.mithril_ore_per_chunk = 3
+moreores.mithril_ore_per_chunk_deep = 7
 
--- Minimal depths of ore generation (Y coordinate, 0 being sea level by default)
+-- Clust sizes for ore generation (bigger = ores in ore deposits are less bound together)
+moreores.tin_clust_size = 3
+moreores.silver_clust_size_high = 3
+moreores.silver_clust_size = 3
+moreores.silver_clust_size_deep = 3
+moreores.mithril_clust_size_high = 3
+moreores.mithril_clust_size = 3
+moreores.mithril_clust_size_deep = 4
+
+-- 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.silver_min_depth = -31000
-moreores.mithril_min_depth = -31000
-
--- Maximal depths of ore generation (Y coordinate, 0 being sea level by default)
-moreores.tin_max_depth = 8
-moreores.silver_max_depth = -2
-moreores.mithril_max_depth = -512
+--Silver
+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
+moreores.silver_max_depth_deep = -128   --For v6 mapgen -64 fits better
+moreores.silver_min_depth_deep = -31000
+--Mithril
+moreores.mithril_max_depth_high = 31000
+moreores.mithril_min_depth_high = 2049
+moreores.mithril_max_depth = -2048          --For v6 mapgen -256 fits better
+moreores.mithril_min_depth = -4095          --For v6 mapgen -511 fits better
+moreores.mithril_max_depth_deep = -4096     --For v6 mapgen -512 fits better
+moreores.mithril_min_depth_deep = -31000
diff --git a/init.lua b/init.lua
index e1cf2a4..1e9b433 100644
--- a/init.lua
+++ b/init.lua
@@ -166,11 +166,21 @@ local function add_ore(modname, description, mineral_name, oredef)
 		})
 	end
 
+	oredef.oredef_high.ore_type = "scatter"
+	oredef.oredef_high.ore = modname .. ":mineral_" .. mineral_name
+	oredef.oredef_high.wherein = "default:stone"
+
 	oredef.oredef.ore_type = "scatter"
 	oredef.oredef.ore = modname .. ":mineral_" .. mineral_name
 	oredef.oredef.wherein = "default:stone"
 
-	minetest.register_ore(oredef.oredef)
+	oredef.oredef_deep.ore_type = "scatter"
+	oredef.oredef_deep.ore = modname .. ":mineral_" .. mineral_name
+	oredef.oredef_deep.wherein = "default:stone"
+
+	minetest.register_ore(oredef.oredef_high)
+    minetest.register_ore(oredef.oredef)
+    minetest.register_ore(oredef.oredef_deep)
 
 	for tool_name, tooldef in pairs(oredef.tools) do
 		local tdef = {
@@ -244,13 +254,27 @@ local oredefs = {
 	silver = {
 		description = "Silver",
 		makes = {ore = true, block = true, lump = true, ingot = true, chest = true},
+		oredef_high= {
+			clust_scarcity = moreores.silver_chunk_size_high ^ 3,
+			clust_num_ores = moreores.silver_ore_per_chunk_high,
+			clust_size = moreores.silver_clust_size_high,
+			y_min = moreores.silver_min_depth_high,
+			y_max = moreores.silver_max_depth_high,
+		},
 		oredef = {
 			clust_scarcity = moreores.silver_chunk_size ^ 3,
 			clust_num_ores = moreores.silver_ore_per_chunk,
-			clust_size = moreores.silver_chunk_size,
+			clust_size = moreores.silver_clust_size,
 			y_min = moreores.silver_min_depth,
 			y_max = moreores.silver_max_depth,
 		},
+		oredef_deep = {
+			clust_scarcity = moreores.silver_chunk_size_deep ^ 3,
+			clust_num_ores = moreores.silver_ore_per_chunk_deep,
+			clust_size = moreores.silver_clust_size_deep,
+			y_min = moreores.silver_min_depth_deep,
+			y_max = moreores.silver_max_depth_deep,
+		},
 		tools = {
 			pick = {
 				groupcaps = {
@@ -288,13 +312,27 @@ local oredefs = {
 	mithril = {
 		description = "Mithril",
 		makes = {ore = true, block = true, lump = true, ingot = true, chest = false},
+		oredef_high = {
+			clust_scarcity = moreores.mithril_chunk_size_high ^ 3,
+			clust_num_ores = moreores.mithril_ore_per_chunk_high,
+			clust_size = moreores.mithril_clust_size_high,
+			y_min = moreores.mithril_min_depth_high,
+			y_max = moreores.mithril_max_depth_high,
+		},
 		oredef = {
 			clust_scarcity = moreores.mithril_chunk_size ^ 3,
 			clust_num_ores = moreores.mithril_ore_per_chunk,
-			clust_size = moreores.mithril_chunk_size,
+			clust_size = moreores.mithril_clust_size,
 			y_min = moreores.mithril_min_depth,
 			y_max = moreores.mithril_max_depth,
 		},
+		oredef_deep = {
+			clust_scarcity = moreores.mithril_chunk_size_deep ^ 3,
+			clust_num_ores = moreores.mithril_ore_per_chunk_deep,
+			clust_size = moreores.mithril_clust_size_deep,
+			y_min = moreores.mithril_min_depth_deep,
+			y_max = moreores.mithril_max_depth_deep,
+		},
 		tools = {
 			pick = {
 				groupcaps = {