update: Additional async removals

This reverts commit 9145e16b90.

LICENSES.MD

@@ -1,20 +1,16 @@
-| 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.340  | Expression                 | GPL-3.0-only       | https://licenses.nuget.org/GPL-3.0-only |                                                 | Roflmuffin                           | http://docs.cssharp.dev/                                                                         |
-| Dapper                                                | 2.1.66   | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | 2019 Stack Exchange, Inc.                       | Sam Saffron,Marc Gravell,Nick Craver | https://github.com/DapperLib/Dapper                                                              |
-| 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/                                          |
-| Microsoft.Extensions.DependencyInjection.Abstractions | 9.0.7    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://dot.net/                                                                                 |
-| Microsoft.Extensions.Localization.Abstractions        | 8.0.3    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://asp.net/                                                                                 |
-| Microsoft.NET.Test.Sdk                                | 17.14.1  | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://github.com/microsoft/vstest                                                              |
-| Microsoft.Reactive.Testing                            | 6.0.1    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) .NET Foundation and Contributors. | .NET Foundation and Contributors     | https://github.com/dotnet/reactive                                                               |
-| Microsoft.Testing.Extensions.CodeCoverage             | 17.14.2  | Unknown                    |                    | https://aka.ms/deprecateLicenseUrl      | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://github.com/microsoft/codecoverage                                                        |
-| MySqlConnector                                        | 2.4.0    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright 2016–2024 Bradley Grainger            | Bradley Grainger                     | https://mysqlconnector.net/                                                                      |
-| SQLite                                                | 3.13.0   | Unknown                    |                    |                                         | Public Domain                                   | SQLite Development Team              |                                                                                                  |
-| System.Reactive                                       | 6.0.1    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) .NET Foundation and Contributors. | .NET Foundation and Contributors     | https://github.com/dotnet/reactive                                                               |
-| System.Text.Json                                      | 8.0.5    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://dot.net/                                                                                 |
-| Xunit.DependencyInjection                             | 10.6.0   | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright © 2019                                | Wei Peng                             | https://github.com/pengweiqhca/Xunit.DependencyInjection/tree/main/src/Xunit.DependencyInjection |
-| xunit.runner.visualstudio                             | 3.1.3    | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | Copyright (C) .NET Foundation                   | jnewkirk,bradwilson                  |                                                                                                  |
-| xunit.v3                                              | 3.0.0    | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | Copyright (C) .NET Foundation                   | jnewkirk,bradwilson                  |                                                                                                  |
-| YamlDotNet                                            | 16.3.0   | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) Antoine Aubry and contributors    | Antoine Aubry                        | https://github.com/aaubry/YamlDotNet/wiki                                                        |
+| Package                                               | Version  | License Information Origin | License Expression | License Url                             | Copyright                                       | Authors                          | Package Project Url                                                                              |
+| ----------------------------------------------------- | -------- | -------------------------- | ------------------ | --------------------------------------- | ----------------------------------------------- | -------------------------------- | ------------------------------------------------------------------------------------------------ |
+| 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/                                          |
+| Microsoft.Extensions.DependencyInjection.Abstractions | 9.0.7    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                        | https://dot.net/                                                                                 |
+| Microsoft.Extensions.Localization.Abstractions        | 8.0.3    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                        | https://asp.net/                                                                                 |
+| Microsoft.NET.Test.Sdk                                | 17.14.1  | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                        | https://github.com/microsoft/vstest                                                              |
+| Microsoft.Reactive.Testing                            | 6.0.1    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) .NET Foundation and Contributors. | .NET Foundation and Contributors | https://github.com/dotnet/reactive                                                               |
+| Microsoft.Testing.Extensions.CodeCoverage             | 17.14.2  | Unknown                    |                    | https://aka.ms/deprecateLicenseUrl      | © Microsoft Corporation. All rights reserved.   | Microsoft                        | https://github.com/microsoft/codecoverage                                                        |
+| System.Reactive                                       | 6.0.1    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) .NET Foundation and Contributors. | .NET Foundation and Contributors | https://github.com/dotnet/reactive                                                               |
+| System.Text.Json                                      | 8.0.5    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                        | https://dot.net/                                                                                 |
+| Xunit.DependencyInjection                             | 10.6.0   | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright © 2019                                | Wei Peng                         | https://github.com/pengweiqhca/Xunit.DependencyInjection/tree/main/src/Xunit.DependencyInjection |
+| xunit.runner.visualstudio                             | 3.1.3    | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | Copyright (C) .NET Foundation                   | jnewkirk,bradwilson              |                                                                                                  |
+| xunit.v3                                              | 3.0.0    | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | Copyright (C) .NET Foundation                   | jnewkirk,bradwilson              |                                                                                                  |
+| YamlDotNet                                            | 16.3.0   | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) Antoine Aubry and contributors    | Antoine Aubry                    | https://github.com/aaubry/YamlDotNet/wiki                                                        |

Locale/Locale.csproj

@@ -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"/>

TTT.sln

@@ -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

TTT/CS2/API/Items/ITripwireActivator.cs

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

TTT/CS2/API/Items/ITripwireTracker.cs

@@ -0,0 +1,8 @@
+using TTT.CS2.Items.Tripwire;
+
+namespace TTT.CS2.API.Items;
+
+public interface ITripwireTracker {
+  public List<TripwireInstance> ActiveTripwires { get; }
+  void RemoveTripwire(TripwireInstance instance);
+}

TTT/CS2/API/Items/TripwireInstance.cs

@@ -0,0 +1,13 @@
+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) {
+  public override string ToString() {
+    return
+      $"TripwireInstance(Owner={owner}, StartPos={StartPos}, EndPos={EndPos})";
+  }
+}

TTT/CS2/CS2.csproj

@@ -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>

TTT/CS2/CS2ServiceCollection.cs

@@ -66,6 +66,7 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<IStorage<SilentAWPConfig>, CS2SilentAWPConfig>();
     collection
      .AddModBehavior<IStorage<HealthshotConfig>, CS2HealthshotConfig>();
