CSGOWTF/csgowtfd
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

[FEATURE] Detailed stats about player weapon usage and hitgroups (#1)

Browse Source 
Reviewed-on: https://git.harting.dev/CSGOWTF/csgowtfd/pulls/1
Co-authored-by: Giovanni Harting <539@idlegandalf.com>
Co-committed-by: Giovanni Harting <539@idlegandalf.com>
This commit is contained in:
Giovanni Harting
2021-10-16 01:49:52 +02:00
parent 3ff65bc5d7
commit 99ec0ad1bc
37 changed files with 15185 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
csgo/demo_parser.go
View File

@@ -6,6 +6,7 @@ import (
"csgowtfd/ent"
"csgowtfd/ent/match"
"csgowtfd/ent/player"
"csgowtfd/ent/stats"
"fmt"
"github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs"
"github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/common"
@@ -143,53 +144,52 @@ func (p *DemoParser) parseWorker() {
}
killMap := make(map[uint64]int, 10)
eqMap := make(map[uint64][]*struct {
Eq int
HitGroup int
Dmg uint
To uint64
})
gameStarted := false
demoParser := demoinfocs.NewParser(fDemo)
// onPlayerHurt
demoParser.RegisterEventHandler(func(e events.PlayerHurt) {
if e.Attacker == nil || e.Player == nil || !gameStarted {
if e.Attacker == nil || e.Player == nil || e.Weapon == nil || !gameStarted {
return
}
tAttacker := p.getMatchPlayerBySteamID(tStats, e.Attacker.SteamID64)
if e.Attacker.Team == e.Player.Team {
tAttacker.Extended.Dmg.Team += e.HealthDamageTaken
return
tAttacker.DmgTeam += uint(e.HealthDamageTaken)
} else {
tAttacker.Extended.Dmg.Enemy += e.HealthDamageTaken
tAttacker.DmgEnemy += uint(e.HealthDamageTaken)
}
switch e.Weapon.Type {
case common.EqDecoy:
tAttacker.Extended.Dmg.UD.Decoy += e.HealthDamageTaken
case common.EqSmoke:
tAttacker.Extended.Dmg.UD.Smoke += e.HealthDamageTaken
case common.EqHE:
tAttacker.Extended.Dmg.UD.HE += e.HealthDamageTaken
case common.EqMolotov, common.EqIncendiary:
tAttacker.Extended.Dmg.UD.Flames += e.HealthDamageTaken
case common.EqFlash:
tAttacker.Extended.Dmg.UD.Flash += e.HealthDamageTaken
if _, ok := eqMap[e.Attacker.SteamID64]; !ok {
eqMap[e.Attacker.SteamID64] = make([]*struct {
Eq int
HitGroup int
Dmg uint
To uint64
}, 0)
}
switch e.HitGroup {
case events.HitGroupHead:
tAttacker.Extended.Dmg.HitGroup.Head += e.HealthDamageTaken
case events.HitGroupChest:
tAttacker.Extended.Dmg.HitGroup.Chest += e.HealthDamageTaken
case events.HitGroupStomach:
tAttacker.Extended.Dmg.HitGroup.Stomach += e.HealthDamageTaken
case events.HitGroupLeftArm:
tAttacker.Extended.Dmg.HitGroup.LeftArm += e.HealthDamageTaken
case events.HitGroupRightArm:
tAttacker.Extended.Dmg.HitGroup.RightArm += e.HealthDamageTaken
case events.HitGroupLeftLeg:
tAttacker.Extended.Dmg.HitGroup.LeftLeg += e.HealthDamageTaken
case events.HitGroupRightLeg:
tAttacker.Extended.Dmg.HitGroup.RightLeg += e.HealthDamageTaken
case events.HitGroupGear:
tAttacker.Extended.Dmg.HitGroup.Gear += e.HealthDamageTaken
found := false
for _, di := range eqMap[e.Attacker.SteamID64] {
if di.Eq == int(e.Weapon.Type) && di.HitGroup == int(e.HitGroup) {
di.Dmg += uint(e.HealthDamageTaken)
found = true
}
}
if !found {
eqMap[e.Attacker.SteamID64] = append(eqMap[e.Attacker.SteamID64], &struct {
Eq int
HitGroup int
Dmg uint
To uint64
}{Eq: int(e.Weapon.Type), HitGroup: int(e.HitGroup), Dmg: uint(e.HealthDamageTaken), To: e.Player.SteamID64})
}
})
@@ -213,13 +213,13 @@ func (p *DemoParser) parseWorker() {
switch killDiff {
case 2:
tPlayer.Extended.MultiKills.Duo++
tPlayer.Mk2++
case 3:
tPlayer.Extended.MultiKills.Triple++
tPlayer.Mk3++
case 4:
tPlayer.Extended.MultiKills.Quad++
tPlayer.Mk4++
case 5:
tPlayer.Extended.MultiKills.Pent++
tPlayer.Mk5++
}
killMap[IGP.SteamID64] = IGP.Kills()
}
@@ -237,20 +237,20 @@ func (p *DemoParser) parseWorker() {
// team flash
if e.Attacker.Team == e.Player.Team && e.Attacker.SteamID64 != e.Player.SteamID64 {
tAttacker.Extended.Flash.Total.Team++
tAttacker.Extended.Flash.Duration.Team += e.Player.FlashDuration
tAttacker.FlashTotalTeam++
tAttacker.FlashDurationTeam += e.Player.FlashDuration
}
// own flash
if e.Attacker.SteamID64 == e.Player.SteamID64 {
tAttacker.Extended.Flash.Total.Self++
tAttacker.Extended.Flash.Duration.Self += e.Player.FlashDuration
tAttacker.FlashTotalSelf++
tAttacker.FlashDurationSelf += e.Player.FlashDuration
}
// enemy flash
if e.Attacker.Team != e.Player.Team {
tAttacker.Extended.Flash.Total.Enemy++
tAttacker.Extended.Flash.Duration.Enemy += e.Player.FlashDuration
tAttacker.FlashTotalEnemy++
tAttacker.FlashDurationEnemy += e.Player.FlashDuration
}
})
@@ -263,8 +263,26 @@ func (p *DemoParser) parseWorker() {
if demoPlayer != nil && demoPlayer.SteamID64 != 0 {
tMatchPlayer := p.getMatchPlayerBySteamID(tStats, demoPlayer.SteamID64)
tMatchPlayer.Extended.Crosshair = demoPlayer.CrosshairCode()
tMatchPlayer.Extended.Color = demoPlayer.Color().String()
tMatchPlayer.Crosshair = demoPlayer.CrosshairCode()
switch demoPlayer.Color() {
case common.Yellow:
tMatchPlayer.Color = stats.ColorYellow
break
case common.Green:
tMatchPlayer.Color = stats.ColorGreen
break
case common.Purple:
tMatchPlayer.Color = stats.ColorPurple
break
case common.Blue:
tMatchPlayer.Color = stats.ColorBlue
break
case common.Orange:
tMatchPlayer.Color = stats.ColorOrange
break
default:
tMatchPlayer.Color = stats.ColorGrey
}
}
}
})
@@ -279,8 +297,8 @@ func (p *DemoParser) parseWorker() {
if e.Player != nil && e.SteamID64() != 0 {
tMatchPlayer := p.getMatchPlayerBySteamID(tStats, e.SteamID64())
tMatchPlayer.Extended.Rank.Old = e.RankOld
tMatchPlayer.Extended.Rank.New = e.RankNew
tMatchPlayer.RankOld = e.RankOld
tMatchPlayer.RankNew = e.RankNew
}
})
@@ -299,13 +317,49 @@ func (p *DemoParser) parseWorker() {
}
for _, tMatchPlayer := range tStats {
if tMatchPlayer.Color == "" {
tMatchPlayer.Color = stats.ColorGrey
}
p.lock.Lock()
err := tMatchPlayer.Update().SetExtended(tMatchPlayer.Extended).Exec(context.Background())
nMatchPLayer, err := tMatchPlayer.Update().
SetDmgTeam(tMatchPlayer.DmgTeam).
SetDmgEnemy(tMatchPlayer.DmgEnemy).
SetUdHe(tMatchPlayer.UdHe).
SetUdFlash(tMatchPlayer.UdFlash).
SetUdSmoke(tMatchPlayer.UdSmoke).
SetUdFlames(tMatchPlayer.UdFlames).
SetMk2(tMatchPlayer.Mk2).
SetMk3(tMatchPlayer.Mk3).
SetMk4(tMatchPlayer.Mk4).
SetMk5(tMatchPlayer.Mk5).
SetRankOld(tMatchPlayer.RankOld).
SetRankNew(tMatchPlayer.RankNew).
SetColor(tMatchPlayer.Color).
SetCrosshair(tMatchPlayer.Crosshair).
SetFlashDurationTeam(tMatchPlayer.FlashDurationTeam).
SetFlashDurationSelf(tMatchPlayer.FlashDurationSelf).
SetFlashDurationEnemy(tMatchPlayer.FlashDurationEnemy).
SetFlashTotalEnemy(tMatchPlayer.FlashTotalEnemy).
SetFlashTotalSelf(tMatchPlayer.FlashTotalSelf).
SetFlashTotalTeam(tMatchPlayer.FlashTotalTeam).
SetDmgTeam(tMatchPlayer.DmgTeam).
SetDmgEnemy(tMatchPlayer.DmgEnemy).
Save(context.Background())
p.lock.Unlock()
if err != nil {
log.Errorf("[DP] Unable to update player %d in database: %v", tMatchPlayer.Edges.Players.ID, err)
continue
}
for _, eqDmg := range eqMap[tMatchPlayer.PlayerStats] {
p.lock.Lock()
err := p.db.WeaponStats.Create().SetStat(nMatchPLayer).SetDmg(eqDmg.Dmg).SetVictim(eqDmg.To).SetHitGroup(eqDmg.HitGroup).SetEqType(eqDmg.Eq).Exec(context.Background())
p.lock.Unlock()
if err != nil {
log.Errorf("[DP] Unable to create WeaponStat: %v", err)
}
}
}
log.Infof("[DP] Parsed %d (took %s/%s)", demo.MatchId, downloadTime, time.Now().Sub(startTime))