X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_shotgun.qc;h=17bce7f77aa497020ff33486f38b47e0e30d834c;hp=b186230ecf5b5f36b7b506717edf3f1d31a4840a;hb=f36ed3bf423815c52ff68fc55e82a390e2171bdc;hpb=3c0f816b60939e77e81ccbdce43a5027b89dc4a6

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index b186230ec..17bce7f77 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -22,7 +22,7 @@ void W_Shotgun_Attack (void)
 	bulletspeed = cvar("g_balance_shotgun_primary_speed");
 	bulletconstant = cvar("g_balance_shotgun_primary_bulletconstant");
 
-	W_SetupShot (self, cvar("g_antilag_bullets") && bulletspeed >= cvar("g_antilag_bullets"), 5, "weapons/shotgun_fire.wav", cvar("g_balance_shotgun_primary_damage"));
+	W_SetupShot (self, cvar("g_antilag_bullets") && bulletspeed >= cvar("g_antilag_bullets"), 5, "weapons/shotgun_fire.wav", CHAN_WEAPON, d * bullets);
 	for (sc = 0;sc < bullets;sc = sc + 1)
 		fireBallisticBullet(w_shotorg, w_shotdir, spread, bulletspeed, 5, d, 0, f, WEP_SHOTGUN, 0, 1, bulletconstant);
 	endFireBallisticBullet();
@@ -65,12 +65,13 @@ 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");
-		Damage (trace_ent, self.owner, self.owner, cvar("g_balance_shotgun_secondary_damage") * ((f + 1) / 2), WEP_SHOTGUN | HITTYPE_SECONDARY , self.owner.origin + self.owner.view_ofs, force);
-		Damage_RecordDamage(self.owner, WEP_SHOTGUN | HITTYPE_SECONDARY, cvar("g_balance_shotgun_secondary_damage") * ((f + 1) / 2));
+		if(accuracy_isgooddamage(self.owner, trace_ent))
+			accuracy_add(self.owner, WEP_SHOTGUN, 0, cvar("g_balance_shotgun_secondary_damage") * min(1, f + 1));
+		Damage (trace_ent, self.owner, self.owner, cvar("g_balance_shotgun_secondary_damage") * min(1, f + 1), WEP_SHOTGUN | HITTYPE_SECONDARY , self.owner.origin + self.owner.view_ofs, force);
 		remove(self);
 	}
 	else if(time >= self.cnt + cvar("g_balance_shotgun_secondary_melee_time")) // missed, remove ent
@@ -89,11 +90,13 @@ void W_Shotgun_Attack2 (void)
 	meleetemp.owner = self;
 	meleetemp.think = shotgun_meleethink;
 	meleetemp.nextthink = time + cvar("g_balance_shotgun_secondary_melee_delay");
-	W_SetupShot_Range(self, TRUE, 0, "", cvar("g_balance_shotgun_secondary_damage"), cvar("g_balance_shotgun_secondary_melee_range"));
+	W_SetupShot_Range(self, TRUE, 0, "", 0, cvar("g_balance_shotgun_secondary_damage"), cvar("g_balance_shotgun_secondary_melee_range"));
 }
 
 void spawnfunc_weapon_shotgun(); // defined in t_items.qc
 
+.float shotgun_primarytime;
+
 float w_shotgun(float req)
 {
 	if (req == WR_AIM)
@@ -104,10 +107,16 @@ float w_shotgun(float req)
 	else if (req == WR_THINK)
 	{
 		if (self.BUTTON_ATCK)
-		if (weapon_prepareattack(0, cvar("g_balance_shotgun_primary_refire")))
 		{
-			W_Shotgun_Attack();
-			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_primary_animtime"), w_ready);
+			if (time >= self.shotgun_primarytime) // handle refire separately so the secondary can be fired straight after a primary
+			{
+				if(weapon_prepareattack(0, cvar("g_balance_shotgun_primary_animtime")))
+				{
+					W_Shotgun_Attack();
+					self.shotgun_primarytime = time + cvar("g_balance_shotgun_primary_refire");
+					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_primary_animtime"), w_ready);
+				}
+			}
 		}
 		if (self.BUTTON_ATCK2 && cvar("g_balance_shotgun_secondary"))
 		if (weapon_prepareattack(1, cvar("g_balance_shotgun_secondary_refire")))
@@ -138,6 +147,7 @@ float w_shotgun(float req)
 };
 #endif
 #ifdef CSQC
+.float prevric;
 float w_shotgun(float req)
 {
 	if(req == WR_IMPACTEFFECT)
@@ -145,14 +155,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)