Merge branch 'master' into dev

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [2023.08.p3](https://github.com/lord-server/lord/releases/tag/2023.08.p3)
+ - Add drops of stone with coal and obsidian (#1161)
+ - One charcoal from one wood planks. Fixes #1112
+ - Torch from charcoal.
+ - Sounds for `castle:*` nodes. Fixes #1126
+ - Place planks always to north directed. Fixes #833
+ - Animated mordor water. Fixes #611
+
 ## [2023.08.p2](https://github.com/lord-server/lord/releases/tag/2023.08.p2)
  - Add previews for elven clothes. Fixes #1144
  - Add craft for big chains. Fixes #1131

mods/_various/castle/jailbars.lua

@@ -85,6 +85,7 @@ for i = 1, 15 do
 		use_texture_alpha = "clip",
 		paramtype         = "light",
 		groups            = { cracky = 2 },
+		sounds            = default.node_sound_metal_defaults(),
 		drop              = "castle:jailbars",
 		node_box          = {
 			type  = "fixed",
@@ -103,6 +104,7 @@ minetest.register_node("castle:jailbars", {
 	inventory_image           = "castle_jailbars.png",
 	wield_image               = "castle_jailbars.png",
 	groups                    = { steel_item = 1 },
+	sounds                    = default.node_sound_metal_defaults(),
 	node_placement_prediction = "",
 	on_construct              = update_jailbars
 })

mods/_various/castle/rope.lua

@@ -22,6 +22,7 @@ minetest.register_node("castle:ropes",{
 			{-1/16, -8/16, -1/16, 1/16, 8/16, 1/16},
 		},
 	},
+	sounds        = default.node_sound_defaults(),
 })
 
 minetest.register_craft({
@@ -55,6 +56,7 @@ minetest.register_node("castle:box_rope", {
 			{-1/16, -8/16, -1/16, 1/16, 8/16, 1/16},
 		},
 	},
+	sounds        = default.node_sound_wood_defaults(),
     after_destruct = function(pos,oldnode)
         local node = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z})
         if node.name == "castle:box_rope" then
@@ -88,6 +90,7 @@ minetest.register_node("castle:ropebox", {
 			{-1/16, -8/16, -1/16, 1/16, -4/16, 1/16},
 		},
 	},
+	sounds = default.node_sound_wood_defaults(),
     after_destruct = function(pos,oldnode)
         local node = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z})
         if node.name == "castle:box_rope" then

mods/_various/castle/shields_decor.lua

@@ -29,6 +29,7 @@ minetest.register_node("castle:shield", {
 			{ -0.500000, -0.500000, 0.375000, 0.500000, 0.500000, 0.500000 }, --NodeBox 1
 		},
 	},
