Move away from player_stats.healing

This stat is crap (hundreds of hpm on non-medic logs), so prefer heal_stats instead. While we're at it, prefer separating heals given from heals recieved. HR/M is a much more interesting stat if you're not playing medic. Closes #29 Signed-off-by: Sean Anderson <[email protected]>
Forty-Bot · Dec 31, 2020 · a2bbd88 · a2bbd88
1 parent 1f7a2ee
commit a2bbd88
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 21 deletions.
diff --git a/player.py b/player.py
@@ -58,7 +58,7 @@ def get_player(endpoint, values):
 def get_logs(c, steamid, limit=100, offset=0):
     return c.cursor().execute(
         """SELECT
-               logid,
+               log.logid,
                title,
                map,
                classes,
@@ -73,7 +73,8 @@ def get_logs(c, steamid, limit=100, offset=0):
                log.dmg * 60.0 / log.duration AS dpm,
                log.dt * 60.0 / log.duration AS dtm,
                total(hits) / total(shots) AS acc,
-               healing * 60.0 / log.duration AS hpm,
+               total(hsg.healing) * 60.0 / log.duration AS hpm_given,
+               hsr.healing * 60.0 / log.duration AS hpm_recieved,
                time
            FROM log_wlt AS log
            JOIN map USING (mapid)
@@ -92,9 +93,11 @@ def get_logs(c, steamid, limit=100, offset=0):
                  WHERE steamid64 = ?
            ) USING (logid, steamid64)
            LEFT JOIN weapon_stats USING (logid, steamid64)
+           LEFT JOIN heal_stats AS hsg ON (hsg.healer=log.steamid64 AND hsg.logid=log.logid)
+           LEFT JOIN heal_stats AS hsr ON (hsr.healee=log.steamid64 AND hsr.logid=log.logid)
            WHERE steamid64 = ?
-           GROUP BY logid
-           ORDER BY logid DESC
+           GROUP BY log.logid
+           ORDER BY log.logid DESC
            LIMIT ? OFFSET ?;""", (steamid, steamid, limit, offset))
 
 @player.route('/')
@@ -191,25 +194,36 @@ def peers(steamid):
                    sum(CASE WHEN with THEN duration END) AS dpm,
                sum(CASE WHEN with THEN dt END) * 60.0 /
                    sum(CASE WHEN with THEN duration END) AS dtm,
-               sum(CASE WHEN with THEN healing END) * 60.0 /
-                   sum(CASE WHEN with THEN duration END) AS hpm,
+               sum(CASE WHEN with THEN healing_to END) * 60.0 /
+                   sum(CASE WHEN with THEN duration END) AS hpm_to,
+               sum(CASE WHEN with THEN healing_from END) * 60.0 /
+                   sum(CASE WHEN with THEN duration END) AS hpm_from,
                total(CASE WHEN with THEN duration END) as time_with,
                total(CASE WHEN against THEN duration END) as time_against
            FROM (
                SELECT
-                   logid,
+                   p1.logid,
                    p2.steamid64,
                    p1.teamid = p2.teamid AS with,
                    p1.teamid != p2.teamid AS against,
                    p1.round_wins > p1.round_losses AS win,
                    p1.round_wins = p1.round_losses AS tie,
                    p1.dmg,
                    p1.dt,
-                   p1.healing,
+                   hs1.healing AS healing_to,
+                   hs2.healing AS healing_from,
                    p1.duration
                FROM log_wlt AS p1
                JOIN player_stats AS p2 USING (logid)
-               WHERE p1.steamid64 = ?
+               LEFT JOIN heal_stats AS hs1 ON (
+                   hs1.healer = p1.steamid64
+                   AND hs1.healee = p2.steamid64
+                   AND hs1.logid = p1.logid
+               ) LEFT JOIN heal_stats AS hs2 ON (
+                   hs2.healer = p2.steamid64
+                   AND hs2.healee = p1.steamid64
+                   AND hs2.logid = p1.logid
+               ) WHERE p1.steamid64 = ?
                   AND p2.steamid64 != p1.steamid64
                   AND p2.teamid NOTNULL
            ) JOIN player USING (steamid64)
@@ -260,7 +274,7 @@ def totals(steamid):
                total(headshots) AS headshots,
                total(headshots_hit) AS headshots_hit,
                total(sentries) AS sentries,
-               total(healing) AS healing,
+               total(hs.healing) AS healing,
                total(cpc) AS cpc,
                total(ic) AS ic,
                total(ubers) AS ubers,