+    collection.AddModBehavior<IStorage<TripwireConfig>, CS2TripwireConfig>();
 
     // TTT - CS2 Specific optionals
     collection.AddScoped<ITextSpawner, TextSpawner>();

TTT/CS2/Command/Test/SpecialRoundCommand.cs

@@ -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.");

TTT/CS2/Configs/ShopItems/CS2TaserConfig.cs

@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
 
 public class CS2TaserConfig : IStorage<TaserConfig>, IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_taser_price", "Price of the Taser item", 120,
+    "css_ttt_shop_taser_price", "Price of the Taser item", 110,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<string> CV_WEAPON = new(

TTT/CS2/Configs/ShopItems/CS2TripwireConfig.cs

@@ -0,0 +1,110 @@
+using System.Drawing;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Storage;
+
+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)", 45,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_EXPLOSION_POWER = new(
+    "css_ttt_shop_tripwire_explosion_power",
+    "Explosion power of the Tripwire in damage units", 1000,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 10000));
+
+  public static readonly FakeConVar<float> CV_FALLOFF_DELAY = new(
+    "css_ttt_shop_tripwire_falloff_delay",
+    "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(
+    "css_ttt_shop_tripwire_friendlyfire_multiplier",
+    "Damage multiplier applied to friendly fire from Tripwire", 0.5f,
+    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_DISTANCE_SQUARED = new(
+    "css_ttt_shop_tripwire_max_distance_squared",
+    "Maximum placement distance squared for Tripwire", 50000f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1000000f));
+
+  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/defuse-detection", 10f,
+    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 (0–255)", 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 (0–255)", 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 (0–255)", 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 (0–255)", 32,
+    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 static readonly FakeConVar<float> CV_DEFUSE_TIME = new(
+    "css_ttt_shop_tripwire_defuse_time",
+    "Time required to fully defuse the Tripwire (in seconds)", 6f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 30f));
+
+  public static readonly FakeConVar<float> CV_DEFUSE_RATE = new(
+    "css_ttt_shop_tripwire_defuse_rate",
+    "Rate at which Tripwire defuses are processed (in seconds)", 0.5f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0.01f, 5f));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  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_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,
+      DefuseTime        = TimeSpan.FromSeconds(CV_DEFUSE_TIME.Value),
+      DefuseRate        = TimeSpan.FromSeconds(CV_DEFUSE_RATE.Value)
+    };
+
+    return Task.FromResult<TripwireConfig?>(cfg);
+  }
+}

TTT/CS2/Extensions/VectorExtensions.cs

@@ -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);
+  }
 }

TTT/CS2/GameHandlers/CombatHandler.cs

@@ -23,12 +23,12 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
-  private readonly IAliveSpoofer spoofer =
-    provider.GetRequiredService<IAliveSpoofer>();
-
   private readonly IRoleAssigner roles =
     provider.GetRequiredService<IRoleAssigner>();
 
+  private readonly IAliveSpoofer spoofer =
+    provider.GetRequiredService<IAliveSpoofer>();
+
   public void Start() { }
 
   public void Dispose() { }

TTT/CS2/GameHandlers/MapChangeCausesEndListener.cs

@@ -20,7 +20,8 @@ public class MapChangeCausesEndListener(IServiceProvider provider)
   }
 
   private void onMapChange(string mapName) {
+    if (games.ActiveGame is not { State: State.IN_PROGRESS or State.COUNTDOWN })
+      return;
     games.ActiveGame?.EndGame(new EndReason("Map Change"));
-    Server.PrintToConsole("Detected map change, ending active game.");
   }
 }

TTT/CS2/Items/Station/DamageStation.cs

@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
@@ -31,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>();
 
@@ -48,20 +44,21 @@ 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) {
-      if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
-        > Math.Abs(_Config.TotalHealthGiven)) {
-        toRemove.Add(prop);
-        continue;
-      }
+    // accumulate contributions per player: ApiPlayer -> list of (stationInfo, damage, gamePlayer)
+    var playerDamageMap =
+      new Dictionary<IOnlinePlayer, List<(StationInfo info, int damage,
+        CCSPlayerController gamePlayer)>>();
 
-      if (!prop.IsValid || prop.AbsOrigin == null) {
+    foreach (var (prop, info) in Props) {
+      if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
+        > Math.Abs(_Config.TotalHealthGiven) || !prop.IsValid
+        || prop.AbsOrigin == null) {
         toRemove.Add(prop);
         continue;
       }
@@ -80,32 +77,71 @@ public class DamageStation(IServiceProvider provider)
       foreach (var (player, dist, gamePlayer) in playerDists) {
         var healthScale = 1.0 - dist / _Config.MaxRange;
         var damageAmount =
-          (int)Math.Floor(_Config.HealthIncrements * healthScale);
+          Math.Abs((int)Math.Floor(_Config.HealthIncrements * healthScale));
 
-        var dmgEvent = new PlayerDamagedEvent(player,
-          info.Owner as IOnlinePlayer, damageAmount) { Weapon = $"[{Name}]" };
+        if (damageAmount <= 0) continue;
 
-        bus.Dispatch(dmgEvent);
-
-        damageAmount = -dmgEvent.DmgDealt;
-
-        if (player.Health + damageAmount <= 0) {
-          killedWithStation[player.Id] = info;
-          var playerDeath = new PlayerDeathEvent(player)
-           .WithKiller(info.Owner as IOnlinePlayer)
-           .WithWeapon($"[{Name}]");
-          bus.Dispatch(playerDeath);
+        if (!playerDamageMap.TryGetValue(player, out var list)) {
+          list                    = [];
+          playerDamageMap[player] = list;
         }
 
-        gamePlayer.EmitSound("Player.DamageFall", SELF(gamePlayer.Slot), 0.2f);
-        player.Health    += damageAmount;
-        info.HealthGiven += damageAmount;
+        list.Add((info, damageAmount, gamePlayer));
       }
     }
 
-    foreach (var prop in toRemove) props.Remove(prop);
+    // Apply accumulated damage per player once
+    applyDamage(playerDamageMap);
+
+    // remove invalid/expired props
+    foreach (var prop in toRemove) Props.Remove(prop);
   }
 
