From 085dd3a8d74fd0e6bc037fd3797aa6d7a5bf3be7 Mon Sep 17 00:00:00 2001 From: Lanta Date: Wed, 27 Sep 2023 12:33:51 +0200 Subject: [PATCH 1/2] all players of match --- discord/report_new_matches.ps1 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/discord/report_new_matches.ps1 b/discord/report_new_matches.ps1 index 4104c3a..08f5abf 100644 --- a/discord/report_new_matches.ps1 +++ b/discord/report_new_matches.ps1 @@ -42,22 +42,23 @@ foreach ($winid in $new_win_matches) { $winmatches = $player_matches.player_matches | Where-Object { $_.id -eq $winid } $telemetry = (invoke-webrequest @($winmatches.telemetry_url)[0]).content | convertfrom-json $players = $winmatches.stats.name - + $match_stats = Invoke-RestMethod -Uri "https://api.pubg.com/shards/steam/matches/$winid" -Method GET -Headers $headers + $all_winners_of_match = ($match_stats.included.attributes.stats | where-object {$_.winplace -eq 1}) send-discord -content ":chicken: :chicken: CHICKEN CHICKEN WINNER DINNER!! :chicken: :chicken:" send-discord -content "Gefeliciteerd $($players -join ' ')" send-discord -content "match Type $($winmatches[0].matchType)" send-discord -content "map $($winmatches[0].mapName)" - foreach ($player in $players) { + foreach ($player in $all_winners_of_match.name) { $win_stats += [PSCustomObject]@{ playername = $player dmg_h = (($telemetry | where-object { $_._T -eq 'LOGPLAYERTAKEDAMAGE' } | where-object { $_.attacker.name -eq $player } | where-object { $_.victim.accountId -notlike "ai.*" } ).damage | Measure-Object -Sum).Sum - dmg = ($winmatches.stats | Where-Object { $_.name -eq $player }).damageDealt + dmg = ($all_winners_of_match | Where-Object { $_.name -eq $player }).damageDealt k_h = (($telemetry | where-object { $_._T -eq 'LOGPLAYERKILLV2' } | where-object { $_.killer.name -eq $player } | where-object { $_.victim.accountId -notlike "ai.*" } )).count - k_a = ($winmatches.stats | Where-Object { $_.name -eq $player }).kills - k_t = ($winmatches.stats | Where-Object { $_.name -eq $player }).teamKills - t_serv = ($winmatches.stats | Where-Object { $_.name -eq $player }).timeSurvived + k_a = ($all_winners_of_match | Where-Object { $_.name -eq $player }).kills + k_t = ($all_winners_of_match | Where-Object { $_.name -eq $player }).teamKills + t_serv = ($all_winners_of_match | Where-Object { $_.name -eq $player }).timeSurvived } } From 9c56c5160e66b1729c287a88e872393517971b0e Mon Sep 17 00:00:00 2001 From: Lanta Date: Wed, 27 Sep 2023 12:34:13 +0200 Subject: [PATCH 2/2] clean --- discord/report_new_matches.ps1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/discord/report_new_matches.ps1 b/discord/report_new_matches.ps1 index 08f5abf..1aafe99 100644 --- a/discord/report_new_matches.ps1 +++ b/discord/report_new_matches.ps1 @@ -34,10 +34,7 @@ $new_win_matches = $player_matches.new_win_matches $win_stats = @() foreach ($winid in $new_win_matches) { - - - - + if ($null -eq $winid) { continue } $winmatches = $player_matches.player_matches | Where-Object { $_.id -eq $winid } $telemetry = (invoke-webrequest @($winmatches.telemetry_url)[0]).content | convertfrom-json