@@ -273,9 +287,12 @@ def totals(steamid):
            JOIN format USING (formatid)
            JOIN map USING (mapid)
            LEFT JOIN medic_stats AS ms ON (
-               ps.logid=ms.logid
-               AND ps.steamid64=ms.steamid64)
-           LEFT JOIN class_stats AS cs ON (
+               ms.logid=ps.logid
+               AND ms.steamid64=ps.steamid64)
+           LEFT JOIN heal_stats AS hs ON (
+               hs.logid=ps.logid
+               AND hs.healer=ps.steamid64
+           ) LEFT JOIN class_stats AS cs ON (
                cs.logid=ps.logid
                AND cs.steamid64=ps.steamid64
                AND cs.duration * 1.5 >= log.duration
@@ -337,8 +354,10 @@ def trends(steamid):
                    sum(CASE WHEN log.dmg THEN log.duration END) OVER win AS dpm,
                sum(log.dt) OVER win * 60.0 /
                    sum(CASE WHEN log.dt THEN log.duration END) OVER win AS dtm,
-               sum(log.healing) OVER win * 60.0 /
-                   sum(CASE WHEN log.healing THEN log.duration END) OVER win AS hpm
+               sum(hsg.healing) OVER win * 60.0 /
+                   sum(CASE WHEN hsg.healing THEN log.duration END) OVER win AS hpm_given,
+               sum(hsr.healing) OVER win * 60.0 /
+                   sum(CASE WHEN hsr.healing THEN log.duration END) OVER win AS hpm_recieved
            FROM log_wlt AS log
            JOIN format USING (formatid)
            JOIN map USING (mapid)
@@ -347,6 +366,14 @@ def trends(steamid):
                AND cs.steamid64=log.steamid64
                AND cs.duration * 1.5 >= log.duration
            ) LEFT JOIN class USING (classid)
+           LEFT JOIN (SELECT
+                   logid,
+                   healer,
+                   sum(healing) AS healing
+               FROM heal_stats
+               GROUP BY logid, healer
+           ) AS hsg ON (hsg.logid=log.logid AND hsg.healer=log.steamid64)
+           LEFT JOIN heal_stats AS hsr ON (hsr.logid=log.logid AND hsr.healee=log.steamid64)
            WHERE log.steamid64 = ?
                AND class IS ifnull(?, class)
                AND format = ifnull(?, format)

diff --git a/static/js/trends.js b/static/js/trends.js
@@ -58,12 +58,13 @@ document.addEventListener('DOMContentLoaded', () => {
 	pm_config.data = {
 		json: data,
 		keys: {
-			value: ['dpm', 'dtm', 'hpm'],
+			value: ['dpm', 'dtm', 'hpm_given', 'hpm_recieved'],
 		},
 		names: {
 			dpm: "D/M",
 			dtm: "DT/M",
-			hpm: "HP/M",
+			hpm_given: "HG/M",
+			hpm_recieved: "HR/M",
 		},
 		onclick: onclick,
 	};

diff --git a/templates/macros/logs.html b/templates/macros/logs.html
@@ -19,8 +19,9 @@
 			{% if extra %}
 			<th><abbr title="Damage per Minute">D/M</abbr></th>
 			<th><abbr title="Damage Taken per Minute">DT/M</abbr></th>
+			<th><abbr title="Healing Given per Minute ">HG/M</abbr></th>
+			<th><abbr title="Healing Recieved per Minute ">HR/M</abbr></th>
 			<th><abbr title="Accuracy">Acc</abbr></th>
-			<th><abbr title="Healing per Minute">H/M</abbr></th>
 			{% endif %}
 			<th>Date</th>
 		</tr>
@@ -49,8 +50,9 @@
 			{% if extra %}
 			<td>{{ log['dpm'] | int }}</td>
 			<td>{{ log['dtm'] | int if log['dtm'] != None }}</td>
+			<td>{{ log['hpm_given'] | int }}</td>
+			<td>{{ log['hpm_recieved'] | int }}</td>
 			<td>{{ "{:.0%}".format(log['acc']) if log['acc'] != None }}</td>
-			<td>{{ log['hpm'] | int }}</td>
 			{% endif %}
 			<td class="left date" timestamp="{{ log['time'] }}"></td>
 		</tr>

diff --git a/templates/player/peers.html b/templates/player/peers.html
@@ -23,7 +23,8 @@ <h2>Peers</h2>
 				<th>Time Played Against</td>
 				<th><abbr title="Damage per Minute With">D/M With</abbr></th>
 				<th><abbr title="Damage Taken per Minute With">DT/M With</abbr></th>
-				<th><abbr title="Healing per Minute With">H/M With</abbr></th>
+				<th><abbr title="Healing per Minute done To">H/M To</abbr></th>
+				<th><abbr title="Healing per Minute gotten From">H/M From</abbr></th>
 			</tr>
 		</thead>
 		<tbody>
@@ -44,7 +45,8 @@ <h2>Peers</h2>
 				<td>{{ peer['time_against'] | duration }}</td>
 				<td>{{ peer['dpm'] | int if peer['dpm'] != None }}</td>
 				<td>{{ peer['dtm'] | int if peer['dtm'] != None }}</td>
-				<td>{{ peer['hpm'] | int if peer['hpm'] != None }}</td>
+				<td>{{ peer['hpm_to'] | int if peer['hpm_to'] != None }}</td>
+				<td>{{ peer['hpm_from'] | int if peer['hpm_from'] != None }}</td>
 			</tr>
 			{% endfor %}
 		</tbody>