+  private void applyDamage(
+    Dictionary<IOnlinePlayer, List<(StationInfo info, int damage,
+      CCSPlayerController gamePlayer)>> playerDamageMap) {
+    foreach (var kv in playerDamageMap) {
+      var player   = kv.Key;
+      var contribs = kv.Value;
+
+      var totalDamage = contribs.Sum(c => c.damage);
+
+      if (totalDamage <= 0) continue;
+
+      // choose the station that contributed the most damage to attribute the kill to
+      var dominantInfo = contribs.OrderByDescending(c => c.damage).First().info;
+      var gamePlayer   = contribs.First().gamePlayer;
+
+      // dispatch single PlayerDamagedEvent with total damage
+      var dmgEvent = new PlayerDamagedEvent(player,
+        dominantInfo.Owner as IOnlinePlayer, totalDamage) {
+        Weapon = $"[{Name}]"
+      };
+
+      bus.Dispatch(dmgEvent);
+
+      totalDamage = dmgEvent.DmgDealt;
+
+      // if this will kill the player, attribute death to the dominant station
+      if (player.Health - totalDamage <= 0) {
+        killedWithStation[player.Id] = dominantInfo;
+        var playerDeath = new PlayerDeathEvent(player)
+         .WithKiller(dominantInfo.Owner as IOnlinePlayer)
+         .WithWeapon($"[{Name}]");
+        bus.Dispatch(playerDeath);
+      }
+
+      gamePlayer.EmitSound("Player.DamageFall", SELF(gamePlayer.Slot), 0.2f);
+
+      // apply damage to player's health
+      player.Health -= totalDamage;
+
+      // update each station's HealthGiven by its own contribution
+      foreach (var (info, damage, _) in contribs) info.HealthGiven += damage;
+    }
+  }
+
+
   private static RecipientFilter SELF(int slot) {
     return new RecipientFilter(slot);
   }

TTT/CS2/Items/Station/HealthStation.cs

@@ -30,7 +30,29 @@ public class HealthStation(IServiceProvider provider)
   override protected void onInterval() {
     var players  = Utilities.GetPlayers();
     var toRemove = new List<CPhysicsPropMultiplayer>();
-    foreach (var (prop, info) in props) {
+
+    // build per-player potential heal contributions and gather props to remove
+    var perPlayerContrib = BuildPerPlayerContributions(players, toRemove);
+
+    // apply the accumulated heals in a single pass per player
+    applyAccumulatedHeals(perPlayerContrib);
+
+    // remove invalid/expired props
+    foreach (var prop in toRemove) Props.Remove(prop);
+  }
+
+  /// <summary>
+  /// Scan all props and build a map: Player -> list of (StationInfo, potentialHeal).
+  /// Also fills toRemove for invalid/expired props.
+  /// </summary>
+  private
+    Dictionary<CCSPlayerController, List<(StationInfo info, int potential)>>
+    BuildPerPlayerContributions(IReadOnlyList<CCSPlayerController> players,
+      List<CPhysicsPropMultiplayer> toRemove) {
+    var result =
+      new Dictionary<CCSPlayerController, List<(StationInfo, int)>>();
+
+    foreach (var (prop, info) in Props) {
       if (_Config.TotalHealthGiven != 0
         && Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
         toRemove.Add(prop);
@@ -52,19 +74,130 @@ public class HealthStation(IServiceProvider provider)
        .ToList();
 
       foreach (var (player, dist) in playerDists) {
-        var maxHp       = player.Pawn.Value?.MaxHealth ?? 100;
-        var healthScale = 1.0 - dist / _Config.MaxRange;
-        var maxHealAmo =
-          (int)Math.Ceiling(_Config.HealthIncrements * healthScale);
-        var newHealth   = Math.Min(player.GetHealth() + maxHealAmo, maxHp);
-        var healthGiven = newHealth - player.GetHealth();
-        player.SetHealth(newHealth);
-        info.HealthGiven += healthGiven;
+        var potentialHeal = ComputePotentialHeal(dist);
+        if (potentialHeal <= 0) continue;
 
-        if (healthGiven > 0) player.EmitSound("HealthShot.Pickup", null, 0.1f);
+        if (!result.TryGetValue(player, out var list)) {
+          list           = [];
+          result[player] = list;
+        }
+
+        list.Add((info, potentialHeal));
       }
     }
 
-    foreach (var prop in toRemove) props.Remove(prop);
+    return result;
+  }
+
+  /// <summary>
+  /// Compute potential heal from a station given the distance.
+  /// Mirrors your original logic: ceil(HealthIncrements * healthScale).
+  /// </summary>
+  private int ComputePotentialHeal(double dist) {
+    var healthScale = 1.0 - dist / _Config.MaxRange;
+    return (int)Math.Ceiling(_Config.HealthIncrements * healthScale);
+  }
+
+  /// <summary>
+  /// Apply heals to each player once per tick.
+  /// Distributes the actual heal proportionally across contributing stations,
+  /// updates station.Info.HealthGiven and emits a single pickup sound if needed.
+  /// </summary>
+  private void applyAccumulatedHeals(
+    Dictionary<CCSPlayerController, List<(StationInfo info, int potential)>>
+      perPlayerContrib) {
+    foreach (var kv in perPlayerContrib) {
+      var player   = kv.Key;
+      var contribs = kv.Value;
+
+      var maxHp     = player.Pawn.Value?.MaxHealth ?? 100;
+      var currentHp = player.GetHealth();
+      if (currentHp >= maxHp) continue;
+
+      var totalPotential = contribs.Sum(c => c.potential);
+      if (totalPotential <= 0) continue;
+
+      var totalHealAvailable = Math.Min(totalPotential, maxHp - currentHp);
+      if (totalHealAvailable <= 0) continue;
+
+      var potentials = contribs.Select(c => c.potential).ToList();
+      var allocations =
+        allocateProportionalInteger(totalHealAvailable, potentials);
+
+      // safety clamp: never allocate more than a station's potential
+      for (int i = 0; i < allocations.Count; i++)
+        if (allocations[i] > potentials[i])
+          allocations[i] = potentials[i];
+
+      // if clamping reduced the total, try to redistribute remaining amount
+      var allocatedSum = allocations.Sum();
+      if (allocatedSum < totalHealAvailable) {
+        var remaining = totalHealAvailable - allocatedSum;
+        for (var i = 0; i < allocations.Count && remaining > 0; i++) {
+          var headroom = potentials[i] - allocations[i];
+          if (headroom <= 0) continue;
+          var give = Math.Min(headroom, remaining);
+          allocations[i] += give;
+          remaining      -= give;
+        }
+
+        allocatedSum = allocations.Sum();
+      }
+
+      // apply heal to player
+      var actualAllocated = Math.Min(allocatedSum, maxHp - currentHp);
+      if (actualAllocated <= 0) continue;
+
+      var newHealth = Math.Min(currentHp + actualAllocated, maxHp);
+      player.SetHealth(newHealth);
+
+      // update station HealthGiven
+      for (var i = 0; i < allocations.Count; i++) {
+        var info                            = contribs[i].info;
+        var allocated                       = allocations[i];
+        if (allocated > 0) info.HealthGiven += allocated;
+      }
+
+      // emit a single pickup sound if any heal applied
+      player.EmitSound("HealthShot.Pickup", null, 0.1f);
+    }
+  }
+
+  /// <summary>
+  /// Proportionally distribute an integer total across integer potentials.
+  /// Uses floor of shares and assigns leftover to largest fractional remainders.
+  /// Returns a list of allocations with same length as potentials.
+  /// </summary>
+  private List<int>
+    allocateProportionalInteger(int total, List<int> potentials) {
+    var allocations    = new List<int>(new int[potentials.Count]);
+    var remainders     = new List<(int idx, double rem)>();
+    var sumBase        = 0;
+    var totalPotential = potentials.Sum();
+
+    if (totalPotential <= 0) return allocations;
+
+    for (var i = 0; i < potentials.Count; i++) {
+      var potential = potentials[i];
+      var share     = (double)potential / totalPotential * total;
+      var baseAlloc = (int)Math.Floor(share);
+      var rem       = share - baseAlloc;
+      allocations[i] =  baseAlloc;
+      sumBase        += baseAlloc;
+      remainders.Add((i, rem));
+    }
+
+    var leftover = total - sumBase;
+    if (leftover <= 0) return allocations;
+
+    remainders = remainders.OrderByDescending(r => r.rem).ToList();
+    var idx = 0;
+    while (leftover > 0 && idx < remainders.Count) {
+      allocations[remainders[idx].idx] += 1;
+      leftover--;
+      idx++;
+    }
+
+    return allocations;
   }
 }

TTT/CS2/Items/Station/StationItem.cs

@@ -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;

TTT/CS2/Items/Tripwire/TripwireDamageListener.cs

@@ -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;
+  }
+}