+	sounds        = default.node_sound_defaults(),
 })
 
 minetest.register_craft({
@@ -69,6 +70,7 @@ minetest.register_node("castle:shield_2", {
 			{ -0.500000, -0.500000, 0.375000, 0.500000, 0.500000, 0.500000 }, --NodeBox 1
 		},
 	},
+	sounds        = default.node_sound_defaults(),
 })
 
 minetest.register_craft({
@@ -109,6 +111,7 @@ minetest.register_node("castle:shield_3", {
 			{ -0.500000, -0.500000, 0.375000, 0.500000, 0.500000, 0.500000 }, --NodeBox 1
 		},
 	},
+	sounds        = default.node_sound_defaults(),
 })
 
 minetest.register_craft({

mods/_various/castle/town_item.lua

@@ -97,6 +97,7 @@ minetest.register_node("castle:workbench", {
 	paramtype                     = "light",
 	groups                        = { choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wooden = 1 },
 	drawtype                      = "normal",
+	sounds                        = default.node_sound_wood_defaults(),
 	on_construct                  = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string('formspec', workbench_formspec)
@@ -337,6 +338,7 @@ minetest.register_node("castle:light", {
 	tiles               = { "castle_street_light.png" },
 	groups              = { cracky = 2 },
 	paramtype           = "light",
+	sounds              = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

mods/lord/Blocks/lord_default/init.lua

@@ -97,6 +97,14 @@ minetest.register_craft({
 	recipe = "group:wooden",
 })
 
+minetest.register_craft({
+	output = "default:torch 2",
+	recipe = {
+		{"default:charcoal_lump"},
+		{"group:stick"},
+	}
+})
+
 ----------------------------------
 ---      Stone-like nodes      ---
 ----------------------------------

mods/lord/Blocks/lottplants/nodes.lua

@@ -1158,51 +1158,57 @@ default.register_leafdecay({
 --Wood
 
 minetest.register_node("lottplants:pinewood", {
-	description = S("Pine Planks"),
-	tiles       = { "lottplants_pinewood.png" },
-	groups      = { choppy = 3, flammable = 3, wood = 1 },
-	sounds      = default.node_sound_wood_defaults(),
-	paramtype2  = "facedir",
+	description  = S("Pine Planks"),
+	tiles        = { "lottplants_pinewood.png" },
+	groups       = { choppy = 3, flammable = 3, wood = 1 },
+	sounds       = default.node_sound_wood_defaults(),
+	paramtype2   = "facedir",
+	place_param2 = 0,
 })
 
 minetest.register_node("lottplants:firwood", {
-	description = S("Fir Planks"),
-	tiles       = { "lottplants_fir_wood.png" },
-	groups      = { choppy = 3, flammable = 3, wood = 1 },
-	sounds      = default.node_sound_wood_defaults(),
-	paramtype2  = "facedir",
+	description  = S("Fir Planks"),
+	tiles        = { "lottplants_fir_wood.png" },
+	groups       = { choppy = 3, flammable = 3, wood = 1 },
+	sounds       = default.node_sound_wood_defaults(),
+	paramtype2   = "facedir",
+	place_param2 = 0,
 })
 
 minetest.register_node("lottplants:birchwood", {
-	description = S("Birch Planks"),
-	tiles       = { "lottplants_birchwood.png" },
-	groups      = { choppy = 3, flammable = 3, wood = 1 },
-	sounds      = default.node_sound_wood_defaults(),
-	paramtype2  = "facedir",
+	description  = S("Birch Planks"),
+	tiles        = { "lottplants_birchwood.png" },
+	groups       = { choppy = 3, flammable = 3, wood = 1 },
+	sounds       = default.node_sound_wood_defaults(),
+	paramtype2   = "facedir",
+	place_param2 = 0,
 })
 
 minetest.register_node("lottplants:alderwood", {
-	description = S("Alder Planks"),
-	tiles       = { "lottplants_alderwood.png" },
-	groups      = { choppy = 2, flammable = 3, wood = 1 },
-	sounds      = default.node_sound_wood_defaults(),
-	paramtype2  = "facedir",
+	description  = S("Alder Planks"),
+	tiles        = { "lottplants_alderwood.png" },
+	groups       = { choppy = 2, flammable = 3, wood = 1 },
+	sounds       = default.node_sound_wood_defaults(),
+	paramtype2   = "facedir",
+	place_param2 = 0,
 })
 
 minetest.register_node("lottplants:lebethronwood", {
-	description = S("Lebethron Planks"),
-	tiles       = { "lottplants_lebethronwood.png" },
-	groups      = { choppy = 1, flammable = 3, wood = 1 },
-	sounds      = default.node_sound_wood_defaults(),
-	paramtype2  = "facedir",
+	description  = S("Lebethron Planks"),
+	tiles        = { "lottplants_lebethronwood.png" },
+	groups       = { choppy = 1, flammable = 3, wood = 1 },
+	sounds       = default.node_sound_wood_defaults(),
+	paramtype2   = "facedir",
+	place_param2 = 0,
 })
 
 minetest.register_node("lottplants:mallornwood", {
-	description = S("Mallorn Planks"),
-	tiles       = { "lottplants_mallornwood.png" },
-	groups      = { choppy = 1, flammable = 3, wood = 1 },
-	sounds      = default.node_sound_wood_defaults(),
-	paramtype2  = "facedir",
+	description  = S("Mallorn Planks"),
+	tiles        = { "lottplants_mallornwood.png" },
+	groups       = { choppy = 1, flammable = 3, wood = 1 },
+	sounds       = default.node_sound_wood_defaults(),
+	paramtype2   = "facedir",
+	place_param2 = 0,
 })
 
 --Lorien grass

mods/lord/Entities/lottmobs/dwarfs.lua

@@ -113,6 +113,7 @@ local textures2 = {
 }
 
 local drops2 = {
+	{ name = "default:obsidian", chance = 90, min = 1, max = 1, },
 	{ name = "default:diamond", chance = 30, min = 1, max = 2, },
 	{ name   = "default:iron_lump", chance = 3, min    = 1, max    = 7, },
 	{ name   = "default:copper_lump", chance = 4, min    = 1, max    = 4, },

mods/lord/Entities/lottmobs/init.lua

@@ -1526,6 +1526,7 @@ mobs:register_mob("lottmobs:troll", {
 	armor = 100,
 	drops = {
 		{name = "default:stone",		chance = 5,		min = 1,		max = 7,},
+		{name = "default:stone_with_coal",			chance = 15,	min = 1,		max = 4,},
 		{name = "lottweapons:steel_battleaxe",		chance = 10,		min = 1,		max = 1,},
 		{name = "lottweapons:steel_warhammer",		chance = 10,		min = 1,		max = 1,},
 		{name = "lottweapons:bronze_battleaxe",		chance = 10,		min = 1,		max = 1,},

mods/lord/World/Generation/lottmapgen/nodes.lua

@@ -108,15 +108,29 @@ minetest.register_craft({
 minetest.register_node("lottmapgen:blacksource", {
 	description = S("Black Water Source"),
 	drawtype = "liquid",
+	waving = 3,
 	inventory_image = minetest.inventorycube("lottmapgen_black_water.png"),
-	tiles = {"lottmapgen_black_water.png"},
-	special_tiles = {
-		-- New-style water source material (mostly unused)
+	tiles = {
 		{
-			name="lottmapgen_black_water_source_animated.png",
-			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0},
+			name = "lottmapgen_black_water_source_animated.png",
 			backface_culling = false,
-		}
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 2.0,
+			},
+		},
+		{
+			name = "lottmapgen_black_water_source_animated.png",
+			backface_culling = true,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 16,
+				aspect_h = 16,
+				length = 2.0,
+			},
+		},
 	},
 	use_texture_alpha = "blend",
 	paramtype = "light",