Skip to content

Commit ff73d0e

Browse files
numberZeronumberZero
authoredJul 17, 2018
Merge pull request #401 from Wuzzy2/sfx
Add missing sound effects and fix wrong pressure plate sounds
·
v2022-04-01v1.2
2 parents 7013f2e + 5ae3354 commit ff73d0e

File tree

12 files changed

+47
-10
lines changed

12 files changed

+47
-10
lines changed
 

Diff for: ‎mesecons_delayer/init.lua

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), {
158158
end,
159159
delayer_time = delaytime,
160160
delayer_offstate = "mesecons_delayer:delayer_off_"..tostring(i),
161+
sounds = default.node_sound_stone_defaults(),
161162
mesecons = {
162163
receptor =
163164
{

Diff for: ‎mesecons_extrawires/corner.lua

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ minetest.register_node("mesecons_extrawires:corner_on", {
4242
node_box = corner_nodebox,
4343
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
4444
drop = "mesecons_extrawires:corner_off",
45+
sounds = default.node_sound_defaults(),
4546
mesecons = {conductor =
4647
{
4748
state = mesecon.state.on,
@@ -71,6 +72,7 @@ minetest.register_node("mesecons_extrawires:corner_off", {
7172
selection_box = corner_selectionbox,
7273
node_box = corner_nodebox,
7374
groups = {dig_immediate = 3},
75+
sounds = default.node_sound_defaults(),
7476
mesecons = {conductor =
7577
{
7678
state = mesecon.state.off,

Diff for: ‎mesecons_extrawires/crossover.lua

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ minetest.register_node("mesecons_extrawires:crossover_off", {
3434
stack_max = 99,
3535
selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
3636
groups = {dig_immediate=3, mesecon=3},
37+
sounds = default.node_sound_defaults(),
3738
mesecons = {
3839
conductor = {
3940
states = crossover_states,
@@ -60,6 +61,7 @@ minetest.register_node("mesecons_extrawires:crossover_01", {
6061
stack_max = 99,
6162
selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
6263
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
64+
sounds = default.node_sound_defaults(),
6365
mesecons = {
6466
conductor = {
6567
states = crossover_states,
@@ -86,6 +88,7 @@ minetest.register_node("mesecons_extrawires:crossover_10", {
8688
stack_max = 99,
8789
selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
8890
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
91+
sounds = default.node_sound_defaults(),
8992
mesecons = {
9093
conductor = {
9194
states = crossover_states,
@@ -112,6 +115,7 @@ minetest.register_node("mesecons_extrawires:crossover_on", {
112115
stack_max = 99,
113116
selection_box = {type="fixed", fixed={-16/32-0.0001, -18/32, -16/32-0.001, 16/32+0.001, -5/32, 16/32+0.001}},
114117
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
118+
sounds = default.node_sound_defaults(),
115119
mesecons = {
116120
conductor = {
117121
states = crossover_states,

Diff for: ‎mesecons_extrawires/tjunction.lua

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ minetest.register_node("mesecons_extrawires:tjunction_on", {
4343
node_box = tjunction_nodebox,
4444
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
4545
drop = "mesecons_extrawires:tjunction_off",
46+
sounds = default.node_sound_defaults(),
4647
mesecons = {conductor =
4748
{
4849
state = mesecon.state.on,
@@ -72,6 +73,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
7273
selection_box = tjunction_selectionbox,
7374
node_box = tjunction_nodebox,
7475
groups = {dig_immediate = 3},
76+
sounds = default.node_sound_defaults(),
7577
mesecons = {conductor =
7678
{
7779
state = mesecon.state.off,

Diff for: ‎mesecons_extrawires/vertical.lua

+6-3
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ mesecon.register_node("mesecons_extrawires:vertical", {
8888
is_vertical_conductor = true,
8989
drop = "mesecons_extrawires:vertical_off",
9090
after_place_node = vertical_update,
91-
after_dig_node = vertical_update
91+
after_dig_node = vertical_update,
92+
sounds = default.node_sound_defaults(),
9293
},{
9394
tiles = {"mesecons_wire_off.png"},
9495
groups = {dig_immediate=3},
@@ -121,7 +122,8 @@ mesecon.register_node("mesecons_extrawires:vertical_top", {
121122
is_vertical_conductor = true,
122123
drop = "mesecons_extrawires:vertical_off",
123124
after_place_node = vertical_update,
124-
after_dig_node = vertical_update
125+
after_dig_node = vertical_update,
126+
sounds = default.node_sound_defaults(),
125127
},{
126128
tiles = {"mesecons_wire_off.png"},
127129
mesecons = {conductor = {
@@ -152,7 +154,8 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", {
152154
is_vertical_conductor = true,
153155
drop = "mesecons_extrawires:vertical_off",
154156
after_place_node = vertical_update,
155-
after_dig_node = vertical_update
157+
after_dig_node = vertical_update,
158+
sounds = default.node_sound_defaults(),
156159
},{
157160
tiles = {"mesecons_wire_off.png"},
158161
mesecons = {conductor = {

Diff for: ‎mesecons_hydroturbine/init.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
2222
type = "fixed",
2323
fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
2424
},
25-
sounds = default.node_sound_stone_defaults(),
25+
sounds = default.node_sound_metal_defaults(),
2626
mesecons = {receptor = {
2727
state = mesecon.state.off
2828
}},
@@ -51,7 +51,7 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
5151
type = "fixed",
5252
fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
5353
},
54-
sounds = default.node_sound_stone_defaults(),
54+
sounds = default.node_sound_metal_defaults(),
5555
mesecons = {receptor = {
5656
state = mesecon.state.on
5757
}},

Diff for: ‎mesecons_insulated/init.lua

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ minetest.register_node("mesecons_insulated:insulated_on", {
3535
},
3636
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
3737
drop = "mesecons_insulated:insulated_off",
38+
sounds = default.node_sound_defaults(),
3839
mesecons = {conductor = {
3940
state = mesecon.state.on,
4041
offstate = "mesecons_insulated:insulated_off",
@@ -69,6 +70,7 @@ minetest.register_node("mesecons_insulated:insulated_off", {
6970
fixed = { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 }
7071
},
7172
groups = {dig_immediate = 3},
73+
sounds = default.node_sound_defaults(),
7274
mesecons = {conductor = {
7375
state = mesecon.state.off,
7476
onstate = "mesecons_insulated:insulated_on",

Diff for: ‎mesecons_pistons/init.lua

+2
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ minetest.register_node("mesecons_pistons:piston_pusher_normal", {
326326
node_box = piston_pusher_box,
327327
on_rotate = piston_rotate_pusher,
328328
drop = "",
329+
sounds = default.node_sound_wood_defaults(),
329330
})
330331

331332
-- Sticky ones
@@ -403,6 +404,7 @@ minetest.register_node("mesecons_pistons:piston_pusher_sticky", {
403404
node_box = piston_pusher_box,
404405
on_rotate = piston_rotate_pusher,
405406
drop = "",
407+
sounds = default.node_sound_wood_defaults(),
406408
})
407409

408410

Diff for: ‎mesecons_pressureplates/init.lua

+20-5
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,18 @@ end
4242
-- tiles_on: textures of the pressure plate when active
4343
-- image: inventory and wield image of the pressure plate
4444
-- recipe: crafting recipe of the pressure plate
45+
-- groups: groups
46+
-- sounds: sound table
47+
48+
function mesecon.register_pressure_plate(basename, description, textures_off, textures_on, image_w, image_i, recipe, groups, sounds)
49+
local groups_off, groups_on
50+
if not groups then
51+
groups = {}
52+
end
53+
local groups_off = table.copy(groups)
54+
local groups_on = table.copy(groups)
55+
groups_on.not_in_creative_inventory = 1
4556

46-
function mesecon.register_pressure_plate(basename, description, textures_off, textures_on, image_w, image_i, recipe)
4757
mesecon.register_node(basename, {
4858
drawtype = "nodebox",
4959
inventory_image = image_i,
@@ -56,17 +66,18 @@ function mesecon.register_pressure_plate(basename, description, textures_off, te
5666
on_construct = function(pos)
5767
minetest.get_node_timer(pos):start(mesecon.setting("pplate_interval", 0.1))
5868
end,
69+
sounds = sounds,
5970
},{
6071
mesecons = {receptor = { state = mesecon.state.off, rules = mesecon.rules.pplate }},
6172
node_box = pp_box_off,
6273
selection_box = pp_box_off,
63-
groups = {snappy = 2, oddly_breakable_by_hand = 3},
74+
groups = groups_off,
6475
tiles = textures_off
6576
},{
6677
mesecons = {receptor = { state = mesecon.state.on, rules = mesecon.rules.pplate }},
6778
node_box = pp_box_on,
6879
selection_box = pp_box_on,
69-
groups = {snappy = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1},
80+
groups = groups_on,
7081
tiles = textures_on
7182
})
7283

@@ -83,7 +94,9 @@ mesecon.register_pressure_plate(
8394
{"jeija_pressure_plate_wood_on.png","jeija_pressure_plate_wood_on.png","jeija_pressure_plate_wood_on_edges.png"},
8495
"jeija_pressure_plate_wood_wield.png",
8596
"jeija_pressure_plate_wood_inv.png",
86-
{{"group:wood", "group:wood"}})
97+
{{"group:wood", "group:wood"}},
98+
{ choppy = 3, oddly_breakable_by_hand = 3 },
99+
default.node_sound_wood_defaults())
87100

88101
mesecon.register_pressure_plate(
89102
"mesecons_pressureplates:pressure_plate_stone",
@@ -92,4 +105,6 @@ mesecon.register_pressure_plate(
92105
{"jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on.png","jeija_pressure_plate_stone_on_edges.png"},
93106
"jeija_pressure_plate_stone_wield.png",
94107
"jeija_pressure_plate_stone_inv.png",
95-
{{"default:cobble", "default:cobble"}})
108+
{{"default:cobble", "default:cobble"}},
109+
{ cracky = 3, oddly_breakable_by_hand = 3 },
110+
default.node_sound_stone_defaults())

Diff for: ‎mesecons_receiver/init.lua

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ mesecon.register_node("mesecons_receiver:receiver", {
5656
},
5757
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
5858
drop = "mesecons:wire_00000000_off",
59+
sounds = default.node_sound_defaults(),
5960
}, {
6061
tiles = {
6162
"receiver_top_off.png",
@@ -104,6 +105,7 @@ mesecon.register_node("mesecons_receiver:receiver_up", {
104105
},
105106
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
106107
drop = "mesecons:wire_00000000_off",
108+
sounds = default.node_sound_defaults(),
107109
}, {
108110
tiles = {"mesecons_wire_off.png"},
109111
mesecons = {conductor = {
@@ -148,6 +150,7 @@ mesecon.register_node("mesecons_receiver:receiver_down", {
148150
},
149151
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
150152
drop = "mesecons:wire_00000000_off",
153+
sounds = default.node_sound_defaults(),
151154
}, {
152155
tiles = {"mesecons_wire_off.png"},
153156
mesecons = {conductor = {

Diff for: ‎mesecons_torch/init.lua

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_off", {
6060
selection_box = torch_selectionbox,
6161
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
6262
drop = "mesecons_torch:mesecon_torch_on",
63+
sounds = default.node_sound_defaults(),
6364
mesecons = {receptor = {
6465
state = mesecon.state.off,
6566
rules = torch_get_output_rules
@@ -81,6 +82,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
8182
groups = {dig_immediate=3},
8283
light_source = default.LIGHT_MAX-5,
8384
description="Mesecon Torch",
85+
sounds = default.node_sound_defaults(),
8486
mesecons = {receptor = {
8587
state = mesecon.state.on,
8688
rules = torch_get_output_rules

Diff for: ‎mesecons_wires/init.lua

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ local function register_wires()
215215
walkable = false,
216216
drop = "mesecons:wire_00000000_off",
217217
mesecon_wire = true,
218+
sounds = default.node_sound_defaults(),
218219
on_rotate = false,
219220
}, {tiles = tiles_off, mesecons = meseconspec_off, groups = groups_off},
220221
{tiles = tiles_on, mesecons = meseconspec_on, groups = groups_on})

0 commit comments

Comments
 (0)
Please sign in to comment.