TTT/CS2/Items/Tripwire/TripwireDefuserListener.cs

@@ -0,0 +1,125 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Messages;
+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.Locale;
+
+namespace TTT.CS2.Items.Tripwire;
+
+public class TripwireDefuserListener(IServiceProvider provider)
+  : IPluginModule {
+  private readonly ITripwireTracker? tripwireTracker =
+    provider.GetService<ITripwireTracker>();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
+  private readonly IMsgLocalizer locale =
+    provider.GetRequiredService<IMsgLocalizer>();
+
+  private TripwireConfig config
+    => provider.GetService<IStorage<TripwireConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TripwireConfig();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    if (tripwireTracker == null) return;
+    plugin
+    ?.RegisterListener<
+        CounterStrikeSharp.API.Core.Listeners.OnPlayerButtonsChanged>(
+        onButtonsChanged);
+  }
+
+  private void onButtonsChanged(CCSPlayerController player,
+    PlayerButtons pressed, PlayerButtons released) {
+    if (tripwireTracker == null) return;
+    if ((pressed & PlayerButtons.Use) != PlayerButtons.Use) return;
+
+    var instance = getTargetTripwire(player);
+    if (instance == null) return;
+
+    startDefuseTimer(player, instance);
+  }
+
+  private TripwireInstance? getTargetTripwire(CCSPlayerController player) {
+    if (tripwireTracker == null) return null;
+    var raytrace =
+      player.GetGameTraceByEyePosition(TraceMask.MaskSolid, Contents.NoDraw,
+        player);
+
+    if (raytrace == null || tripwireTracker.ActiveTripwires.Count == 0)
+      return null;
+    var raytracePos = raytrace.Value.EndPos.toVector();
+
+    var closest =
+      tripwireTracker?.ActiveTripwires.MinBy(i
+        => i.StartPos.DistanceSquared(raytracePos));
+
+    if (closest == null || closest.StartPos.DistanceSquared(raytracePos)
+      > config.TripwireSizeSquared)
+      return null;
+
+    if (player.Pawn.Value?.AbsOrigin == null
+      || closest.StartPos.DistanceSquared(player.Pawn.Value.AbsOrigin)
+      > config.MaxPlacementDistanceSquared)
+      return null;
+
+    return closest;
+  }
+
+  private void startDefuseTimer(CCSPlayerController player,
+    TripwireInstance instance) {
+    tickDefuse(player, instance, DateTime.Now);
+  }
+
+  private void tickDefuse(CCSPlayerController player, TripwireInstance instance,
+    DateTime startTime) {
+    if (!player.IsValid) return;
+    var apiPlayer = converter.GetPlayer(player);
+
+    if ((player.Buttons & PlayerButtons.Use) != PlayerButtons.Use) {
+      messenger.Message(apiPlayer,
+        locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED]);
+      return;
+    }
+
+    var progress = (DateTime.Now - startTime) / config.DefuseTime;
+    var timeLeft = config.DefuseTime - (config.DefuseTime * progress);
+
+    if (progress >= 1) {
+      instance.TripwireProp.EmitSound("c4.disarmfinish", null, 0.2f, 1.5f);
+      tripwireTracker?.RemoveTripwire(instance);
+      return;
+    }
+
+    var target = getTargetTripwire(player);
+    if (target != instance) {
+      messenger.Message(apiPlayer,
+        locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED]);
+      return;
+    }
+
+    player.PrintToCenter(
+      locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING(progress, timeLeft)]);
+    var pitch = 1.5f - (float)progress;
+    player.EmitSound("c4.keypressquiet", pitch: pitch);
+    var ticksDelay = (int)Math.Round(64 * config.DefuseRate.TotalSeconds);
+    Server.RunOnTick(Server.TickCount + ticksDelay,
+      () => tickDefuse(player, instance, startTime));
+  }
+}

