From 422e57d3d846029e21bf0ddb0b9b13ce82c6ec02 Mon Sep 17 00:00:00 2001
From: Xylemon <xylemon@posteo.net>
Date: Wed, 26 Apr 2023 17:33:12 -0700
Subject: [PATCH] weapon_gauss: Add special effect for overcharge, fix a
 mistake with overcharge damage, update gauss to use new weapon sound API

---
 src/shared/w_gauss.qc                     | 53 ++++++++++++++++++++---
 zpak001.pk3dir/sound/weapons_valve.sndshd |  8 ++++
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/src/shared/w_gauss.qc b/src/shared/w_gauss.qc
index a6f8742..b3ca530 100644
--- a/src/shared/w_gauss.qc
+++ b/src/shared/w_gauss.qc
@@ -54,8 +54,9 @@ void w_gauss_precache(void)
 	precache_sound("weapons/electro4.wav");
 	precache_sound("weapons/electro5.wav");
 	precache_sound("weapons/electro6.wav");
-	precache_sound("weapons/gauss2.wav");
 	Sound_Precache("weapon_gauss.empty");
+	Sound_Precache("weapon_gauss.fire");
+	Sound_Precache("weapon_gauss.overcharge");
 #else
 	precache_model("models/v_gauss.mdl");
 	precache_model("models/p_gauss.mdl");
@@ -124,7 +125,7 @@ void w_gauss_fire(player pl, int one)
 	vecCurPlane = trace_plane_normal;
 	vecCurPos = trace_endpos;
 
-	sound(pl, CHAN_WEAPON, "weapons/gauss2.wav", 1, ATTN_NORM);
+	pl.StartSoundDef("weapon_gauss.fire", CHAN_WEAPON, true);
 	int iDamage = one ? 20 : (int)rint((bound(0, pl.ammo_gauss_volume, 10) * 20));
 
 	if (serverkeyfloat("*bspversion") == BSPVER_HL)
@@ -174,7 +175,7 @@ void w_gauss_primary(player pl)
 	/* Ammo check */
 	if ((pl.ammo_uranium < 2) || (pl.WaterLevel() >= WATERLEVEL_SUBMERGED)) {
 #ifdef SERVER
-		Sound_Play(pl, CHAN_AUTO, "weapon_gauss.empty");
+		pl.StartSoundDef("weapon_gauss.fire", CHAN_WEAPON, true);
 #endif
 		pl.gflags |= GF_SEMI_TOGGLED;
 		return;
@@ -204,6 +205,11 @@ void w_gauss_release(player pl)
 		return;
 	}
 
+	/* do nothing if we overcharged */
+	if (pl.ammo_gauss_volume == 100) {
+		return;
+	}
+
 	/* if multiplayer then always fling the player
 	 * FIXME need a check for coop */
 	if (serverkeyfloat("sv_playerslots") > 1) {
@@ -264,6 +270,7 @@ void w_gauss_release(player pl)
 
 void w_gauss_secondary(player pl)
 {
+
 	if (pl.w_attack_next > 0.0)
 		return;
 	if (pl.gflags & GF_SEMI_TOGGLED)
@@ -280,7 +287,7 @@ void w_gauss_secondary(player pl)
 	/* regular ammo check */
 	if ((pl.ammo_uranium <= 0) || (pl.WaterLevel() >= WATERLEVEL_SUBMERGED)) {
 #ifdef SERVER
-		Sound_Play(pl, CHAN_AUTO, "weapon_gauss.empty");
+		pl.StartSoundDef("weapon_gauss.empty", CHAN_AUTO, true);
 #endif
 		pl.gflags |= GF_SEMI_TOGGLED;
 		return;
@@ -295,17 +302,21 @@ void w_gauss_secondary(player pl)
 	/* Set pitch sound shift */
 	pl.ammo_gauss_volume += 1;
 
-	/* holding it for too long, damage our owner */
+	/* holding it for too long, damage our owner (overcharge) */
 	if (pl.ammo_gauss_volume > 100) {
 		pl.ammo_gauss_volume = 100;
+		w_gauss_release(pl);
 #ifdef SERVER
-		Damage_Apply(pl, pl, 10, DMG_ELECTRO, WEAPON_GAUSS);
+		Damage_Apply(pl, pl, 50, WEAPON_GAUSS, DMG_ELECTRO);
+		pl.StartSoundDef("weapon_gauss.overcharge", CHAN_AUTO, true);
+		pl.StopSound(CHAN_WEAPON, true);
 #endif
 		pl.mode_tempstate = GAUSSTATE_IDLE;
 		pl.w_attack_next = 0.5f;
 		pl.w_idle_next = 0.5f;
 		pl.ammo_gauss_volume = 0;
 		Weapons_ViewAnimation(pl, GAUSS_IDLE1);
+		return;
 	}
 
 	if (pl.mode_tempstate == GAUSSTATE_REVVINGUP) {
@@ -324,6 +335,10 @@ void w_gauss_secondary(player pl)
 	}
 }
 
+/* set globals for the overcharge's overlay */
+.float overlay_state;
+.float overlay_alpha;
+
 void w_gauss_crosshair(player pl)
 {
 #ifdef CLIENT
@@ -344,6 +359,32 @@ void w_gauss_crosshair(player pl)
 	);
 
 	HUD_DrawAmmo2();
+
+	/* overchage flashes the player */
+	if (pl.ammo_gauss_volume == 100) {
+		/* check for the state, give a default alpha */
+		if (pl.overlay_state == 0)
+		pl.overlay_alpha = 0.8f;
+
+		pl.overlay_state = 1;
+	}
+
+	if (pl.overlay_state == 1) {
+		/* give us a nice fadeout about 3 seconds */
+		pl.overlay_alpha -= frametime * 0.3;
+
+		drawfill(
+			video_mins,
+			video_res,
+			[0.6,0.3,0],
+			pl.overlay_alpha,
+			DRAWFLAG_ADDITIVE
+		);
+
+		if (pl.overlay_alpha < 0.1f) {
+			pl.overlay_state = 0;
+		}
+	}
 #endif
 }
 
diff --git a/zpak001.pk3dir/sound/weapons_valve.sndshd b/zpak001.pk3dir/sound/weapons_valve.sndshd
index 7f597d6..499a54c 100644
--- a/zpak001.pk3dir/sound/weapons_valve.sndshd
+++ b/zpak001.pk3dir/sound/weapons_valve.sndshd
@@ -224,6 +224,14 @@ weapon_gauss.empty
 {
 	sample weapons/357_cock1.wav
 }
+weapon_gauss.fire
+{
+	sample weapons/gauss2.wav
+}
+weapon_gauss.overcharge
+{
+	sample weapons/electro4.wav
+}
 weapon_egon.empty
 {
 	sample weapons/357_cock1.wav