From 12d2c161749707cc0d70d5e81ae2b13cf513714c Mon Sep 17 00:00:00 2001 From: LegendaryGuard Date: Sun, 13 Jun 2021 00:40:12 +0200 Subject: [PATCH] Add sound implementation for playercrush SMB feature --- .../mutator/player_crush/player_crush.qc | 7 +++++++ sound/misc/goomba.ogg | Bin 0 -> 13399 bytes 2 files changed, 7 insertions(+) create mode 100644 sound/misc/goomba.ogg diff --git a/qcsrc/common/mutators/mutator/player_crush/player_crush.qc b/qcsrc/common/mutators/mutator/player_crush/player_crush.qc index af7824483..a72c226a1 100644 --- a/qcsrc/common/mutators/mutator/player_crush/player_crush.qc +++ b/qcsrc/common/mutators/mutator/player_crush/player_crush.qc @@ -9,6 +9,8 @@ REGISTER_STAT(PLAYER_CRUSH_BOUNCE, float, autocvar_g_player_crush_bounce) REGISTER_STAT(PLAYER_CRUSH_BOUNCE_JUMP, float, autocvar_g_player_crush_bounce_jump) #ifdef GAMEQC +SOUND(GOOMBA_STOMP, "misc/goomba"); + void pc_PlayerTouch(entity this, entity toucher) { if(toucher == NULL) @@ -53,7 +55,10 @@ void pc_PlayerTouch(entity this, entity toucher) vector vdir = normalize(toucher.origin - this.origin); if(vdir_z > autocvar_g_player_crush_headheight) // adjust this to set how sharp from above players need to hit the player to crush them. + { Damage (this, toucher, toucher, autocvar_g_player_crush_damage, DEATH_VH_CRUSH.m_id, DMG_NOWEP, this.origin, '0 0 0'); + sound(toucher, CH_TRIGGER_SINGLE, SND_GOOMBA_STOMP, VOL_BASE, ATTEN_NORM); + } #endif #ifdef GAMEQC @@ -84,6 +89,7 @@ void pc_PlayerTouch(entity this, entity toucher) animdecide_setaction(this, ANIMACTION_JUMP, true); Damage (toucher, this, this, autocvar_g_player_crush_damage, DEATH_VH_CRUSH.m_id, DMG_NOWEP, toucher.origin, '0 0 0'); + sound(this, CH_TRIGGER_SINGLE, SND_GOOMBA_STOMP, VOL_BASE, ATTEN_NORM); #endif #ifdef GAMEQC } @@ -112,6 +118,7 @@ void pc_PlayerTouch(entity this, entity toucher) animdecide_setaction(this, ANIMACTION_JUMP, true); Damage (toucher, this, this, autocvar_g_player_crush_damage, DEATH_VH_CRUSH.m_id, DMG_NOWEP, toucher.origin, '0 0 0'); + sound(this, CH_TRIGGER_SINGLE, SND_GOOMBA_STOMP, VOL_BASE, ATTEN_NORM); #endif #ifdef GAMEQC } diff --git a/sound/misc/goomba.ogg b/sound/misc/goomba.ogg new file mode 100644 index 0000000000000000000000000000000000000000..1a499a8f1824da189bee22c1e1234ab26025343a GIT binary patch literal 13399 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 l>eC+wDmxsu{Y=c7$gB^_TfJ_