Merge remote-tracking branch 'upstream/master'

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

glass.lua

@@ -1,16 +1,18 @@
 --[[
 	Medival glasses.
-	The glasses can be colorized using dye. 
+	The glasses can be colorized using dye.
 	Colorization requires unifieddyes installed.
 
 	Special thanks to Semmett9 for the glass textures.
 ]]
 
+--[[ Rhombus Glass ]]
+
 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},
@@ -26,80 +28,17 @@ minetest.register_craft({
 	}
 })
 
-if minetest.get_modpath("unifieddyes") then
+--[[ Round Glass By Semmett9 aka Infinatum ]]
-	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.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
-	})
 
--- Craft
-	minetest.register_craft({
-		output = "darkage:milk_glass 1",
-		type = "shapeless",
-		recipe = {"darkage:glass", "dye:white"}
-	})
-
--- Recycling
-	minetest.register_craft({
-		output = "darkage:glass 1",
-		recipe = {{"darkage:milk_glass"}}
-	})
-end
-
---[[
-	Glow Glass
-]]
-minetest.register_node("darkage:glow_glass", {
-	description = "Medieval Glow Glass",
-	drawtype = "glasslike",
-	tiles = {"darkage_glass.png"},
-	use_texture_alpha=true,
-	paramtype = "light",
-	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX-1,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
-	sounds = default.node_sound_glass_defaults(),
-})
-
--- Craft
-minetest.register_craft({
-	output = "darkage:glass 1",
-	recipe = {
-		{"darkage:glow_glass"},
-	}
-})
-
--- Recycling
-minetest.register_craft({
-	output = "darkage:glow_glass 1",
-	recipe = {
-		{"darkage:glass"},
-		{"default:torch"},
-	}
-})
-
---[[
-	Round Glass
-	By Semmett9 aka Infinatum
-]]
 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},
+	groups = {cracky=3,oddly_breakable_by_hand=3, not_cuttable=1},
 })
 
 minetest.register_craft({
@@ -111,49 +50,17 @@ minetest.register_craft({
 	}
 })
 
--- If unifieddyes installed provide a colorizeable variant
+--[[ Square glass By Semmett9 aka Infinatum ]]
-if minetest.get_modpath("unifieddyes") then
-	minetest.register_node("darkage:milk_glass_round", {
-		description = "Milky Medieval Round Glass (Good for colorization)",
-		drawtype = "glasslike",
-		tiles = {"darkage_milk_glass_round.png"},
-		use_texture_alpha=true,
-		paramtype = "light",
-		paramtype2 = "color",
-		palette = "unifieddyes_palette.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
-	})
 
--- Craft
-	minetest.register_craft({
-		output = "darkage:milk_glass_round 1",
-		type = "shapeless",
-		recipe = {"darkage:glass_round", "dye:white"}
-	})
-
--- Recycling
-	minetest.register_craft({
-		output = "darkage:glass_round 1",
-		recipe = {{"darkage:milk_glass_round"}}
-	})
-end
-
---[[
-	Square glass
-	By Semmett9 aka Infinatum
-]]
 minetest.register_node("darkage:glass_square", {
 	description = "Square Glass",
 	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},
+	groups = {cracky=3,oddly_breakable_by_hand=3, not_cuttable=1},
 })
 
 minetest.register_craft({
@@ -165,32 +72,222 @@ minetest.register_craft({
 	}
 })
 
--- If unifieddyes installed provide a colorizeable variant
+--[[
+		Glowing Glass Variants
+
+		]]
+
+--[[ Rhombus Glow Glass ]]
+
+minetest.register_node("darkage:glow_glass", {
+	description = "Medieval Glow Glass",
+	drawtype = "glasslike",
+	tiles = {"darkage_glass.png"},
+	use_texture_alpha = "clip",
+	paramtype = "light",
+	sunlight_propagates = true,
+	light_source = default.LIGHT_MAX-3,
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	sounds = default.node_sound_glass_defaults(),
+    inventory_image = minetest.inventorycube("darkage_glow_glass.png")
+})
+
+minetest.register_craft({
+	output = "darkage:glow_glass 1",
+    type = "shaped",
+	recipe = {
+		{"darkage:glass"},
+		{"default:torch"}
+	}
+})
+
+-- Recycling
+minetest.register_craft({
+	output = "darkage:glass 1",
+    type = "shaped",
+	recipe = {{"darkage:glow_glass"}},
+})
+
+--[[ Round Glow Glass ]]
+
+minetest.register_node("darkage:glow_glass_round", {
+	description = "Medieval Round Glow Glass",
+	drawtype = "glasslike",
+	tiles = {"darkage_glass_round.png"},
+	use_texture_alpha = "clip",
+	paramtype = "light",
+	sunlight_propagates = true,
+	light_source = default.LIGHT_MAX-3,
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	sounds = default.node_sound_glass_defaults(),
+    inventory_image = minetest.inventorycube("darkage_glow_glass_round.png")
+})
+
+minetest.register_craft({
+	output = "darkage:glow_glass_round 1",
+    type = "shaped",
+	recipe = {
+		{"darkage:glass_round"},
+        {"default:torch"}
+	}
+})
+
+-- Recycling
+minetest.register_craft({
+	output = "darkage:glass_round 1",
+	recipe = {{"darkage:glow_glass_round"}}
+})
+
+--]] Square Glow Glass ]]
+
+minetest.register_node("darkage:glow_glass_square", {
+    description = "Medieval Square Glow Glass",
+    drawtype = "glasslike",
+    tiles = {"darkage_glass_square.png"},
+	use_texture_alpha = "clip",
+	paramtype = "light",
+	sunlight_propagates = true,
+	light_source = default.LIGHT_MAX-3,
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	sounds = default.node_sound_glass_defaults(),
+    inventory_image = minetest.inventorycube("darkage_glow_glass_square.png")
+})
+
+minetest.register_craft({
+    output = "darkage:glow_glass_square 1",
+    type = "shaped",
+    recipe = {
+        {"darkage:glass_square"},
+        {"default:torch"},
+    }
+})
+
+--Recycling
+minetest.register_craft({
+    output = "darkage:glass_square 1",
+    recipe = {{"darkage:glow_glass_square"}}
+})
+
+--[[
+		Colorizable Milk Glass Variants, depending on unifieddyes mod
+
+		]]
+
 if minetest.get_modpath("unifieddyes") then
