Compare commits

...

11 Commits

Author SHA1 Message Date
MSWS
3cdf2510bf mark: Resolves #175 2025-11-05 04:42:38 -08:00
MSWS
61b8d4eba9 fix: Update naming for protected vars in station items 2025-11-05 04:42:06 -08:00
MSWS
1ff4eabd45 fix: Resolve CS# version conflicts 2025-11-05 04:40:25 -08:00
MSWS
a0cf6b38f2 Reapply "fix: Re-add moved files"
This reverts commit 9145e16b90.
2025-11-05 04:38:51 -08:00
MSWS
9145e16b90 Revert "fix: Re-add moved files"
This reverts commit b3000ecc4e.
2025-11-05 04:38:33 -08:00
MSWS
b3000ecc4e fix: Re-add moved files 2025-11-05 04:38:29 -08:00
MSWS
f2fde12737 fix: Move specialroundapi into ttt parent 2025-11-05 04:37:47 -08:00
MSWS
e7ed74de0c fix: Re-add used library 2025-11-05 04:32:58 -08:00
MSWS
33535abdd7 Remove outdated licenses 2025-11-05 04:31:03 -08:00
MSWS
0d8643dfe3 Remove outdated licenses 2025-11-05 04:30:24 -08:00
MSWS
50d078f78e feat: Refactor and enhance tripwire system functionality. +semver:minor
Enhance Tripwire System with New Configurations and API Interfaces

- Update `TripwireConfig.cs` to add new configurations for tripwire appearance and behavior, including multipliers for out-of-line-of-sight detection and settings for size, color, and thickness.
- Refactor `TripwireMovementListener.cs` to improve tripwire activation logic by adopting a new listener and tripwire tracking approach, hence enhancing code maintainability and operational checks.
- Introduce the `TripwireInstance.cs` file to define a record structure for managing tripwire-related properties, integrating with existing APIs.
- Implement new interfaces in `ITripwireActivator.cs` and `ITripwireTracker.cs` to support modular activation and tracking of tripwire instances, facilitating clear interaction definitions within the system.
- Revise `TripwireItem.cs` to refine tripwire management, incorporating new utility methods for vector-to-angle conversions and applying configuration-based settings for visual aspects of tripwires.
- Adjust the `VectorExtensions.cs` to include a new method for converting vectors to angles, improving calculations in tripwire functionalities.

Additionally, integrate changes across related files to enhance the overall functionality and maintainability of the Tripwire system within the platform.
2025-11-05 04:28:21 -08:00
34 changed files with 271 additions and 2560 deletions

View File

@@ -1,6 +1,5 @@
| Package | Version | License Information Origin | License Expression | License Url | Copyright | Authors | Package Project Url |
| ----------------------------------------------------- | -------- | -------------------------- | ------------------ | --------------------------------------- | ----------------------------------------------- | -------------------------------- | ------------------------------------------------------------------------------------------------ |
| CounterStrikeSharp.API | 1.0.332 | Expression | GPL-3.0-only | https://licenses.nuget.org/GPL-3.0-only | | Roflmuffin | http://docs.cssharp.dev/ |
| CounterStrikeSharp.API | 1.0.342 | Expression | GPL-3.0-only | https://licenses.nuget.org/GPL-3.0-only | | Roflmuffin | http://docs.cssharp.dev/ |
| JetBrains.Annotations | 2025.2.0 | Expression | MIT | https://licenses.nuget.org/MIT | Copyright (c) 2016-2025 JetBrains s.r.o. | JetBrains | https://www.jetbrains.com/help/resharper/Code_Analysis__Code_Annotations.html |
| Microsoft.Data.Sqlite | 9.0.9 | Expression | MIT | https://licenses.nuget.org/MIT | © Microsoft Corporation. All rights reserved. | Microsoft | https://docs.microsoft.com/dotnet/standard/data/sqlite/ |

View File

@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.332"/>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.346" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.3"/>
<PackageReference Include="System.Text.Json" Version="8.0.5"/>
<PackageReference Include="YamlDotNet" Version="16.3.0"/>

View File