TTT/CS2/Items/Tripwire/TripwireItem.cs

@@ -1,56 +1,68 @@
-using System.Drawing;
+using System.Diagnostics.CodeAnalysis;
+using System.Drawing;
 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>();
+    services.AddModBehavior<TripwireDefuserListener>();
   }
 }
 
 public class TripwireItem(IServiceProvider provider)
-  : RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
-  public override string Name => Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE];
+  : RoleRestrictedItem<TraitorRole>(provider), IPluginModule, ITripwireTracker {
+  private TripwireConfig config
+    => Provider.GetService<IStorage<TripwireConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TripwireConfig();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
   private readonly IScheduler scheduler =
     provider.GetRequiredService<IScheduler>();
 
-  protected readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+  public List<TripwireInstance> ActiveTripwires { get; } = [];
 
-  public record TripwireInstance(IOnlinePlayer owner, CEnvBeam Beam,
-    CDynamicProp TripwireProp, Vector StartPos, Vector EndPos);
+  public void RemoveTripwire(TripwireInstance instance) {
+    instance.Beam.Remove();
+    instance.TripwireProp.Remove();
+    ActiveTripwires.Remove(instance);
+  }
 
-  private TripwireConfig config = provider
-   .GetService<IStorage<TripwireConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new TripwireConfig();
+  public override string Name => Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE];
 
   public override string Description
     => Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DESC];
 
   public override ShopItemConfig Config => config;
 
-  public List<TripwireInstance> ActiveTripwires = new();
-
   public void Start(BasePlugin? plugin) {
     Start();
     plugin
@@ -64,45 +76,73 @@ 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(() => {
-      var gamePlayer = converter.GetPlayer(player);
-      var playerPawn = gamePlayer?.PlayerPawn.Value;
-      if (gamePlayer == null || playerPawn == null) return;
-      var originTrace =
-        gamePlayer.GetGameTraceByEyePosition(TraceMask.MaskSolid,
-          Contents.NoDraw, gamePlayer);
-      var origin = gamePlayer.GetEyePosition();
-      if (origin == null || originTrace == null) return;
+      if (!placeTripwire(player, out var originTrace, out var endTrace,
+        out var tripwire))
+        return;
 
-      var angles = vectorToAngle(originTrace.Value.Normal.toVector());
-
-      var endTrace = TraceRay.TraceShape(origin, angles, TraceMask.MaskSolid,
-        Contents.NoDraw, gamePlayer);
-
-      var tripwire = Utilities.CreateEntityByName<CDynamicProp>("prop_dynamic");
-      if (tripwire == null) return;
-
-      tripwire.SetModel(
-        "models/generic/conveyor_control_panel_01/conveyor_button_02.vmdl");
-      tripwire.DispatchSpawn();
-
-      tripwire.Teleport(originTrace.Value.EndPos.toVector(),
-        vectorToAngle(originTrace.Value.Normal.toVector()));
-      tripwire.EmitSound("Weapon_ELITE.Clipout");
-
-      scheduler.Schedule(TimeSpan.FromSeconds(2), () => {
-        Server.NextWorldUpdate(() => {
-          if (!gamePlayer.IsValid) return;
-          createBeam(player, tripwire, originTrace.Value.EndPos.toVector(),
-            endTrace.EndPos.toVector());
+      scheduler.Schedule(config.TripwireInitiationTime,
+        () => {
+          Server.NextWorldUpdate(() => {
+            createTripwireBeam(player, tripwire,
+              originTrace.Value.EndPos.toVector(),
+              endTrace.Value.EndPos.toVector());
+          });
         });
-      });
     });
   }
 
-  private void createBeam(IOnlinePlayer owner, CDynamicProp prop, Vector start,
-    Vector end) {
+  private bool placeTripwire(IOnlinePlayer player,
+    [NotNullWhen(true)] out CGameTrace? originTrace,
+    [NotNullWhen(true)] out CGameTrace? endTrace,
+    [NotNullWhen(true)] out CDynamicProp? tripwire) {
+    tripwire    = null;
+    originTrace = null;
+    endTrace    = null;
+    var gamePlayer = converter.GetPlayer(player);
+    var playerPawn = gamePlayer?.PlayerPawn.Value;
+    if (gamePlayer == null || playerPawn == null) return false;
+
+    originTrace = gamePlayer.GetGameTraceByEyePosition(TraceMask.MaskSolid,
+      Contents.NoDraw, gamePlayer);
+    var origin = gamePlayer.GetEyePosition();
+    if (origin == null || originTrace == null) return false;
+
+    if (origin.DistanceSquared(originTrace.Value.EndPos.toVector())
+      > config.MaxPlacementDistanceSquared) {
+      Shop.AddBalance(player, config.Price, "Refund");
+      Messenger.Message(player, Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_TOOFAR]);
+      return false;
+    }
+
+    var angles = originTrace.Value.Normal.toVector().toAngle();
+
+    endTrace = TraceRay.TraceShape(originTrace.Value.EndPos.toVector(), angles,
+      TraceMask.MaskSolid, Contents.NoDraw, gamePlayer);
+
+    tripwire = Utilities.CreateEntityByName<CDynamicProp>("prop_dynamic");
+    if (tripwire == null) return false;
+
+    tripwire.SetModel(
+      "models/generic/conveyor_control_panel_01/conveyor_button_02.vmdl");
+    tripwire.DispatchSpawn();
+
+    tripwire.Teleport(originTrace.Value.EndPos.toVector(),
+      originTrace.Value.Normal.toVector().toAngle());
+    tripwire.EmitSound("Weapon_ELITE.Clipout");
+    return true;
+  }
+
+  private void createTripwireBeam(IOnlinePlayer owner, CDynamicProp prop,
+    Vector start, Vector end) {
     prop.EmitSound("C4.ExplodeTriggerTrip");
     var beam = createBeamEnt(start, end);
     if (beam == null) return;
@@ -111,19 +151,12 @@ 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;

TTT/CS2/Items/Tripwire/TripwireMovementListener.cs

@@ -1,101 +1,82 @@
-using CounterStrikeSharp.API;
+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;
 using TTT.API;
 using TTT.API.Events;
 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.Utils;
 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 TripwireItem? item = provider.GetService<TripwireItem>();
-
-  private readonly IPlayerFinder finder =
-    provider.GetRequiredService<IPlayerFinder>();
-
+  : BaseListener(provider), IPluginModule, ITripwireActivator {
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
+  private readonly ITripwireTracker? tripwireTracker =
+    provider.GetService<ITripwireTracker>();
 
-  public void Dispose() { }
-  public void Start() { }
+  private readonly Dictionary<string, TripwireInstance> killedWithTripwire =
+    new();
+
+  private TripwireConfig config
+    => Provider.GetService<IStorage<TripwireConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TripwireConfig();
 
   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 readonly Dictionary<string, TripwireItem.TripwireInstance>
-    killedWithTripwire = new();
-
   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 _)) continue;
+      if (!ray.DidHit() || !ray.HitPlayer(out var player)) 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();
-    }
-  }
-
-  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 (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);
+      if (!config.FriendlyFireTriggers && player != null) {
+        var apiPlayer = converter.GetPlayer(player);
+        var role      = Roles.GetRoles(apiPlayer);
+        if (role.Any(r => r is TraitorRole)) continue;
       }
 
