diff --git a/last_stats.php b/last_stats.php index 79bc9aa..edc2d7e 100644 --- a/last_stats.php +++ b/last_stats.php @@ -25,11 +25,14 @@ $ogDescription = "Explore detailed player statistics over the past month includi if ($key == 'updated') { continue; } + if ($key == 'all') { + continue; + } echo "
"; - if ($key == 'all') { - echo "Stats for $key (minimal 20 matches)"; - } + // if ($key == 'all') { + // echo "Stats for $key (minimal 20 matches)"; + // } if ($key == 'Intense') { echo "Stats for $key (minimal 8 matches)"; } @@ -65,7 +68,7 @@ $ogDescription = "Explore detailed player statistics over the past month includi continue; // Skip this iteration and move to the next } - if ($key == 'all' && $player_data['matches'] < 20) { + if ($key == 'all' && $player_data['matches'] < 20) { continue; } if ($key == 'Intense' && $player_data['matches'] < 8) { diff --git a/update/matchparser.ps1 b/update/matchparser.ps1 index 1a152e3..34e4520 100644 --- a/update/matchparser.ps1 +++ b/update/matchparser.ps1 @@ -46,7 +46,7 @@ function get-killstats { $gameMode ) $LOGPLAYERKILLV2 = $telemetry | where-object { $_._T -eq 'LOGPLAYERKILLV2' } - $kills = $LOGPLAYERKILLV2 | where-object { $_.killer.name -eq $player_name} + $kills = $LOGPLAYERKILLV2 | where-object { $_.killer.name -eq $player_name } $deaths = $LOGPLAYERKILLV2 | where-object { $_.victim.name -eq $player_name -and $_.finisher.name.count -ge 1 } $HumanDmg = $([math]::Round(($telemetry | Where-Object { $_._T -eq 'LOGPLAYERTAKEDAMAGE' -and $_.attacker.name -eq $player_name -and $_.victim.accountId -notlike "ai.*" -and $_.victim.teamId -ne $_.attacker.teamId } | Measure-Object -Property damage -Sum).Sum)) return @{ @@ -130,11 +130,11 @@ foreach ($player in $all_player_matches) { $savekillstats = @{ - - matchid = $match.id - created = $match.createdAt - stats = $killstat - winplace = (($all_player_matches | where-object { $_.playername -eq $player_name } ).player_matches | where-object { $_.id -eq $match.id }).stats.winplace + matchid = $match.id + created = $match.createdAt + stats = $killstat + deathType = $match.stats.deathType + winplace = (($all_player_matches | where-object { $_.playername -eq $player_name } ).player_matches | where-object { $_.id -eq $match.id }).stats.winplace } Write-Output "Writing to file $scriptroot/../data/killstats/$($match.id)_$player_name.json" $savekillstats | ConvertTo-Json | out-file "$scriptroot/../data/killstats/$($match.id)_$player_name.json" @@ -181,7 +181,8 @@ function Get-MatchStatsPlayer { if ($MatchType) { $filterProperty = 'matchType' } - $deaths = (($killstats.stats | where-object { $_.playername -eq $player -and $_.$filterProperty -like $typemodevalue }).deaths | Measure-Object -sum).sum + $alives = (($killstats | where-object { $_.stats.playername -eq $player -and $_.stats.$filterProperty -like $typemodevalue }).deathType | where-object {$_ -eq 'alive'}).count + $deaths = (($killstats | where-object { $_.stats.playername -eq $player -and $_.stats.$filterProperty -like $typemodevalue }).deathType | where-object {$_ -ne 'alive'}).count $kills = (($killstats.stats | where-object { $_.playername -eq $player -and $_.$filterProperty -like $typemodevalue }).kills | Measure-Object -sum).sum $dbno = (($killstats.stats | where-object { $_.playername -eq $player -and $_.$filterProperty -like $typemodevalue }).dbno | Measure-Object -sum).sum $humankills = (($killstats.stats | where-object { $_.playername -eq $player -and $_.$filterProperty -like $typemodevalue }).humankills | Measure-Object -sum).sum @@ -199,13 +200,14 @@ function Get-MatchStatsPlayer { write-host $change $MatchStatsPlayer += [PSCustomObject]@{ + alives = $alives playername = $player deaths = $deaths kills = $kills humankills = $humankills matches = $player_matches - KD_H = $humankills / $deaths - KD_ALL = $kills / $deaths + KD_H = $humankills / ($deaths + $alives) # KD_Human calculated per match (kills / (deaths + alives)) + KD_ALL = $kills / ($deaths + $alives) # KD_ALL calculated per match (kills / (deaths + alives)) winratio = $winratio wins = $player_wins dbno = $dbno