@@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats", "TTT\Stats\Stats.cs
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRound", "TTT\SpecialRound\SpecialRound.csproj", "{5092069A-3CFA-41C8-B685-341040AB435C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRoundAPI", "SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj", "{360FEF16-54DA-42EE-995A-3D31C699287D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRoundAPI", "TTT\SpecialRoundAPI\SpecialRoundAPI.csproj", "{360FEF16-54DA-42EE-995A-3D31C699287D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@@ -0,0 +1,5 @@
namespace TTT.CS2.API.Items;
public interface ITripwireActivator {
public void ActivateTripwire(TripwireInstance tripwire);
}

View File

@@ -0,0 +1,7 @@
using TTT.CS2.Items.Tripwire;
namespace TTT.CS2.API.Items;
public interface ITripwireTracker {
public List<TripwireInstance> ActiveTripwires { get; }
}

View File

@@ -0,0 +1,8 @@
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Utils;
using TTT.API.Player;
namespace TTT.CS2.API.Items;
public record TripwireInstance(IOnlinePlayer owner, CEnvBeam Beam,
CDynamicProp TripwireProp, Vector StartPos, Vector EndPos);

View File

@@ -14,6 +14,7 @@
<ProjectReference Include="..\Game\Game.csproj"/>
<ProjectReference Include="..\Karma\Karma.csproj"/>
<ProjectReference Include="..\ShopAPI\ShopAPI.csproj"/>
<ProjectReference Include="..\SpecialRoundAPI\SpecialRoundAPI.csproj" />
</ItemGroup>
<ItemGroup>

View File

@@ -8,8 +8,8 @@ using TTT.API.Player;
namespace TTT.CS2.Command.Test;
public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
private readonly ISpecialRoundStarter tracker =
provider.GetRequiredService<ISpecialRoundStarter>();
private readonly ISpecialRoundStarter? tracker =
provider.GetService<ISpecialRoundStarter>();
public void Dispose() { }
public void Start() { }
@@ -18,6 +18,11 @@ public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
public Task<CommandResult>
Execute(IOnlinePlayer? executor, ICommandInfo info) {
if (tracker == null) {
info.ReplySync("Special round tracker is not available.");
return Task.FromResult(CommandResult.ERROR);
}
if (info.ArgCount == 1) {
tracker.TryStartSpecialRound(null);
info.ReplySync("Started a random special round.");

View File

@@ -1,4 +1,5 @@
using CounterStrikeSharp.API;
using System.Drawing;
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Cvars;
using CounterStrikeSharp.API.Modules.Cvars.Validators;
@@ -10,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
public class CS2TripwireConfig : IStorage<TripwireConfig>, IPluginModule {
public static readonly FakeConVar<int> CV_PRICE = new(
"css_ttt_shop_tripwire_price", "Price of the Tripwire item (Traitor)", 50,
"css_ttt_shop_tripwire_price", "Price of the Tripwire item (Traitor)", 45,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
public static readonly FakeConVar<int> CV_EXPLOSION_POWER = new(
@@ -20,7 +21,7 @@ public class CS2TripwireConfig : IStorage<TripwireConfig>, IPluginModule {
public static readonly FakeConVar<float> CV_FALLOFF_DELAY = new(
"css_ttt_shop_tripwire_falloff_delay",
"Damage falloff, higher means faster falloff", 0.15f,
"Damage falloff of tripwire explosion, higher = quicker falloff", 0.015f,
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
public static readonly FakeConVar<float> CV_FF_MULTIPLIER = new(
@@ -28,19 +29,49 @@ public class CS2TripwireConfig : IStorage<TripwireConfig>, IPluginModule {
"Damage multiplier applied to friendly fire from Tripwire", 0.5f,
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
public static readonly FakeConVar<float> CV_OOLOS_MULTIPLIER = new(
"css_ttt_shop_tripwire_outoflineofsight_multiplier",
"Damage multiplier for players out of line of sight", 0.3f,
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
public static readonly FakeConVar<bool> CV_FF_TRIGGERS = new(
"css_ttt_shop_tripwire_friendlyfire_triggers",
"Whether Tripwires can be triggered by teammates", true);
public static readonly FakeConVar<float> CV_MAX_PLACEMENT_DISTANCE_SQUARED =
new("css_ttt_shop_tripwire_max_placement_distance_squared",
"Maximum distance squared from player to place Tripwire", 400f * 400f,
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(100f, 100000f));
public static readonly FakeConVar<float> CV_MAX_DISTANCE_SQUARED = new(
"css_ttt_shop_tripwire_max_distance_squared",
"Maximum placement distance squared for Tripwire", 400f * 400f,
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1000000f));
public static readonly FakeConVar<int> CV_INITIATION_TIME_MS = new(
"css_ttt_shop_tripwire_initiation_time_ms",
"Time in milliseconds to initiate Tripwire placement", 2000,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
public static readonly FakeConVar<float> CV_INITIATION_TIME = new(
"css_ttt_shop_tripwire_initiation_time",
"Seconds before Tripwire becomes active", 2f, ConVarFlags.FCVAR_NONE,
new RangeValidator<float>(0f, 10f));
public static readonly FakeConVar<float> CV_SIZE_SQUARED = new(
"css_ttt_shop_tripwire_size_squared",
"Size of tripwire for the purposes of bullet-detection", 500f,
ConVarFlags.FCVAR_NONE, new RangeValidator<float>(1f, 100000f));
public static readonly FakeConVar<int> CV_COLOR_R = new(
"css_ttt_shop_tripwire_color_r", "Tripwire color red channel (0255)", 255,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
public static readonly FakeConVar<int> CV_COLOR_G = new(
"css_ttt_shop_tripwire_color_g", "Tripwire color green channel (0255)", 0,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
public static readonly FakeConVar<int> CV_COLOR_B = new(
"css_ttt_shop_tripwire_color_b", "Tripwire color blue channel (0255)", 0,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
public static readonly FakeConVar<int> CV_COLOR_A = new(
"css_ttt_shop_tripwire_color_a", "Tripwire color alpha (0255)", 64,
ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
public static readonly FakeConVar<float> CV_THICKNESS = new(
"css_ttt_shop_tripwire_thickness", "Visual thickness of the Tripwire beam",
0.5f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0.01f, 5f));
public void Dispose() { }
@@ -53,14 +84,19 @@ public class CS2TripwireConfig : IStorage<TripwireConfig>, IPluginModule {
public Task<TripwireConfig?> Load() {
var cfg = new TripwireConfig {
Price = CV_PRICE.Value,
ExplosionPower = CV_EXPLOSION_POWER.Value,
FalloffDelay = CV_FALLOFF_DELAY.Value,
FriendlyFireMultiplier = CV_FF_MULTIPLIER.Value,
FriendlyFireTriggers = CV_FF_TRIGGERS.Value,
MaxPlacementDistanceSquared = CV_MAX_PLACEMENT_DISTANCE_SQUARED.Value,
TripwireInitiationTime =
TimeSpan.FromMilliseconds(CV_INITIATION_TIME_MS.Value)
Price = CV_PRICE.Value,
ExplosionPower = CV_EXPLOSION_POWER.Value,
FalloffDelay = CV_FALLOFF_DELAY.Value,
FriendlyFireMultiplier = CV_FF_MULTIPLIER.Value,
OutOfLineOfSightMultiplier = CV_OOLOS_MULTIPLIER.Value,
FriendlyFireTriggers = CV_FF_TRIGGERS.Value,
MaxPlacementDistanceSquared = CV_MAX_DISTANCE_SQUARED.Value,
TripwireInitiationTime = TimeSpan.FromSeconds(CV_INITIATION_TIME.Value),
TripwireSizeSquared = CV_SIZE_SQUARED.Value,
TripwireColor =
Color.FromArgb(CV_COLOR_A.Value, CV_COLOR_R.Value, CV_COLOR_G.Value,
CV_COLOR_B.Value),
TripwireThickness = CV_THICKNESS.Value
};
return Task.FromResult<TripwireConfig?>(cfg);

View File

@@ -97,4 +97,11 @@ public static class VectorExtensions {
public static Vector toVector(this Vector3 vec) {
return new Vector(vec.X, vec.Y, vec.Z);
}
public static QAngle toAngle(this Vector vec) {
var pitch = (float)(Math.Atan2(-vec.Z,
Math.Sqrt(vec.X * vec.X + vec.Y * vec.Y)) * (180.0 / Math.PI));
var yaw = (float)(Math.Atan2(vec.Y, vec.X) * (180.0 / Math.PI));
return new QAngle(pitch, yaw, 0);
}
}

View File

@@ -30,9 +30,6 @@ public class DamageStation(IServiceProvider provider)
.GetResult() ?? new DamageStationConfig()), IListener {
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IPlayerFinder finder =
provider.GetRequiredService<IPlayerFinder>();
@@ -47,13 +44,13 @@ public class DamageStation(IServiceProvider provider)
var players = finder.GetOnline();
var toRemove = new List<CPhysicsPropMultiplayer>();
var playerMapping = players
.Select(p => (ApiPlayer: p, GamePlayer: converter.GetPlayer(p)))
.Select(p => (ApiPlayer: p, GamePlayer: Converter.GetPlayer(p)))
.Where(m
=> m.GamePlayer != null
&& !Roles.GetRoles(m.ApiPlayer).Any(r => r is TraitorRole))
.ToList();
foreach (var (prop, info) in props) {
foreach (var (prop, info) in Props) {
if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
> Math.Abs(_Config.TotalHealthGiven)) {
toRemove.Add(prop);
@@ -102,7 +99,7 @@ public class DamageStation(IServiceProvider provider)
}
}
foreach (var prop in toRemove) props.Remove(prop);
foreach (var prop in toRemove) Props.Remove(prop);
}
private static RecipientFilter SELF(int slot) {

View File

@@ -30,7 +30,7 @@ public class HealthStation(IServiceProvider provider)
override protected void onInterval() {
var players = Utilities.GetPlayers();
var toRemove = new List<CPhysicsPropMultiplayer>();
foreach (var (prop, info) in props) {
foreach (var (prop, info) in Props) {
if (_Config.TotalHealthGiven != 0
&& Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
toRemove.Add(prop);
@@ -65,6 +65,6 @@ public class HealthStation(IServiceProvider provider)
}
}
foreach (var prop in toRemove) props.Remove(prop);
foreach (var prop in toRemove) Props.Remove(prop);
}
}

View File

@@ -20,12 +20,12 @@ public abstract class StationItem<T>(IServiceProvider provider,
: RoleRestrictedItem<T>(provider), IPluginModule where T : IRole {
protected readonly StationConfig _Config = config;
protected readonly IPlayerConverter<CCSPlayerController> converter =
protected readonly IPlayerConverter<CCSPlayerController> Converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly long PROP_SIZE_SQUARED = 700;
protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> Props =
new();
private readonly IScheduler scheduler =
@@ -60,7 +60,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
public HookResult OnBulletImpact(EventBulletImpact ev, GameEventInfo info) {
var hitVec = new Vector(ev.X, ev.Y, ev.Z);
var nearest = props
var nearest = Props
.Select(kv => (kv.Key, kv.Value,
Distance: kv.Key.AbsOrigin!.DistanceSquared(hitVec)))
.Where(t => t.Key is { IsValid: true, AbsOrigin: not null })
@@ -76,7 +76,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
if (nearest.Value.Health <= 0) {
nearest.Key.AcceptInput("Kill");
props.Remove(nearest.Key);
Props.Remove(nearest.Key);
return HookResult.Continue;
}
@@ -119,12 +119,12 @@ public abstract class StationItem<T>(IServiceProvider provider,
if (prop == null) return;
props[prop] = new StationInfo(prop, _Config.StationHealth, player);
Props[prop] = new StationInfo(prop, _Config.StationHealth, player);
prop.SetModel("models/props/cs_office/microwave.vmdl");
prop.DispatchSpawn();
var gamePlayer = converter.GetPlayer(player);
var gamePlayer = Converter.GetPlayer(player);
if (gamePlayer == null || !gamePlayer.Pawn.IsValid
|| gamePlayer.Pawn.Value == null)
return;

View File

@@ -0,0 +1,47 @@
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Core.Attributes.Registration;
using CounterStrikeSharp.API.Modules.Utils;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI.Configs.Traitor;
using TTT.API;
using TTT.API.Storage;
using TTT.CS2.API.Items;
using TTT.CS2.Extensions;
namespace TTT.CS2.Items.Tripwire;
public class TripwireDamageListener(IServiceProvider provider) : IPluginModule {
public void Dispose() { }
public void Start() { }
private readonly ITripwireTracker? tripwires =
provider.GetService<ITripwireTracker>();
private readonly ITripwireActivator? tripwireActivator =
provider.GetRequiredService<ITripwireActivator>();
private TripwireConfig config
=> provider.GetService<IStorage<TripwireConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new TripwireConfig();
[UsedImplicitly]
[GameEventHandler]
public HookResult OnBulletImpact(EventBulletImpact ev, GameEventInfo info) {
if (tripwires == null) return HookResult.Continue;
var hitVec = new Vector(ev.X, ev.Y, ev.Z);
var nearest = tripwires.ActiveTripwires
.OrderBy(wire => wire.TripwireProp.AbsOrigin.DistanceSquared(hitVec))
.FirstOrDefault();
if (nearest == null) return HookResult.Continue;
var distSquared = nearest.TripwireProp.AbsOrigin.DistanceSquared(hitVec);
if (distSquared > config.TripwireSizeSquared) return HookResult.Continue;
tripwireActivator?.ActivateTripwire(nearest);
return HookResult.Continue;
}
}

View File

@@ -4,31 +4,37 @@ using System.Reactive.Concurrency;
using CounterStrikeSharp.API;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Utils;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI;
using ShopAPI.Configs;
using ShopAPI.Configs.Traitor;
using TTT.API;
using TTT.API.Events;
using TTT.API.Extensions;
using TTT.API.Game;
using TTT.API.Player;
using TTT.API.Storage;
using TTT.CS2.API.Items;
using TTT.CS2.Extensions;
using TTT.CS2.RayTrace.Class;
using TTT.CS2.RayTrace.Enum;
using TTT.CS2.RayTrace.Struct;
using TTT.Game.Events.Game;
using TTT.Game.Roles;
namespace TTT.CS2.Items.Tripwire;
public static class TripwireServiceCollection {
public static void AddTripwireServices(this IServiceCollection services) {
services.AddModBehavior<TripwireItem>();
services.AddModBehavior<TripwireMovementListener>();
services.AddModBehavior<ITripwireTracker, TripwireItem>();
services.AddModBehavior<ITripwireActivator, TripwireMovementListener>();
services.AddModBehavior<TripwireDamageListener>();
}
}
public class TripwireItem(IServiceProvider provider)
: RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
: RoleRestrictedItem<TraitorRole>(provider), IPluginModule, ITripwireTracker {
private TripwireConfig config
=> Provider.GetService<IStorage<TripwireConfig>>()
?.Load()
@@ -41,7 +47,8 @@ public class TripwireItem(IServiceProvider provider)
private readonly IScheduler scheduler =
provider.GetRequiredService<IScheduler>();
public readonly List<TripwireInstance> ActiveTripwires = [];
public List<TripwireInstance> ActiveTripwires { get; } = [];
public override string Name => Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE];
public override string Description
@@ -62,6 +69,13 @@ public class TripwireItem(IServiceProvider provider)
"models/generic/conveyor_control_panel_01/conveyor_button_02.vmdl");
}
[UsedImplicitly]
[EventHandler]
public void OnGameEvent(GameStateUpdateEvent ev) {
if (ev.NewState != State.FINISHED) return;
ActiveTripwires.Clear();
}
public override void OnPurchase(IOnlinePlayer player) {
Server.NextWorldUpdate(() => {
if (!placeTripwire(player, out var originTrace, out var endTrace,
@@ -102,7 +116,7 @@ public class TripwireItem(IServiceProvider provider)
return false;
}
var angles = vectorToAngle(originTrace.Value.Normal.toVector());
var angles = originTrace.Value.Normal.toVector().toAngle();
endTrace = TraceRay.TraceShape(originTrace.Value.EndPos.toVector(), angles,
TraceMask.MaskSolid, Contents.NoDraw, gamePlayer);
@@ -115,7 +129,7 @@ public class TripwireItem(IServiceProvider provider)
tripwire.DispatchSpawn();
tripwire.Teleport(originTrace.Value.EndPos.toVector(),
vectorToAngle(originTrace.Value.Normal.toVector()));
originTrace.Value.Normal.toVector().toAngle());
tripwire.EmitSound("Weapon_ELITE.Clipout");
return true;
}
@@ -130,26 +144,16 @@ public class TripwireItem(IServiceProvider provider)
ActiveTripwires.Add(instance);
}
private QAngle vectorToAngle(Vector vec) {
var pitch = (float)(Math.Atan2(-vec.Z,
Math.Sqrt(vec.X * vec.X + vec.Y * vec.Y)) * (180.0 / Math.PI));
var yaw = (float)(Math.Atan2(vec.Y, vec.X) * (180.0 / Math.PI));
return new QAngle(pitch, yaw, 0);
}
private CEnvBeam? createBeamEnt(Vector start, Vector end) {
var beam = Utilities.CreateEntityByName<CEnvBeam>("env_beam");
if (beam == null) return null;
beam.RenderMode = RenderMode_t.kRenderTransAlpha;
beam.Width = 0.5f;
beam.Render = Color.FromArgb(128, Color.Red);
beam.Width = config.TripwireThickness;
beam.Render = config.TripwireColor;
beam.EndPos.X = end.X;
beam.EndPos.Y = end.Y;
beam.EndPos.Z = end.Z;
beam.Teleport(start);
return beam;
}
public record TripwireInstance(IOnlinePlayer owner, CEnvBeam Beam,
CDynamicProp TripwireProp, Vector StartPos, Vector EndPos);
}

View File

@@ -1,5 +1,7 @@
using CounterStrikeSharp.API.Core;
using System.Diagnostics.CodeAnalysis;
using CounterStrikeSharp.API.Core;
using CounterStrikeSharp.API.Modules.Timers;
using CounterStrikeSharp.API.Modules.Utils;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using ShopAPI.Configs.Traitor;
@@ -7,110 +9,63 @@ using TTT.API;
using TTT.API.Events;
using TTT.API.Game;
using TTT.API.Player;
using TTT.API.Role;
using TTT.API.Storage;
using TTT.CS2.API.Items;
using TTT.CS2.Extensions;
using TTT.CS2.RayTrace.Class;
using TTT.CS2.RayTrace.Enum;
using TTT.Game.Events.Body;
using TTT.Game.Events.Game;
using TTT.Game.Events.Player;
using TTT.Game.Listeners;
using TTT.Game.Roles;
namespace TTT.CS2.Items.Tripwire;
public class TripwireMovementListener(IServiceProvider provider)
: IPluginModule, IListener {
private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
: BaseListener(provider), IPluginModule, ITripwireActivator {
private readonly IPlayerConverter<CCSPlayerController> converter =
provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
private readonly IPlayerFinder finder =
provider.GetRequiredService<IPlayerFinder>();
private readonly ITripwireTracker? tripwireTracker =
provider.GetService<ITripwireTracker>();
private readonly TripwireItem? item = provider.GetService<TripwireItem>();
private readonly Dictionary<string, TripwireItem.TripwireInstance>
killedWithTripwire = new();
private readonly IRoleAssigner roles =
provider.GetRequiredService<IRoleAssigner>();
private readonly Dictionary<string, TripwireInstance> killedWithTripwire =
new();
private TripwireConfig config
=> provider.GetService<IStorage<TripwireConfig>>()
=> Provider.GetService<IStorage<TripwireConfig>>()
?.Load()
.GetAwaiter()
.GetResult() ?? new TripwireConfig();
public void Dispose() { }
public void Start() { }
public void Start(BasePlugin? plugin) {
if (item == null) return;
plugin?.AddTimer(0.1f, checkTripwires, TimerFlags.REPEAT);
if (tripwireTracker == null) return;
plugin?.AddTimer(0.2f, checkTripwires, TimerFlags.REPEAT);
}
private void checkTripwires() {
if (item == null) return;
var toRemove = new List<TripwireItem.TripwireInstance>();
foreach (var wire in item.ActiveTripwires) {
if (tripwireTracker == null) return;
foreach (var wire in new List<TripwireInstance>(tripwireTracker
.ActiveTripwires)) {
var ray = TraceRay.TraceShape(wire.StartPos, wire.EndPos, Contents.Player,
wire.TripwireProp.Handle);
if (!ray.DidHit() || !ray.HitPlayer(out var player)) continue;
if (!config.FriendlyFireTriggers && player != null) {
var apiPlayer = converter.GetPlayer(player);
var role = roles.GetRoles(apiPlayer);
var role = Roles.GetRoles(apiPlayer);
if (role.Any(r => r is TraitorRole)) continue;
}
toRemove.Add(wire);
wire.TripwireProp.EmitSound("Flashbang.ExplodeDistant");
doExplosion(wire);
}
foreach (var wire in toRemove) {
item.ActiveTripwires.Remove(wire);
wire.Beam.Remove();
wire.TripwireProp.Remove();
ActivateTripwire(wire);
}
}
private void doExplosion(TripwireItem.TripwireInstance instance) {
foreach (var player in finder.GetOnline()) {
if (!player.IsAlive) continue;
var gamePlayer = converter.GetPlayer(player);
if (gamePlayer == null || gamePlayer.Pawn.Value == null) continue;
if (gamePlayer.Pawn.Value.AbsOrigin == null) continue;
var distance =
instance.StartPos.Distance(gamePlayer.Pawn.Value.AbsOrigin);
var damage = (int)Math.Round(getDamage(distance));
if (roles.GetRoles(player).Any(r => r is TraitorRole))
damage = (int)(damage * config.FriendlyFireMultiplier);
if (damage < 1) continue;
if (player.Health - damage <= 0) {
killedWithTripwire[player.Id] = instance;
var death = new PlayerDeathEvent(player).WithKiller(instance.owner)
.WithWeapon("[Tripwire]");
bus.Dispatch(death);
} else {
var damaged =
new PlayerDamagedEvent(player, instance.owner, damage) {
Weapon = "[Tripwire]"
};
bus.Dispatch(damaged);
}
player.Health -= damage;
gamePlayer.EmitSound("Player.BurnDamage");
}
private void removeTripwire(TripwireInstance wire) {
tripwireTracker?.ActiveTripwires.Remove(wire);
wire.Beam.Remove();
wire.TripwireProp.Remove();
}
private float getDamage(float distance) {
@@ -118,6 +73,31 @@ public class TripwireMovementListener(IServiceProvider provider)
* MathF.Pow(MathF.E, -distance * config.FalloffDelay);
}
private int getDamage(CCSPlayerController gamePlayer, IOnlinePlayer player,
Vector tripwire) {
var origin = gamePlayer.Pawn.Value?.AbsOrigin;
if (origin == null) return 0;
var distance = tripwire.Distance(origin);
var damage = getDamage(distance);
Messenger.DebugAnnounce($"Base damage: {damage} at distance {distance}");
if (Roles.GetRoles(player).Any(r => r is TraitorRole)) {
damage *= config.FriendlyFireMultiplier;
Messenger.DebugAnnounce($"Applied friendly fire multiplier: {damage}");
}
var angleToPlayer = (origin - tripwire).Normalized().toAngle();
var losRay = TraceRay.TraceShape(tripwire, angleToPlayer, Contents.Player,
gamePlayer);
var los = losRay.HitPlayer(out _);
if (!los) {
damage *= config.OutOfLineOfSightMultiplier;
Messenger.DebugAnnounce(
$"Applied out of line of sight multiplier: {damage}");
}
return (int)damage;
}
[UsedImplicitly]
[EventHandler]
public void OnGameEnd(GameStateUpdateEvent ev) {
@@ -134,4 +114,43 @@ public class TripwireMovementListener(IServiceProvider provider)
return;
ev.Body.Killer = info.owner;
}
public void ActivateTripwire(TripwireInstance instance) {
removeTripwire(instance);
instance.TripwireProp.EmitSound("Flashbang.ExplodeDistant");
foreach (var player in Finder.GetOnline()) {
if (dealTripwireDamage(instance, player, out var gamePlayer)) continue;
gamePlayer?.EmitSound("Player.BurnDamage");
}
}
private bool dealTripwireDamage(TripwireInstance instance,
IOnlinePlayer player,
[NotNullWhen(true)] out CCSPlayerController? gamePlayer) {
gamePlayer = null;
if (!player.IsAlive) return false;
gamePlayer = converter.GetPlayer(player);
if (gamePlayer == null) return false;
var damage = getDamage(gamePlayer, player, instance.StartPos);
if (damage < 1) return false;
Event ev;
if (player.Health - damage <= 0) {
killedWithTripwire[player.Id] = instance;
ev = new PlayerDeathEvent(player).WithKiller(instance.owner)
.WithWeapon("[Tripwire]");
} else {
ev = new PlayerDamagedEvent(player, instance.owner, damage) {
Weapon = "[Tripwire]"
};
}
Bus.Dispatch(ev);
player.Health -= damage;
return true;
}
}

View File

@@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.342"/>
<PackageReference Include="CounterStrikeSharp.API" Version="1.0.346"/>
<PackageReference Include="System.Reactive" Version="6.0.1"/>
</ItemGroup>

View File

@@ -1,11 +1,20 @@
namespace ShopAPI.Configs.Traitor;
using System.Drawing;
namespace ShopAPI.Configs.Traitor;
public record TripwireConfig : ShopItemConfig {
public override int Price { get; init; } = 60;
public int ExplosionPower { get; init; } = 1000;
public float FalloffDelay { get; init; } = 0.02f;
public float FriendlyFireMultiplier { get; init; } = 0.5f;
public float OutOfLineOfSightMultiplier { get; init; } = 0.3f;
public bool FriendlyFireTriggers { get; init; } = true;
public float MaxPlacementDistanceSquared { get; init; } = 400f * 400f;
public TimeSpan TripwireInitiationTime { get; init; } = TimeSpan.FromSeconds(2);
public TimeSpan TripwireInitiationTime { get; init; } =
TimeSpan.FromSeconds(2);
public float TripwireSizeSquared { get; init; } = 500f;
public Color TripwireColor { get; init; } = Color.FromArgb(64, Color.Red);
public float TripwireThickness { get; init; } = 0.5f;
}

View File

@@ -11,6 +11,7 @@
<ProjectReference Include="..\API\API.csproj"/>
<ProjectReference Include="..\CS2\CS2.csproj"/>
<ProjectReference Include="..\Game\Game.csproj"/>
<ProjectReference Include="..\SpecialRoundAPI\SpecialRoundAPI.csproj" />
</ItemGroup>
</Project>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,343 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" href="/Content/Site.css" />
<title>&#39;Apache-2.0&#39; reference</title>
</head>
<body>
<div id="main-content">
<h1>Apache License 2.0</h1>
<h2>SPDX identifier</h2>
<div id="license-expression">Apache-2.0</div>
<h2>License text</h2>
<div class="optional-license-text">
<p>Apache License
<br />
Version 2.0, January 2004
<br />
http://www.apache.org/licenses/
</p>
</div>
<div class="optional-license-text">
<p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
</div>
<ul style="list-style:none">
<li>
<var class="replaceable-license-text"> 1.</var>
Definitions.
<ul style="list-style:none">
<li>
<p>&quot;License&quot; shall mean the terms and conditions for use, reproduction, and distribution
as defined by Sections 1 through 9 of this document.</p>
</li>
<li>
<p>&quot;Licensor&quot; shall mean the copyright owner or entity authorized by the copyright owner
that is granting the License.</p>
</li>
<li>
<p>&quot;Legal Entity&quot; shall mean the union of the acting entity and all other entities that
control, are controlled by, or are under common control with that entity. For the purposes of
this definition, &quot;control&quot; means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or otherwise, or (ii) ownership of
fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such
entity.</p>
</li>
<li>
<p>&quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity exercising
permissions granted by this License.</p>
</li>
<li>
<p>&quot;Source&quot; form shall mean the preferred form for making modifications, including but not
limited to software source code, documentation source, and configuration files.</p>
</li>
<li>
<p>&quot;Object&quot; form shall mean any form resulting from mechanical transformation or
translation of a Source form, including but not limited to compiled object code, generated
documentation, and conversions to other media types.</p>
</li>
<li>
<p>&quot;Work&quot; shall mean the work of authorship, whether in Source or Object form, made
available under the License, as indicated by a copyright notice that is included in or
attached to the work (an example is provided in the Appendix below).</p>
</li>
<li>
<p>&quot;Derivative Works&quot; shall mean any work, whether in Source or Object form, that is based
on (or derived from) the Work and for which the editorial revisions, annotations,
elaborations, or other modifications represent, as a whole, an original work of authorship.
For the purposes of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative
Works thereof.</p>
</li>
<li>
<p>&quot;Contribution&quot; shall mean any work of authorship, including the original version of the
Work and any modifications or additions to that Work or Derivative Works thereof, that is
intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an
individual or Legal Entity authorized to submit on behalf of the copyright owner. For the
purposes of this definition, &quot;submitted&quot; means any form of electronic, verbal, or
written communication sent to the Licensor or its representatives, including but not limited
to communication on electronic mailing lists, source code control systems, and issue tracking
systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and
improving the Work, but excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as &quot;Not a Contribution.&quot;</p>
</li>
<li>
<p>&quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity on behalf of whom
a Contribution has been received by Licensor and subsequently incorporated within the
Work.</p>
</li>
</ul>
</li>
<li>
<var class="replaceable-license-text"> 2.</var>
Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor
hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display,
publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or
Object form.
</li>
<li>
<var class="replaceable-license-text"> 3.</var>
Grant of Patent License. Subject to the terms and conditions of this License, each Contributor
hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except as stated in this section) patent license to make, have made, use, offer
to sell, sell, import, and otherwise transfer the Work, where such license applies only to
those patent claims licensable by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s) with the Work to which such
Contribution(s) was submitted. If You institute patent litigation against any entity
(including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a
Contribution incorporated within the Work constitutes direct or contributory patent
infringement, then any patent licenses granted to You under this License for that Work shall
terminate as of the date such litigation is filed.
</li>
<li>
<var class="replaceable-license-text"> 4.</var>
Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof
in any medium, with or without modifications, and in Source or Object form, provided that You
meet the following conditions:
<ul style="list-style:none">
<li>
<var class="replaceable-license-text"> (a)</var>
You must give any other recipients of the Work or Derivative Works a copy of this License; and
</li>
<li>
<var class="replaceable-license-text"> (b)</var>
You must cause any modified files to carry prominent notices stating that You changed the files; and
</li>
<li>
<var class="replaceable-license-text"> (c)</var>
You must retain, in the Source form of any Derivative Works that You distribute, all
copyright, patent, trademark, and attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of the Derivative Works; and
</li>
<li>
<var class="replaceable-license-text"> (d)</var>
If the Work includes a &quot;NOTICE&quot; text file as part of its distribution, then any
Derivative Works that You distribute must include a readable copy of the attribution
notices contained within such NOTICE file, excluding those notices that do not pertain to
any part of the Derivative Works, in at least one of the following places: within a NOTICE
text file distributed as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or, within a display generated
by the Derivative Works, if and wherever such third-party notices normally appear. The
contents of the NOTICE file are for informational purposes only and do not modify the
License. You may add Your own attribution notices within Derivative Works that You
distribute, alongside or as an addendum to the NOTICE text from the Work, provided that
such additional attribution notices cannot be construed as modifying the License.
</li>
</ul>
<p>You may add Your own copyright statement to Your modifications and may provide additional or
different license terms and conditions for use, reproduction, or distribution of Your
modifications, or for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with the conditions stated
in this License.</p>
</li>
<li>
<var class="replaceable-license-text"> 5.</var>
Submission of Contributions. Unless You explicitly state otherwise, any Contribution
intentionally submitted for inclusion in the Work by You to the Licensor shall be under the
terms and conditions of this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate
license agreement you may have executed with Licensor regarding such Contributions.
</li>
<li>
<var class="replaceable-license-text"> 6.</var>
Trademarks. This License does not grant permission to use the trade names, trademarks, service
marks, or product names of the Licensor, except as required for reasonable and customary use
in describing the origin of the Work and reproducing the content of the NOTICE file.
</li>
<li>
<var class="replaceable-license-text"> 7.</var>
Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor
provides the Work (and each Contributor provides its Contributions) on an &quot;AS IS&quot;
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY,
or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any risks associated with Your
exercise of permissions under this License.
</li>
<li>
<var class="replaceable-license-text"> 8.</var>
Limitation of Liability. In no event and under no legal theory, whether in tort (including
negligence), contract, or otherwise, unless required by applicable law (such as deliberate and
grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for
damages, including any direct, indirect, special, incidental, or consequential damages of any
character arising as a result of this License or out of the use or inability to use the Work
(including but not limited to damages for loss of goodwill, work stoppage, computer failure or
malfunction, or any and all other commercial damages or losses), even if such Contributor has
been advised of the possibility of such damages.
</li>
<li>
<var class="replaceable-license-text"> 9.</var>
Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works
thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty,
indemnity, or other liability obligations and/or rights consistent with this License. However,
in accepting such obligations, You may act only on Your own behalf and on Your sole
responsibility, not on behalf of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability incurred by, or claims asserted
against, such Contributor by reason of your accepting any such warranty or additional
liability.
</li>
</ul>
<div class="optional-license-text">
<p>END OF TERMS AND CONDITIONS</p>
</div>
<div class="optional-license-text">
<p>APPENDIX: How to apply the Apache License to your work.</p>
<p>To apply the Apache License to your work, attach the following boilerplate notice, with the fields
enclosed by brackets &quot;[]&quot; replaced with your own identifying information. (Don&apos;t
include the brackets!) The text should be enclosed in the appropriate comment syntax for the file
format. We also recommend that a file or class name and description of purpose be included on the same
&quot;printed page&quot; as the copyright notice for easier identification within third-party
archives.</p>
<p>Copyright <var class="replaceable-license-text"> [yyyy] [name of copyright owner]</var></p>
<p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
<br />
you may not use this file except in compliance with the License.
<br />
You may obtain a copy of the License at
</p>
<p>http://www.apache.org/licenses/LICENSE-2.0</p>
<p>Unless required by applicable law or agreed to in writing, software
<br />
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
<br />
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br />
See the License for the specific language governing permissions and
<br />
limitations under the License.
</p>
</div>
<h2>Standard License Header</h2>
<p>Copyright <var class="replaceable-license-text"> [yyyy] [name of copyright owner]</var></p>
<p>Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
<br />
you may not use this file except in compliance with the License.
<br />
You may obtain a copy of the License at
</p>
<p>http://www.apache.org/licenses/LICENSE-2.0</p>
<p>Unless required by applicable law or agreed to in writing, software
<br />
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
<br />
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<br />
See the License for the specific language governing permissions and
<br />
limitations under the License.
</p>
<h2>Notes</h2>
<p>This license was released January 2004</p>
<h2>SPDX web page</h2>
<ul>
<li><a href="https://spdx.org/licenses/Apache-2.0.html">https://spdx.org/licenses/Apache-2.0.html</a></li>
</ul>
<h2>Notice</h2>
<p>This license content is provided by the <a href="https://spdx.dev/">SPDX project</a>. For more information about <b>licenses.nuget.org</b>, see <a href="https://aka.ms/licenses.nuget.org">our documentation</a>.
<p><i>Data pulled from <a href="https://github.com/spdx/license-list-data">spdx/license-list-data</a> on November 6, 2024.</i></p>
</div>
</body>
</html>

View File

@@ -1,63 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<link rel="stylesheet" href="/Content/Site.css" />
<title>&#39;MIT&#39; reference</title>
</head>
<body>
<div id="main-content">
<h1>MIT License</h1>
<h2>SPDX identifier</h2>
<div id="license-expression">MIT</div>
<h2>License text</h2>
<div class="optional-license-text">
<p>MIT License</p>
</div>
<div class="replaceable-license-text">
<p>Copyright (c) &lt;year&gt; &lt;copyright holders&gt;
</p>
</div>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of <var class="replaceable-license-text"> this software and
associated documentation files</var> (the &quot;Software&quot;), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:</p>
<p>The above copyright notice and this permission notice
<var class="optional-license-text"> (including the next paragraph)</var>
shall be included in all copies or substantial
portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
NO EVENT SHALL <var class="replaceable-license-text"> THE AUTHORS OR COPYRIGHT HOLDERS</var> BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
<h2>SPDX web page</h2>
<ul>
<li><a href="https://spdx.org/licenses/MIT.html">https://spdx.org/licenses/MIT.html</a></li>
</ul>
<h2>Notice</h2>
<p>This license content is provided by the <a href="https://spdx.dev/">SPDX project</a>. For more information about <b>licenses.nuget.org</b>, see <a href="https://aka.ms/licenses.nuget.org">our documentation</a>.
<p><i>Data pulled from <a href="https://github.com/spdx/license-list-data">spdx/license-list-data</a> on November 6, 2024.</i></p>
</div>
</body>
</html>