1
0
mirror of https://github.com/Sokomine/cottages.git synced 2024-12-28 03:30:35 +01:00

corrected bug with sounds

This commit is contained in:
Sokomine 2019-02-17 14:27:49 +01:00
parent bd257ee16e
commit 479e76b854
10 changed files with 47 additions and 38 deletions

View File

@ -29,10 +29,20 @@ else
cottages.S = function(s) return s end
end
cottages.sounds = {}
-- MineClone2 needs special treatment; default is only needed for
-- crafting materials and sounds (less important)
if( not( minetest.get_modpath("default"))) then
default = {};
cottages.sounds.wood = nil
cottages.sounds.dirt = nil
cottages.sounds.leaves = nil
cottages.sounds.stone = nil
else
cottages.sounds.wood = default.node_sound_wood_defaults()
cottages.sounds.dirt = default.node_sound_dirt_defaults()
cottages.sounds.stone = default.node_sound_stone_defaults()
cottages.sounds.leaves = default.node_sound_leaves_defaults()
end
--cottages.config_use_mesh_barrel = false;
--cottages.config_use_mesh_handmill = true;

View File

@ -28,7 +28,7 @@ if( cottages_feldweg_mode == "simple" or cottages_feldweg_mode == "flat" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
})
end
@ -47,7 +47,7 @@ if( cottages_feldweg_mode == "flat" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
})
@ -58,7 +58,7 @@ if( cottages_feldweg_mode == "flat" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
})
@ -69,7 +69,7 @@ if( cottages_feldweg_mode == "flat" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
})
@ -84,7 +84,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then
roups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
drawtype = "nodebox",
-- top, bottom, side1, side2, inner, outer
@ -116,7 +116,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
drawtype = "nodebox",
@ -162,7 +162,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
drawtype = "nodebox",
@ -206,7 +206,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
drawtype = "nodebox",
@ -256,7 +256,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
"default_dirt.png", "default_grass.png",
@ -274,7 +274,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
tiles = {"cottages_feldweg_end.png","default_dirt.png",
"default_grass.png","cottages_feldweg_surface.png",
@ -290,7 +290,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png", "default_dirt.png",
"default_grass.png","cottages_feldweg_surface.png",
@ -306,7 +306,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
tiles = {"default_dirt.png^default_grass_side.png","default_grass.png",
"default_dirt.png^default_grass_side.png","cottages_feldweg_surface.png",
@ -322,7 +322,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
"default_dirt.png", "default_grass.png",
@ -342,7 +342,7 @@ if( minetest.get_modpath("stairs") and stairs and stairs.register_stair_and_slab
{"cottages_feldweg.png","default_dirt.png", "default_grass.png","default_grass.png","cottages_feldweg.png","cottages_feldweg.png"},
S("Dirt Road Stairs"),
S("Dirt Road, half height"),
default.node_sound_dirt_defaults)
cottages.sounds.dirt)
end
if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then
@ -371,7 +371,7 @@ if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
"default_dirt.png", "default_grass.png",
@ -391,7 +391,7 @@ if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
legacy_facedir_simple = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
tiles = {"cottages_feldweg_end.png","default_dirt.png^default_grass_side.png",
"default_dirt.png", "default_grass.png",

View File

@ -23,7 +23,7 @@ minetest.register_node("cottages:bed_foot", {
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.wood,
node_box = {
type = "fixed",
fixed = {
@ -58,7 +58,7 @@ minetest.register_node("cottages:bed_head", {
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.wood,
node_box = {
type = "fixed",
fixed = {
@ -99,7 +99,7 @@ minetest.register_node("cottages:sleeping_mat", {
paramtype2 = "facedir",
walkable = false,
groups = { snappy = 3 },
sounds = default.node_sound_leaves_defaults,
sounds = cottages.sounds.leaves,
selection_box = {
type = "wallmounted",
},
@ -133,7 +133,7 @@ minetest.register_node("cottages:sleeping_mat_head", {
paramtype = 'light',
paramtype2 = "facedir",
groups = { snappy = 3 },
sounds = default.node_sound_leaves_defaults,
sounds = cottages.sounds.leaves,
node_box = {
type = "fixed",
fixed = {
@ -162,7 +162,7 @@ minetest.register_node("cottages:bench", {
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.wood,
node_box = {
type = "fixed",
fixed = {

View File

@ -46,7 +46,7 @@ minetest.register_node("cottages:hay_mat", {
description = S("Some hay"),
tiles = {"cottages_darkage_straw.png^[multiply:#88BB88"},
groups = {hay=3, snappy=2, oddly_breakable_by_hand=2, flammable=3},
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.leaves,
-- the bale is slightly smaller than a full node
is_ground_content = false,
node_box = {
@ -73,7 +73,7 @@ minetest.register_node("cottages:hay", {
description = S("Hay"),
tiles = {"cottages_darkage_straw.png^[multiply:#88BB88"},
groups = {hay=3, snappy=2, oddly_breakable_by_hand=2, flammable=3},
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.leaves,
is_ground_content = false,
})
@ -85,7 +85,7 @@ minetest.register_node("cottages:hay_bale", {
tiles = {"cottages_darkage_straw_bale.png^[multiply:#88BB88"},
paramtype = "light",
groups = {hay=3, snappy=2, oddly_breakable_by_hand=2, flammable=3},
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.leaves,
-- the bale is slightly smaller than a full node
node_box = {
type = "fixed",

View File

@ -27,7 +27,6 @@ minetest.register_node("cottages:wagon_wheel", {
},
groups = {choppy=2,dig_immediate=2,attached_node=1},
legacy_wallmounted = true,
sounds = default.node_sound_defaults,
is_ground_content = false,
})
@ -38,7 +37,7 @@ minetest.register_node("cottages:loam", {
tiles = {"cottages_loam.png"},
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.dirt,
is_ground_content = false,
})
@ -50,7 +49,7 @@ if( minetest.get_modpath("stairs") and stairs and stairs.register_stair_and_slab
{"cottages_loam.png"},
S("Loam Stairs"),
S("Loam Slab"),
default.node_sound_dirt_defaults)
cottages.sounds.dirt)
if( minetest.registered_nodes["default:clay"]) then
stairs.register_stair_and_slab("clay", "default:clay",
@ -58,7 +57,7 @@ if( minetest.get_modpath("stairs") and stairs and stairs.register_stair_and_slab
{"cottages_clay.png"},
S("Clay Stairs"),
S("Clay Slab"),
default.node_sound_dirt_defaults)
cottages.sounds.dirt)
end
end
@ -70,7 +69,7 @@ minetest.register_node("cottages:straw_ground", {
tiles = {"cottages_darkage_straw.png","cottages_loam.png","cottages_loam.png","cottages_loam.png","cottages_loam.png","cottages_loam.png"},
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults,
sounds = cottages.sounds.leaves,
is_ground_content = false,
})

View File

@ -54,7 +54,7 @@ minetest.register_node("cottages:ladder_with_rope_and_rail", {
},
groups = {choppy=2,oddly_breakable_by_hand=3,rail=1,connect_to_raillike=1}, --connect_to_raillike=minetest.raillike_group("rail")},
legacy_wallmounted = true,
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.wood,
})

View File

@ -72,7 +72,7 @@ minetest.register_node("cottages:pitchfork_placed", {
paramtype2 = "facedir",
is_ground_content = false,
groups = {snappy = 2, dig_immediate = 3, falling_node = 1, attached_node = 1},
sounds = default.node_sound_wood_defaults(),
sounds = cottages.sounds.wood,
node_box = {
type = "fixed",
fixed = {

View File

@ -191,7 +191,7 @@ minetest.register_node("cottages:slate_vertical", {
tiles = {"cottages_slate.png",cottages.texture_roof_sides,"cottages_slate.png","cottages_slate.png",cottages.texture_roof_sides,"cottages_slate.png"},
paramtype2 = "facedir",
groups = {cracky=2, stone=1},
sounds = default.node_sound_stone_defaults,
sounds = cottages.sounds.stone,
is_ground_content = false,
})
@ -208,8 +208,8 @@ minetest.register_craft({
minetest.register_node("cottages:reet", {
description = S("Reet for thatching"),
tiles = {"cottages_reet.png"},
groups = {snappy=3,choppy=3,oddly_breakable_by_hand=3,flammable=3},
sounds = default.node_sound_wood_defaults,
groups = {hay = 3, snappy=3,choppy=3,oddly_breakable_by_hand=3,flammable=3},
sounds = cottages.sounds.leaves,
is_ground_content = false,
})

View File

@ -20,7 +20,7 @@ minetest.register_node("cottages:straw_mat", {
paramtype2 = "facedir",
walkable = false,
groups = { hay = 3, snappy = 2, oddly_breakable_by_hand = 2, flammable=3 },
sounds = default.node_sound_leaves_defaults,
sounds = cottages.sounds.leaves,
node_box = {
type = "fixed",
fixed = {
@ -46,7 +46,7 @@ minetest.register_node("cottages:straw_bale", {
tiles = {"cottages_darkage_straw_bale.png"},
paramtype = "light",
groups = { hay = 3, snappy = 2, oddly_breakable_by_hand = 2, flammable=3 },
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.leaves,
-- the bale is slightly smaller than a full node
node_box = {
type = "fixed",
@ -69,7 +69,7 @@ minetest.register_node("cottages:straw", {
description = S("straw"),
tiles = {"cottages_darkage_straw.png"},
groups = { hay = 3, snappy = 2, oddly_breakable_by_hand = 2, flammable=3 },
sounds = default.node_sound_wood_defaults,
sounds = cottages.sounds.leaves,
-- the bale is slightly smaller than a full node
is_ground_content = false,
})

View File

@ -117,7 +117,7 @@ minetest.register_node("cottages:water_gen", {
paramtype2 = "facedir",
is_ground_content = false,
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
sounds = default.node_sound_wood_defaults(),
sounds = cottages.sounds.wood,
node_box = {
type = "fixed",
fixed = {