X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_shotgun.qc;h=c5f1ed12c02143b993bb15d92e7c3d27c7c4d5b1;hb=a63f5d0afcdd3c85742b92a4dbc99c324e4ddb6f;hp=29343c8f749dd73e591dc325d237f10f27d54c62;hpb=b735b4fcbc82a7365740beb7d5d25c409d063063;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 29343c8f7..c5f1ed12c 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -65,7 +65,7 @@ void shotgun_meleethink (void)
 	WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, targpos, FALSE, self.owner, ANTILAG_LATENCY(self.owner));
 
 	// apply the damage, also remove self
-	if(trace_fraction < 1 && trace_ent.takedamage == DAMAGE_AIM && trace_ent.classname == "player")
+	if(trace_fraction < 1 && trace_ent.takedamage == DAMAGE_AIM && (trace_ent.classname == "player" || trace_ent.classname == "body"))
 	{
 		vector force;
 		force = angle * cvar("g_balance_shotgun_secondary_force");
@@ -146,6 +146,7 @@ float w_shotgun(float req)
 };
 #endif
 #ifdef CSQC
+.float prevric;
 float w_shotgun(float req)
 {
 	if(req == WR_IMPACTEFFECT)
@@ -153,14 +154,15 @@ float w_shotgun(float req)
 		vector org2;
 		org2 = w_org + w_backoff * 2;
 		pointparticles(particleeffectnum("shotgun_impact"), org2, w_backoff * 1000, 1);
-		if(!w_issilent)
+		if(!w_issilent && time - self.prevric > 0.25)
 		{
-			if(w_random < 0.05)
+			if(w_random < 0.0165)
 				sound(self, CHAN_PROJECTILE, "weapons/ric1.wav", VOL_BASE, ATTN_NORM);
-			else if(w_random < 0.1)
+			else if(w_random < 0.033)
 				sound(self, CHAN_PROJECTILE, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
-			else if(w_random < 0.2)
+			else if(w_random < 0.05)
 				sound(self, CHAN_PROJECTILE, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
+			self.prevric = time;
 		}
 	}
 	else if(req == WR_PRECACHE)