Skip to content

Some edits relevant to upstream draft PR #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 4, 2024
Merged

Some edits relevant to upstream draft PR #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09e77be
Inherit Checkpoint object, replace RunTime with Ticks
1zc Jan 4, 2024
4ac8521
Fix errors with creating new Checkpoint
1zc Jan 4, 2024
cbfa9da
Simplify PersonalBest base class by excluding ID and Rank from constr…
1zc Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/ST-Events/TriggerStartTouch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ internal HookResult OnTriggerStartTouch(DynamicHook handler)
player.Stats.ThisRun.EndVelZ = velocity_z; // End pre speed for the run

// To-do: make Style (currently 0) be dynamic
if (player.Stats.PB[0].RunTime <= 0) // Player first ever PersonalBest for the map
if (player.Stats.PB[0].Ticks <= 0) // Player first ever PersonalBest for the map
{
Server.PrintToChatAll($"{PluginPrefix} {player.Controller.PlayerName} finished the map in {ChatColors.Gold}{player.HUD.FormatTime(player.Timer.Ticks)}{ChatColors.Default} ({player.Timer.Ticks})!");
}
else if (player.Timer.Ticks < player.Stats.PB[0].RunTime) // Player beating their existing PersonalBest for the map
else if (player.Timer.Ticks < player.Stats.PB[0].Ticks) // Player beating their existing PersonalBest for the map
{
Server.PrintToChatAll($"{PluginPrefix} {ChatColors.Lime}{player.Profile.Name}{ChatColors.Default} beat their PB in {ChatColors.Gold}{player.HUD.FormatTime(player.Timer.Ticks)}{ChatColors.Default} (Old: {ChatColors.BlueGrey}{player.HUD.FormatTime(player.Stats.PB[0].RunTime)}{ChatColors.Default})!");
Server.PrintToChatAll($"{PluginPrefix} {ChatColors.Lime}{player.Profile.Name}{ChatColors.Default} beat their PB in {ChatColors.Gold}{player.HUD.FormatTime(player.Timer.Ticks)}{ChatColors.Default} (Old: {ChatColors.BlueGrey}{player.HUD.FormatTime(player.Stats.PB[0].Ticks)}{ChatColors.Default})!");
}
else // Player did not beat their existing PersonalBest for the map
{
Expand All @@ -73,13 +73,13 @@ internal HookResult OnTriggerStartTouch(DynamicHook handler)
throw new Exception("CS2 Surf ERROR >> OnTriggerStartTouch (Map end zone) -> DB object is null, this shouldn't happen.");


player.Stats.PB[0].RunTime = player.Timer.Ticks; // Reload the run_time for the HUD and also assign for the DB query
player.Stats.PB[0].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}, 0, 0, 0, {player.Stats.PB[0].RunTime}, " +
$"VALUES ({player.Profile.ID}, {CurrentMap.ID}, 0, 0, 0, {player.Stats.PB[0].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);");
Expand Down Expand Up @@ -139,16 +139,16 @@ internal HookResult OnTriggerStartTouch(DynamicHook handler)
player.HUD.DisplayCheckpointMessages(PluginPrefix);

// store the checkpoint in the player's current run checkpoints used for Checkpoint functionality
CheckpointObject cp2 = new CheckpointObject(stage,
player.Timer.Ticks, // To-do: what type of value we use here? DB uses DECIMAL but `.Tick` is int???
player.Timer.Ticks, // To-do: this was supposed to be the ticks but that is used for run_time for HUD
Checkpoint cp2 = new Checkpoint(stage,
player.Timer.Ticks,
velocity_x,
velocity_y,
velocity_z,
-1.0f,
-1.0f,
-1.0f,
-1.0f,
0,
0,
0);
player.Stats.ThisRun.Checkpoint[stage] = cp2;
}
Expand Down Expand Up @@ -176,15 +176,15 @@ internal HookResult OnTriggerStartTouch(DynamicHook handler)
player.HUD.DisplayCheckpointMessages(PluginPrefix);

// store the checkpoint in the player's current run checkpoints used for Checkpoint functionality
CheckpointObject cp2 = new CheckpointObject(checkpoint,
player.Timer.Ticks, // To-do: what type of value we use here? DB uses DECIMAL but `.Tick` is int???
player.Timer.Ticks, // To-do: this was supposed to be the ticks but that is used for run_time for HUD
Checkpoint cp2 = new Checkpoint(checkpoint,
player.Timer.Ticks,
velocity_x,
velocity_y,
velocity_z,
-1.0f,
-1.0f,
-1.0f,
0,
-1.0f,
0);
player.Stats.ThisRun.Checkpoint[checkpoint] = cp2;
Expand Down
6 changes: 3 additions & 3 deletions src/ST-Player/PlayerHUD.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void Display()
string velocityModule = FormatHUDElementHTML("Speed", velocity.ToString("0"), "#79d1ed") + " u/s";
// Rank Module
string rankModule = FormatHUDElementHTML("Rank", $"N/A", "#7882dd");
if (_player.Stats.PB[0].RunTime > 0 && _player.CurrMap.WrRunTime > 0)
if (_player.Stats.PB[0].Ticks > 0 && _player.CurrMap.WrRunTime > 0)
{
rankModule = FormatHUDElementHTML("Rank", $"{_player.Stats.PB[0].Rank}/{_player.CurrMap.TotalCompletions}", "#7882dd");
}
Expand All @@ -86,7 +86,7 @@ public void Display()
rankModule = FormatHUDElementHTML("Rank", $"N/A/{_player.CurrMap.TotalCompletions}", "#7882dd");
}
// PB & WR Modules
string pbModule = FormatHUDElementHTML("PB", _player.Stats.PB[0].RunTime > 0 ? FormatTime(_player.Stats.PB[0].RunTime) : "N/A", "#7882dd"); // IMPLEMENT IN PlayerStats // To-do: make Style (currently 0) be dynamic
string pbModule = FormatHUDElementHTML("PB", _player.Stats.PB[0].Ticks > 0 ? FormatTime(_player.Stats.PB[0].Ticks) : "N/A", "#7882dd"); // IMPLEMENT IN PlayerStats // To-do: make Style (currently 0) be dynamic
string wrModule = FormatHUDElementHTML("WR", _player.CurrMap.WrRunTime > 0 ? FormatTime(_player.CurrMap.WrRunTime) : "N/A", "#ffc61a"); // IMPLEMENT IN PlayerStats - This should be part of CurrentMap, not PlayerStats?

// Build HUD
Expand Down Expand Up @@ -119,7 +119,7 @@ public void DisplayCheckpointMessages(string PluginPrefix) // To-do: PluginPrefi
// Can check checkpoints count instead of try/catch
try
{
pbTime = _player.Stats.PB[0].Checkpoint[_player.Timer.Checkpoint].RunTime;
pbTime = _player.Stats.PB[0].Checkpoint[_player.Timer.Checkpoint].Ticks;
pbSpeed = (float)Math.Sqrt(_player.Stats.PB[0].Checkpoint[_player.Timer.Checkpoint].StartVelX * _player.Stats.PB[0].Checkpoint[_player.Timer.Checkpoint].StartVelX
+ _player.Stats.PB[0].Checkpoint[_player.Timer.Checkpoint].StartVelY * _player.Stats.PB[0].Checkpoint[_player.Timer.Checkpoint].StartVelY
+ _player.Stats.PB[0].Checkpoint[_player.Timer.Checkpoint].StartVelZ * _player.Stats.PB[0].Checkpoint[_player.Timer.Checkpoint].StartVelZ);
Expand Down
Loading