Many fixes and adaptations to the Accuracy Stats window, and get the Grabber to prope...

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 9b3db2e22a2bf0087c687e560758dfad1eaf43a1..0c95d1609bcdb516a689be910cafcbdd79d93282 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2397,17 +2397,17 @@ void Sbar_DrawAccuracyStats_Description_Hitscan(vector position)
        drawstring(position + '0 9 0' * sbar_fontsize_y, "Shots missed:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 }\r
 \r
-void Sbar_DrawAccuracyStats_Description_Splash(vector position)\r
+/*void Sbar_DrawAccuracyStats_Description_Splash(vector position)\r
 {\r
        drawstring(position + '0 3 0' * sbar_fontsize_y, "Maximum damage:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
        drawstring(position + '0 5 0' * sbar_fontsize_y, "Actual damage:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
        drawstring(position + '0 7 0' * sbar_fontsize_y, "Accuracy:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
        drawstring(position + '0 9 0' * sbar_fontsize_y, "Damage wasted:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-}\r
+}*/ // we have no splash damage weapons, but keep this code just in case\r
 \r
 void Sbar_DrawAccuracyStats()\r
 {\r
-       float i, count_hitscan, count_splash, row_hitscan, row_splash;  // count is the number of 'colums'\r
+       float i, count_hitscan, /*count_splash,*/ row_hitscan/*, row_splash*/;  // count is the number of 'colums'\r
        float weapon_hit, weapon_damage, weapon_stats;\r
        float left_border;  // position where the weapons start, the description is in the border\r
        vector fill_colour, fill_size;\r
@@ -2451,8 +2451,8 @@ void Sbar_DrawAccuracyStats()
        float top_border_hitscan = cvar("sbar_scoreboard_offset") + 55;  // position where the hitscan row starts: pixels down the screen\r
        Sbar_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * top_border_hitscan);\r
 \r
-       float top_border_splash = cvar("sbar_scoreboard_offset") + 175;  // position where the splash row starts: pixels down the screen\r
-       Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash);\r
+//     float top_border_splash = cvar("sbar_scoreboard_offset") + 175;  // position where the splash row starts: pixels down the screen\r
+//     Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash);\r
 \r
        for(i = WEP_FIRST; i <= WEP_LAST; ++i)\r
        {\r
@@ -2464,7 +2464,7 @@ void Sbar_DrawAccuracyStats()
                border_colour = (i == activeweapon) ? '1 1 1' : '0 0 0';  // white or black border\r
 \r
                if (weapon_damage) {\r
-                       if (self.spawnflags & WEP_TYPE_SPLASH) {\r
+                       /*if (self.spawnflags & WEP_TYPE_SPLASH) {\r
                                weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);\r
 \r
                                fill_colour_x = 1 - 0.015 * weapon_stats;\r
@@ -2514,7 +2514,9 @@ void Sbar_DrawAccuracyStats()
                                drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 9 0' * sbar_fontsize_y, ftos(max(0, weapon_damage - weapon_hit)), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 \r
                                ++count_splash;\r
-                       } else if (self.spawnflags & WEP_TYPE_HITSCAN) {\r
+                       } else*/ // we have no splash damage weapons, but keep this code just in case\r
+\r
+                       if (self.spawnflags & WEP_TYPE_HITSCAN) {\r
                                weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);\r
 \r
                                fill_colour_x = 1 - 0.015 * weapon_stats;\r

diff --git a/data/qcsrc/common/items.qh b/data/qcsrc/common/items.qh
index 194cb1ba8ac0f1cd8d003102dc7a9d9f6372645e..2650545841ec7af890a0efe3234e9c359a7dbe91 100644 (file)
--- a/data/qcsrc/common/items.qh
+++ b/data/qcsrc/common/items.qh
@@ -2,7 +2,7 @@ float BOT_PICKUP_RATING_LOW     = 2500;
 float BOT_PICKUP_RATING_MID    = 5000;\r
 float BOT_PICKUP_RATING_HIGH   = 10000;\r
 \r
-float WEP_TYPE_OTHER   = 0x00; // e.g: Grabber, Port-o-launch, etc\r
+float WEP_TYPE_OTHER   = 0x00; // e.g: Grabber, etc\r
 float WEP_TYPE_SPLASH  = 0x01;\r
 float WEP_TYPE_HITSCAN = 0x02;\r
 float WEP_TYPEMASK      = 0x0F;\r

diff --git a/data/qcsrc/server/g_grabber.qc b/data/qcsrc/server/g_grabber.qc
index 28b687e5a8a9a000ee90183dc9372998d7e1444a..1c3361e1f929e5403ed5a8d88dac9d333a7dc526 100644 (file)
--- a/data/qcsrc/server/g_grabber.qc
+++ b/data/qcsrc/server/g_grabber.qc
@@ -266,6 +266,7 @@ void GrabberTouch (void)
                if(other.movetype != MOVETYPE_NONE)\r
                {\r
                        SetMovetypeFollow(self, other);\r
+                       W_Grabber_UpdateStats(self.owner, FALSE, TRUE); // count this as a hit\r
                        WarpZone_RefSys_BeginAddingIncrementally(self, self.aiment);\r
                }\r
 \r
@@ -294,6 +295,8 @@ void FireGrabber (void)
        local entity missile;\r
        local vector org;\r
 \r
+       W_Grabber_UpdateStats(self, TRUE, FALSE);\r
+\r
        if((arena_roundbased && time < warmup) || (time < game_starttime))\r
                return;\r
 \r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 30937850d4bf3eb18ddcdc2d3156ac86e4f9da7c..0f5a818e144a7588b21e7a665522f8d0086fe654 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON\r
-REGISTER_WEAPON(GRABBER, w_grabber, IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, 0, "grabber", "grabber", "Grabber");\r
+REGISTER_WEAPON(GRABBER, w_grabber, IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, 0, "grabber", "grabber", "Grabber");\r
 #else\r
 .float dmg;\r
 .float dmg_edge;\r
@@ -9,6 +9,22 @@ REGISTER_WEAPON(GRABBER, w_grabber, IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_SPL
 .float grabber_time_grabbered;\r
 .float grabber_time_fueldecrease;\r
 \r
+void W_Grabber_UpdateStats(entity e, float shot, float hit)\r
+{\r
+       // this may not be entierly right, but for the time being we're recording the hook accuracy here\r
+       // this is likely needed for detecting if the hook has hit (linked to) another person though\r
+       if(shot)\r
+       {\r
+               e.stats_fired[e.weapon - 1] += 1;\r
+               e.stat_fired = e.weapon + 64 * floor(e.stats_fired[e.weapon - 1]);\r
+       }\r
+       if(hit)\r
+       {\r
+               e.stats_hit[e.weapon - 1] += 1;\r
+               e.stat_hit = e.weapon + 64 * floor(e.stats_hit[e.weapon - 1]);\r
+       }\r
+}\r
+\r
 void W_Grabber_Touch2 (void)\r
 {\r
        PROJECTILE_TOUCH;\r
@@ -21,13 +37,17 @@ void W_Grabber_Attack2()
                return;\r
 \r
        W_SetupShot (self, TRUE, 0, "weapons/grabber_altfire.wav", cvar("g_balance_grabber_secondary_damage"));\r
+       W_Grabber_UpdateStats(self, TRUE, FALSE); // the hit is recorded below\r
 \r
        WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self));\r
 \r
        pointparticles(particleeffectnum("grabber_melee"), w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), '0 0 0', 1);\r
 \r
        if (trace_fraction < 1)\r
+       {\r
                Damage(trace_ent, self, self, cvar("g_balance_grabber_secondary_damage"), WEP_GRABBER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_grabber_secondary_force") * w_shotdir);\r
+               W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above\r
+       }\r
 \r
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)\r
                self.ammo_fuel = self.ammo_fuel - cvar("g_balance_grabber_secondary_ammo");\r