Merge remote-tracking branch 'upstream/master'

Co-authored-by: sys4 <bricassa@sys4.fr>

glass.lua

@@ -12,7 +12,7 @@ minetest.register_node("darkage:glass", {
 	description = "Clean Medieval Glass",
 	drawtype = "glasslike",
 	tiles = {"darkage_glass.png"},
-	use_texture_alpha=false,
+	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
 	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
@@ -29,13 +29,28 @@ minetest.register_craft({
 })
 
 --[[ Round Glass By Semmett9 aka Infinatum ]]
+if minetest.get_modpath("unifieddyes") then
+	minetest.register_node("darkage:milk_glass", {
+		description = "Milky Medieval Glass (Good for colorization)",
+		drawtype = "glasslike",
+		tiles = {"darkage_milk_glass.png"},
+		use_texture_alpha=true,
+		paramtype = "light",
+		paramtype2 = "color",
+		palette = "unifieddyes_palette_extended.png",
+		sunlight_propagates = true,
+		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1, ud_param2_colorable = 1},
+		sounds = default.node_sound_glass_defaults(),
+		after_dig_node = unifieddyes.after_dig_node
+	})
+end
 
 minetest.register_node("darkage:glass_round", {
 	description = "Round Glass",
 	drawtype = "glasslike",
 	tiles = { "darkage_glass_round.png" },
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "clip",
 	sunlight_propagates = true,
 	sounds = default.node_sound_glass_defaults(),
 	groups = {cracky=3,oddly_breakable_by_hand=3, not_cuttable=1},
@@ -57,7 +72,7 @@ minetest.register_node("darkage:glass_square", {
 	drawtype = "glasslike",
 	tiles = { "darkage_glass_square.png" },
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "clip",
 	sunlight_propagates = true,
 	sounds = default.node_sound_glass_defaults(),
 	groups = {cracky=3,oddly_breakable_by_hand=3, not_cuttable=1},
@@ -83,7 +98,7 @@ minetest.register_node("darkage:glow_glass", {
 	description = "Medieval Glow Glass",
 	drawtype = "glasslike",
 	tiles = {"darkage_glass.png"},
-	use_texture_alpha=true,
+	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
 	light_source = default.LIGHT_MAX-3,
@@ -114,7 +129,7 @@ minetest.register_node("darkage:glow_glass_round", {
 	description = "Medieval Round Glow Glass",
 	drawtype = "glasslike",
 	tiles = {"darkage_glass_round.png"},
-	use_texture_alpha=true,
+	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
 	light_source = default.LIGHT_MAX-3,
@@ -144,7 +159,7 @@ minetest.register_node("darkage:glow_glass_square", {
     description = "Medieval Square Glow Glass",
     drawtype = "glasslike",
     tiles = {"darkage_glass_square.png"},
-	use_texture_alpha=true,
+	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
 	light_source = default.LIGHT_MAX-3,
@@ -181,7 +196,7 @@ if minetest.get_modpath("unifieddyes") then
 		description = "Milky Medieval Glass (Good for colorization)",
 		drawtype = "glasslike",
 		tiles = {"darkage_milk_glass.png"},
-		use_texture_alpha=true,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
@@ -219,7 +234,7 @@ if minetest.get_modpath("unifieddyes") then
 		description = "Milky Medieval Round Glass (Good for colorization)",
 		drawtype = "glasslike",
 		tiles = {"darkage_milk_glass_round.png"},
-		use_texture_alpha=true,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
@@ -257,7 +272,7 @@ if minetest.get_modpath("unifieddyes") then
 		description = "Milky Medieval Square Glass (Good for colorization)",
 		drawtype = "glasslike",
 		tiles = {"darkage_milk_glass_square.png"},
-		use_texture_alpha=true,
+		use_texture_alpha = "blend",
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",

mapgen.lua

@@ -153,8 +153,7 @@ local function generate_claylike(data, varea, name, minp, maxp, seed, chance, mi
 	end
 end
 
-local mgparams = minetest.get_mapgen_params()
+local seed = minetest.get_mapgen_setting("seed")
-local seed = mgparams.seed
 
 
 --[[ Generate desert stone with iron in derset.
@@ -192,7 +191,7 @@ minetest.register_ore({
 minetest.register_ore({
 	ore_type        	= "sheet",
 	ore             	= "darkage:tuff",
-	wherein         	= {"default:stone", "default:needs_dirt", "default:gravel", "default:stone_with_coal"},
+	wherein         	= {"default:stone", "default:dirt", "default:gravel", "default:stone_with_coal"},
 	column_height_max = 20,
 	column_height_min = 15,
 	y_min            = -200,
@@ -211,7 +210,7 @@ minetest.register_ore({
 minetest.register_ore({
 	ore_type        	= "sheet",
 	ore             	= "darkage:rhyolitic_tuff",
-	wherein         	= {"default:stone", "default:needs_dirt", "default:gravel", "default:stone_with_coal"},
+	wherein         	= {"default:stone", "default:dirt", "default:gravel", "default:stone_with_coal"},
 	column_height_max = 20,
 	column_height_min = 15,
 	y_min            = -2000,

nodes.lua

@@ -198,9 +198,7 @@ minetest.register_node("darkage:mud", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 	drop = 'darkage:mud_lump 4',
-	sounds = default.node_sound_dirt_defaults({
+	sounds = default.node_sound_dirt_defaults()
-		footstep = "",
-	}),
 })
 
 --[[
@@ -269,9 +267,7 @@ minetest.register_node("darkage:silt", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 	drop = 'darkage:silt_lump 4',
-	sounds = default.node_sound_dirt_defaults({
+	sounds = default.node_sound_dirt_defaults()
-		footstep = "",
-	}),
 })
 
 --[[

stairs.lua

@@ -15,6 +15,7 @@ darkage.register_stairs("darkage:ors_brick")
 darkage.register_stairs("darkage:ors_rubble")
 darkage.register_stairs("darkage:rhyolitic_tuff")
 darkage.register_stairs("darkage:rhyolitic_tuff_bricks")
+darkage.register_stairs("darkage:rhyolitic_tuff_rubble")
 darkage.register_stairs("darkage:schist")
 darkage.register_stairs("darkage:serpentine")
 darkage.register_stairs("darkage:shale")
@@ -26,4 +27,5 @@ darkage.register_stairs("darkage:stone_brick")
 darkage.register_stairs("darkage:straw_bale")
 darkage.register_stairs("darkage:tuff")
 darkage.register_stairs("darkage:tuff_bricks")
+darkage.register_stairs("darkage:tuff_rubble")