Adds MVP info

awpy/analytics/stats.py

@@ -136,6 +136,7 @@ def initialize_round(
                     "success1v4": 0,
                     "attempts1v5": 0,
                     "success1v5": 0,
+                    "mvp": 0,
                 }
             player_statistics[player_key]["totalRounds"] += 1
     for player_key in active_players:
@@ -620,6 +621,20 @@ def _handle_multi_kills(
             _increment_statistic(player_statistics, player, n_kills)
 
 
+def _handle_mvps(
+    game_round: GameRound,
+    player_statistics: dict[str, PlayerStatistics],
+    round_statistics: RoundStatistics,
+) -> None:
+    player_key = (
+        game_round["mvpName"]
+        if game_round["mvpSteamID"] == 0
+        else str(game_round["mvpSteamID"])
+    )
+    if player_key in round_statistics["active_players"]:
+        player_statistics[player_key]["mvp"] += 1
+
+
 def _increment_statistic(
     player_statistics: dict[str, PlayerStatistics], player: str, n_kills: int
 ) -> None:
@@ -665,6 +680,7 @@ def player_stats(
         _handle_bomb(game_round, player_statistics, round_statistics)
         _handle_kast(player_statistics, round_statistics)
         _handle_multi_kills(player_statistics, round_statistics)
+        _handle_mvps(game_round, player_statistics, round_statistics)
 
     _finalize_statistics(player_statistics)
 

awpy/parser/demoparser.py

@@ -763,6 +763,9 @@ def _parse_rounds(self) -> pd.DataFrame:
                 "winningTeam",
                 "losingTeam",
                 "roundEndReason",
+                "mvpName",
+                "mvpSteamID",
+                "mvpReason",
                 "ctFreezeTimeEndEqVal",
                 "ctRoundStartEqVal",
                 "ctRoundSpendMoney",

awpy/parser/parse_demo.go

@@ -138,6 +138,9 @@ type GameRound struct {
 	WinningTeam          *string            `json:"winningTeam"`
 	LosingTeam           *string            `json:"losingTeam"`
 	Reason               string             `json:"roundEndReason"`
+	MVPName              *string            `json:"mvpName"`
+	MVPSteamID           *int64             `json:"mvpSteamID"`
+	MVPReason            *string            `json:"mvpReason"`
 	CTFreezeTimeEndEqVal int64              `json:"ctFreezeTimeEndEqVal"`
 	CTRoundStartEqVal    int64              `json:"ctRoundStartEqVal"`
 	CTRoundMoneySpend    int64              `json:"ctRoundSpendMoney"`
@@ -556,6 +559,19 @@ func convertRoundEndReason(r events.RoundEndReason) string {
 	}
 }
 
+func convertRoundMVPReason(r events.RoundMVPReason) string {
+	switch reason := r; reason {
+	case events.MVPReasonMostEliminations:
+		return "MVPReasonMostEliminations"
+	case events.MVPReasonBombDefused:
+		return "MVPReasonBombDefused"
+	case events.MVPReasonBombPlanted:
+		return "MVPReasonBombPlanted"
+	default:
+		return unknown
+	}
+}
+
 func convertHitGroup(hg events.HitGroup) string {
 	switch hitGroup := hg; hitGroup {
 	case events.HitGroupGeneric:
@@ -1467,6 +1483,18 @@ func registerRoundEndHandler(demoParser *dem.Parser, currentGame *Game, currentR
 	})
 }
 
+func registerRoundMVPHandler(demoParser *dem.Parser, currentRound *GameRound) {
+	(*demoParser).RegisterEventHandler(func(e events.RoundMVPAnnouncement) {
+		if e.Player != nil {
+			currentRound.MVPName = &e.Player.Name
+			playerSteamID := int64(e.Player.SteamID64)
+			mvpReason := convertRoundMVPReason(e.Reason)
+			currentRound.MVPSteamID = &playerSteamID
+			currentRound.MVPReason = &mvpReason
+		}
+	})
+}
+
 func getBombSite(site rune) string {
 	switch site {
 	case rune(events.BombsiteA):
@@ -2727,6 +2755,9 @@ func main() {
 	registerRoundEndOfficialHandler(&p, &currentGame, &currentRound, &roundInEndTime, &RoundRestartDelay)
 	registerRoundEndHandler(&p, &currentGame, &currentRound, &roundStarted, &roundInEndTime, &RoundRestartDelay)
 
+	// Parse MVP announcements
+	registerRoundMVPHandler(&p, &currentRound)
+
 	// Parse bomb defuses
 	registerBombDefusedHandler(&p, &currentGame, &currentRound)
 	registerBombDefuseStartHandler(&p, &currentGame, &currentRound)

awpy/parser/parse_demo_test.go

@@ -4,8 +4,26 @@ import (
 	"testing"
 
 	common "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/common"
+	events "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/events"
 )
 
+func TestConvertRoundMVPReason(t *testing.T) {
+	t.Parallel()
+	enumReasons := [3]events.RoundMVPReason{
+		events.MVPReasonMostEliminations, events.MVPReasonBombDefused, events.MVPReasonBombPlanted,
+	}
+	textReasons := []string{
+		"MVPReasonMostEliminations", "MVPReasonBombDefused", "MVPReasonBombPlanted",
+	}
+	for index, reason := range enumReasons {
+		is := convertRoundMVPReason(reason)
+		want := textReasons[index]
+		if is != want {
+			t.Errorf("Round MVP reason value of %v should convert to %v, got %v", reason, want, is)
+		}
+	}
+}
+
 func TestConvertRank(t *testing.T) {
 	t.Parallel()
 	var rankInt int

awpy/types.py

@@ -569,6 +569,9 @@ class GameRound(TypedDict):
     winningTeam: str | None
     losingTeam: str | None
     roundEndReason: str
+    mvpName: str | None
+    mvpSteamID: int | None
+    mvpReason: str | None
     ctFreezeTimeEndEqVal: int
     ctRoundStartEqVal: int
     ctRoundSpendMoney: int
@@ -677,6 +680,7 @@ class PlayerStatistics(TypedDict):
     success1v4: int
     attempts1v5: int
     success1v5: int
+    mvp: int
 
 
 class KAST(TypedDict):