-      player.Health -= damage;
-      gamePlayer.EmitSound("Player.BurnDamage");
+      ActivateTripwire(wire);
     }
   }
 
-  private static readonly float fallofDelay = 0.01f;
-
   private float getDamage(float distance) {
-    return 1000.0f * MathF.Pow(MathF.E, -distance * fallofDelay);
+    return config.ExplosionPower
+      * 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);
+    if (Roles.GetRoles(player).Any(r => r is TraitorRole))
+      damage *= config.FriendlyFireMultiplier;
+
+    return (int)Math.Floor(damage);
   }
 
   [UsedImplicitly]
@@ -114,4 +95,43 @@ public class TripwireMovementListener(IServiceProvider provider)
       return;
     ev.Body.Killer = info.owner;
   }
+
+  public void ActivateTripwire(TripwireInstance instance) {
+    tripwireTracker?.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;
+  }
 }

TTT/CS2/Items/Tripwire/TripwireMsgs.cs

@@ -8,4 +8,16 @@ public class TripwireMsgs {
 
   public static IMsg SHOP_ITEM_TRIPWIRE_DESC
     => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DESC));
+
+  public static IMsg SHOP_ITEM_TRIPWIRE_TOOFAR
+    => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_TOOFAR));
+
+  public static IMsg
+    SHOP_ITEM_TRIPWIRE_DEFUSING(double progress, TimeSpan time) {
+    return MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DEFUSING),
+      progress.ToString("P0"), time.TotalSeconds.ToString("F1"));
+  }
+
+  public static IMsg SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED
+    => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED));
 }

TTT/CS2/Listeners/WardenTagAssigner.cs

@@ -4,8 +4,10 @@ using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
+using TTT.API.Game;
 using TTT.API.Player;
 using TTT.CS2.ThirdParties.eGO;
+using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
 using TTT.Game.Roles;
