swamps and mapgen fix(coniferous forest)

mods/hyrule_mapgen/init.lua

@@ -403,7 +403,7 @@ minetest.override_item("default:cactus", {
 
 minetest.override_item("default:grass_1", {
 	on_destruct = function(pos, oldnode)
-		local num = math.random(3,5)
+		local num = math.random(3,7)
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
@@ -420,7 +420,7 @@ minetest.override_item("default:grass_1", {
 
 minetest.override_item("default:grass_2", {
 	on_destruct = function(pos, oldnode)
-		local num = math.random(3,5)
+		local num = math.random(3,7)
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
@@ -438,7 +438,7 @@ minetest.override_item("default:grass_2", {
 
 minetest.override_item("default:grass_3", {
 	on_destruct = function(pos, oldnode)
-		local num = math.random(3,5)
+		local num = math.random(3,7)
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
@@ -455,7 +455,7 @@ minetest.override_item("default:grass_3", {
 
 minetest.override_item("default:grass_4", {
 	on_destruct = function(pos, oldnode)
-		local num = math.random(3,5)
+		local num = math.random(3,7)
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
@@ -472,7 +472,7 @@ minetest.override_item("default:grass_4", {
 
 minetest.override_item("default:grass_5", {
 	on_destruct = function(pos, oldnode)
-		local num = math.random(3,5)
+		local num = math.random(3,7)
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
@@ -878,7 +878,7 @@ minetest.register_node("hyrule_mapgen:bridge2", {
 minetest.register_node("hyrule_mapgen:swamp_flower", {
 	description = "Swamp Flower",
 	drawtype = "mesh",
-	mesh = "flatnode.b3d",
+	mesh = "lilypad.b3d",
 	tiles = {"hyrule_mapgen_swampflower.png"},
 	inventory_image = "hyrule_mapgen_swampflower.png",
 	paramtype = "light",
@@ -889,6 +889,10 @@ minetest.register_node("hyrule_mapgen:swamp_flower", {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
 	},
+	collision_box = {
+		type = "fixed",
+		fixed = {-1, -0.5, -1, 1, -0.4, 1}
+	},
 	groups = {cracky=3,dig_immediate=3},
 })
 
@@ -923,6 +927,52 @@ minetest.register_node("hyrule_mapgen:fallen_leaves", {
 	}
 })
 
+minetest.register_node("hyrule_mapgen:biglily", {
+	description = "Big Waterlily",
+	drawtype = "mesh",
+	mesh = "lilypad.b3d",
+	tiles = {"hyrule_mapgen_biglily.png"},
+	inventory_image = "hyrule_mapgen_biglily.png",
+	paramtype = "light",
+	sunlight_propagates = false,	
+	walkable = true,
+	is_ground_content = true,
+	liquids_pointable = true,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = {-1, -0.5, -1, 1, -0.4, 1}
+	},
+	--on_place from flowers waterlily Originally by Ironzorg (MIT) and VanessaE (MIT)
+    --Various Minetest developers and contributors.
+	on_place = function(itemstack, placer, pointed_thing)
+		local pos = pointed_thing.above
+		local node = minetest.get_node(pointed_thing.under).name
+		local def = minetest.registered_nodes[node]
+		local player_name = placer:get_player_name()
+
+		if def and def.liquidtype == "source" and
+				minetest.get_item_group(node, "water") > 0 then
+			if not minetest.is_protected(pos, player_name) then
+				minetest.set_node(pos, {name = "hyrule_mapgen:biglily",
+					param2 = math.random(0, 3)})
+				if not minetest.setting_getbool("creative_mode") then
+					itemstack:take_item()
+				end
+			else
+				minetest.chat_send_player(player_name, "Node is protected")
+				minetest.record_protection_violation(pos, player_name)
+			end
+		end
+
+		return itemstack
+	end,
+	groups = {snappy=1, dig_immediate=3,},
+})
+
 minetest.register_node("hyrule_mapgen:deku_flower", {
 	description = "Deku Flower",
 	drawtype = "mesh",
@@ -937,7 +987,7 @@ minetest.register_node("hyrule_mapgen:deku_flower", {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
 	},
-	groups = {snappy=1, dig_immediate=3, bouncy=2},
+	groups = {snappy=1, dig_immediate=3,},
 })
 
 minetest.register_node("hyrule_mapgen:healwater_src", {
@@ -1111,7 +1161,41 @@ minetest.register_node("hyrule_mapgen:leaves_with_mystery", {
 	groups = {snappy=3, oddly_breakable_by_hand=1, dig_immediate=3}
 })
 
+minetest.register_node("hyrule_mapgen:swamp_mud", {
+	description = "Swamp Mud",
+	tiles = {
+		"hyrule_mapgen_swampmud.png"
+	},
+	groups = {crumbly=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_dirt_defaults()
+})
 
+minetest.register_node("hyrule_mapgen:swamp_grass", {
+	description = "Swamp Grass",
+	drawtype = "plantlike",
+	tiles = {"hyrule_mapgen_swampgrass.png"},
+	inventory_image = "hyrule_mapgen_swampgrass.png",
+	is_ground_content = false,
+	sunlight_propagates = true,
+	walkable = false,
+	paramtype = "light",
+	selection_box = {
+	type = "fixed",
+	fixed = {{-0.3, -0.5, -0.3, 0.3, 0.4, 0.3}}
+	},
+	groups = {snappy=1, oddly_breakable_by_hand=1, dig_immediate=3},
+	sounds = default.node_sound_leaves_defaults(),
+	on_destruct = function(pos, oldnode)
+		local num = math.random(3,7)
+		if num == 5 then
+		minetest.env:add_item(pos, "hyruletools:green_rupee")
+		end
+		if num == 4 then
+		minetest.env:add_entity(pos, "hyruletools:heart_entity")
+		end
+	end,
+	drop = "",
+})
 
 minetest.register_node("hyrule_mapgen:grupee", {
 	description = "Green Rupee Block",
@@ -1741,6 +1825,7 @@ minetest.register_node("hyrule_mapgen:stalagtite", {
 	fixed = {{-0.3, -0.2, -0.3, 0.3, 0.5, 0.3}}
 	},
 	groups = {crumbly=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("hyrule_mapgen:stalagtite1", {
@@ -1771,6 +1856,7 @@ minetest.register_node("hyrule_mapgen:stalagtite2", {
 	fixed = {{-0.3, -0.2, -0.3, 0.3, 0.5, 0.3}}
 	},
 	groups = {crumbly=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("hyrule_mapgen:stalagtite3", {
@@ -1786,6 +1872,7 @@ minetest.register_node("hyrule_mapgen:stalagtite3", {
 	fixed = {{-0.3, -0.2, -0.3, 0.3, 0.5, 0.3}}
 	},
 	groups = {crumbly=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("hyrule_mapgen:stalagmite0", {
@@ -1801,6 +1888,7 @@ minetest.register_node("hyrule_mapgen:stalagmite0", {
 	fixed = {{-0.3, -0.2, -0.3, 0.3, 0.5, 0.3}}
 	},
 	groups = {crumbly=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("hyrule_mapgen:stalagmite1", {
@@ -1817,6 +1905,7 @@ minetest.register_node("hyrule_mapgen:stalagmite1", {
 	fixed = {{-0.3, -0.2, -0.3, 0.3, 0.5, 0.3}}
 	},
 	groups = {crumbly=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("hyrule_mapgen:stalagmite2", {
@@ -1833,6 +1922,7 @@ minetest.register_node("hyrule_mapgen:stalagmite2", {
 	fixed = {{-0.3, -0.2, -0.3, 0.3, 0.5, 0.3}}
 	},
 	groups = {crumbly=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("hyrule_mapgen:roots", {

mods/hyrule_mapgen/mapgen.lua

@@ -74,8 +74,8 @@ minetest.register_biome({
 	--node_river_water = "",
 	y_min = 9,
 	y_max = 21000,
-	heat_point = 45,
-	humidity_point = 25,
+	heat_point = 46,
+	humidity_point = 26,
 })
 
 minetest.register_biome({
@@ -313,6 +313,24 @@ minetest.register_biome({
 	humidity_point = 80,
 })
 
+minetest.register_biome({
+	name = "swamp",
+	--node_dust = "",
+	node_top = "hyrule_mapgen:swamp_mud",
+	depth_top = 2,
+	node_filler = "default:dirt",
+	depth_filler = 6,
+	--node_stone = "",
+	node_water_top = "default:river_water_source",
+	depth_water_top = 1,
+	--node_water = "",
+	--node_river_water = "",
+	y_min = 1,
+	y_max = 31000,
+	heat_point = 24,
+	humidity_point = 76,
+})
+
 minetest.register_biome({
 	name = "deciduous_forest_ocean",
 	--node_dust = "",
@@ -533,6 +551,44 @@ end
 
 minetest.clear_registered_decorations()
 
+--swamp grass
+
+minetest.register_decoration({
+		deco_type = "simple",
+		place_on = {"hyrule_mapgen:swamp_mud",},
+		sidelen = 16,
+		noise_params = {
+			offset = 0.02,
+			scale = 0.02,
+			spread = {x = 200, y = 200, z = 200},
+			seed = 329,
+			octaves = 3,
+			persist = 0.6
+		},
+		biomes = {"swamp"},
+		y_min = 1,
+		y_max = 31000,
+		decoration = "hyrule_mapgen:swamp_grass",
+	})
+	
+minetest.register_decoration({
+		deco_type = "simple",
+		place_on = {"default:water_source",},
+		sidelen = 26,
+		noise_params = {
+			offset = 0,
+			scale = 0.001,
+			spread = {x = 200, y = 200, z = 200},
+			seed = 329,
+			octaves = 3,
+			persist = 0.6
+		},
+		biomes = {"swamp", "rainforest_swamp"},
+		y_min = 1,
+		y_max = 31000,
+		decoration = "hyrule_mapgen:biglily",
+	})
+
 -- Apple tree
 minetest.register_decoration({
 	deco_type = "schematic",
@@ -577,7 +633,7 @@ minetest.register_decoration({
 -- Big tree
 minetest.register_decoration({
 	deco_type = "schematic",
-	place_on = {"default:dirt_with_grass", "dirt_with_grass2"},
+	place_on = {"default:dirt_with_grass", "default:dirt_with_grass2"},
 	sidelen = 16,
 	noise_params = {
 		offset = 0.03,
@@ -594,6 +650,26 @@ minetest.register_decoration({
 	flags = "place_center_x, place_center_z",
 })
 
+minetest.register_decoration({
+	deco_type = "schematic",
+	place_on = {"hyrule_mapgen:swamp_mud",},
+	sidelen = 16,
+	noise_params = {
+		offset = 0.002,
+		scale = 0.001,
+		spread = {x = 250, y = 250, z = 250},
+		seed = 2,
+		octaves = 3,
+		persist = 0.66
+	},
+	biomes = {"swamp"},
+	y_min = 1,
+	y_max = 31000,
+	schematic = minetest.get_modpath("hyrule_mapgen").."/schematics/big_tree.mts",
+	flags = "place_center_x, place_center_z",
+})
+
+
 minetest.register_decoration({
 	deco_type = "schematic",
 	place_on = {"default:dirt_with_grass"},
@@ -822,7 +898,7 @@ minetest.register_decoration({
 -- palm tree
 minetest.register_decoration({
 	deco_type = "schematic",
-	place_on = {"default:sand"},
+	place_on = {"default:sand", "hyrule_mapgen:swamp_mud"},
 	sidelen = 16,
 	noise_params = {
 		offset = 0.004,
@@ -832,7 +908,7 @@ minetest.register_decoration({
 		octaves = 3,
 		persist = 0.66
 	},
-	biomes = {"sandstone_grassland_ocean", "stone_grassland_ocean", "deciduous_forest_ocean"},
+	biomes = {"sandstone_grassland_ocean", "stone_grassland_ocean", "deciduous_forest_ocean", "swamp"},
 	y_min = 1,
 	y_max = 31000,
 	schematic = minetest.get_modpath("hyrule_mapgen").."/schematics/palmtree.mts",
@@ -946,10 +1022,10 @@ minetest.register_decoration({
 minetest.register_decoration({
 	deco_type = "simple",
 	place_on = {"default:snowblock", "default:ice"},
-	sidelen = 80,
+	sidelen = 16,
 	noise_params = {
 		offset = 0.002,
-		scale = 0.002,
+		scale = 0.02,
 		spread = {x = 200, y = 200, z = 200},
 		seed = 230,
 		octaves = 3,