Skip to content

Update CounterStrikeSharp.API version and refactor jump handling logic #11

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

Open
ShiNxz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update CounterStrikeSharp.API version and refactor jump handling logic #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions SharpTimer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.330">
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.359">
<PrivateAssets>none</PrivateAssets>
<ExcludeAssets>runtime</ExcludeAssets>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Nexd.MySQL" Version="1.0.2"/>
<PackageReference Include="Npgsql" Version="8.0.3"/>
<PackageReference Include="System.Data.SQLite" Version="1.0.118"/>
<PackageReference Include="Nexd.MySQL" Version="1.0.2" />
<PackageReference Include="Npgsql" Version="8.0.3" />
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
</ItemGroup>
<ItemGroup>
<Content Include=".github\workflows\nightly.yml" />
Expand All @@ -34,9 +34,9 @@
</ItemGroup>

<Target Name="Date" BeforeTargets="BeforeBuild">
<WriteLinesToFile File="$(IntermediateOutputPath)gen.cs" Lines="static partial class CompileTimeStamp { public static long CompileTime = $([System.DateTime]::UtcNow.Ticks) %3B }" Overwrite="true"/>
<WriteLinesToFile File="$(IntermediateOutputPath)gen.cs" Lines="static partial class CompileTimeStamp { public static long CompileTime = $([System.DateTime]::UtcNow.Ticks) %3B }" Overwrite="true" />
<ItemGroup>
<Compile Include="$(IntermediateOutputPath)gen.cs"/>
<Compile Include="$(IntermediateOutputPath)gen.cs" />
</ItemGroup>
</Target>
</Project>
10 changes: 5 additions & 5 deletions src/Player/PlayerOnTick.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void PlayerOnTick()

if (!startzoneJumping && playerTimers[player.Slot].inStartzone)
{
if((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.OldJumpPressed)
if((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.LegacyJump.OldJumpPressed)
{
player!.Pawn.Value!.AbsVelocity.Z = 0f;
}
Expand Down Expand Up @@ -327,7 +327,7 @@ public void PlayerOnTick()
$"{((playerButtons & PlayerButtons.Forward) != 0 ? "W" : "_")} " +
$"{((playerButtons & PlayerButtons.Moveright) != 0 ? "D" : "_")} " +
$"{((playerButtons & PlayerButtons.Back) != 0 ? "S" : "_")} " +
$"{((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.OldJumpPressed ? "J" : "_")} " +
$"{((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.LegacyJump.OldJumpPressed ? "J" : "_")} " +
$"{((playerButtons & PlayerButtons.Duck) != 0 ? "C" : "_")}";


Expand All @@ -345,7 +345,7 @@ public void PlayerOnTick()
player.PrintToCenterHtml(hudContent);
}

playerTimer.MovementService!.OldJumpPressed = false;
playerTimer.MovementService!.LegacyJump.OldJumpPressed = false;
}
}
}
Expand Down Expand Up @@ -443,10 +443,10 @@ public void SpectatorOnTick(CCSPlayerController player)
$"{((playerButtons & PlayerButtons.Forward) != 0 ? "W" : "_")} " +
$"{((playerButtons & PlayerButtons.Moveright) != 0 ? "D" : "_")} " +
$"{((playerButtons & PlayerButtons.Back) != 0 ? "S" : "_")} " +
$"{((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.OldJumpPressed ? "J" : "_")} " +
$"{((playerButtons & PlayerButtons.Jump) != 0 || playerTimer.MovementService!.LegacyJump.OldJumpPressed ? "J" : "_")} " +
$"{((playerButtons & PlayerButtons.Duck) != 0 ? "C" : "_")}";

if (playerTimer.MovementService!.OldJumpPressed == true) playerTimer.MovementService.OldJumpPressed = false;
if (playerTimer.MovementService!.LegacyJump.OldJumpPressed == true) playerTimer.MovementService.LegacyJump.OldJumpPressed = false;

string hudContent = (hudEnabled ? timerLine +
(VelocityHudEnabled ? veloLine : "") +
Expand Down