Fix waterlily, change sheep spawn chance, fix doors sound

games/default/files/doors/init.lua

@@ -281,7 +281,7 @@ function doors:register_door(name, def)
                 if is_right(pos, clicker) then
                     minetest.sound_play("doors_door_open", {pos=pos, gain = 0.3, max_hear_distance = 10})
                 else
-                    minetest.sound_play("doors_door_close", {gain = 0.3, max_hear_distance = 10})
+                    minetest.sound_play("doors_door_close", {pos=pos, gain = 0.3, max_hear_distance = 10})
                 end
             end
         end,

games/default/files/flowers/mapgen.lua

@@ -46,21 +46,20 @@ end
 
 local function register_mgv6_waterlily()
 	minetest.register_decoration({
-		deco_type = "simple",
+		deco_type = "schematic",
 		place_on = {"default:dirt"},
 		sidelen = 16,
 		noise_params = {
-			offset = -0.12,
+			offset = -0.02,
-			scale = 0.3,
+			scale = 0.1,
 			spread = {x = 100, y = 100, z = 100},
-			seed = 33,
+			seed = 48,
 			octaves = 3,
 			persist = 0.7
 		},
-		y_max = 0,
 		y_min = 0,
-		decoration = "flowers:waterlily",
+		y_max = 0,
-		param2 = 0,
+		schematic = minetest.get_modpath("flowers") .. "/schematics/waterlily.mts",
 		rotation = "random",
 	})
 end
@@ -93,7 +92,7 @@ local function register_flower(seed, flower_name)
 		noise_params = {
 			offset = -0.02,
 			scale = 0.04,
-			spread = {x = 200, y = 200, z = 200},
+			spread = {x = 100, y = 100, z = 100},
 			seed = seed,
 			octaves = 3,
 			persist = 0.6
@@ -130,21 +129,20 @@ end
 
 local function register_waterlily()
 	minetest.register_decoration({
-		deco_type = "simple",
+		deco_type = "schematic",
 		place_on = {"default:dirt"},
 		sidelen = 16,
 		noise_params = {
-			offset = -0.12,
+			offset = -0.02,
-			scale = 0.3,
+			scale = 0.1,
 			spread = {x = 100, y = 100, z = 100},
-			seed = 33,
+			seed = 48,
 			octaves = 3,
 			persist = 0.7
 		},
-		biomes = {"rainforest_swamp", "savanna_shore", "deciduous_forest_shore"},
-		y_max = 0,
 		y_min = 0,
-		decoration = "flowers:waterlily",
+		y_max = 0,
+		schematic = minetest.get_modpath("flowers") .. "/schematics/waterlily.mts",
 		rotation = "random",
 	})
 end

games/default/files/mobs_animal/sheep.lua

@@ -44,7 +44,7 @@ for _, col in ipairs(all_colours) do
 		run_velocity = 2,
 		runaway = true,
 		jump = true,
-		jump_height = 4,
+		jump_height = 3,
 		drops = {
 			{name = "mobs:meat_raw", chance = 1, min = 1, max = 1},
 			{name = "mobs:meat_raw", chance = 2, min = 1, max = 1},
@@ -204,9 +204,9 @@ end
 mobs:spawn({
 	name = "mobs_animal:sheep_white",
 	nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow",  "default:dirt_with_grass"},
-	min_light = 5,
+	min_light = 7,
 	interval = 30,
-	chance = 30000,
+	chance = 40000,
 	min_height = 0,
 	max_height = 31000,
 	day_toggle = true,
@@ -215,9 +215,9 @@ mobs:spawn({
 mobs:spawn({
 	name = "mobs_animal:sheep_grey",
 	nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow",  "default:dirt_with_grass"},
-	min_light = 5,
+	min_light = 7,
 	interval = 30,
-	chance = 30000,
+	chance = 40000,
 	min_height = 0,
 	max_height = 31000,
 	day_toggle = true,
@@ -226,8 +226,9 @@ mobs:spawn({
 mobs:spawn({
 	name = "mobs_animal:sheep_dark_grey",
 	nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow",  "default:dirt_with_grass"},
+	min_light = 7,
 	interval = 30,
-	chance = 30000,
+	chance = 40000,
 	min_height = 0,
 	max_height = 31000,
 	day_toggle = true,
@@ -236,9 +237,9 @@ mobs:spawn({
 mobs:spawn({
 	name = "mobs_animal:sheep_black",
 	nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow",  "default:dirt_with_grass"},
-	min_light = 5,
+	min_light = 7,
 	interval = 30,
-	chance = 30000,
+	chance = 40000,
 	min_height = 0,
 	max_height = 31000,
 	day_toggle = true,
@@ -247,9 +248,9 @@ mobs:spawn({
 mobs:spawn({
 	name = "mobs_animal:sheep_brown",
 	nodes = {"default:dirt", "default:sand", "default:redsand", "default:snow", "default:snowblock", "default:dirt_with_snow",  "default:dirt_with_grass"},
-	min_light = 5,
+	min_light = 7,
 	interval = 30,
-	chance = 30000,
+	chance = 40000,
 	min_height = 0,
 	max_height = 31000,
 	day_toggle = true,

games/default/files/player_api/init.lua

@@ -3,7 +3,7 @@ dofile(minetest.get_modpath("player_api") .. "/api.lua")
 -- Default player appearance
 player_api.register_model("character.b3d", {
 	animation_speed = 30,
-	textures = {"character.png", },
+	textures = {"character.png", "blank.png", "blank.png"},
 	animations = {
 		-- Standard animations.
 		stand     = {x = 0,   y = 0}, -- y = 79

games/default/files/wool/depends.txt

@@ -1 +1,2 @@
 default
+dye

games/default/files/wool/init.lua

@@ -1,20 +1,4 @@
-local dyes = {
+local dyes = dye.dyes
-	{"white", "White"},
-	{"grey", "Grey"},
-	{"black", "Black"},
-	{"red", "Red"},
-	{"yellow", "Yellow"},
-	{"green", "Green"},
-	{"cyan", "Cyan"},
-	{"blue", "Blue"},
-	{"magenta", "Magenta"},
-	{"orange", "Orange"},
-	{"violet", "Violet"},
-	{"brown", "Brown"},
-	{"pink", "Pink"},
-	{"dark_grey", "Dark Grey"},
-	{"dark_green", "Dark Green"},
-}
 
 for i = 1, #dyes do
 	local name, desc = unpack(dyes[i])