@@ -14,42 +16,55 @@ namespace TTT.CS2.Listeners;
 
 public class WardenTagAssigner(IServiceProvider provider)
   : BaseListener(provider) {
-  private Dictionary<string, (string, char)> oldTags =
-    new Dictionary<string, (string, char)>();
-
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly Dictionary<string, (string, char)> oldTags = new();
+
   [UsedImplicitly]
   [EventHandler]
   public void OnRoleAssign(PlayerRoleAssignEvent ev) {
     var maul = EgoApi.MAUL.Get();
     if (maul == null) return;
-    Server.NextWorldUpdate(() => {
-      var gamePlayer = converter.GetPlayer(ev.Player);
-      if (gamePlayer == null) return;
+    if (!(ev.Role is DetectiveRole)) return;
+    var gamePlayer = converter.GetPlayer(ev.Player);
+    if (gamePlayer == null) return;
 
-      Task.Run(async () => {
-        if (ev.Role is DetectiveRole) {
-          var oldTag = await maul.getTagService().GetTag(gamePlayer.SteamID);
-          var oldTagColor =
-            await maul.getTagService().GetTagColor(gamePlayer.SteamID);
+    Task.Run(async () => {
+      if (ev.Role is DetectiveRole) {
+        var oldTag = await maul.getTagService().GetTag(gamePlayer.SteamID);
+        var oldTagColor =
+          await maul.getTagService().GetTagColor(gamePlayer.SteamID);
+        if (oldTag != "[DETECTIVE]")
           oldTags[ev.Player.Id] = (oldTag, oldTagColor);
+      }
+
+      await Server.NextWorldUpdateAsync(() => {
+        if (ev.Role is DetectiveRole) {
+          maul.getTagService().SetTag(gamePlayer, "[DETECTIVE]", false);
+          maul.getTagService()
+           .SetTagColor(gamePlayer, ChatColors.DarkBlue, false);
         }
-
-        await Server.NextWorldUpdateAsync(() => {
-          if (ev.Role is DetectiveRole) {
-            maul.getTagService().SetTag(gamePlayer, "[DETECTIVE]", false);
-            maul.getTagService()
-             .SetTagColor(gamePlayer, ChatColors.DarkBlue, false);
-          } else if (oldTags.TryGetValue(ev.Player.Id, out var oldTag)) {
-            maul.getTagService().SetTag(gamePlayer, oldTag.Item1, false);
-            maul.getTagService().SetTagColor(gamePlayer, oldTag.Item2, false);
-
-            oldTags.Remove(ev.Player.Id);
-          }
-        });
       });
     });
   }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+    var maul = EgoApi.MAUL.Get();
+    if (maul == null) return;
+
+    foreach (var (playerId, (oldTag, oldTagColor)) in oldTags) {
+      var apiPlayer = Finder.GetPlayerById(playerId);
+      if (apiPlayer == null) return;
+      var csPlayer = converter.GetPlayer(apiPlayer);
+      if (csPlayer == null || !csPlayer.IsValid) return;
+      maul.getTagService().SetTag(csPlayer, oldTag, false);
+      maul.getTagService().SetTagColor(csPlayer, oldTagColor, false);
+    }
+
+    oldTags.Clear();
+  }
 }

TTT/CS2/lang/en.yml

@@ -55,4 +55,7 @@ SHOP_ITEM_TELEPORT_DECOY: "Teleport Decoy"
 SHOP_ITEM_TELEPORT_DECOY_DESC: "A decoy that teleports you to it upon explosion."
 
 SHOP_ITEM_TRIPWIRE: "Tripwire"
-SHOP_ITEM_TRIPWIRE_DESC: "A tripwire that explodes when triggered."
+SHOP_ITEM_TRIPWIRE_DESC: "A tripwire that explodes when triggered."
+SHOP_ITEM_TRIPWIRE_TOOFAR: "%PREFIX%You are too far away to place the tripwire."
+SHOP_ITEM_TRIPWIRE_DEFUSING: "Defusing... ({0}, {1} second%s% left)."
+SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED: "%PREFIX%You stopped defusing the tripwire."

TTT/Directory.Build.props

@@ -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>
 

TTT/Shop/Shop.csproj

@@ -7,12 +7,6 @@
     <RootNamespace>TTT.Shop</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
-      <HintPath>..\..\..\..\..\..\.nuget\packages\microsoft.extensions.dependencyinjection.abstractions\8.0.0\lib\net8.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\API\API.csproj"/>
     <ProjectReference Include="..\Game\Game.csproj"/>

TTT/Shop/Shop.csproj.DotSettings

@@ -2,8 +2,8 @@
                         xmlns:s="clr-namespace:System;assembly=mscorlib"
                         xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xml:space="preserve">
 	<s:Boolean
-          x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=items_005Coneshotdeagle/@EntryIndexedValue">True</s:Boolean>
+    x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=items_005Coneshotdeagle/@EntryIndexedValue">True</s:Boolean>
   <s:Boolean
-          x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=lang/@EntryIndexedValue">True</s:Boolean>
+    x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=lang/@EntryIndexedValue">True</s:Boolean>
   <s:Boolean
-          x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=shop/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+    x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=shop/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

TTT/Shop/lang/en.yml

@@ -21,7 +21,7 @@ SHOP_ITEM_GLOVES: "Gloves"
 SHOP_ITEM_GLOVES_DESC: "Lets you kill without DNA being left behind, or move bodies without identifying the body."
 SHOP_ITEM_GLOVES_USED_BODY: "%SHOP_PREFIX%You used your gloves to move a body without leaving DNA. ({yellow}{0}{grey}/{yellow}{1}{grey} use%s% left)."
 SHOP_ITEM_GLOVES_USED_KILL: "%SHOP_PREFIX%You used your gloves to kill without leaving DNA evidence. ({yellow}{0}{grey}/{yellow}{1}{grey} use%s% left)."
-SHOP_ITEM_GLOVES_WORN_OUT: "%SHOP_PREFIX%Your gloves worn out."
+SHOP_ITEM_GLOVES_WORN_OUT: "%SHOP_PREFIX%Your gloves wore out."
 
 SHOP_ITEM_TASER: "Taser"
 SHOP_ITEM_TASER_DESC: "A taser that allows you to identify the roles of players you hit."

TTT/ShopAPI/Configs/Traitor/TripwireConfig.cs

@@ -1,6 +1,22 @@
-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; } = 100;
+  public int ExplosionPower { get; init; } = 1000;
+  public float FalloffDelay { get; init; } = 0.02f;
+  public float FriendlyFireMultiplier { get; init; } = 0.5f;
+  public bool FriendlyFireTriggers { get; init; } = true;
+  public float MaxPlacementDistanceSquared { get; init; } = 400f * 400f;
+
+  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;
+
+  public TimeSpan DefuseTime { get; init; } = TimeSpan.FromSeconds(5);
+  public TimeSpan DefuseRate { get; init; } = TimeSpan.FromMilliseconds(500);
 }

TTT/ShopAPI/PurchaseResult.cs

@@ -41,11 +41,6 @@ public enum PurchaseResult {
   ///   The item cannot be purchased multiple times, and the player already owns it.
   /// </summary>
   ALREADY_OWNED,
-
-  /// <summary>
-  ///  The tripwire placement is too far from the player.
-  /// </summary>
-  TRIPWIRE_TOO_FAR
 }
 
 public static class PurchaseResultExtensions {
@@ -64,8 +59,6 @@ public static class PurchaseResultExtensions {
         "You do not have the required role to purchase this item",
       PurchaseResult.ALREADY_OWNED =>
         "You have purchased the maximum amount of this item",
-      PurchaseResult.TRIPWIRE_TOO_FAR =>
-        "The tripwire placement is too far from you",
       _ => "An unexpected error occurred"
     };
   }

TTT/SpecialRound/Events/SpecialRoundEvent.cs

@@ -0,0 +1,8 @@
+using SpecialRoundAPI;
+using TTT.API.Events;
+
+namespace SpecialRound.Events;
+
+public abstract class SpecialRoundEvent(AbstractSpecialRound round) : Event {
+  public AbstractSpecialRound Round { get; } = round;
+}

TTT/SpecialRound/Events/SpecialRoundStartEvent.cs

@@ -0,0 +1,6 @@
+using SpecialRoundAPI;
+
+namespace SpecialRound.Events;
+
+public class SpecialRoundStartEvent(AbstractSpecialRound round)
+  : SpecialRoundEvent(round) { }

TTT/SpecialRound/Rounds/PistolRound.cs

@@ -17,9 +17,12 @@ namespace SpecialRound.Rounds;
 
 public class PistolRound(IServiceProvider provider)
   : AbstractSpecialRound(provider), IPluginModule {
+  private readonly IInventoryManager inventory = provider
+   .GetRequiredService<IInventoryManager>();
+
+  private BasePlugin? plugin;
   public override string Name => "Pistol";
   public override IMsg Description => RoundMsgs.SPECIAL_ROUND_PISTOL;
-  private BasePlugin? plugin;
 
   private PistolRoundConfig config
     => Provider.GetService<IStorage<PistolRoundConfig>>()
@@ -27,9 +30,6 @@ public class PistolRound(IServiceProvider provider)
      .GetAwaiter()
      .GetResult() ?? new PistolRoundConfig();
 
-  private readonly IInventoryManager inventory = provider
-   .GetRequiredService<IInventoryManager>();
-
   public override SpecialRoundConfig Config => config;
 
   public void Start(BasePlugin? newPluing) { plugin = newPluing; }

TTT/SpecialRound/Rounds/SuppressedRound.cs

@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.UserMessages;
 using Microsoft.Extensions.DependencyInjection;
 using SpecialRound.lang;
@@ -15,23 +14,6 @@ namespace SpecialRound.Rounds;
 
 public class SuppressedRound(IServiceProvider provider)
   : AbstractSpecialRound(provider), IPluginModule {
-  public override string Name => "Suppressed";
-  public override IMsg Description => RoundMsgs.SPECIAL_ROUND_SUPPRESSED;
-  public override SpecialRoundConfig Config => config;
-  private BasePlugin? plugin;
-
-  private SuppressedRoundConfig config
-    => Provider.GetService<IStorage<SuppressedRoundConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new SuppressedRoundConfig();
-
-  public void Start(BasePlugin? newPlugin) { plugin ??= newPlugin; }
-
-  public override void ApplyRoundEffects() {
-    plugin?.HookUserMessage(452, onWeaponSound);
-  }
-
   private static readonly HashSet<uint> silencedWeapons = new() {
     1,  // deagle
     2,  // dual berettas
@@ -45,6 +27,23 @@ public class SuppressedRound(IServiceProvider provider)
     64  // r8 revolver
   };
 
+  private BasePlugin? plugin;
+  public override string Name => "Suppressed";
+  public override IMsg Description => RoundMsgs.SPECIAL_ROUND_SUPPRESSED;
+  public override SpecialRoundConfig Config => config;
+
+  private SuppressedRoundConfig config
+    => Provider.GetService<IStorage<SuppressedRoundConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new SuppressedRoundConfig();
+
+  public void Start(BasePlugin? newPlugin) { plugin ??= newPlugin; }
+
+  public override void ApplyRoundEffects() {
+    plugin?.HookUserMessage(452, onWeaponSound);
+  }
+
   private HookResult onWeaponSound(UserMessage msg) {
     var defIndex = msg.ReadUInt("item_def_index");
 

TTT/SpecialRound/SpecialRound.csproj

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

TTT/SpecialRound/SpecialRoundCollection.cs

@@ -9,6 +9,7 @@ public static class SpecialRoundCollection {
   public static void AddSpecialRounds(this IServiceCollection services) {
     services.AddModBehavior<ISpecialRoundStarter, SpecialRoundStarter>();
     services.AddModBehavior<ISpecialRoundTracker, SpecialRoundTracker>();
+    services.AddModBehavior<SpecialRoundSoundNotifier>();
 
     services.AddModBehavior<SpeedRound>();
     services.AddModBehavior<BhopRound>();

TTT/SpecialRound/SpecialRoundSoundNotifier.cs

@@ -0,0 +1,17 @@
+using CounterStrikeSharp.API;
+using JetBrains.Annotations;
+using SpecialRound.Events;
+using TTT.API.Events;
+using TTT.Game.Listeners;
+
+namespace SpecialRound;
+
+public class SpecialRoundSoundNotifier(IServiceProvider provider)
+  : BaseListener(provider) {
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnSpecialRoundStart(SpecialRoundStartEvent ev) {
+    foreach (var player in Utilities.GetPlayers())
+      player.EmitSound("UI.XP.Star.Spend", null, 0.8f);
+  }
+}

TTT/SpecialRound/SpecialRoundStarter.cs

@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API.Core;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
+using SpecialRound.Events;
 using SpecialRound.lang;
 using SpecialRoundAPI;
 using TTT.API;
@@ -32,10 +33,14 @@ public class SpecialRoundStarter(IServiceProvider provider)
   public AbstractSpecialRound?
     TryStartSpecialRound(AbstractSpecialRound? round) {
     round ??= getSpecialRound();
+
+    var roundStart = new SpecialRoundStartEvent(round);
+    Bus.Dispatch(roundStart);
+
     Messenger.MessageAll(Locale[RoundMsgs.SPECIAL_ROUND_STARTED(round)]);
     Messenger.MessageAll(Locale[round.Description]);
 
-    round?.ApplyRoundEffects();
+    round.ApplyRoundEffects();
     tracker.CurrentRound           = round;
     tracker.RoundsSinceLastSpecial = 0;
     return round;

TTT/SpecialRoundAPI/AbstractSpecialRound.cs

@@ -1,7 +1,6 @@
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using SpecialRoundAPI.Configs;
-using TTT.API;
 using TTT.API.Events;
 using TTT.Game.Events.Game;
 using TTT.Game.Listeners;

licenses/Dapper__2.1.66.html

@@ -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>

licenses/MySqlConnector__2.4.0.html

@@ -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>