more readable queries;formatting

tslashd · tslashd · commit d978813ff1d9 · 2024-01-16T22:44:42.000+02:00
diff --git a/src/ST-Commands/PlayerCommands.cs b/src/ST-Commands/PlayerCommands.cs
@@ -18,8 +18,8 @@ public void PlayerReset(CCSPlayerController? player, CommandInfo command)
 
         // To-do: players[userid].Timer.Reset() -> teleport player
         playerList[player.UserId ?? 0].Timer.Reset();
-        if (CurrentMap.StartZone != new Vector(0,0,0))
-            Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StartZone, new QAngle(0,0,0), new Vector(0,0,0)));
+        if (CurrentMap.StartZone != new Vector(0, 0, 0))
+            Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StartZone, new QAngle(0, 0, 0), new Vector(0, 0, 0)));
         return;
     }
 
@@ -32,10 +32,10 @@ public void PlayerResetStage(CCSPlayerController? player, CommandInfo command)
 
         // To-do: players[userid].Timer.Reset() -> teleport player
         Player SurfPlayer = playerList[player.UserId ?? 0];
-        if (SurfPlayer.Timer.Stage != 0 && CurrentMap.StageStartZone[SurfPlayer.Timer.Stage] != new Vector(0,0,0))
-            Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StageStartZone[SurfPlayer.Timer.Stage], CurrentMap.StageStartZoneAngles[SurfPlayer.Timer.Stage], new Vector(0,0,0)));
+        if (SurfPlayer.Timer.Stage != 0 && CurrentMap.StageStartZone[SurfPlayer.Timer.Stage] != new Vector(0, 0, 0))
+            Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StageStartZone[SurfPlayer.Timer.Stage], CurrentMap.StageStartZoneAngles[SurfPlayer.Timer.Stage], new Vector(0, 0, 0)));
         else // Reset back to map start
-            Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StartZone, new QAngle(0,0,0), new Vector(0,0,0)));
+            Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StartZone, new QAngle(0, 0, 0), new Vector(0, 0, 0)));
         return;
     }
 
@@ -66,71 +66,59 @@ public void PlayerGoToStage(CCSPlayerController? player, CommandInfo command)
             return;
         }
 
-        if (CurrentMap.StageStartZone[stage] != new Vector(0,0,0))
+        if (CurrentMap.StageStartZone[stage] != new Vector(0, 0, 0))
         {
             if (stage == 0)
-                Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StartZone, CurrentMap.StartZoneAngles, new Vector(0,0,0)));
+                Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StartZone, CurrentMap.StartZoneAngles, new Vector(0, 0, 0)));
             else
-                Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StageStartZone[stage], CurrentMap.StageStartZoneAngles[stage], new Vector(0,0,0)));
-        
+                Server.NextFrame(() => player.PlayerPawn.Value!.Teleport(CurrentMap.StageStartZone[stage], CurrentMap.StageStartZoneAngles[stage], new Vector(0, 0, 0)));
+
             playerList[player.UserId ?? 0].Timer.Reset();
             playerList[player.UserId ?? 0].Timer.IsStageMode = true;
 
             // To-do: If you run this while you're in the start zone, endtouch for the start zone runs after you've teleported
             //        causing the timer to start. This needs to be fixed.
         }
 
-        else 
+        else
             player.PrintToChat($"{PluginPrefix} {ChatColors.Red}Invalid stage provided. Usage: {ChatColors.Green}!s <stage>");
     }
 
-    // // Test command
-    // [ConsoleCommand("css_savereplay", "Test")]
-    // public void SaveReplay(CCSPlayerController? player, CommandInfo command) {
-    //     if(player == null)
-    //         return;
-
-    //     foreach(var p in playerList.Values) {
-    //         if(p.Replay.Frames.Count() > 0) {
-    //             p.Replay.StopRecording();
-    //             p.Replay.SaveReplayData(p, DB!);
-    //             break;
-    //         }
-    //     }
-    // }
-
     // Test command
     [ConsoleCommand("css_spec", "Moves a player automaticlly into spectator mode")]
