From bc218b081a49bf9c39a4c63ad5b13ce608d5e61c Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Tue, 5 Sep 2017 04:17:35 +0200
Subject: [PATCH] Update special spruce schematics

---
 .../schematics/mcl_core_spruce_lollipop.mts   | Bin 121 -> 143 bytes
 .../schematics/mcl_core_spruce_matchstick.mts | Bin 0 -> 128 bytes
 mods/MAPGEN/mcl_biomes/init.lua               |  79 ++----------------
 3 files changed, 7 insertions(+), 72 deletions(-)
 create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_spruce_matchstick.mts

diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_spruce_lollipop.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_spruce_lollipop.mts
index 46d01e0b9eb3e02eb5a5b13887af9b8719291478..a88c40074c56b4be1b8b99da77f4857576d71841 100644
GIT binary patch
delta 77
zcmV-T0J8sij{%TKN6k)K3IHGoOE12o+k+GWEA6WdWT+b}B@7yTgL=uh%j1Khrqsz!
jN~~SHOAJ{rfXfw_Q<t&~NI#0bIB{-Dy36ONlw}wOxhNph

delta 55
zcmV-70LcH30eO%}F=JpL8Zd$(c>t!D5e{*g$ApK)2xP%@GGQ@=IM)&H7UBRNz4b#2
NkQo321pt}kR{}Et6Yl^3

diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_spruce_matchstick.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_spruce_matchstick.mts
new file mode 100644
index 0000000000000000000000000000000000000000..a279d04b833dee9842057c08a5414879aae52e8b
GIT binary patch
literal 128
zcmeYb3HD`RVPIwuU|_blx7U~FuZIHrdY~wCVrCJ8Xl`;&d~$wKs#S48QE75&PHJLV
zYB7T_ns7-`YHG!t<b(xM2}cwZ8#=XAlqaOPC<f*(oco)zxk`em>3>V$-~Uw{O<9U3
N|2VQSa7`DT000oyEcpNc

literal 0
HcmV?d00001

diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index 59e36adf71..57b579f0cc 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -1119,6 +1119,8 @@ local function register_decorations()
 	})
 
 	-- Spruce
+
+	-- Common spruces
 	minetest.register_decoration({
 		deco_type = "schematic",
 		place_on = {"mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", "mcl_core:podzol"},
@@ -1173,6 +1175,8 @@ local function register_decorations()
 		schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_spruce_3.mts",
 		flags = "place_center_x, place_center_z",
 	})
+
+	-- Small lollipop spruce
 	minetest.register_decoration({
 		deco_type = "schematic",
 		place_on = {"mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", "mcl_core:podzol"},
@@ -1192,82 +1196,13 @@ local function register_decorations()
 		flags = "place_center_x, place_center_z",
 	})
 
-
-	local a = {name = "air", prob = 0}
-	local t = {name = "mcl_core:sprucetree" }
-	local l = {name = "mcl_core:spruceleaves" }
-	local matchstick = {
-		size = {x = 3, y = 16, z = 3},
-		data = {
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,l,a,
-			a,l,a,
-			a,l,a,
-			a,a,a,
-
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			a,t,a,
-			l,t,l,
-			l,t,l,
-			l,t,l,
-			a,l,a,
-
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,a,a,
-			a,l,a,
-			a,l,a,
-			a,l,a,
-			a,a,a,
-		},
-		yslice_prob = {
-			-- 8-13 trunk-only levels
-			{ ypos = 0, prob = 127 },
-			{ ypos = 1, prob = 127 },
-			{ ypos = 2, prob = 127 },
-			{ ypos = 3, prob = 95 },
-			{ ypos = 4, prob = 63 },
-			{ ypos = 5, prob = 31 },
-			-- 2-3 leaf levels
-			{ ypos = 14, prob = 127 },
-		},
-	}
+	-- Matchstick spruce: Very few leaves, tall trunk
 	minetest.register_decoration({
 		deco_type = "schematic",
 		place_on = {"mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", "mcl_core:podzol"},
 		sidelen = 80,
 		noise_params = {
-			offset = -0.01,
+			offset = -0.005,
 			scale = 0.025,
 			spread = {x = 250, y = 250, z = 250},
 			seed = 2566,
@@ -1277,7 +1212,7 @@ local function register_decorations()
 		biomes = {"coniferous_forest"},
 		y_min = 3,
 		y_max = mcl_vars.mg_overworld_max,
-		schematic = matchstick,
+		schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_spruce_matchstick.mts",
 		flags = "place_center_x, place_center_z",
 	})