Merge remote-tracking branch 'upstream/master'

glass.lua

@@ -15,7 +15,7 @@ minetest.register_node("darkage:glass", {
 	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
@@ -28,32 +28,15 @@ 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" },
+	tiles = {"darkage_glass_round.png"},
 	paramtype = "light",
 	use_texture_alpha = "clip",
 	sunlight_propagates = true,
 	sounds = default.node_sound_glass_defaults(),
-	groups = {cracky=3,oddly_breakable_by_hand=3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 })
 
 minetest.register_craft({
@@ -70,20 +53,20 @@ minetest.register_craft({
 minetest.register_node("darkage:glass_square", {
 	description = "Square Glass",
 	drawtype = "glasslike",
-	tiles = { "darkage_glass_square.png" },
+	tiles = {"darkage_glass_square.png"},
 	paramtype = "light",
 	use_texture_alpha = "clip",
 	sunlight_propagates = true,
 	sounds = default.node_sound_glass_defaults(),
-	groups = {cracky=3,oddly_breakable_by_hand=3, not_cuttable=1},
+	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1},
 })
 
 minetest.register_craft({
 	output = "darkage:glass_square 8",
 	recipe = {
-		{"default:glass",		"default:steel_ingot", "default:glass"},
+		{"default:glass", "default:steel_ingot", "default:glass"},
 		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"default:glass",		"default:steel_ingot", "default:glass"},
+		{"default:glass", "default:steel_ingot", "default:glass"},
 	}
 })
 
@@ -101,15 +84,15 @@ minetest.register_node("darkage:glow_glass", {
 	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX-3,
+	light_source = default.LIGHT_MAX - 3,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	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")
+	inventory_image = minetest.inventorycube("darkage_glow_glass.png")
 })
 
 minetest.register_craft({
 	output = "darkage:glow_glass 1",
-    type = "shaped",
+	type = "shaped",
 	recipe = {
 		{"darkage:glass"},
 		{"default:torch"}
@@ -119,7 +102,7 @@ minetest.register_craft({
 -- Recycling
 minetest.register_craft({
 	output = "darkage:glass 1",
-    type = "shaped",
+	type = "shaped",
 	recipe = {{"darkage:glow_glass"}},
 })
 
@@ -132,18 +115,18 @@ minetest.register_node("darkage:glow_glass_round", {
 	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX-3,
+	light_source = default.LIGHT_MAX - 3,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	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")
+	inventory_image = minetest.inventorycube("darkage_glow_glass_round.png")
 })
 
 minetest.register_craft({
 	output = "darkage:glow_glass_round 1",
-    type = "shaped",
+	type = "shaped",
 	recipe = {
 		{"darkage:glass_round"},
-        {"default:torch"}
+		{"default:torch"}
 	}
 })
 
@@ -156,31 +139,31 @@ minetest.register_craft({
 --]] Square Glow Glass ]]
 
 minetest.register_node("darkage:glow_glass_square", {
-    description = "Medieval Square Glow Glass",
+	description = "Medieval Square Glow Glass",
-    drawtype = "glasslike",
+	drawtype = "glasslike",
-    tiles = {"darkage_glass_square.png"},
+	tiles = {"darkage_glass_square.png"},
 	use_texture_alpha = "clip",
 	paramtype = "light",
 	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX-3,
+	light_source = default.LIGHT_MAX - 3,
-	groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable=1},
+	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")
+	inventory_image = minetest.inventorycube("darkage_glow_glass_square.png")
 })
 
 minetest.register_craft({
-    output = "darkage:glow_glass_square 1",
+	output = "darkage:glow_glass_square 1",
-    type = "shaped",
+	type = "shaped",
-    recipe = {
+	recipe = {
-        {"darkage:glass_square"},
+		{"darkage:glass_square"},
-        {"default:torch"},
+		{"default:torch"},
-    }
+	}
 })
 
 --Recycling
 minetest.register_craft({
-    output = "darkage:glass_square 1",
+	output = "darkage:glass_square 1",
-    recipe = {{"darkage:glow_glass_square"}}
+	recipe = {{"darkage:glow_glass_square"}}
 })
 
 --[[
@@ -201,28 +184,22 @@ if minetest.get_modpath("unifieddyes") then
 		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},
+		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1, ud_param2_colorable = 1},
 		sounds = default.node_sound_glass_defaults()
 	})
 
-	minetest.register_craft({
+	unifieddyes.register_color_craft({
 		output = "darkage:milk_glass",
+		palette = "extended",
 		type = "shapeless",
-		recipe = {"darkage:glass", "dye:white"}
+		neutral_node = "darkage:glass",
+		recipe = {
+			"NEUTRAL_NODE",
+			"MAIN_DYE"
+		}
 	})
 
-    unifieddyes.register_color_craft({
+	-- Recycling
-        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"}}
@@ -239,26 +216,20 @@ if minetest.get_modpath("unifieddyes") then
 		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},
+		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({
+	unifieddyes.register_color_craft({
-        output = "darkage:milk_glass_round",
+		output = "darkage:milk_glass_round",
-        palette = "extended",
+		palette = "extended",
-        type = "shapeless",
+		type = "shapeless",
-        neutral_node = "",
+		neutral_node = "darkage:glass_round",
-        recipe = {
+		recipe = {
-                 "darkage:milk_glass_round",
+			"NEUTRAL_NODE",
-                 "MAIN_DYE"
+			"MAIN_DYE"
-        }
+		}
-    })
+	})
 
 	-- Recycling
 	minetest.register_craft({
@@ -277,7 +248,7 @@ if minetest.get_modpath("unifieddyes") then
 		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},
+		groups = {cracky = 3, oddly_breakable_by_hand = 3, not_cuttable = 1, ud_param2_colorable = 1},
 		sounds = default.node_sound_glass_defaults()
 	})
 
@@ -289,13 +260,13 @@ if minetest.get_modpath("unifieddyes") then
 	})
 
 	unifieddyes.register_color_craft({
-	output = "darkage:milk_glass_square",
+		output = "darkage:milk_glass_square",
-	palette = "extended",
+		palette = "extended",
-	type = "shapeless",
+		type = "shapeless",
-	neutral_node = "",
+		neutral_node = "darkage:glass_square",
-	recipe = {
+		recipe = {
-			 "darkage:milk_glass_square",
+			"NEUTRAL_NODE",
-			 "MAIN_DYE"
+			"MAIN_DYE"
 		}
 	})
 

init.lua

@@ -384,3 +384,5 @@ minetest.register_craft({
 		{"darkage:rhyolitic_tuff", "darkage:rhyolitic_tuff"},
 	}
 })
+
+minetest.log("action", "[darkage] loaded.")

mapgen.lua

@@ -156,7 +156,7 @@ end
 local seed = minetest.get_mapgen_setting("seed")
 
 
--- Generate desert stone with iron in derset.
+--[[ Generate desert stone with iron in derset.
 minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "darkage:desert_stone_with_iron",
@@ -167,6 +167,7 @@ minetest.register_ore({
 	y_min          = -1,
 	y_max          = 200,
 })
+]]--
 
 -- Generate chalk inside mountains
 minetest.register_ore({

nodes.lua

@@ -110,7 +110,7 @@ minetest.register_lbm({
 	end
 })
 
-minetest.register_node("darkage:desert_stone_with_iron", {
+--[[minetest.register_node("darkage:desert_stone_with_iron", {
 	description = "Desert Iron Ore",
 	tiles = {"default_desert_stone.png^default_mineral_iron.png"},
 	is_ground_content = true,
@@ -118,6 +118,7 @@ minetest.register_node("darkage:desert_stone_with_iron", {
 	drop = 'default:iron_lump',
 	sounds = default.node_sound_stone_defaults(),
 })
+]]--
 
 minetest.register_node("darkage:darkdirt", {
 	description = "Dark Dirt",
@@ -197,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 = "",
-	}),
 })
 
 --[[
@@ -268,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")