Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move core sounds from mcl_core to mcl_sounds

Browse source
This commit is contained in:
Wuzzy 2017-02-11 18:46:23 +01:00
parent 7ff49a165a
commit fcda60cc2e
121 changed files with 393 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mods/redstone/mesecons/depends.txt
View file

@ -1 +1,2 @@
mcl_sounds
mcl_core

4
mods/redstone/mesecons/wires.lua
View file

@ -123,7 +123,7 @@ for zmy=0, 1 do
state = mesecon.state.off,
onstate = "mesecons:wire_"..nodeid.."_on"
}},
sounds = mcl_core.node_sound_defaults(),
sounds = mcl_sounds.node_sound_defaults(),
})
minetest.register_node("mesecons:wire_"..nodeid.."_on", {
@ -154,7 +154,7 @@ for zmy=0, 1 do
state = mesecon.state.on,
offstate = "mesecons:wire_"..nodeid.."_off"
}},
sounds = mcl_core.node_sound_defaults(),
sounds = mcl_sounds.node_sound_defaults(),
})
end
end

8
mods/redstone/mesecons_button/init.lua
View file

@ -44,7 +44,7 @@ minetest.register_node("mesecons_button:button_stone_off", {
minetest.sound_play("mesecons_button_push", {pos=pos})
minetest.after(1, mesecon.button_turnoff, pos)
end,
sounds = mcl_core.node_sound_stone_defaults(),
sounds = mcl_sounds.node_sound_stone_defaults(),
mesecons = {receptor = {
state = mesecon.state.off,
rules = mesecon.rules.buttonlike_get
@ -70,7 +70,7 @@ minetest.register_node("mesecons_button:button_stone_on", {
groups = {cracky=3, not_in_creative_inventory=1, attached_node=1, dig_by_water=1},
drop = 'mesecons_button:button_stone_off',
description = "Stone Button",
sounds = mcl_core.node_sound_stone_defaults(),
sounds = mcl_sounds.node_sound_stone_defaults(),
mesecons = {receptor = {
state = mesecon.state.on,
rules = mesecon.rules.buttonlike_get
@ -101,7 +101,7 @@ minetest.register_node("mesecons_button:button_wood_off", {
minetest.sound_play("mesecons_button_push", {pos=pos})
minetest.after(1, mesecon.button_turnoff, pos)
end,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {receptor = {
state = mesecon.state.off,
rules = mesecon.rules.buttonlike_get
@ -127,7 +127,7 @@ minetest.register_node("mesecons_button:button_wood_on", {
groups = {choppy=3, not_in_creative_inventory=1, attached_node=1, dig_by_water=1},
drop = 'mesecons_button:button_wood_off',
description = "Wooden Button",
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {receptor = {
state = mesecon.state.on,
rules = mesecon.rules.buttonlike_get

4
mods/redstone/mesecons_commandblock/init.lua
View file

@ -185,7 +185,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
after_place_node = after_place,
on_receive_fields = receive_fields,
can_dig = can_dig,
sounds = mcl_core.node_sound_stone_defaults(),
sounds = mcl_sounds.node_sound_stone_defaults(),
mesecons = {effector = {
action_on = commandblock_action_on
}},
@ -201,7 +201,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", {
after_place_node = after_place,
on_receive_fields = receive_fields,
can_dig = can_dig,
sounds = mcl_core.node_sound_stone_defaults(),
sounds = mcl_sounds.node_sound_stone_defaults(),
mesecons = {effector = {
action_off = commandblock_action_off
}}

2
mods/redstone/mesecons_delayer/init.lua
View file

@ -125,7 +125,7 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
end,
delayer_time = delaytime,
delayer_onstate = "mesecons_delayer:delayer_on_"..tostring(i),
sounds = mcl_core.node_sound_stone_defaults(),
sounds = mcl_sounds.node_sound_stone_defaults(),
mesecons = {
receptor =
{

4
mods/redstone/mesecons_lightstone/init.lua
View file

@ -4,7 +4,7 @@ minetest.register_node("mesecons_lightstone:lightstone_off", {
groups = {cracky=2, mesecon_effector_off = 1, mesecon = 2},
is_ground_content = false,
description= "Redstone Lamp",
sounds = mcl_core.node_sound_stone_defaults(),
sounds = mcl_sounds.node_sound_stone_defaults(),
mesecons = {effector = {
action_on = function (pos, node)
mesecon:swap_node(pos, "mesecons_lightstone:lightstone_on")
@ -20,7 +20,7 @@ minetest.register_node("mesecons_lightstone:lightstone_on", {
is_ground_content = false,
-- Real light level: 15 (Minetest caps at 14)
light_source = 14,
sounds = mcl_core.node_sound_stone_defaults(),
sounds = mcl_sounds.node_sound_stone_defaults(),
mesecons = {effector = {
action_off = function (pos, node)
mesecon:swap_node(pos, "mesecons_lightstone:lightstone_off")

2
mods/redstone/mesecons_noteblock/init.lua
View file

@ -15,7 +15,7 @@ minetest.register_node("mesecons_noteblock:noteblock", {
minetest.add_node(pos, {name = node.name, param2 = param2})
mesecon.noteblock_play(pos, param2)
end,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector = { -- play sound when activated
action_on = function (pos, node)
mesecon.noteblock_play(pos, node.param2)

22
mods/redstone/mesecons_pistons/init.lua
View file

@ -157,7 +157,7 @@ minetest.register_node("mesecons_pistons:piston_normal_off", {
is_ground_content = false,
after_place_node = piston_orientate,
mesecons_piston = pistonspec_normal,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_on = piston_on,
rules = piston_get_rules
@ -186,7 +186,7 @@ minetest.register_node("mesecons_pistons:piston_normal_on", {
node_box = piston_on_box,
selection_box = piston_on_box,
mesecons_piston = pistonspec_normal,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_off = piston_off,
rules = piston_get_rules
@ -241,7 +241,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", {
is_ground_content = false,
after_place_node = piston_orientate,
mesecons_piston = pistonspec_sticky,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_on = piston_on,
rules = piston_get_rules
@ -270,7 +270,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", {
node_box = piston_on_box,
selection_box = piston_on_box,
mesecons_piston = pistonspec_sticky,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_off = piston_off,
rules = piston_get_rules
@ -372,7 +372,7 @@ minetest.register_node("mesecons_pistons:piston_up_normal_on", {
node_box = piston_up_on_box,
selection_box = piston_up_on_box,
mesecons_piston = pistonspec_normal_up,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_off = piston_off,
rules = piston_up_rules,
@ -430,7 +430,7 @@ minetest.register_node("mesecons_pistons:piston_up_sticky_off", {
is_ground_content = false,
drop = "mesecons_pistons:piston_sticky_off",
mesecons_piston = pistonspec_sticky_up,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_on = piston_on,
rules = piston_up_rules,
@ -459,7 +459,7 @@ minetest.register_node("mesecons_pistons:piston_up_sticky_on", {
node_box = piston_up_on_box,
selection_box = piston_up_on_box,
mesecons_piston = pistonspec_sticky_up,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_off = piston_off,
rules = piston_up_rules,
@ -535,7 +535,7 @@ minetest.register_node("mesecons_pistons:piston_down_normal_off", {
is_ground_content = false,
drop = "mesecons_pistons:piston_normal_off",
mesecons_piston = pistonspec_normal_down,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_on = piston_on,
rules = piston_down_rules,
@ -564,7 +564,7 @@ minetest.register_node("mesecons_pistons:piston_down_normal_on", {
node_box = piston_down_on_box,
selection_box = piston_down_on_box,
mesecons_piston = pistonspec_normal_down,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_off = piston_off,
rules = piston_down_rules,
@ -618,7 +618,7 @@ minetest.register_node("mesecons_pistons:piston_down_sticky_off", {
is_ground_content = false,
drop = "mesecons_pistons:piston_sticky_off",
mesecons_piston = pistonspec_sticky_down,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_on = piston_on,
rules = piston_down_rules,
@ -647,7 +647,7 @@ minetest.register_node("mesecons_pistons:piston_down_sticky_on", {
node_box = piston_down_on_box,
selection_box = piston_down_on_box,
mesecons_piston = pistonspec_sticky_down,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {effector={
action_off = piston_off,
rules = piston_down_rules,

4
mods/redstone/mesecons_pressureplates/init.lua
View file

@ -115,7 +115,7 @@ mesecon:register_pressure_plate(
"default_wood.png",
"default_wood.png",
{{"group:wood", "group:wood"}},
mcl_core.node_sound_wood_defaults())
mcl_sounds.node_sound_wood_defaults())
mesecon:register_pressure_plate(
"mesecons_pressureplates:pressure_plate_stone_off",
@ -124,7 +124,7 @@ mesecon:register_pressure_plate(
"default_stone.png",
"default_stone.png",
{{"mcl_core:stone", "mcl_core:stone"}},
mcl_core.node_sound_stone_defaults())
mcl_sounds.node_sound_stone_defaults())
minetest.register_craft({
type = "fuel",

8
mods/redstone/mesecons_solarpanel/init.lua
View file

@ -20,7 +20,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_on", {
drop = "mesecons_solarpanel:solar_panel_off",
description="Daylight Sensor",
groups = {dig_immediate=3, not_in_creative_inventory = 1},
sounds = mcl_core.node_sound_glass_defaults(),
sounds = mcl_sounds.node_sound_glass_defaults(),
mesecons = {receptor = {
state = mesecon.state.on
}},
@ -49,7 +49,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", {
},
groups = {dig_immediate=3},
description="Daylight Sensor",
sounds = mcl_core.node_sound_glass_defaults(),
sounds = mcl_sounds.node_sound_glass_defaults(),
mesecons = {receptor = {
state = mesecon.state.off
}},
@ -118,7 +118,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_on", {
drop = "mesecons_solarpanel:solar_panel_off",
groups = {dig_immediate=3, not_in_creative_inventory = 1},
description="Inverted Daylight Sensor",
sounds = mcl_core.node_sound_glass_defaults(),
sounds = mcl_sounds.node_sound_glass_defaults(),
mesecons = {receptor = {
state = mesecon.state.on
}},
@ -148,7 +148,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_off", {
drop = "mesecons_solarpanel:solar_panel_off",
groups = {dig_immediate=3, not_in_creative_inventory=1},
description="Inverted Daylight Sensor",
sounds = mcl_core.node_sound_glass_defaults(),
sounds = mcl_sounds.node_sound_glass_defaults(),
mesecons = {receptor = {
state = mesecon.state.off
}},

6
mods/redstone/mesecons_torch/init.lua
View file

@ -46,7 +46,7 @@ mcl_torches.register_torch("mesecon_torch_off", "Mesecon Torch (off)", "jeija_to
{"jeija_torches_off.png"},
0,
{dig_immediate=3, dig_by_water=1, not_in_creative_inventory=1},
mcl_core.node_sound_wood_defaults(),
mcl_sounds.node_sound_wood_defaults(),
{
mesecons = {receptor = {
state = mesecon.state.off,
@ -61,7 +61,7 @@ mcl_torches.register_torch("mesecon_torch_on", "Mesecon Torch", "jeija_torches_o
{"jeija_torches_on.png"},
7,
{dig_immediate=3, dig_by_water=1},
mcl_core.node_sound_wood_defaults(),
mcl_sounds.node_sound_wood_defaults(),
{
mesecons = {receptor = {
state = mesecon.state.on,
@ -75,7 +75,7 @@ minetest.register_node("mesecons_torch:redstoneblock", {
tiles = {"default_redstone_block.png"},
stack_max = 64,
groups = {cracky=1},
sounds = mcl_core.node_sound_stone_defaults(),
sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false,
mesecons = {receptor = {
state = mesecon.state.on,

4
mods/redstone/mesecons_walllever/init.lua
View file

@ -35,7 +35,7 @@ minetest.register_node("mesecons_walllever:wall_lever_off", {
mesecon:receptor_on(pos, mesecon.rules.buttonlike_get(node))
minetest.sound_play("mesecons_lever", {pos=pos})
end,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {receptor = {
rules = mesecon.rules.buttonlike_get,
state = mesecon.state.off
@ -75,7 +75,7 @@ minetest.register_node("mesecons_walllever:wall_lever_on", {
mesecon:receptor_off(pos, mesecon.rules.buttonlike_get(node))
minetest.sound_play("mesecons_lever", {pos=pos})
end,
sounds = mcl_core.node_sound_wood_defaults(),
sounds = mcl_sounds.node_sound_wood_defaults(),
mesecons = {receptor = {
rules = mesecon.rules.buttonlike_get,
state = mesecon.state.on