From 2557f65dd1f682be29839f0d6ad2c0eab86f4d68 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Sun, 25 Jul 2010 16:51:03 +0300 Subject: [PATCH] try fixing the accuracies... shotgun secondary accuracy still broken? --- qcsrc/server/w_electro.qc | 1 + qcsrc/server/w_laser.qc | 1 + qcsrc/server/w_shotgun.qc | 3 +++ 3 files changed, 5 insertions(+) diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 92ed5e75a..cccd463b3 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -243,6 +243,7 @@ void lgbeam_think() vector force; force = w_shotdir * cvar("g_balance_electro_primary_force") + '0 0 1' * cvar("g_balance_electro_primary_force_up"); Damage (trace_ent, self.owner, self.owner, cvar("g_balance_electro_primary_damage") * dt, WEP_ELECTRO, trace_endpos, force * dt); + Damage_RecordDamage(self.owner, WEP_ELECTRO, cvar("g_balance_electro_primary_damage") * dt); } W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner); diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index 280e42cf3..18715a9b4 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -145,6 +145,7 @@ void gauntletbeam_think() vector force; force = w_shotdir * myforce; Damage (trace_ent, self.owner, self.owner, damage * dt, WEP_LASER | HITTYPE_SECONDARY, trace_endpos, force * dt); + Damage_RecordDamage(self.owner, WEP_LASER | HITTYPE_SECONDARY, damage * dt); } // draw effect diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 1f714d1c7..b186230ec 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -61,6 +61,7 @@ void shotgun_meleethink (void) f = (self.cnt + cvar("g_balance_shotgun_secondary_melee_time") - time) / cvar("g_balance_shotgun_secondary_melee_time") * 2 - 1; vector targpos; targpos = self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_shotgun_secondary_melee_range") + v_right * f * cvar("g_balance_shotgun_secondary_melee_swing") + v_up * f * cvar("g_balance_shotgun_secondary_melee_swing"); + 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 @@ -69,6 +70,7 @@ void shotgun_meleethink (void) 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)); remove(self); } else if(time >= self.cnt + cvar("g_balance_shotgun_secondary_melee_time")) // missed, remove ent @@ -87,6 +89,7 @@ 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")); } void spawnfunc_weapon_shotgun(); // defined in t_items.qc -- 2.39.2