Merge pull request #70 from OpzekerIT/dev

Dev

data/claninfo.json

@@ -1,6 +0,0 @@
-{
-  "clanLevel": 6,
-  "clanMemberCount": 12,
-  "clanName": "ChickenWingMen",
-  "clanTag": "DTCH"
-}

data/player_last_stats.json

@@ -1,77 +0,0 @@
-[
-  {
-    "playername": "Lanta01",
-    "deaths": 62.0,
-    "kills": 241.0,
-    "humankills": 70.0,
-    "matches": 75,
-    "KD_H": 1.1290322580645162,
-    "KD_ALL": 3.8870967741935485
-  },
-  {
-    "playername": "Petje1972",
-    "deaths": 45.0,
-    "kills": 278.0,
-    "humankills": 58.0,
-    "matches": 52,
-    "KD_H": 1.288888888888889,
-    "KD_ALL": 6.177777777777778
-  },
-  {
-    "playername": "TaGMoM",
-    "deaths": 13.0,
-    "kills": 42.0,
-    "humankills": 1.0,
-    "matches": 14,
-    "KD_H": 0.07692307692307693,
-    "KD_ALL": 3.230769230769231
-  },
-  {
-    "playername": "r00tger",
-    "deaths": 0.0,
-    "kills": 6.0,
-    "humankills": 2.0,
-    "matches": 1,
-    "KD_H": "Infinity",
-    "KD_ALL": "Infinity"
-  },
-  {
-    "playername": "Masistuta",
-    "deaths": 33.0,
-    "kills": 129.0,
-    "humankills": 15.0,
-    "matches": 44,
-    "KD_H": 0.45454545454545453,
-    "KD_ALL": 3.909090909090909
-  },
-  {
-    "playername": "RalphNorris",
-    "deaths": 49.0,
-    "kills": 86.0,
-    "humankills": 13.0,
-    "matches": 55,
-    "KD_H": 0.2653061224489796,
-    "KD_ALL": 1.7551020408163265
-  },
-  {
-    "playername": "Jimbo_The_One",
-    "deaths": 34.0,
-    "kills": 38.0,
-    "humankills": 20.0,
-    "matches": 43,
-    "KD_H": 0.5882352941176471,
-    "KD_ALL": 1.1176470588235294
-  },
-  {
-    "playername": "Shepherders",
-    "deaths": 3.0,
-    "kills": 4.0,
-    "humankills": 0.0,
-    "matches": 3,
-    "KD_H": 0.0,
-    "KD_ALL": 1.3333333333333333
-  },
-  {
-    "updated": "09/25/2023 15:46:45 - Time Zone: W. Europe Standard Time"
-  }
-]

index.php

@@ -47,13 +47,13 @@ $lastMatches = array_slice($allMatches, 0, 8);
         <tr>
             <!-- <th>Match Date</th> -->
             <th>Player Name</th>
-            <th>Game Mode</th>
+            <th>Mode</th>
-            <th>MatchType</th>
+            <th>Type</th>
             <th>Map</th>
             <th>Kills</th>
-            <th>Damage Dealt</th>
+            <th>Damage</th>
             <th>Time Survived</th>
-            <th>Win Place</th>
+            <th>Place</th>
         </tr>
     </thead>
     <tbody>

update/matchparser.ps1

@@ -9,25 +9,17 @@ else {
     $scriptroot = $PSScriptRoot
 }
 
-function get-change {
+function Get-Change {
     param (
-        $winratio_old,
+        [double]$OldWinRatio,
-        $winratio
+        [double]$NewWinRatio
-
     )
-    if ($winratio_old -eq 0) {
+
-        if ($winratio -eq 0) {
+    $change = ($OldWinRatio -eq 0) ? (($NewWinRatio -eq 0) ? 0 : $NewWinRatio) : ($NewWinRatio - $OldWinRatio)
-            $change = 0
+    
-        } else {
+    return [math]::Round($change, 2)
-o
-            $change = 0
-        }
-    } else {
-        $change = [math]::Round(($winratio - $winratio_old) , 2)
 }
 
-    return $change
-}
 function get-killstats {
     param (
         $player_name,
@@ -122,7 +114,7 @@ foreach ($player in $all_player_matches.playername) {
     $player_wins = ($all_player_matches | where-object { $_.playername -eq $player } | ForEach-Object { $_.player_matches } | where-object { $_.stats.winPlace -eq 1 }).count
     $winratio = ($player_wins / $player_matches) * 100
     $winratio_old = (($oldstats.all | Where-Object { $_.playername -eq $player }).winratio)
-    $change = get-change -winratio_old $winratio_old -winratio $winratio
+    $change = get-change -OldWinRatio $winratio_old -NewWinRatio $winratio
     write-output 'all'
     write-output "Calculating for player $player"
     write-output "new winratio $winratio"
@@ -160,7 +152,7 @@ foreach ($player in $all_player_matches.playername) {
     $player_wins = ($all_player_matches | where-object { $_.playername -eq $player } | ForEach-Object { $_.player_matches } | where-object { $_.stats.winPlace -eq 1 } | Where-Object { $_.matchType -eq 'event' -and $_.gameMode -eq 'ibr' }).count
     $winratio = ($player_wins / $player_matches) * 100
     $winratio_old = (($oldstats.Intense | Where-Object { $_.playername -eq $player }).winratio)
-    $change = get-change -winratio_old $winratio_old -winratio $winratio
+    $change = get-change -OldWinRatio $winratio_old -NewWinRatio $winratio
 
     write-output 'event'
     write-output "Calculating for player $player"
@@ -196,7 +188,7 @@ foreach ($player in $all_player_matches.playername) {
     $player_wins = ($all_player_matches | where-object { $_.playername -eq $player } | ForEach-Object { $_.player_matches } | where-object { $_.stats.winPlace -eq 1 } | Where-Object { $_.matchType -eq 'airoyale' }).count
     $winratio = ($player_wins / $player_matches) * 100
     $winratio_old = (($oldstats.Casual | Where-Object { $_.playername -eq $player }).winratio)
-    $change = get-change -winratio_old $winratio_old -winratio $winratio
+    $change = get-change -OldWinRatio $winratio_old -NewWinRatio $winratio
 
     write-output 'airoyale'
     write-output "Calculating for player $player"
@@ -232,7 +224,7 @@ foreach ($player in $all_player_matches.playername) {
     $player_wins = ($all_player_matches | where-object { $_.playername -eq $player } | ForEach-Object { $_.player_matches } | where-object { $_.stats.winPlace -eq 1 } | Where-Object { $_.matchType -eq 'official' }).count
     $winratio = ($player_wins / $player_matches) * 100
     $winratio_old = (($oldstats.official | Where-Object { $_.playername -eq $player }).winratio)
-    $change = get-change -winratio_old $winratio_old -winratio $winratio
+    $change = get-change -OldWinRatio $winratio_old -NewWinRatio $winratio
     write-output 'official'
     write-output "Calculating for player $player"
     write-output "new winratio $winratio"