+ explosive fizzle sound

momentum-mod · Oct 27, 2020 · 53c904e · 53c904e
1 parent 4c7bb93
commit 53c904e
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 0 deletions.
diff --git a/mp/game/momentum/scripts/game_sounds_momentum_weapons.txt b/mp/game/momentum/scripts/game_sounds_momentum_weapons.txt
@@ -76,6 +76,16 @@
     "wave"          "weapons/mom_rocketlauncher/mom_rocketlauncher-RocketTrail.wav"
 }
 
+"Rocket.Fizzle"
+{
+    "channel"    "CHAN_STATIC"
+    "volume"     "0.42"
+    "soundlevel" "SNDLVL_NORM"
+    "pitch"      "70,80"
+
+    "wave" "weapons/physcannon/physcannon_dryfire.wav"
+}
+
 "Weapon_RL.Explosion"
 {
     "channel"       "CHAN_STATIC"
@@ -169,6 +179,16 @@
 
 }
 
+"Stickybomb.Fizzle"
+{
+    "channel"    "CHAN_STATIC"
+    "volume"     "0.42"
+    "soundlevel" "SNDLVL_NORM"
+    "pitch"      "70,80"
+
+    "wave" "^weapons/physcannon/physcannon_dryfire.wav"
+}
+
 "Weapon_Pistol.Single"
 {
 	"channel"		"CHAN_WEAPON"

diff --git a/mp/game/momentum/scripts/weapon_momentum_rocketlauncher.txt b/mp/game/momentum/scripts/weapon_momentum_rocketlauncher.txt
@@ -31,6 +31,7 @@ WeaponData
         "single_shot"       "Weapon_RL.Single"
         "explosion"         "Weapon_RL.Explosion"
         "RocketTrail"       "Rocket.Trail"
+        "RocketFizzle"      "Rocket.Fizzle"
     }
 
     // Weapon particles

diff --git a/mp/game/momentum/scripts/weapon_momentum_stickylauncher.txt b/mp/game/momentum/scripts/weapon_momentum_stickylauncher.txt
@@ -33,6 +33,7 @@ WeaponData
         "deny"              "StickybombLauncher.Deny"
         "charge"            "StickybombLauncher.Charge"
         "chargestop"        "StickybombLauncher.ChargeStop"
+        "StickyFizzle"      "Stickybomb.Fizzle"
     }
 
     // Weapon particles

diff --git a/mp/src/game/shared/momentum/mom_explosive.cpp b/mp/src/game/shared/momentum/mom_explosive.cpp
@@ -137,6 +137,7 @@ void CMomExplosive::Fizzle()
     Destroy();
 
     ShowFizzleSprite();
+    PlayFizzleSound();
 }
 
 void CMomExplosive::ShowFizzleSprite()

diff --git a/mp/src/game/shared/momentum/mom_explosive.h b/mp/src/game/shared/momentum/mom_explosive.h
@@ -32,6 +32,7 @@ class CMomExplosive : public CBaseProjectile
     virtual void Destroy();
     virtual void Fizzle();
     virtual void ShowFizzleSprite();
+    virtual void PlayFizzleSound() {}
     virtual void InitExplosive(CBaseEntity *pOwner, const Vector &velocity, const QAngle &angles);
 
     float GetDamage() const { return m_fDamage; }

diff --git a/mp/src/game/shared/momentum/mom_rocket.cpp b/mp/src/game/shared/momentum/mom_rocket.cpp
@@ -25,6 +25,7 @@ PRECACHE_WEAPON_REGISTER(momentum_rocket);
 
 #ifdef GAME_DLL
 static MAKE_TOGGLE_CONVAR(mom_rj_sound_trail_enable, "1", FCVAR_ARCHIVE, "Toggles the rocket trail sound. 0 = OFF, 1 = ON\n");
+static MAKE_TOGGLE_CONVAR(mom_rj_sound_fizzle_enable, "1", FCVAR_ARCHIVE | FCVAR_REPLICATED, "Toggles the rocket fizzle sound. 0 = OFF, 1 = ON\n");
 static MAKE_TOGGLE_CONVAR(mom_rj_decals_enable, "1", FCVAR_ARCHIVE, "Toggles creating decals on rocket explosion. 0 = OFF, 1 = ON\n");
 #else
 static MAKE_TOGGLE_CONVAR(mom_rj_particle_trail_enable, "1", FCVAR_ARCHIVE, "Toggles the rocket trail particle. 0 = OFF, 1 = ON\n");
@@ -101,6 +102,14 @@ void CMomRocket::Destroy()
     BaseClass::Destroy();
 }
 
+void CMomRocket::PlayFizzleSound()
+{
+    if (mom_rj_sound_fizzle_enable.GetBool())
+    {
+        EmitSound(g_pWeaponDef->GetWeaponSound(WEAPON_ROCKETLAUNCHER, "RocketFizzle"));
+    }
+}
+
 void CMomRocket::Explode(trace_t *pTrace, CBaseEntity *pOther)
 {
     if (CNoGrenadesZone::IsInsideNoGrenadesZone(this))

diff --git a/mp/src/game/shared/momentum/mom_rocket.h b/mp/src/game/shared/momentum/mom_rocket.h
@@ -21,6 +21,7 @@ class CMomRocket : public CMomExplosive
 #else
     float GetDamageAmount() override;
     void Destroy() override;
+    void PlayFizzleSound() override;
 
     void RocketTouch(CBaseEntity *pOther);
     void Explode(trace_t *pTrace, CBaseEntity *pOther);

diff --git a/mp/src/game/shared/momentum/mom_stickybomb.cpp b/mp/src/game/shared/momentum/mom_stickybomb.cpp
@@ -49,6 +49,7 @@ static MAKE_TOGGLE_CONVAR(mom_sj_particle_trail_enable, "1", FCVAR_ARCHIVE,
                           "Toggles the sticky trail particle. 0 = OFF, 1 = ON\n");
 #else
 static MAKE_TOGGLE_CONVAR(mom_sj_decals_enable, "1", FCVAR_ARCHIVE, "Toggles creating decals on sticky explosion. 0 = OFF, 1 = ON\n");
+static MAKE_TOGGLE_CONVAR(mom_sj_sound_fizzle_enable, "1", FCVAR_ARCHIVE | FCVAR_REPLICATED, "Toggles the stickybomb fizzle sound. 0 = OFF, 1 = ON\n");
 #endif
 
 CMomStickybomb::CMomStickybomb()
@@ -230,6 +231,15 @@ void CMomStickybomb::InitExplosive(CBaseEntity *pOwner, const Vector &velocity,
 void CMomStickybomb::Fizzle()
 {
     Dissolve(nullptr, gpGlobals->curtime, false, ENTITY_DISSOLVE_CORE);
+    PlayFizzleSound();
+}
+
+void CMomStickybomb::PlayFizzleSound()
+{
+    if (mom_sj_sound_fizzle_enable.GetBool())
+    {
+        EmitSound(g_pWeaponDef->GetWeaponSound(WEAPON_STICKYLAUNCHER, "StickyFizzle"));
+    }
 }
 
 void CMomStickybomb::Detonate()

diff --git a/mp/src/game/shared/momentum/mom_stickybomb.h b/mp/src/game/shared/momentum/mom_stickybomb.h
@@ -39,6 +39,7 @@ class CMomStickybomb : public CMomExplosive
 
     void Explode(trace_t *pTrace, CBaseEntity *pOther);
     void Fizzle() override;
+    void PlayFizzleSound() override;
 
     void Detonate();
     void VPhysicsCollision(int index, gamevcollisionevent_t *pEvent) override;