+
+	--[[ Rhombus Milk Glass ]]
+
+	minetest.register_node("darkage:milk_glass", {
+		description = "Milky Medieval Glass (Good for colorization)",
+		drawtype = "glasslike",
+		tiles = {"darkage_milk_glass.png"},
+		use_texture_alpha = "blend",
+		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()
+	})
+
+	minetest.register_craft({
+		output = "darkage:milk_glass",
+		type = "shapeless",
+		recipe = {"darkage:glass", "dye:white"}
+	})
+
+    unifieddyes.register_color_craft({
+        output = "darkage:milk_glass",
+        palette = "extended",
+        type = "shapeless",
+        neutral_node = "",
+        recipe = {
+                 "darkage:milk_glass",
+                 "MAIN_DYE"
+        }
+    })
+
+    -- Recycling
+	minetest.register_craft({
+		output = "darkage:glass 1",
+		recipe = {{"darkage:milk_glass"}}
+	})
+
+	--[[ Round Milk Glass ]]
+
+	minetest.register_node("darkage:milk_glass_round", {
+		description = "Milky Medieval Round Glass (Good for colorization)",
+		drawtype = "glasslike",
+		tiles = {"darkage_milk_glass_round.png"},
+		use_texture_alpha = "blend",
+		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()
+	})
+	-- Craft
+	minetest.register_craft({
+		output = "darkage:milk_glass_round",
+		type = "shapeless",
+		recipe = {"darkage:glass_round", "dye:white"},
+	})
+
+    unifieddyes.register_color_craft({
+        output = "darkage:milk_glass_round",
+        palette = "extended",
+        type = "shapeless",
+        neutral_node = "",
+        recipe = {
+                 "darkage:milk_glass_round",
+                 "MAIN_DYE"
+        }
+    })
+
+	-- Recycling
+	minetest.register_craft({
+		output = "darkage:glass_round 1",
+		recipe = {{"darkage:milk_glass_round"}}
+	})
+
+	--[[ Square Milk Glass ]]
+
 	minetest.register_node("darkage:milk_glass_square", {
 		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.png",
+		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(),
+		sounds = default.node_sound_glass_defaults()
-		after_dig_node = unifieddyes.after_dig_node
 	})
 
--- Craft
+	-- Craft
 	minetest.register_craft({
-		output = "darkage:milk_glass_square 1",
+		output = "darkage:milk_glass_square",
 		type = "shapeless",
-		recipe = {"darkage:glass_square", "dye:white"}
+		recipe = {"darkage:glass_square", "dye:white"},
 	})
 
--- Recycling
+	unifieddyes.register_color_craft({
+	output = "darkage:milk_glass_square",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "",
+	recipe = {
+			 "darkage:milk_glass_square",
+			 "MAIN_DYE"
+		}
+	})
+
+	-- Recycling
 	minetest.register_craft({
-		output = "darkage:glass_square 1",
+		output = "darkage:glass_square",
 		recipe = {{"darkage:milk_glass_square"}}
 	})
-end
+
+end --unifieddyes condition

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.

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")