From 794fb251ba9ef50bfbc674f7946d86318f53a089 Mon Sep 17 00:00:00 2001
From: sys4-fr <sys4@free.fr>
Date: Wed, 14 Nov 2018 22:26:29 +0100
Subject: [PATCH] Modif biomes

---
 schematics/pine.mts              | Bin 183 -> 172 bytes
 schematics/pine_from_sapling.mts | Bin 0 -> 170 bytes
 src/abms.lua                     |   2 +-
 src/mapgen.lua                   |   6 ++---
 src/mapgen_v7.lua                |  43 ++++++++++++++++++++-----------
 src/nodes.lua                    |  34 +++++++-----------------
 6 files changed, 42 insertions(+), 43 deletions(-)
 create mode 100644 schematics/pine_from_sapling.mts

diff --git a/schematics/pine.mts b/schematics/pine.mts
index 46795fe98b4ea36ecd1507d6ee965f0ba0c7e11c..0f966ffb08a71199cac1d1cbda631e43e5d94559 100644
GIT binary patch
delta 111
zcmV-#0FeK;0jvR#L}<-Y0SW*i2y=e?o_<Fl=3NWyf@*?{g=1(U1n_Fr)nHlj`FLg!
z#-JZoywn~0nwTa7T71pq+qsuamIeRiItuqhI}zcK1y287tGZCX;0$kJ+M3P2n9ULf
R1@)WD(z=ZA<pH<vv{X4<H<JJW

delta 122
zcmV-=0EPdo0k;8=M03Sb0Sdq%2t51vzCHvow{D<C?IJl0&qD(U#Lt*L4dx~9k9!uv
z7}|@eR&&Mg94v=IF1}{`{W+J6mjnOhB7ohkfVM#Iwc0S~?ebEeOIW1B>Fl<;3e^kB
c;vrO9u-XT+TEe6W)m!s2s?_Il1D3y}XxPg>6#xJL

diff --git a/schematics/pine_from_sapling.mts b/schematics/pine_from_sapling.mts
new file mode 100644
index 0000000000000000000000000000000000000000..3e2b1e8ca974d32eb57ea76c432f25ff5058cd42
GIT binary patch
literal 170
zcmV;b09F4@R8vg=1ONp94gduV3=9Gcb7l-?41a%re*gmj17T@$01R_(Z+ALwWo2Y+
zWpe-#WMyVyb!>DxaA|I3UvzS1Wq6$JQqc+kAqaE+`2BhW;#n=Qj_Y1-f{cY@Xd(pg
z8r9QaS@QXKW)Q}p9jjjIj&n^+lLallX7YWxmrRxe|K<AeBElgnobF!hcA<X38Q#LQ
YHJfdi%@PI$^?R0ObXng^0Z2QpQ~<w5HUIzs

literal 0
HcmV?d00001

diff --git a/src/abms.lua b/src/abms.lua
index e775bbf..1e763c0 100644
--- a/src/abms.lua
+++ b/src/abms.lua
@@ -161,7 +161,7 @@ minetest.register_abm({
 		-- This finds the sapling under the grown tree. ~ LazyJ
 		if minetest.get_node(pos).name == "snow:sapling_pine" then
 			   -- This switches the sapling to a tree trunk. ~ LazyJ
-			minetest.set_node(pos, {name="default:pinetree"})
+			minetest.set_node(pos, {name="default:pine_tree"})
 			   -- This is more for testing but it may be useful info to some admins when
 			   -- grepping the server logs too. ~ LazyJ
 			minetest.log("action", "A pine sapling grows into a tree at "..minetest.pos_to_string(pos))
diff --git a/src/mapgen.lua b/src/mapgen.lua
index 398746a..951b786 100644
--- a/src/mapgen.lua
+++ b/src/mapgen.lua
@@ -81,7 +81,7 @@ local pine_tree = {
 	axiom="TABff",
 	rules_a="[&T+f+ff+ff+ff+f]GA",
 	rules_b="[&T+f+Gf+Gf+Gf]GB",
-	trunk="default:pinetree",
+	trunk="default:pine_tree",
 	leaves="snow:needles",
 	angle=90,
 	iterations=1,
@@ -96,7 +96,7 @@ local xmas_tree = {
 	axiom="TABff",
 	rules_a="[&T+f+ff+ff+ff+f]GA",
 	rules_b="[&T+f+Gf+Gf+Gf]GB",
-	trunk="default:pinetree",
+	trunk="default:pine_tree",
 	leaves="snow:needles_decorated",
 	angle=90,
 	iterations=1,
@@ -149,7 +149,7 @@ end
 function snow.voxelmanip_pine(pos,a,data)
 	local c_snow = minetest.get_content_id("default:snow")
 	local c_pine_needles = minetest.get_content_id("snow:needles")
-	local c_pinetree = minetest.get_content_id("default:pinetree")
+	local c_pinetree = minetest.get_content_id("default:pine_tree")
 	local c_air = minetest.get_content_id("air")
 
 	local perlin1 = minetest.get_perlin(112,3, 0.5, perlin_scale)
diff --git a/src/mapgen_v7.lua b/src/mapgen_v7.lua
index 5a1d206..22705e2 100644
--- a/src/mapgen_v7.lua
+++ b/src/mapgen_v7.lua
@@ -22,12 +22,26 @@ minetest.register_biome({
 	depth_filler   = 2,
 	node_riverbed = "default:sand",
 	depth_riverbed = 2,
-	y_min     = 40,
+	y_min     = 2,
 	y_max     = 31000,
 	heat_point     = 20.0,
 	humidity_point = 70.0,
 })
 
+minetest.register_biome({
+	name = "pine_forest",
+	node_top = "default:dirt_with_grass",
+	depth_top = 1,
+	node_filler = "default:dirt",
+	depth_filler = 3,
+	node_riverbed = "default:sand",
+	depth_riverbed = 2,
+	y_min = 60,
+	y_max = 31000,
+	heat_point = 40,
+	humidity_point = 68,
+})
+
 minetest.register_biome({
 	name           = "snow_biome_lush",
 	node_dust = "default:snow",
@@ -37,25 +51,25 @@ minetest.register_biome({
 	depth_filler   = 2,
 	node_riverbed = "default:sand",
 	depth_riverbed = 2,
-	y_min     = 60,
+	y_min     = 2,
 	y_max     = 31000,
 	heat_point     = 10.0,
 	humidity_point = 70.0,
 })
 
---[[minetest.register_biome({
+minetest.register_biome({
 	name           = "snow_biome_alpine",
 
-	node_top       = "default:stone",
+	node_top       = "default:dirt_with_snow",
 	depth_top      = 1,
 	node_filler    = "default:stone",
 
-	y_min     = snow.min_height+60,
+	y_min     = 60,
 	y_max     = 31000,
 	heat_point     = 10.0,
 	humidity_point = 40.0,
 })
-]]--
+
 minetest.register_biome({
 	name           = "snow_biome_sand",
 
@@ -85,28 +99,28 @@ minetest.register_decoration({
 		persist = 0.7,
 	},
 	y_max = 31000,
-	y_min = 60,
-	biomes = {"snowy_grassland", "coniferous_forest", "taiga"},
+	y_min = 4,
+	biomes = {"snowy_grassland", "coniferous_forest", "taiga", "snow_biome_alpine"},
 	schematic = minetest.get_modpath("snow").."/schematics/pine.mts",
 	flags = "place_center_x, place_center_z",
 })
 
 minetest.register_decoration({
 	deco_type = "schematic",
-	place_on = "default:dirt_with_snow",
+	place_on = {"default:dirt_with_snow", "default:dirt_with_grass"},
 	sidelen = 16,
 	noise_params = {
 		--offset = 0.036,
 		offset = 0.020,
-		scale = 0.022,
+		scale = 0.002,
 		spread = {x = 250, y = 250, z = 250},
 		seed = 2861,
 		octaves = 3,
 		persist = 0.66
 	},
 	y_max = 31000,
-	y_min = 40,
-	biomes = {"snow_biome_forest"},
+	y_min = 4,
+	biomes = {"snow_biome_forest", "pine_forest"},
 	schematic = minetest.get_modpath("snow").."/schematics/pine.mts",
 	flags = "place_center_x, place_center_z",
 })
@@ -117,7 +131,7 @@ minetest.register_decoration({
 	sidelen = 16,
 	fill_ratio = 0.05,
 	y_max = 31000,
-	y_min = 60,
+	y_min = 4,
 	biomes = {"snow_biome_lush"},
 	schematic = minetest.get_modpath("snow").."/schematics/pine.mts",
 	flags = "place_center_x, place_center_z",
@@ -209,7 +223,7 @@ minetest.register_decoration({
 	decoration = "default:snow",
 })
 
---[[minetest.register_decoration({
+minetest.register_decoration({
 	deco_type = "simple",
 	place_on = "default:stone",
 	sidelen = 16,
@@ -219,4 +233,3 @@ minetest.register_decoration({
 	biomes = {"snow_biome_alpine"},
 	decoration = "default:snow",
 })
-]]
diff --git a/src/nodes.lua b/src/nodes.lua
index 9ee671a..acbc2df 100644
--- a/src/nodes.lua
+++ b/src/nodes.lua
@@ -1,15 +1,14 @@
 -- NODES
 
 -- Pine Needles
---[[local nodedef = {
-	description = "Pine Needles",
+local nodedef = {
+	description = "Snow Pine Needles",
 	drawtype = "allfaces_optional",
 	visual_scale = 1.3,
 	tiles = {"snow_needles.png"},
 	waving = 1,
 	paramtype = "light",
-	groups = {snappy=3},
-	furnace_burntime = 1,
+	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
 	drop = {
 		max_items = 1,
 		items = {
@@ -24,23 +23,9 @@
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
+	after_place_node = default.after_place_leaves,
 }
-]]--
-local nodedef = table.copy(minetest.registered_nodes["default:pine_needles"])
-nodedef.tiles = {"snow_needles.png"}
-nodedef.drop = {
-	max_items = 1,
-	items = {
-		{
-			-- player will get sapling with 1/20 chance
-			items = {'snow:sapling_pine'},
-			rarity = 20,
-		},
-		{
-			items = {'snow:needles'},
-		}
-	}
-}
+
 --[[
 If christmas_content is enabled, then this next part will override the pine needles' drop code
 (in the code section above) and adds Xmas tree saplings to the items that are dropped.
@@ -60,7 +45,7 @@ minetest.register_node("snow:needles", table.copy(nodedef))
 
 default.register_leafdecay{
 	trunks = {"default:pine_tree"},
-	leaves = {"default:pine_needles", "snow:needles"},
+	leaves = {"snow:needles", "default:pine_needles"},
 	radius = 2,
 }
 
@@ -114,10 +99,11 @@ nodedef = {
 	inventory_image = "snow_sapling_pine.png",
 	wield_image = "snow_sapling_pine.png",
 	paramtype = "light",
+	sunlight_propagates = true,
 	walkable = false,
-	groups = {snappy=2,dig_immediate=3},
-	furnace_burntime = 10,
-	sounds = default.node_sound_defaults(),
+	groups = {snappy=2,dig_immediate=3, flammable = 3,
+				 attached_node = 1, sapling = 1},
+	sounds = default.node_sound_leaves_defaults(),
 }
 
 -- Pine Sapling