diff --git a/pkg/base/common.lua b/pkg/base/common.lua index bfcccf5..c51a314 100644 --- a/pkg/base/common.lua +++ b/pkg/base/common.lua @@ -122,6 +122,7 @@ if client then wav_buld = skin_load("wav", "buld.wav", DIR_PKG_WAV) wav_grif = skin_load("wav", "grif.wav", DIR_PKG_WAV) wav_hammer = skin_load("wav", "hammer.wav", DIR_PKG_WAV) + wav_swish = skin_load("wav", "swish.wav", DIR_PKG_WAV) wav_jump_up = skin_load("wav", "jump-up.wav", DIR_PKG_WAV) wav_jump_down = skin_load("wav", "jump-down.wav", DIR_PKG_WAV) wav_pin = skin_load("wav", "pin.wav", DIR_PKG_WAV) diff --git a/pkg/base/network.lua b/pkg/base/network.lua index 647427d..922bf20 100644 --- a/pkg/base/network.lua +++ b/pkg/base/network.lua @@ -351,8 +351,12 @@ network.sys_handle_s2c(PKT_TEAM_SCORE, "bh", function (sockfd, cli, plr, sec_cur teams[tidx].score = score end) network.sys_handle_s2c(PKT_BLK_DAMAGE, "HHHH", function (sockfd, cli, plr, sec_current, x, y, z, amt, pkt) - client.wav_play_global(wav_hammer, x, y, z) - bhealth_damage(x, y, z, amt) + if map_block_get(x, y, z) then + client.wav_play_global(wav_hammer, x, y, z) + bhealth_damage(x, y, z, amt) + else + client.wav_play_global(wav_swish, x, y, z) + end end) network.sys_handle_s2c(PKT_PIANO, "B", function (sockfd, cli, plr, sec_current, pid, pkt) local plr = players[pid]