diff --git a/games/default/files/default/sounds/default_dirt_footstep.1.ogg b/games/default/files/default/sounds/default_dirt_footstep.1.ogg index 84a197d2b..201aa3b2d 100644 Binary files a/games/default/files/default/sounds/default_dirt_footstep.1.ogg and b/games/default/files/default/sounds/default_dirt_footstep.1.ogg differ diff --git a/games/default/files/default/sounds/default_dirt_footstep.2.ogg b/games/default/files/default/sounds/default_dirt_footstep.2.ogg index 2e23b8a2b..2667dbc21 100644 Binary files a/games/default/files/default/sounds/default_dirt_footstep.2.ogg and b/games/default/files/default/sounds/default_dirt_footstep.2.ogg differ diff --git a/games/default/files/default/sounds/default_place_node_hard.1.ogg b/games/default/files/default/sounds/default_place_node_hard.1.ogg index 76eecf976..9f97facad 100644 Binary files a/games/default/files/default/sounds/default_place_node_hard.1.ogg and b/games/default/files/default/sounds/default_place_node_hard.1.ogg differ diff --git a/games/default/files/default/sounds/default_snow_footstep.1.ogg b/games/default/files/default/sounds/default_snow_footstep.1.ogg index 3260b915f..97cc8252e 100644 Binary files a/games/default/files/default/sounds/default_snow_footstep.1.ogg and b/games/default/files/default/sounds/default_snow_footstep.1.ogg differ diff --git a/games/default/files/default/sounds/default_snow_footstep.2.ogg b/games/default/files/default/sounds/default_snow_footstep.2.ogg index 4aac1e7fa..97a6baa48 100644 Binary files a/games/default/files/default/sounds/default_snow_footstep.2.ogg and b/games/default/files/default/sounds/default_snow_footstep.2.ogg differ diff --git a/games/default/files/default/sounds/default_snow_footstep.3.ogg b/games/default/files/default/sounds/default_snow_footstep.3.ogg index cf4235b7b..bde1f21d4 100644 Binary files a/games/default/files/default/sounds/default_snow_footstep.3.ogg and b/games/default/files/default/sounds/default_snow_footstep.3.ogg differ diff --git a/games/default/files/default/sounds/default_snow_footstep.4.ogg b/games/default/files/default/sounds/default_snow_footstep.4.ogg new file mode 100644 index 000000000..8ca6a590d Binary files /dev/null and b/games/default/files/default/sounds/default_snow_footstep.4.ogg differ diff --git a/games/default/files/default/sounds/default_snow_footstep.5.ogg b/games/default/files/default/sounds/default_snow_footstep.5.ogg new file mode 100644 index 000000000..220d60c93 Binary files /dev/null and b/games/default/files/default/sounds/default_snow_footstep.5.ogg differ diff --git a/games/default/files/doors/init.lua b/games/default/files/doors/init.lua index 05a2ed156..b985eee72 100644 --- a/games/default/files/doors/init.lua +++ b/games/default/files/doors/init.lua @@ -174,9 +174,9 @@ function doors:register_door(name, def) if check_player_priv(pos, clicker) then on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0}) if is_right(pos, clicker) then - minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) else - minetest.sound_play("door_open", {pos = pos, gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10}) end end end, @@ -209,9 +209,9 @@ function doors:register_door(name, def) if check_player_priv(pos, clicker) then on_rightclick(pos, -1, name.."_b_1", name.."_t_2", name.."_b_2", {1,2,3,0}) if is_right(pos, clicker) then - minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) else - minetest.sound_play("door_open", {pos = pos, gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10}) end end end, @@ -244,9 +244,9 @@ function doors:register_door(name, def) if check_player_priv(pos, clicker) then on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2}) if is_right(pos, clicker) then - minetest.sound_play("door_open", {gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_open", {gain = 0.3, max_hear_distance = 10}) else - minetest.sound_play("door_close", {gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_close", {gain = 0.3, max_hear_distance = 10}) end end end, @@ -279,9 +279,9 @@ function doors:register_door(name, def) if check_player_priv(pos, clicker) then on_rightclick(pos, -1, name.."_b_2", name.."_t_1", name.."_b_1", {3,0,1,2}) if is_right(pos, clicker) then - minetest.sound_play("door_open", {pos=pos, gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_open", {pos=pos, gain = 0.3, max_hear_distance = 10}) else - minetest.sound_play("door_close", {gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_close", {gain = 0.3, max_hear_distance = 10}) end end end, @@ -415,12 +415,12 @@ local function punch(pos) oben = {x=pos.x, y=pos.y+1, z=pos.z} if state == 1 then state = 0 - minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) tmp_node = {name="doors:trapdoor", param1=me.param1, param2=me.param2} else state = 1 - minetest.sound_play("door_open", {pos = pos, gain = 0.3, max_hear_distance = 10}) - tmp_node = {name="doors:trapdoor_open", param1=me.param1, param2=me.param2} + minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10}) + tmp_node = {name="doors:trapdoors_door_open", param1=me.param1, param2=me.param2} end update_door(pos, tmp_node) meta:set_int("state", state) @@ -473,7 +473,7 @@ minetest.register_node("doors:trapdoor", { }) -minetest.register_node("doors:trapdoor_open", { +minetest.register_node("doors:trapdoors_door_open", { drawtype = "nodebox", tiles = {"default_wood.png", "default_wood.png", "default_wood.png", "default_wood.png", "door_trapdoor.png", "door_trapdoor.png"}, paramtype = "light", @@ -532,12 +532,12 @@ local function punch(pos) oben = {x=pos.x, y=pos.y+1, z=pos.z} if state == 1 then state = 0 - minetest.sound_play("door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) + minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10}) tmp_node = {name="doors:iron_trapdoor", param1=me.param1, param2=me.param2} else state = 1 - minetest.sound_play("door_open", {pos = pos, gain = 0.3, max_hear_distance = 10}) - tmp_node = {name="doors:iron_trapdoor_open", param1=me.param1, param2=me.param2} + minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10}) + tmp_node = {name="doors:iron_trapdoors_door_open", param1=me.param1, param2=me.param2} end update_door(pos, tmp_node) meta:set_int("state", state) @@ -587,7 +587,7 @@ minetest.register_node("doors:iron_trapdoor", { }) -minetest.register_node("doors:iron_trapdoor_open", { +minetest.register_node("doors:iron_trapdoors_door_open", { drawtype = "nodebox", tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "iron_trapdoor.png", "iron_trapdoor.png"}, paramtype = "light", diff --git a/games/default/files/doors/sounds/door_close.ogg b/games/default/files/doors/sounds/door_close.ogg deleted file mode 100644 index a39452ba1..000000000 Binary files a/games/default/files/doors/sounds/door_close.ogg and /dev/null differ diff --git a/games/default/files/doors/sounds/door_open.ogg b/games/default/files/doors/sounds/door_open.ogg deleted file mode 100644 index 7ec7f4809..000000000 Binary files a/games/default/files/doors/sounds/door_open.ogg and /dev/null differ diff --git a/games/default/files/doors/sounds/doors_door_close.ogg b/games/default/files/doors/sounds/doors_door_close.ogg new file mode 100644 index 000000000..fede4af32 Binary files /dev/null and b/games/default/files/doors/sounds/doors_door_close.ogg differ diff --git a/games/default/files/doors/sounds/doors_door_open.ogg b/games/default/files/doors/sounds/doors_door_open.ogg new file mode 100644 index 000000000..9a4c4f111 Binary files /dev/null and b/games/default/files/doors/sounds/doors_door_open.ogg differ diff --git a/games/default/files/drops/sounds/item_drop_pickup.1.ogg b/games/default/files/drops/sounds/item_drop_pickup.1.ogg index 2ae432d59..7b450d88a 100644 Binary files a/games/default/files/drops/sounds/item_drop_pickup.1.ogg and b/games/default/files/drops/sounds/item_drop_pickup.1.ogg differ diff --git a/games/default/files/drops/sounds/item_drop_pickup.2.ogg b/games/default/files/drops/sounds/item_drop_pickup.2.ogg index f58bf08e0..9d659c868 100644 Binary files a/games/default/files/drops/sounds/item_drop_pickup.2.ogg and b/games/default/files/drops/sounds/item_drop_pickup.2.ogg differ diff --git a/games/default/files/drops/sounds/item_drop_pickup.3.ogg b/games/default/files/drops/sounds/item_drop_pickup.3.ogg index cf57c94c7..a2ef6a1a0 100644 Binary files a/games/default/files/drops/sounds/item_drop_pickup.3.ogg and b/games/default/files/drops/sounds/item_drop_pickup.3.ogg differ diff --git a/games/default/files/drops/sounds/item_drop_pickup.4.ogg b/games/default/files/drops/sounds/item_drop_pickup.4.ogg index bfe99d9a3..c9aebc3c3 100644 Binary files a/games/default/files/drops/sounds/item_drop_pickup.4.ogg and b/games/default/files/drops/sounds/item_drop_pickup.4.ogg differ diff --git a/games/default/files/mobs_animal/sounds/mobs_bear.ogg b/games/default/files/mobs_animal/sounds/mobs_bear.ogg index 5245605f5..3e5623f4f 100644 Binary files a/games/default/files/mobs_animal/sounds/mobs_bear.ogg and b/games/default/files/mobs_animal/sounds/mobs_bear.ogg differ diff --git a/games/default/files/mobs_animal/sounds/mobs_bear_angry.ogg b/games/default/files/mobs_animal/sounds/mobs_bear_angry.ogg index 6866651d2..7b7e9a1e0 100644 Binary files a/games/default/files/mobs_animal/sounds/mobs_bear_angry.ogg and b/games/default/files/mobs_animal/sounds/mobs_bear_angry.ogg differ diff --git a/games/default/files/mobs_animal/sounds/mobs_kitten.ogg b/games/default/files/mobs_animal/sounds/mobs_kitten.ogg index 021d3dc79..2496dd8f1 100644 Binary files a/games/default/files/mobs_animal/sounds/mobs_kitten.ogg and b/games/default/files/mobs_animal/sounds/mobs_kitten.ogg differ diff --git a/games/default/files/mobs_animal/sounds/mobs_sheep_angry.ogg b/games/default/files/mobs_animal/sounds/mobs_sheep_angry.ogg index 371d2bda9..7d957ab05 100644 Binary files a/games/default/files/mobs_animal/sounds/mobs_sheep_angry.ogg and b/games/default/files/mobs_animal/sounds/mobs_sheep_angry.ogg differ diff --git a/games/default/files/mobs_monster/sounds/mobs_zombie.3.ogg b/games/default/files/mobs_monster/sounds/mobs_zombie.3.ogg index a63976939..685692fe9 100644 Binary files a/games/default/files/mobs_monster/sounds/mobs_zombie.3.ogg and b/games/default/files/mobs_monster/sounds/mobs_zombie.3.ogg differ diff --git a/games/default/files/mobs_redo/sounds/mobs_swing.ogg b/games/default/files/mobs_redo/sounds/mobs_swing.ogg index ffe6a9ce1..e3fc2ec55 100644 Binary files a/games/default/files/mobs_redo/sounds/mobs_swing.ogg and b/games/default/files/mobs_redo/sounds/mobs_swing.ogg differ diff --git a/textures/base/refresh.png b/textures/base/refresh.png index 2c60552b0..00094d233 100644 Binary files a/textures/base/refresh.png and b/textures/base/refresh.png differ diff --git a/textures/base/search.png b/textures/base/search.png index 5bd9ed220..1505e5015 100644 Binary files a/textures/base/search.png and b/textures/base/search.png differ diff --git a/textures/base/server_flags_mc.png b/textures/base/server_flags_mc.png index fb50be137..175f4342c 100644 Binary files a/textures/base/server_flags_mc.png and b/textures/base/server_flags_mc.png differ diff --git a/textures/base/server_flags_mt.png b/textures/base/server_flags_mt.png index 368095e63..14aad37f1 100644 Binary files a/textures/base/server_flags_mt.png and b/textures/base/server_flags_mt.png differ diff --git a/textures/base/server_ping_1.png b/textures/base/server_ping_1.png index 53c7fccb1..b94760236 100644 Binary files a/textures/base/server_ping_1.png and b/textures/base/server_ping_1.png differ diff --git a/textures/base/server_ping_2.png b/textures/base/server_ping_2.png index c1ef52c0a..7f588ecdb 100644 Binary files a/textures/base/server_ping_2.png and b/textures/base/server_ping_2.png differ diff --git a/textures/base/server_ping_3.png b/textures/base/server_ping_3.png index b05e6f1fd..331a1df1c 100644 Binary files a/textures/base/server_ping_3.png and b/textures/base/server_ping_3.png differ diff --git a/textures/base/server_ping_4.png b/textures/base/server_ping_4.png index ab9625277..1c5df1468 100644 Binary files a/textures/base/server_ping_4.png and b/textures/base/server_ping_4.png differ diff --git a/textures/base/trash.png b/textures/base/trash.png index 4e71fdebc..b3638201f 100644 Binary files a/textures/base/trash.png and b/textures/base/trash.png differ