-    public void MovePlayerToSpectator(CCSPlayerController? player, CommandInfo command) {
-        if(player == null || player.Team == CsTeam.Spectator)
+    public void MovePlayerToSpectator(CCSPlayerController? player, CommandInfo command)
+    {
+        if (player == null || player.Team == CsTeam.Spectator)
             return;
 
         player.ChangeTeam(CsTeam.Spectator);
     }
 
     [ConsoleCommand("css_replaybotpause", "Pause the replay bot playback")]
     [ConsoleCommand("css_rbpause", "Pause the replay bot playback")]
-    public void PauseReplay(CCSPlayerController? player, CommandInfo command) {
-        if(player == null
+    public void PauseReplay(CCSPlayerController? player, CommandInfo command)
+    {
+        if (player == null
             || player.Team != CsTeam.Spectator
             || CurrentMap.ReplayBot.Controller == null
             || !CurrentMap.ReplayBot.IsPlaying
             || CurrentMap.ReplayBot.Controller.Pawn.SerialNum != player.ObserverPawn.Value!.ObserverServices!.ObserverTarget.SerialNum)
             return;
-        
+
         CurrentMap.ReplayBot.Pause();
     }
 
     [ConsoleCommand("css_replaybotflip", "Flips the replay bot between Forward/Backward playback")]
     [ConsoleCommand("css_rbflip", "Flips the replay bot between Forward/Backward playback")]
-    public void ReverseReplay(CCSPlayerController? player, CommandInfo command) {
-        if(player == null
+    public void ReverseReplay(CCSPlayerController? player, CommandInfo command)
+    {
+        if (player == null
             || player.Team != CsTeam.Spectator
             || CurrentMap.ReplayBot.Controller == null
             || !CurrentMap.ReplayBot.IsPlaying
             || CurrentMap.ReplayBot.Controller.Pawn.SerialNum != player.ObserverPawn.Value!.ObserverServices!.ObserverTarget.SerialNum)
             return;
-        
+
         CurrentMap.ReplayBot.FrameTickIncrement *= -1;
     }
 }
diff --git a/src/ST-Events/Players.cs b/src/ST-Events/Players.cs
@@ -97,7 +97,10 @@ public HookResult OnPlayerConnectFull(EventPlayerConnectFull @event, GameEventIn
                 connections = 1;
 
                 // Write new player to database
-                Task<int> newPlayerTask = DB.Write($"INSERT INTO `Player` (`name`, `steam_id`, `country`, `join_date`, `last_seen`, `connections`) VALUES ('{MySqlHelper.EscapeString(name)}', {player.SteamID}, '{country}', {joinDate}, {lastSeen}, {connections});");
+                Task<int> newPlayerTask = DB.Write($@"
+                    INSERT INTO `Player` (`name`, `steam_id`, `country`, `join_date`, `last_seen`, `connections`) 
+                    VALUES ('{MySqlHelper.EscapeString(name)}', {player.SteamID}, '{country}', {joinDate}, {lastSeen}, {connections});
+                ");
                 int newPlayerTaskRows = newPlayerTask.Result;
                 if (newPlayerTaskRows != 1)
                     throw new Exception($"CS2 Surf ERROR >> OnPlayerConnect -> Failed to write new player to database, this shouldnt happen. Player: {name} ({player.SteamID})");
@@ -174,9 +177,11 @@ public HookResult OnPlayerDisconnect(EventPlayerDisconnect @event, GameEventInfo
             else
             {
                 // Update data in Player DB table
-                Task<int> updatePlayerTask = DB.Write($"UPDATE `Player` SET country = '{playerList[player.UserId ?? 0].Profile.Country}', " +
-                                                        $"`last_seen` = {(int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()}, `connections` = `connections` + 1 " +
-                                                        $"WHERE `id` = {playerList[player.UserId ?? 0].Profile.ID} LIMIT 1;");
+                Task<int> updatePlayerTask = DB.Write($@"
+                    UPDATE `Player` SET country = '{playerList[player.UserId ?? 0].Profile.Country}', 
+                    `last_seen` = {(int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()}, `connections` = `connections` + 1 
+                    WHERE `id` = {playerList[player.UserId ?? 0].Profile.ID} LIMIT 1;
+                ");
                 if (updatePlayerTask.Result != 1)
                     throw new Exception($"CS2 Surf ERROR >> OnPlayerDisconnect -> Failed to update player data in database. Player: {player.PlayerName} ({player.SteamID})");
                 // Player disconnection to-do
diff --git a/src/ST-Events/TriggerStartTouch.cs b/src/ST-Events/TriggerStartTouch.cs
@@ -79,13 +79,14 @@ internal HookResult OnTriggerStartTouch(DynamicHook handler)
                         player.Stats.PB[style].Ticks = player.Timer.Ticks; // Reload the run_time for the HUD and also assign for the DB query
 
                         #if DEBUG
-                        Console.WriteLine($"CS2 Surf DEBUG >> OnTriggerStartTouch (Map end zone) -> " +
-                                                                    $"============== INSERT INTO `MapTimes` " +
-                                                                    $"(`player_id`, `map_id`, `style`, `type`, `stage`, `run_time`, `start_vel_x`, `start_vel_y`, `start_vel_z`, `end_vel_x`, `end_vel_y`, `end_vel_z`, `run_date`) " +
-                                                                    $"VALUES ({player.Profile.ID}, {CurrentMap.ID}, {style}, 0, 0, {player.Stats.ThisRun.Ticks}, " +
-                                                                    $"{player.Stats.ThisRun.StartVelX}, {player.Stats.ThisRun.StartVelY}, {player.Stats.ThisRun.StartVelZ}, {velocity_x}, {velocity_y}, {velocity_z}, {(int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()}) " + // To-do: get the `start_vel` values for the run from CP implementation
-                                                                    $"ON DUPLICATE KEY UPDATE run_time=VALUES(run_time), start_vel_x=VALUES(start_vel_x), start_vel_y=VALUES(start_vel_y), " +
-                                                                    $"start_vel_z=VALUES(start_vel_z), end_vel_x=VALUES(end_vel_x), end_vel_y=VALUES(end_vel_y), end_vel_z=VALUES(end_vel_z), run_date=VALUES(run_date);");
+                        Console.WriteLine($@"CS2 Surf DEBUG >> OnTriggerStartTouch (Map end zone) -> 
+                            ============== INSERT INTO `MapTimes` 
+                            (`player_id`, `map_id`, `style`, `type`, `stage`, `run_time`, `start_vel_x`, `start_vel_y`, `start_vel_z`, `end_vel_x`, `end_vel_y`, `end_vel_z`, `run_date`) 
+                            VALUES ({player.Profile.ID}, {CurrentMap.ID}, {style}, 0, 0, {player.Stats.ThisRun.Ticks}, 
+                            {player.Stats.ThisRun.StartVelX}, {player.Stats.ThisRun.StartVelY}, {player.Stats.ThisRun.StartVelZ}, {velocity_x}, {velocity_y}, {velocity_z}, {(int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()})
+                            ON DUPLICATE KEY UPDATE run_time=VALUES(run_time), start_vel_x=VALUES(start_vel_x), start_vel_y=VALUES(start_vel_y), 
+                            start_vel_z=VALUES(start_vel_z), end_vel_x=VALUES(end_vel_x), end_vel_y=VALUES(end_vel_y), end_vel_z=VALUES(end_vel_z), run_date=VALUES(run_date);
+                        ");
                         #endif
 
                         // Add entry in DB for the run
diff --git a/src/ST-Player/PlayerStats/CurrentRun.cs b/src/ST-Player/PlayerStats/CurrentRun.cs
@@ -53,12 +53,14 @@ public void SaveMapTime(Player player, TimerDatabase DB)
         // Add entry in DB for the run
         // To-do: add `type`
         int style = player.Timer.Style;
-        Task<int> updatePlayerRunTask = DB.Write($"INSERT INTO `MapTimes` " +
-                                                    $"(`player_id`, `map_id`, `style`, `type`, `stage`, `run_time`, `start_vel_x`, `start_vel_y`, `start_vel_z`, `end_vel_x`, `end_vel_y`, `end_vel_z`, `run_date`) " +
-                                                    $"VALUES ({player.Profile.ID}, {player.CurrMap.ID}, {style}, 0, 0, {player.Stats.ThisRun.Ticks}, " +
-                                                    $"{player.Stats.ThisRun.StartVelX}, {player.Stats.ThisRun.StartVelY}, {player.Stats.ThisRun.StartVelZ}, {player.Stats.ThisRun.EndVelX}, {player.Stats.ThisRun.EndVelY}, {player.Stats.ThisRun.EndVelZ}, {(int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()}) " +
-                                                    $"ON DUPLICATE KEY UPDATE run_time=VALUES(run_time), start_vel_x=VALUES(start_vel_x), start_vel_y=VALUES(start_vel_y), " +
-                                                    $"start_vel_z=VALUES(start_vel_z), end_vel_x=VALUES(end_vel_x), end_vel_y=VALUES(end_vel_y), end_vel_z=VALUES(end_vel_z), run_date=VALUES(run_date);");
+        Task<int> updatePlayerRunTask = DB.Write($@"
+            INSERT INTO `MapTimes` 
+            (`player_id`, `map_id`, `style`, `type`, `stage`, `run_time`, `start_vel_x`, `start_vel_y`, `start_vel_z`, `end_vel_x`, `end_vel_y`, `end_vel_z`, `run_date`) 
+            VALUES ({player.Profile.ID}, {player.CurrMap.ID}, {style}, 0, 0, {player.Stats.ThisRun.Ticks}, 
+            {player.Stats.ThisRun.StartVelX}, {player.Stats.ThisRun.StartVelY}, {player.Stats.ThisRun.StartVelZ}, {player.Stats.ThisRun.EndVelX}, {player.Stats.ThisRun.EndVelY}, {player.Stats.ThisRun.EndVelZ}, {(int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()}) 
+            ON DUPLICATE KEY UPDATE run_time=VALUES(run_time), start_vel_x=VALUES(start_vel_x), start_vel_y=VALUES(start_vel_y), 
+            start_vel_z=VALUES(start_vel_z), end_vel_x=VALUES(end_vel_x), end_vel_y=VALUES(end_vel_y), end_vel_z=VALUES(end_vel_z), run_date=VALUES(run_date);
+        ");
         if (updatePlayerRunTask.Result <= 0)
             throw new Exception($"CS2 Surf ERROR >> internal class PersonalBest -> SaveMapTime -> Failed to insert/update player run in database. Player: {player.Profile.Name} ({player.Profile.SteamID})");
         updatePlayerRunTask.Dispose();
@@ -91,30 +93,33 @@ public void SaveMapTime(Player player, TimerDatabase DB)
 
             #if DEBUG
             Console.WriteLine($"CP: {cp} | MapTime ID: {player.Stats.PB[style].ID} | Time: {runTime} | Ticks: {ticks} | startVelX: {startVelX} | startVelY: {startVelY} | startVelZ: {startVelZ} | endVelX: {endVelX} | endVelY: {endVelY} | endVelZ: {endVelZ}");
-            Console.WriteLine($"CS2 Surf DEBUG >> internal class Checkpoint : PersonalBest -> SaveCurrentRunCheckpoints -> " +
-                                $"INSERT INTO `Checkpoints` " +
-                                $"(`maptime_id`, `cp`, `run_time`, `start_vel_x`, `start_vel_y`, `start_vel_z`, " +
-                                $"`end_vel_x`, `end_vel_y`, `end_vel_z`, `attempts`, `end_touch`) " +
-                                $"VALUES ({player.Stats.PB[style].ID}, {cp}, {runTime}, {startVelX}, {startVelY}, {startVelZ}, {endVelX}, {endVelY}, {endVelZ}, {attempts}, {ticks}) ON DUPLICATE KEY UPDATE " +
-                                $"run_time=VALUES(run_time), start_vel_x=VALUES(start_vel_x), start_vel_y=VALUES(start_vel_y), start_vel_z=VALUES(start_vel_z), " +
-                                $"end_vel_x=VALUES(end_vel_x), end_vel_y=VALUES(end_vel_y), end_vel_z=VALUES(end_vel_z), attempts=VALUES(attempts), end_touch=VALUES(end_touch);");
+            Console.WriteLine($@"CS2 Surf DEBUG >> internal class Checkpoint : PersonalBest -> SaveCurrentRunCheckpoints -> 
+                INSERT INTO `Checkpoints` 
+                (`maptime_id`, `cp`, `run_time`, `start_vel_x`, `start_vel_y`, `start_vel_z`, 
+                `end_vel_x`, `end_vel_y`, `end_vel_z`, `attempts`, `end_touch`) 
+                VALUES ({player.Stats.PB[style].ID}, {cp}, {runTime}, {startVelX}, {startVelY}, {startVelZ}, {endVelX}, {endVelY}, {endVelZ}, {attempts}, {ticks}) ON DUPLICATE KEY UPDATE 
+                run_time=VALUES(run_time), start_vel_x=VALUES(start_vel_x), start_vel_y=VALUES(start_vel_y), start_vel_z=VALUES(start_vel_z), 
+                end_vel_x=VALUES(end_vel_x), end_vel_y=VALUES(end_vel_y), end_vel_z=VALUES(end_vel_z), attempts=VALUES(attempts), end_touch=VALUES(end_touch);
+            ");
             #endif
 
             // Insert/Update CPs to database
             // To-do: Transactions?
             // Check if the player has PB object initialized and if the player's character is currently active in the game
             if (item.Value != null && player.Controller.PlayerPawn.Value != null)
             {
-                Task<int> newPbTask = DB.Write($"INSERT INTO `Checkpoints` " +
-                                $"(`maptime_id`, `cp`, `run_time`, `start_vel_x`, `start_vel_y`, `start_vel_z`, " +
-                                $"`end_vel_x`, `end_vel_y`, `end_vel_z`, `attempts`, `end_touch`) " +
-                                $"VALUES ({player.Stats.PB[style].ID}, {cp}, {runTime}, {startVelX}, {startVelY}, {startVelZ}, {endVelX}, {endVelY}, {endVelZ}, {attempts}, {ticks}) " +
-                                $"ON DUPLICATE KEY UPDATE " +
-                                $"run_time=VALUES(run_time), start_vel_x=VALUES(start_vel_x), start_vel_y=VALUES(start_vel_y), start_vel_z=VALUES(start_vel_z), " +
-                                $"end_vel_x=VALUES(end_vel_x), end_vel_y=VALUES(end_vel_y), end_vel_z=VALUES(end_vel_z), attempts=VALUES(attempts), end_touch=VALUES(end_touch);");
+                Task<int> newPbTask = DB.Write($@"
+                    INSERT INTO `Checkpoints` 
+                    (`maptime_id`, `cp`, `run_time`, `start_vel_x`, `start_vel_y`, `start_vel_z`, 
+                    `end_vel_x`, `end_vel_y`, `end_vel_z`, `attempts`, `end_touch`) 
+                    VALUES ({player.Stats.PB[style].ID}, {cp}, {runTime}, {startVelX}, {startVelY}, {startVelZ}, {endVelX}, {endVelY}, {endVelZ}, {attempts}, {ticks}) 
+                    ON DUPLICATE KEY UPDATE 
+                    run_time=VALUES(run_time), start_vel_x=VALUES(start_vel_x), start_vel_y=VALUES(start_vel_y), start_vel_z=VALUES(start_vel_z), 
+                    end_vel_x=VALUES(end_vel_x), end_vel_y=VALUES(end_vel_y), end_vel_z=VALUES(end_vel_z), attempts=VALUES(attempts), end_touch=VALUES(end_touch);
+                ");
                 if (newPbTask.Result <= 0)
                     throw new Exception($"CS2 Surf ERROR >> internal class Checkpoint : PersonalBest -> SaveCurrentRunCheckpoints -> Inserting Checkpoints. CP: {cp} | Name: {player.Profile.Name}");
-                
+
                 newPbTask.Dispose();
             }
         }
diff --git a/src/ST-Player/PlayerStats/PlayerStats.cs b/src/ST-Player/PlayerStats/PlayerStats.cs
@@ -28,10 +28,12 @@ public PlayerStats()
     /// </summary>
     public void LoadMapTimesData(Player player, TimerDatabase DB, int playerId = 0, int mapId = 0)
     {
-        Task<MySqlDataReader> dbTask2 = DB.Query($"SELECT mainquery.*, (SELECT COUNT(*) FROM `MapTimes` AS subquery " +
-                                                 $"WHERE subquery.`map_id` = mainquery.`map_id` AND subquery.`style` = mainquery.`style` " +
-                                                 $"AND subquery.`run_time` <= mainquery.`run_time`) AS `rank` FROM `MapTimes` AS mainquery " +
-                                                 $"WHERE mainquery.`player_id` = {player.Profile.ID} AND mainquery.`map_id` = {player.CurrMap.ID}; ");
+        Task<MySqlDataReader> dbTask2 = DB.Query($@"
+            SELECT mainquery.*, (SELECT COUNT(*) FROM `MapTimes` AS subquery 
+            WHERE subquery.`map_id` = mainquery.`map_id` AND subquery.`style` = mainquery.`style` 
+            AND subquery.`run_time` <= mainquery.`run_time`) AS `rank` FROM `MapTimes` AS mainquery 
+            WHERE mainquery.`player_id` = {player.Profile.ID} AND mainquery.`map_id` = {player.CurrMap.ID}; 
+        ");
         MySqlDataReader playerStats = dbTask2.Result;
         int style = 0; // To-do: implement styles
         if (!playerStats.HasRows)
diff --git a/src/ST-Player/Replay/ReplayPlayer.cs b/src/ST-Player/Replay/ReplayPlayer.cs
@@ -96,8 +96,10 @@ public void LoadReplayData(TimerDatabase DB, Map current_map)
         if (this.Controller == null)
             return;
         // TODO: make query for wr too
-        Task<MySqlDataReader> dbTask = DB.Query($"SELECT `replay_frames` FROM MapTimeReplay " +
-                                                $"WHERE `map_id`={current_map.ID} AND `maptime_id`={current_map.WR[0].ID} ");
+        Task<MySqlDataReader> dbTask = DB.Query($@"
+            SELECT `replay_frames` FROM MapTimeReplay 
+            WHERE `map_id`={current_map.ID} AND `maptime_id`={current_map.WR[0].ID} 
+        ");
         MySqlDataReader mapTimeReplay = dbTask.Result;
         if(!mapTimeReplay.HasRows) 
         {
diff --git a/src/ST-Player/Replay/ReplayRecorder.cs b/src/ST-Player/Replay/ReplayRecorder.cs
