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

added spray patterns

Browse Source
This commit is contained in:
Giovanni Harting
2021-10-31 08:40:02 +01:00
parent 268793f0e5
commit 978232dd0a
66 changed files with 16805 additions and 11903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
csgo/demo_loader.go
View File

@@ -62,7 +62,7 @@ func SteamId2AccountId(steamId uint64) uint32 {
return uint32(steamId - 76561197960265728)
}
func playerStatsFromRound(round *protobuf.CMsgGCCStrike15V2_MatchmakingServerRoundStats, p *ent.Player) (int32, int32, int32, int32, int32, int32) {
func playerStatsFromRound(round *protobuf.CMsgGCCStrike15V2_MatchmakingServerRoundStats, p *ent.Player) (kills int32, deaths int32, assists int32, headshots int32, score int32, mvps int32) {
for i, acc := range round.GetReservation().GetAccountIds() {
if AccountId2SteamId(acc) == p.ID {
return round.GetKills()[i], round.GetDeaths()[i], round.GetAssists()[i], round.GetEnemyHeadshots()[i], round.GetScores()[i], round.GetMvps()[i]
@@ -431,7 +431,7 @@ func (d *DemoMatchLoader) gcWorker(apiKey string, rl ratelimit.Limiter) {
}
kills, deaths, assists, hs, score, mvp := playerStatsFromRound(lastRound, mPlayer)
err := d.db.Stats.Create().
err := d.db.MatchPlayer.Create().
SetMatches(tMatch).
SetPlayers(mPlayer).
SetTeamID(teamId).
@@ -451,15 +451,21 @@ func (d *DemoMatchLoader) gcWorker(apiKey string, rl ratelimit.Limiter) {
}
}
// clear cache for player
// clear cache or regen values player
for _, p := range players {
err = d.cache.Delete(context.Background(), fmt.Sprintf(utils.SideMetaCacheKey, p.ID))
if err != nil {
log.Warningf("[DL] Unable to delete cache key %s: %v", fmt.Sprintf(utils.SideMetaCacheKey, p.ID), err)
}
err = d.cache.Delete(context.Background(), fmt.Sprintf(utils.MatchMetaCacheKey, p.ID))
w, l, t, err := utils.GetWinLossTieForPlayer(p)
if err != nil {
log.Warningf("[DL] Unable to delete cache key %s: %v", fmt.Sprintf(utils.MatchMetaCacheKey, p.ID), err)
log.Warningf("[DL] Failure to calculate WinLossTie for player %d: %v", p.ID, err)
continue
}
err = p.Update().SetWins(w).SetTies(t).SetLooses(l).Exec(context.Background())
if err != nil {
log.Warningf("[DL] Failure to save WinLossTie for player %d: %v", p.ID, err)
}
}

164
csgo/demo_parser.go
View File

@@ -1,13 +1,16 @@
package csgo
import (
"bytes"
"compress/bzip2"
"context"
"csgowtfd/ent"
"csgowtfd/ent/match"
"csgowtfd/ent/matchplayer"
"csgowtfd/ent/player"
"csgowtfd/ent/stats"
"encoding/gob"
"fmt"
"github.com/golang/geo/r2"
"github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs"
"github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/common"
"github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/events"
@@ -29,10 +32,79 @@ type DemoParser struct {
db *ent.Client
}
type Encounter struct {
Spotted uint64
TimeToReact float32
FirstFrag bool
Spray []*Spray
CrosshairMovement r2.Point
Time time.Duration
}
type Sprays struct {
Sprayer uint64
Sprays []*Spray
Weapon int
}
type Spray struct {
Time time.Duration
Spray [][]float32
}
type DemoNotFoundError struct {
error
}
func (s *Sprays) Add(currentTime time.Duration, sprayPoint []float32, timeout int, maxLength int) {
sprayFound := false
for _, sp := range s.Sprays {
if currentTime.Milliseconds()-sp.Time.Milliseconds() <= int64(timeout) {
sprayFound = true
if len(sp.Spray) < maxLength+1 {
sp.Spray = append(sp.Spray, []float32{
sprayPoint[0] - sp.Spray[0][0],
sprayPoint[1] - sp.Spray[0][1],
})
}
}
}
if !sprayFound {
s.Sprays = append(s.Sprays, &Spray{
Time: currentTime,
Spray: [][]float32{sprayPoint},
})
}
}
func (s *Sprays) Avg() (avg [][]float32) {
var (
total int
)
total++
for _, sp := range s.Sprays {
for i, r2p := range sp.Spray {
if i == 0 {
continue
}
if len(avg) <= i-1 {
avg = append(avg, r2p)
} else {
avg[i-1][0] += r2p[0]
avg[i-1][1] += r2p[1]
}
}
}
for i, r2p := range avg {
avg[i][0] = r2p[0] / float32(total)
avg[i][1] = r2p[1] / float32(total)
}
return
}
func (p *DemoParser) Setup(db *ent.Client, worker int) error {
p.demoQueue = make(chan *Demo, 1000)
p.db = db
@@ -51,10 +123,10 @@ func (p *DemoParser) ParseDemo(demo *Demo) error {
}
}
func (p *DemoParser) downloadDecompressReplay(demo *Demo) (io.Reader, error) {
log.Debugf("[DP] Downloading replay for %d", demo.MatchId)
func (d *Demo) download() (io.Reader, error) {
log.Debugf("[DP] Downloading replay for %d", d.MatchId)
r, err := http.Get(demo.Url)
r, err := http.Get(d.Url)
if err != nil {
return nil, err
}
@@ -65,8 +137,8 @@ func (p *DemoParser) downloadDecompressReplay(demo *Demo) (io.Reader, error) {
return bzip2.NewReader(r.Body), nil
}
func (p *DemoParser) getDBPlayer(demo *Demo, demoPlayer *common.Player) (*ent.Stats, error) {
tMatchPlayer, err := p.db.Stats.Query().WithMatches(func(q *ent.MatchQuery) {
func (p *DemoParser) getDBPlayer(demo *Demo, demoPlayer *common.Player) (*ent.MatchPlayer, error) {
tMatchPlayer, err := p.db.MatchPlayer.Query().WithMatches(func(q *ent.MatchQuery) {
q.Where(match.ID(demo.MatchId))
}).WithPlayers(func(q *ent.PlayerQuery) {
q.Where(player.ID(demoPlayer.SteamID64))
@@ -78,7 +150,7 @@ func (p *DemoParser) getDBPlayer(demo *Demo, demoPlayer *common.Player) (*ent.St
return tMatchPlayer, nil
}
func (p *DemoParser) getMatchPlayerBySteamID(stats []*ent.Stats, steamId uint64) *ent.Stats {
func (p *DemoParser) getMatchPlayerBySteamID(stats []*ent.MatchPlayer, steamId uint64) *ent.MatchPlayer {
for _, tStats := range stats {
tPLayer, err := tStats.Edges.PlayersOrErr()
if err != nil {
@@ -112,7 +184,7 @@ func (p *DemoParser) parseWorker() {
}
startTime := time.Now()
fDemo, err := p.downloadDecompressReplay(demo)
fDemo, err := demo.download()
if err != nil {
if _, ok := err.(DemoNotFoundError); ok {
if tMatch.Date.Before(time.Now().UTC().AddDate(0, 0, -30)) {
@@ -146,8 +218,47 @@ func (p *DemoParser) parseWorker() {
Bank int
Spent int
}, 0)
encounters := make([]*Encounter, 0)
spays := make([]*Sprays, 0)
demoParser := demoinfocs.NewParser(fDemo)
// onPlayerSpotted
demoParser.RegisterEventHandler(func(e events.PlayerSpottersChanged) {
gs := demoParser.GameState()
if !gs.IsMatchStarted() {
return
}
encounters = append(encounters, &Encounter{
Spotted: e.Spotted.SteamID64,
Time: demoParser.CurrentTime(),
})
})
// onWeaponFire
demoParser.RegisterEventHandler(func(e events.WeaponFire) {
gs := demoParser.GameState()
if !gs.IsMatchStarted() {
return
}
playerWeaponFound := false
for _, spray := range spays {
if e.Shooter.SteamID64 == spray.Sprayer && int(e.Weapon.Type) == spray.Weapon {
playerWeaponFound = true
spray.Add(demoParser.CurrentTime(), []float32{e.Shooter.ViewDirectionX(), e.Shooter.ViewDirectionY()}, 500, 10)
}
}
if !playerWeaponFound {
spays = append(spays, &Sprays{
Sprayer: e.Shooter.SteamID64,
Sprays: []*Spray{{demoParser.CurrentTime(), [][]float32{{e.Shooter.ViewDirectionX(), e.Shooter.ViewDirectionY()}}}},
Weapon: int(e.Weapon.Type),
})
}
})
// onPlayerHurt
demoParser.RegisterEventHandler(func(e events.PlayerHurt) {
if e.Attacker == nil || e.Player == nil || e.Weapon == nil || !demoParser.GameState().IsMatchStarted() {
@@ -244,22 +355,22 @@ func (p *DemoParser) parseWorker() {
tMatchPlayer.Crosshair = demoPlayer.CrosshairCode()
switch demoPlayer.Color() {
case common.Yellow:
tMatchPlayer.Color = stats.ColorYellow
tMatchPlayer.Color = matchplayer.ColorYellow
break
case common.Green:
tMatchPlayer.Color = stats.ColorGreen
tMatchPlayer.Color = matchplayer.ColorGreen
break
case common.Purple:
tMatchPlayer.Color = stats.ColorPurple
tMatchPlayer.Color = matchplayer.ColorPurple
break
case common.Blue:
tMatchPlayer.Color = stats.ColorBlue
tMatchPlayer.Color = matchplayer.ColorBlue
break
case common.Orange:
tMatchPlayer.Color = stats.ColorOrange
tMatchPlayer.Color = matchplayer.ColorOrange
break
default:
tMatchPlayer.Color = stats.ColorGrey
tMatchPlayer.Color = matchplayer.ColorGrey
}
}
}
@@ -289,7 +400,7 @@ func (p *DemoParser) parseWorker() {
for _, tMatchPlayer := range tStats {
if tMatchPlayer.Color == "" {
tMatchPlayer.Color = stats.ColorGrey
tMatchPlayer.Color = matchplayer.ColorGrey
}
nMatchPLayer, err := tMatchPlayer.Update().
@@ -318,18 +429,37 @@ func (p *DemoParser) parseWorker() {
}
for _, eqDmg := range eqMap[tMatchPlayer.PlayerStats] {
err := p.db.WeaponStats.Create().SetStat(nMatchPLayer).SetDmg(eqDmg.Dmg).SetVictim(eqDmg.To).SetHitGroup(eqDmg.HitGroup).SetEqType(eqDmg.Eq).Exec(context.Background())
err := p.db.Weapon.Create().SetStat(nMatchPLayer).SetDmg(eqDmg.Dmg).SetVictim(eqDmg.To).SetHitGroup(eqDmg.HitGroup).SetEqType(eqDmg.Eq).Exec(context.Background())
if err != nil {
log.Errorf("[DP] Unable to create WeaponStat: %v", err)
}
}
for _, eco := range ecoMap[tMatchPlayer.PlayerStats] {
err := p.db.RoundStats.Create().SetStat(nMatchPLayer).SetRound(uint(eco.Round)).SetBank(uint(eco.Bank)).SetEquipment(uint(eco.EqV)).SetSpent(uint(eco.Spent)).Exec(context.Background())
err := p.db.RoundStats.Create().SetMatchPlayer(nMatchPLayer).SetRound(uint(eco.Round)).SetBank(uint(eco.Bank)).SetEquipment(uint(eco.EqV)).SetSpent(uint(eco.Spent)).Exec(context.Background())
if err != nil {
log.Errorf("[DP] Unable to create RoundStat: %v", err)
}
}
for _, spray := range spays {
if spray.Sprayer == nMatchPLayer.PlayerStats {
if sprayAvg := spray.Avg(); len(sprayAvg) >= 5 {
sprayBuf := new(bytes.Buffer)
enc := gob.NewEncoder(sprayBuf)
err = enc.Encode(sprayAvg)
if err != nil {
log.Warningf("[DP] Failure to encode spray %v as bytes: %v", spray, err)
continue
}
err = p.db.Spray.Create().SetMatchPlayers(nMatchPLayer).SetWeapon(spray.Weapon).SetSpray(sprayBuf.Bytes()).Exec(context.Background())
if err != nil {
log.Warningf("[DP] Failure adding spray to database: %v", err)
}
}
}
}
}
log.Infof("[DP] parsed match %d (took %s/%s)", demo.MatchId, downloadTime, time.Since(startTime))