feat: Add tripwire item (resolves #165) +semver:minor

This reverts commit bacd288fe7.

README.md

@@ -16,7 +16,9 @@ survive while eliminating the traitors among them.
     - [X] Innocents
 - [X] Shop
 - [X] Karma
-- [ ] Statistics
+- [X] Statistics
+- [X] Map Integrations
+- [X] Special Rounds
 
 ## Versioning
 

SpecialRoundAPI/SpecialRoundAPI/AbstractSpecialRound.cs

@@ -1,22 +1,19 @@
 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;
 using TTT.Locale;
 
 namespace SpecialRoundAPI;
 
 public abstract class AbstractSpecialRound(IServiceProvider provider)
-  : ITerrorModule, IListener {
-  protected readonly IServiceProvider Provider = provider;
-
+  : BaseListener(provider) {
   protected readonly ISpecialRoundTracker Tracker =
     provider.GetRequiredService<ISpecialRoundTracker>();
 
-  public void Dispose() { }
-  public void Start() { }
-
   public abstract string Name { get; }
   public abstract IMsg Description { get; }
   public abstract SpecialRoundConfig Config { get; }

SpecialRoundAPI/SpecialRoundAPI/Configs/BhopRoundConfig.cs

@@ -1,4 +1,4 @@
-namespace SpecialRoundAPI;
+namespace SpecialRoundAPI.Configs;
 
 public record BhopRoundConfig : SpecialRoundConfig {
   public override float Weight { get; init; } = 0.2f;

SpecialRoundAPI/SpecialRoundAPI/Configs/SilentRoundConfig.cs

@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI.Configs;
+
+public record SilentRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.1f;
+}

SpecialRoundAPI/SpecialRoundAPI/Configs/SpecialRoundConfig.cs

@@ -1,4 +1,4 @@
-namespace SpecialRoundAPI;
+namespace SpecialRoundAPI.Configs;
 
 public abstract record SpecialRoundConfig {
   public abstract float Weight { get; init; }

SpecialRoundAPI/SpecialRoundAPI/Configs/SpeedRoundConfig.cs

@@ -1,8 +1,9 @@
-namespace SpecialRoundAPI;
+namespace SpecialRoundAPI.Configs;
 
 public record SpeedRoundConfig : SpecialRoundConfig {
-  public override float Weight { get; init; } = 0.4f;
+  public override float Weight { get; init; } = 0.6f;
 
-  public TimeSpan InitialSeconds { get; init; } = TimeSpan.FromSeconds(60);
+  public TimeSpan InitialSeconds { get; init; } = TimeSpan.FromSeconds(40);
   public TimeSpan SecondsPerKill { get; init; } = TimeSpan.FromSeconds(10);
+  public TimeSpan MaxTimeEver { get; init; } = TimeSpan.FromSeconds(90);
 }

SpecialRoundAPI/SpecialRoundAPI/Configs/SuppressedRoundConfig.cs

@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI.Configs;
+
+public record SuppressedRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.3f;
+}

SpecialRoundAPI/SpecialRoundAPI/Configs/VanillaRoundConfig.cs

@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI.Configs;
+
+public record VanillaRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.2f;
+}

SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundStarter.cs

@@ -2,9 +2,9 @@
 
 public interface ISpecialRoundStarter {
   /// <summary>
-  /// Attempts to start the given special round.
-  /// Will bypass most checks, but may still return null if starting the round
-  /// is not possible.
+  ///   Attempts to start the given special round.
+  ///   Will bypass most checks, but may still return null if starting the round
+  ///   is not possible.
   /// </summary>
   /// <param name="round"></param>
   /// <returns></returns>

SpecialRoundAPI/SpecialRoundAPI/SpecialRoundAPI.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Locale\Locale.csproj" />
-    <ProjectReference Include="..\..\TTT\API\API.csproj" />
-    <ProjectReference Include="..\..\TTT\Game\Game.csproj" />
+    <ProjectReference Include="..\..\Locale\Locale.csproj"/>
+    <ProjectReference Include="..\..\TTT\API\API.csproj"/>
+    <ProjectReference Include="..\..\TTT\Game\Game.csproj"/>
   </ItemGroup>
 
 </Project>

SpecialRoundAPI/SpecialRoundAPI/VanillaRoundConfig.cs

@@ -1,5 +0,0 @@
-namespace SpecialRoundAPI;
-
-public record VanillaRoundConfig : SpecialRoundConfig {
-  public override float Weight { get; init; } = 0.3f;
-}

TTT/API/Game/IActionLogger.cs

@@ -18,6 +18,6 @@ public interface IActionLogger {
 
   void PrintLogs();
   void PrintLogs(IOnlinePlayer? player);
-  
+
   string[] MakeLogs();
 }

TTT/API/Player/IMuted.cs

@@ -1,3 +1,3 @@
 namespace TTT.API.Player;
-  
+
 public interface IMuted : ISet<string> { }

TTT/API/Player/IPlayer.cs

@@ -7,7 +7,7 @@ public interface IPlayer : IEquatable<IPlayer> {
   /// </summary>
   string Id { get; }
 
-  string Name { get; }
+  string Name { get; set; }
 
   bool IEquatable<IPlayer>.Equals(IPlayer? other) {
     if (other is null) return false;

TTT/CS2/CS2.csproj

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

TTT/CS2/CS2ServiceCollection.cs

@@ -1,6 +1,6 @@
-using System.Runtime.CompilerServices;
 using CounterStrikeSharp.API.Core;
 using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
 using ShopAPI.Configs;
 using ShopAPI.Configs.Detective;
 using ShopAPI.Configs.Traitor;
@@ -64,25 +64,27 @@ public static class CS2ServiceCollection {
     collection
      .AddModBehavior<IStorage<OneHitKnifeConfig>, CS2OneHitKnifeConfig>();
     collection.AddModBehavior<IStorage<SilentAWPConfig>, CS2SilentAWPConfig>();
+    collection
+     .AddModBehavior<IStorage<HealthshotConfig>, CS2HealthshotConfig>();
 
     // TTT - CS2 Specific optionals
     collection.AddScoped<ITextSpawner, TextSpawner>();
 
     // GameHandlers
     collection.AddModBehavior<BodySpawner>();
+    collection.AddModBehavior<BombPlantSuppressor>();
+    collection.AddModBehavior<BuyMenuHandler>();
     collection.AddModBehavior<CombatHandler>();
     collection.AddModBehavior<DamageCanceler>();
+    collection.AddModBehavior<MapChangeCausesEndListener>();
+    collection.AddModBehavior<MapZoneRemover>();
+    collection.AddModBehavior<NameUpdater>();
     collection.AddModBehavior<PlayerConnectionsHandler>();
+    collection.AddModBehavior<PlayerMuter>();
     collection.AddModBehavior<PropMover>();
     collection.AddModBehavior<RoundStart_GameStartHandler>();
-    collection.AddModBehavior<BombPlantSuppressor>();
-    collection.AddModBehavior<MapZoneRemover>();
-    collection.AddModBehavior<BuyMenuHandler>();
     collection.AddModBehavior<TeamChangeHandler>();
     collection.AddModBehavior<TraitorChatHandler>();
-    collection.AddModBehavior<PlayerMuter>();
-    collection.AddModBehavior<MapChangeCausesEndListener>();
-    // collection.AddModBehavior<EntityTargetHandlers>();
 
     // Damage Cancelers
     collection.AddModBehavior<OutOfRoundCanceler>();
@@ -92,13 +94,14 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<AfkTimerListener>();
     collection.AddModBehavior<BodyPickupListener>();
     collection.AddModBehavior<IBodyTracker, BodyTracker>();
+    collection.AddModBehavior<KarmaBanner>();
+    collection.AddModBehavior<KarmaSyncer>();
     collection.AddModBehavior<LateSpawnListener>();
+    collection.AddModBehavior<MapHookListener>();
     collection.AddModBehavior<PlayerStatsTracker>();
     collection.AddModBehavior<RoundTimerListener>();
     collection.AddModBehavior<ScreenColorApplier>();
-    collection.AddModBehavior<KarmaBanner>();
-    collection.AddModBehavior<KarmaSyncer>();
-    collection.AddModBehavior<MapHookListener>();
+    collection.AddModBehavior<WardenTagAssigner>();
 
     // Commands
     collection.AddModBehavior<TestCommand>();

TTT/CS2/Command/CS2CommandManager.cs

@@ -6,7 +6,6 @@ using TTT.API;
 using TTT.API.Command;
 using TTT.API.Messages;
 using TTT.API.Player;
-using TTT.Game;
 using TTT.Game.Commands;
 using TTT.Game.lang;
 

TTT/CS2/Command/PlayerPingShopAlias.cs

@@ -41,15 +41,15 @@ public class PlayerPingShopAlias(IServiceProvider provider) : IPluginModule {
 
   private void onButton(CCSPlayerController? player, int index) {
     if (player == null) return;
-    if (converter.GetPlayer(player) is not IOnlinePlayer gamePlayer) return;
+    if (converter.GetPlayer(player) is not IOnlinePlayer apiPlayer) return;
 
-    var lastUpdated = itemSorter.GetLastUpdate(gamePlayer);
+    var lastUpdated = itemSorter.GetLastUpdate(apiPlayer);
     if (lastUpdated == null
       || DateTime.Now - lastUpdated > TimeSpan.FromSeconds(20))
       return;
-    var cmdInfo = new CS2CommandInfo(provider, gamePlayer, 0, "css_shop", "buy",
-      (index - 1).ToString());
-    cmdInfo.CallingContext = CommandCallingContext.Chat;
+    var cmdInfo = new CS2CommandInfo(provider, apiPlayer, 0, "css_shop", "buy",
+      (index - 1).ToString()) { CallingContext = CommandCallingContext.Chat };
     provider.GetRequiredService<ICommandManager>().ProcessCommand(cmdInfo);
+    itemSorter.InvalidateOrder(apiPlayer);
   }
 }

TTT/CS2/Command/Test/GiveItemCommand.cs

@@ -48,7 +48,6 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {
 
       var purchaseEv = new PlayerPurchaseItemEvent(target, item);
       provider.GetRequiredService<IEventBus>().Dispatch(purchaseEv);
-      if (purchaseEv.IsCanceled) return;
 
       shop.GiveItem(target, item);
       info.ReplySync($"Gave item '{item.Name}' to {target.Name}.");

TTT/CS2/Command/Test/ReloadModuleCommand.cs

@@ -9,17 +9,12 @@ namespace TTT.CS2.Command.Test;
 
 public class ReloadModuleCommand(IServiceProvider provider)
   : ICommand, IPluginModule {
+  private BasePlugin? plugin;
   public void Dispose() { }
   public void Start() { }
-  private BasePlugin? plugin;
 
   public string Id => "reload";
 
-  public void Start(BasePlugin? plugin) {
-    if (plugin == null) return;
-    this.plugin = plugin;
-  }
-
   public string[] Usage => ["<module>"];
 
   public Task<CommandResult>
@@ -59,4 +54,9 @@ public class ReloadModuleCommand(IServiceProvider provider)
 
     return Task.FromResult(CommandResult.SUCCESS);
   }
+
+  public void Start(BasePlugin? plugin) {
+    if (plugin == null) return;
+    this.plugin = plugin;
+  }
 }

TTT/CS2/Command/Test/SetTargetCommand.cs

@@ -1,13 +1,8 @@
-using System.Numerics;
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Command;
 using TTT.API.Player;
-using TTT.CS2.Extensions;
-using TTT.CS2.Utils;
-using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
 
 namespace TTT.CS2.Command.Test;
 
@@ -24,10 +19,6 @@ public class SetTargetCommand(IServiceProvider provider) : ICommand {
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
 
-    var name = "TRAITOR";
-
-    if (info.ArgCount == 2) name = info.Args[1];
-
     Server.NextWorldUpdate(() => {
       var gamePlayer = converter.GetPlayer(executor);
       if (gamePlayer == null) return;

TTT/CS2/Command/Test/SpecCommand.cs

@@ -11,6 +11,8 @@ public class SpecCommand(IServiceProvider provider) : ICommand {
   public void Dispose() { }
   public void Start() { }
 
+  public string Id => "spec";
+
   public Task<CommandResult>
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     var target = executor;

TTT/CS2/Command/Test/SpecialRoundCommand.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using CounterStrikeSharp.API;
+using Microsoft.Extensions.DependencyInjection;
 using SpecialRoundAPI;
 using TTT.API;
 using TTT.API.Command;
@@ -25,7 +26,7 @@ public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
 
     var rounds = provider.GetServices<ITerrorModule>()
      .OfType<AbstractSpecialRound>()
-     .ToDictionary(r => r.GetType().Name.ToLower(), r => r);
+     .ToDictionary(r => r.Name.ToLower(), r => r);
 
     var roundName = info.Args[1].ToLower();
     if (!rounds.TryGetValue(roundName, out var round)) {
@@ -34,8 +35,10 @@ public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
       return Task.FromResult(CommandResult.INVALID_ARGS);
     }
 
-    tracker.TryStartSpecialRound(round);
-    info.ReplySync($"Started special round '{roundName}'.");
+    Server.NextWorldUpdate(() => {
+      tracker.TryStartSpecialRound(round);
+      info.ReplySync($"Started special round '{roundName}'.");
+    });
     return Task.FromResult(CommandResult.SUCCESS);
   }
 }

TTT/CS2/Configs/CS2GameConfig.cs

@@ -63,21 +63,19 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
 
   public static readonly FakeConVar<string> CV_TRAITOR_WEAPONS = new(
     "css_ttt_roleweapons_traitor",
-    "Weapons available to traitors at start of round",
-    "weapon_knife,weapon_glock", ConVarFlags.FCVAR_NONE,
-    new ItemValidator(allowMultiple: true));
+    "Weapons available to traitors at start of round", "",
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<string> CV_DETECTIVE_WEAPONS = new(
     "css_ttt_roleweapons_detective",
     "Weapons available to detectives at start of round",
-    "weapon_knife,weapon_taser,weapon_m4a1,weapon_revolver",
-    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
+    "weapon_taser,weapon_m4a1_silencer,weapon_revolver", ConVarFlags.FCVAR_NONE,
+    new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<string> CV_INNOCENT_WEAPONS = new(
     "css_ttt_roleweapons_innocent",
-    "Weapons available to innocents at start of round",
-    "weapon_knife,weapon_glock", ConVarFlags.FCVAR_NONE,
-    new ItemValidator(allowMultiple: true));
+    "Weapons available to innocents at start of round", "",
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<int> CV_TIME_BETWEEN_ROUNDS = new(
     "css_ttt_time_between_rounds", "Time to wait between rounds in seconds", 1,

TTT/CS2/Configs/CS2KarmaConfig.cs

@@ -74,13 +74,13 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
 
   public static readonly FakeConVar<int> CV_KARMA_PER_ROUND = new(
     "css_ttt_karma_per_round",
-    "Amount of karma a player will gain at the end of each round", 2,
+    "Amount of karma a player will gain at the end of each round", 1,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
 
   public static readonly FakeConVar<int> CV_KARMA_PER_ROUND_WIN = new(
     "css_ttt_karma_per_round_win",
     "Amount of karma a player will gain at the end of each round if their team won",
-    4, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
+    1, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
 
   public void Dispose() { }
 

TTT/CS2/Configs/ShopItems/CS2BodyPaintConfig.cs

@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
 
 public class CS2BodyPaintConfig : IStorage<BodyPaintConfig>, IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_bodypaint_price", "Price of the Body Paint item", 40,
+    "css_ttt_shop_bodypaint_price", "Price of the Body Paint item", 30,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<int> CV_MAX_USES = new(
@@ -22,7 +22,7 @@ public class CS2BodyPaintConfig : IStorage<BodyPaintConfig>, IPluginModule {
   public static readonly FakeConVar<string> CV_COLOR = new(
     "css_ttt_shop_bodypaint_color",
     "Color to apply to the player's body (HTML hex or known color name)",
-    "GreenYellow", ConVarFlags.FCVAR_NONE);
+    "GreenYellow");
 
   public void Dispose() { }
 

TTT/CS2/Configs/ShopItems/CS2CamoConfig.cs

@@ -16,7 +16,7 @@ public class CS2CamoConfig : IStorage<CamoConfig>, IPluginModule {
   public static readonly FakeConVar<float> CV_CAMO_VISIBILITY = new(
     "css_ttt_shop_camo_visibility",
     "Player visibility multiplier while camouflaged (0 = invisible, 1 = fully visible)",
-    0.6f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
+    0.5f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
 
   public void Dispose() { }
 

TTT/CS2/Configs/ShopItems/CS2ClusterGrenadeConfig.cs

@@ -12,7 +12,7 @@ public class CS2ClusterGrenadeConfig : IStorage<ClusterGrenadeConfig>,
   IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
     "css_ttt_shop_clustergrenade_price",
-    "Price of the Cluster Grenade item (Traitor)", 90, ConVarFlags.FCVAR_NONE,
+    "Price of the Cluster Grenade item (Traitor)", 100, ConVarFlags.FCVAR_NONE,
     new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<int> CV_GRENADE_COUNT = new(
@@ -22,8 +22,7 @@ public class CS2ClusterGrenadeConfig : IStorage<ClusterGrenadeConfig>,
 
   public static readonly FakeConVar<string> CV_WEAPON_ID = new(
     "css_ttt_shop_clustergrenade_weapon",
-    "Weapon entity ID used for the Cluster Grenade", "weapon_hegrenade",
-    ConVarFlags.FCVAR_NONE);
+    "Weapon entity ID used for the Cluster Grenade", "weapon_hegrenade");
 
   public static readonly FakeConVar<float> CV_UP_FORCE = new(
     "css_ttt_shop_clustergrenade_up_force",

TTT/CS2/Configs/ShopItems/CS2HealthStationConfig.cs

@@ -17,8 +17,7 @@ public class CS2HealthStationConfig : IStorage<HealthStationConfig>,
 
   public static readonly FakeConVar<string> CV_USE_SOUND = new(
     "css_ttt_shop_healthstation_use_sound",
-    "Sound played when using the Health Station", "sounds/buttons/blip1",
-    ConVarFlags.FCVAR_NONE);
+    "Sound played when using the Health Station", "sounds/buttons/blip1");
 
   public static readonly FakeConVar<int> CV_HEALTH_INCREMENTS = new(
     "css_ttt_shop_healthstation_increments",

TTT/CS2/Configs/ShopItems/CS2HealthshotConfig.cs

@@ -0,0 +1,43 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2HealthshotConfig : IStorage<HealthshotConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_healthshot_price", "Price of the Healthshot item", 40,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_MAX_PURCHASES = new(
+    "css_ttt_shop_healthshot_max_purchases",
+    "Maximum number of times a player can purchase the Healthshot per round", 2,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 100));
+
+  public static readonly FakeConVar<string> CV_WEAPON = new(
+    "css_ttt_shop_healthshot_weapon", "Weapon entity name for the Healthshot",
+    "weapon_healthshot");
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<HealthshotConfig?> Load() {
+    var cfg = new HealthshotConfig {
+      Price        = CV_PRICE.Value,
+      MaxPurchases = CV_MAX_PURCHASES.Value,
+      Weapon       = CV_WEAPON.Value
+    };
+
+    return Task.FromResult<HealthshotConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2OneHitKnifeConfig.cs

@@ -16,8 +16,7 @@ public class CS2OneHitKnifeConfig : IStorage<OneHitKnifeConfig>, IPluginModule {
 
   public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(
     "css_ttt_shop_onehitknife_friendly_fire",
-    "Whether the One-Hit Knife can damage teammates", false,
-    ConVarFlags.FCVAR_NONE);
+    "Whether the One-Hit Knife can damage teammates");
 
   public void Dispose() { }
 

TTT/CS2/Configs/ShopItems/CS2OneShotDeagleConfig.cs

@@ -12,7 +12,7 @@ namespace TTT.CS2.Configs.ShopItems;
 public class CS2OneShotDeagleConfig : IStorage<OneShotDeagleConfig>,
   IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 125,
+    "css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 130,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(

TTT/CS2/Configs/ShopItems/CS2SilentAWPConfig.cs

@@ -19,7 +19,7 @@ public class CS2SilentAWPConfig : IStorage<SilentAWPConfig>, IPluginModule {
 
   public static readonly FakeConVar<string> CV_WEAPON_ID = new(
     "css_ttt_shop_silentawp_weapon", "Weapon entity ID for the Silent AWP",
-    "weapon_awp", ConVarFlags.FCVAR_NONE);
+    "weapon_awp");
 
   public static readonly FakeConVar<int> CV_RESERVE_AMMO = new(
     "css_ttt_shop_silentawp_reserve_ammo",

TTT/CS2/Configs/ShopItems/CS2StickersConfig.cs

@@ -10,7 +10,7 @@ namespace TTT.CS2.Configs.ShopItems;
 
 public class CS2StickersConfig : IStorage<StickersConfig>, IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_stickers_price", "Price of the Stickers item (Detective)", 25,
+    "css_ttt_shop_stickers_price", "Price of the Stickers item (Detective)", 45,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public void Dispose() { }

TTT/CS2/Extensions/PlayerExtensions.cs

@@ -119,8 +119,11 @@ public static class PlayerExtensions {
       SELF(player.Slot), 0.2f, 1);
   }
 
-  private static RecipientFilter SELF(int slot) => new(slot);
+  private static RecipientFilter SELF(int slot) {
+    return new RecipientFilter(slot);
+  }
 
-  private static RecipientFilter OTHERS(int slot)
-    => new(ulong.MaxValue & ~(1ul << slot));
+  private static RecipientFilter OTHERS(int slot) {
+    return new RecipientFilter(ulong.MaxValue & ~(1ul << slot));
+  }
 }

TTT/CS2/GameHandlers/BuyMenuHandler.cs

@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Commands;
 using JetBrains.Annotations;
@@ -32,7 +31,7 @@ public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
     { "weapon_mp5sd", "M4A1" },
     { "weapon_awp", "AWP" },
     { "weapon_hegrenade", "Cluster" },
-    { "weapon_decoy", "Teleport Decoy" },
+    { "weapon_decoy", "Teleport Decoy" }
   };
 
   public void Dispose() { }

TTT/CS2/GameHandlers/CombatHandler.cs

@@ -7,8 +7,10 @@ using TTT.API;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Player;
+using TTT.API.Role;
 using TTT.CS2.API;
 using TTT.Game.Events.Player;
+using TTT.Game.Roles;
 
 namespace TTT.CS2.GameHandlers;
 
@@ -24,6 +26,9 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
   private readonly IAliveSpoofer spoofer =
     provider.GetRequiredService<IAliveSpoofer>();
 
+  private readonly IRoleAssigner roles =
+    provider.GetRequiredService<IRoleAssigner>();
+
   public void Start() { }
 
   public void Dispose() { }
@@ -45,13 +50,36 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
     if (games.ActiveGame is not { State: State.IN_PROGRESS })
       return HookResult.Continue;
 
-    if (ev.Attacker != null) ev.FireEventToClient(ev.Attacker);
+    if (ev.Attacker != null) {
+      ev.FireEventToClient(ev.Attacker);
+      var apiPlayer = converter.GetPlayer(ev.Attacker);
+      var role      = roles.GetRoles(apiPlayer);
+      if (role.Any(r => r is TraitorRole))
+        foreach (var p in Utilities.GetPlayers()) {
+          var apiP = converter.GetPlayer(p);
+          if (apiP.Id == apiPlayer.Id) continue;
+          var r = roles.GetRoles(converter.GetPlayer(p));
+          if (role.Intersect(r).Any()) ev.FireEventToClient(p);
+        }
+    }
+
     info.DontBroadcast = true;
     spoofer.SpoofAlive(player);
     Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
     return HookResult.Continue;
   }
 
+  [UsedImplicitly]
+  [GameEventHandler(HookMode.Pre)]
+  public HookResult OnPlayerDamage(EventPlayerHurt ev, GameEventInfo info) {
+    var player = ev.Userid;
+    if (player == null) return HookResult.Continue;
+
+    hideAndTrackStats(ev);
+
+    return HookResult.Continue;
+  }
+
   private void hideAndTrackStats(EventPlayerDeath ev,
     CCSPlayerController player) {
     var victimStats = player.ActionTrackingServices?.MatchStats;
@@ -89,6 +117,16 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
         "m_pActionTrackingServices");
   }
 
+  private void hideAndTrackStats(EventPlayerHurt ev) {
+    var attackerStats = ev.Attacker?.ActionTrackingServices?.MatchStats;
+
+    if (attackerStats == null) return;
+    if (ev.Attacker == null) return;
+    attackerStats.Damage -= ev.DmgHealth;
+    Utilities.SetStateChanged(ev.Attacker, "CCSPlayerController",
+      "m_pActionTrackingServices");
+  }
+
   [UsedImplicitly]
   [GameEventHandler]
   public HookResult OnPlayerHurt(EventPlayerHurt ev, GameEventInfo _) {

TTT/CS2/GameHandlers/EntityTargetHandlers.cs

@@ -1,64 +0,0 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
-using Microsoft.Extensions.DependencyInjection;
-using TTT.API;
-using TTT.API.Messages;
-
-namespace TTT.CS2.GameHandlers;
-
-public class EntityTargetHandlers(IServiceProvider provider) : IPluginModule {
-  private readonly IMessenger messenger =
-    provider.GetRequiredService<IMessenger>();
-
-  public void Dispose() { }
-  public void Start() { }
-
-  public void Start(BasePlugin? plugin) {
-    plugin?.HookEntityOutput("*", "*", handler);
-  }
-
-  private HookResult handler(CEntityIOOutput output, string name,
-    CEntityInstance activator, CEntityInstance caller, CVariant value,
-    float delay) {
-    if (caller.DesignerName == "prop_dynamic") return HookResult.Continue;
-    messenger.Debug("Entity Output Triggered: " + name);
-    messenger.Debug("Activator: " + activator.DesignerName);
-    messenger.Debug("Caller: " + caller.DesignerName);
-    messenger.Debug("Value: " + value + " " + value.GetType());
-    caller.AcceptInput("OnPass");
-    activator.AcceptInput("OnPass");
-    if (caller.DesignerName != "filter_activator_name")
-      return HookResult.Continue;
-    var csPlayer =
-      Utilities.GetPlayerFromIndex((int)activator.EntityHandle.Index);
-    if (csPlayer != null && csPlayer.IsValid) {
-      messenger.DebugAnnounce(
-        $"Filter Activator Name triggered by player: {csPlayer.PlayerName} {(int)csPlayer.Index}");
-    }
-
-    var ptrPlayer = new CCSPlayerController(activator.Handle);
-    if (ptrPlayer.IsValid) {
-      messenger.DebugAnnounce(
-        $"Filter Activator Name triggered by player controller: {ptrPlayer.PlayerName} {(int)ptrPlayer.Index}");
-    }
-
-    messenger.DebugAnnounce(output + " - " + output.Description);
-
-    var connections = output.Connections;
-    if (connections != null) debugConnection(connections);
-
-    caller.AcceptInput("OnPass");
-    return HookResult.Continue;
-  }
-
-  private void debugConnection(EntityIOConnection_t connection) {
-    messenger.DebugAnnounce("Connection:");
-    messenger.DebugAnnounce("  Target: " + connection.Target);
-    messenger.DebugAnnounce("  Input: " + connection.TargetInput);
-    messenger.DebugAnnounce("  Parameter: " + connection.ValueOverride);
-    messenger.DebugAnnounce("  Delay: " + connection.Delay);
-    messenger.DebugAnnounce("  Times to fire: " + connection.TimesToFire);
-
-    if (connection.Next != null) debugConnection(connection.Next);
-  }
-}

TTT/CS2/GameHandlers/NameUpdater.cs

@@ -0,0 +1,22 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Events;
+using TTT.API.Player;
+using TTT.Game.Events.Game;
+using TTT.Game.Listeners;
+
+namespace TTT.CS2.GameHandlers;
+
+public class NameUpdater(IServiceProvider provider) : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameInit(GameInitEvent ev) {
+    foreach (var player in Utilities.GetPlayers())
+      converter.GetPlayer(player).Name = player.PlayerName;
+  }
+}

TTT/CS2/GameHandlers/PlayerMuter.cs

@@ -18,15 +18,15 @@ public class PlayerMuter(IServiceProvider provider) : IPluginModule {
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly IGameManager game =
+    provider.GetRequiredService<IGameManager>();
+
   private readonly IMsgLocalizer locale =
     provider.GetRequiredService<IMsgLocalizer>();
 
   private readonly IMessenger messenger =
     provider.GetRequiredService<IMessenger>();
 
-  private readonly IGameManager game =
-    provider.GetRequiredService<IGameManager>();
-
   public void Dispose() { }
   public void Start() { }
 
@@ -66,8 +66,6 @@ public class PlayerMuter(IServiceProvider provider) : IPluginModule {
   public void OnGameEvent(GameStateUpdateEvent ev) {
     if (ev.NewState != State.FINISHED) return;
 
-    foreach (var p in Utilities.GetPlayers()) {
-      p.VoiceFlags &= ~VoiceFlags.Muted;
-    }
+    foreach (var p in Utilities.GetPlayers()) p.VoiceFlags &= ~VoiceFlags.Muted;
   }
 }

TTT/CS2/GameHandlers/PropMover.cs

@@ -51,7 +51,9 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
       return;
     }
 
-    if (!pressed.HasFlag(PlayerButtons.Use)) return;
+    if (!pressed.HasFlag(PlayerButtons.Use)
+      && !pressed.HasFlag(PlayerButtons.Inspect))
+      return;
 
     onStartUse(player);
   }

TTT/CS2/GameHandlers/RoleIconsHandler.cs

@@ -6,7 +6,6 @@ using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Events;
-using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.CS2.Extensions;

TTT/CS2/GameHandlers/RoundStart_GameStartHandler.cs

@@ -12,18 +12,18 @@ namespace TTT.CS2.GameHandlers;
 
 public class RoundStart_GameStartHandler(IServiceProvider provider)
   : IPluginModule {
-  private TTTConfig config
-    => provider.GetService<IStorage<TTTConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new TTTConfig();
-
   private readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
 
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
+  private TTTConfig config
+    => provider.GetService<IStorage<TTTConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
   public void Dispose() { }
 
   public void Start() { }

TTT/CS2/GameHandlers/TeamChangeHandler.cs

@@ -11,12 +11,14 @@ using TTT.API.Game;
 using TTT.API.Player;
 using TTT.CS2.API;
 using TTT.CS2.Extensions;
-using TTT.Game;
 using TTT.Game.Events.Player;
 
 namespace TTT.CS2.GameHandlers;
 
 public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
+  private readonly IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
@@ -25,9 +27,6 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
-  private readonly IBodyTracker bodies =
-    provider.GetRequiredService<IBodyTracker>();
-
   public void Dispose() { }
   public void Start() { }
 

TTT/CS2/GameHandlers/TraitorChatHandler.cs

@@ -29,11 +29,11 @@ public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
   private readonly IMessenger messenger =
     provider.GetRequiredService<IMessenger>();
 
+  private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
+
   private readonly IRoleAssigner roles =
     provider.GetRequiredService<IRoleAssigner>();
 
-  private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
-
   private IActain? maulService;
 
   public void Start(BasePlugin? plugin) {
@@ -79,7 +79,7 @@ public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
 
   private HookResult onSay(CCSPlayerController? player,
     CommandInfo commandInfo) {
-    if (mutedPlayers != null
+    if (mutedPlayers != null && player != null && player.GetHealth() > 0
       && mutedPlayers.Contains(player?.SteamID.ToString() ?? ""))
       return HookResult.Handled;
 

TTT/CS2/Items/Armor/ArmorItem.cs

@@ -16,15 +16,15 @@ public static class ArmorItemServicesCollection {
 }
 
 public class ArmorItem(IServiceProvider provider) : BaseItem(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
   private ArmorConfig config
     => Provider.GetService<IStorage<ArmorConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new ArmorConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
   public override string Name => Locale[ArmorMsgs.SHOP_ITEM_ARMOR];
   public override string Description => Locale[ArmorMsgs.SHOP_ITEM_ARMOR_DESC];
   public override ShopItemConfig Config => config;

TTT/CS2/Items/BodyPaint/BodyPaintListener.cs

@@ -17,16 +17,16 @@ public class BodyPaintListener(IServiceProvider provider)
   private readonly IBodyTracker bodies =
     provider.GetRequiredService<IBodyTracker>();
 
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  private readonly Dictionary<IPlayer, int> uses = new();
+
   private BodyPaintConfig config
     => Provider.GetService<IStorage<BodyPaintConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new BodyPaintConfig();
 
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
-
-  private readonly Dictionary<IPlayer, int> uses = new();
-
   [UsedImplicitly]
   [EventHandler(Priority = Priority.HIGH)]
   public void BodyIdentify(BodyIdentifyEvent ev) {

TTT/CS2/Items/Camouflage/CamouflageItem.cs

@@ -18,15 +18,15 @@ public static class CamoServiceCollection {
 }
 
 public class CamouflageItem(IServiceProvider provider) : BaseItem(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
   private CamoConfig config
     => Provider.GetService<IStorage<CamoConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new CamoConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
   public override string Name => Locale[CamoMsgs.SHOP_ITEM_CAMO];
   public override string Description => Locale[CamoMsgs.SHOP_ITEM_CAMO_DESC];
   public override ShopItemConfig Config => config;

TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs

@@ -1,9 +1,6 @@
-using System.Reactive.Concurrency;
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,23 +8,25 @@ using ShopAPI;
 using ShopAPI.Configs.Traitor;
 using TTT.API;
 using TTT.API.Player;
-using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.CS2.Utils;
 
 namespace TTT.CS2.Items.ClusterGrenade;
 
 public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
   private ClusterGrenadeConfig config
     => provider.GetService<IStorage<ClusterGrenadeConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new ClusterGrenadeConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
+  public void Dispose() { }
+  public void Start() { }
 
   [UsedImplicitly]
   [GameEventHandler]
@@ -60,7 +59,4 @@ public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
 
     return HookResult.Continue;
   }
-
-  public void Dispose() { }
-  public void Start() { }
 }

TTT/CS2/Items/Compass/AbstractCompassItem.cs

@@ -1,5 +1,3 @@
-using System.Linq;
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Timers;
 using CounterStrikeSharp.API.Modules.Utils;
@@ -10,7 +8,6 @@ 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.Role;
@@ -18,17 +15,15 @@ using TTT.API.Storage;
 using TTT.CS2.Extensions;
 using TTT.CS2.Utils;
 using TTT.Game.Events.Game;
-using TTT.Game.Roles;
 
 namespace TTT.CS2.Items.Compass;
 
 /// <summary>
-/// Base compass that renders a heading toward the nearest target returned by GetTargets.
-/// Child classes decide which targets to expose and who owns the item.
+///   Base compass that renders a heading toward the nearest target returned by GetTargets.
+///   Child classes decide which targets to expose and who owns the item.
 /// </summary>
 public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
   IListener, IPluginModule where TRole : class, IRole {
-  protected CompassConfig _Config { get; }
   protected readonly IPlayerConverter<CCSPlayerController> Converter;
   protected readonly ISet<IPlayer> Owners = new HashSet<IPlayer>();
 
@@ -42,6 +37,8 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
       provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
   }
 
+  protected CompassConfig _Config { get; }
+
   public override ShopItemConfig Config => _Config;
 
   public void Start(BasePlugin? plugin) {
@@ -56,14 +53,14 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
   }
 
   /// <summary>
-  /// Return world positions to point at for this player.
+  ///   Return world positions to point at for this player.
   /// </summary>
-  protected abstract IList<Vector> GetTargets(IOnlinePlayer requester);
+  abstract protected IList<Vector> GetTargets(IOnlinePlayer requester);
 
   /// <summary>
-  /// Whether this player currently owns/has this compass effect.
+  ///   Whether this player currently owns/has this compass effect.
   /// </summary>
-  protected abstract bool OwnsItem(IOnlinePlayer player);
+  abstract protected bool OwnsItem(IOnlinePlayer player);
 
   public override void OnPurchase(IOnlinePlayer player) { Owners.Add(player); }
 

TTT/CS2/Items/Compass/BodyCompassItem.cs

@@ -27,11 +27,11 @@ public class BodyCompassItem(IServiceProvider provider)
     => Locale[CompassMsgs.SHOP_ITEM_COMPASS_BODY_DESC];
 
   /// <summary>
-  /// For innocents: point to nearest traitor.
-  /// For traitors: point to nearest non-traitor (ally list in original code).
-  /// Returns target world positions as vectors.
+  ///   For innocents: point to nearest traitor.
+  ///   For traitors: point to nearest non-traitor (ally list in original code).
+  ///   Returns target world positions as vectors.
   /// </summary>
-  protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
+  override protected IList<Vector> GetTargets(IOnlinePlayer requester) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
       return Array.Empty<Vector>();
 

TTT/CS2/Items/Compass/InnoCompassItem.cs

@@ -23,11 +23,11 @@ public class InnoCompassItem(IServiceProvider provider)
     => Locale[CompassMsgs.SHOP_ITEM_COMPASS_PLAYER_DESC];
 
   /// <summary>
-  /// For innocents: point to nearest traitor.
-  /// For traitors: point to nearest non-traitor (ally list in original code).
-  /// Returns target world positions as vectors.
+  ///   For innocents: point to nearest traitor.
+  ///   For traitors: point to nearest non-traitor (ally list in original code).
+  ///   Returns target world positions as vectors.
   /// </summary>
-  protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
+  override protected IList<Vector> GetTargets(IOnlinePlayer requester) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
       return Array.Empty<Vector>();
 

TTT/CS2/Items/DNA/DnaListener.cs

@@ -28,15 +28,15 @@ public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
   private readonly IBodyTracker bodies =
     provider.GetRequiredService<IBodyTracker>();
 
+  private readonly Dictionary<string, DateTime> lastMessages = new();
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
   private DnaScannerConfig config
     => Provider.GetService<IStorage<DnaScannerConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new DnaScannerConfig();
 
-  private readonly Dictionary<string, DateTime> lastMessages = new();
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
-
   // Low priority to allow body identification to happen first
   [UsedImplicitly]
   [EventHandler(Priority = Priority.LOW)]

TTT/CS2/Items/DNA/DnaMsgs.cs

@@ -1,6 +1,5 @@
 using TTT.API.Player;
 using TTT.API.Role;
-using TTT.Game;
 using TTT.Game.lang;
 using TTT.Locale;
 

TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs

@@ -4,7 +4,6 @@ using ShopAPI;
 using ShopAPI.Configs.Traitor;
 using TTT.API.Events;
 using TTT.API.Game;
-using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
@@ -13,14 +12,14 @@ namespace TTT.CS2.Items.OneHitKnife;
 
 public class OneHitKnifeListener(IServiceProvider provider)
   : BaseListener(provider) {
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
   private OneHitKnifeConfig config
     => Provider.GetService<IStorage<OneHitKnifeConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new OneHitKnifeConfig();
 
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
-
   [UsedImplicitly]
   [EventHandler]
   public void OnDamage(PlayerDamagedEvent ev) {

TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs

@@ -24,15 +24,11 @@ public class PoisonShotsListener(IServiceProvider provider)
   : BaseListener(provider), IPluginModule {
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
-  private PoisonShotsConfig config
-    => Provider.GetService<IStorage<PoisonShotsConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new PoisonShotsConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly Dictionary<string, IPlayer> killedWithPoison = new();
+
   private readonly Dictionary<IPlayer, int> poisonShots = new();
 
   private readonly List<IDisposable> poisonTimers = [];
@@ -42,7 +38,11 @@ public class PoisonShotsListener(IServiceProvider provider)
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
-  private readonly Dictionary<string, IPlayer> killedWithPoison = new();
+  private PoisonShotsConfig config
+    => Provider.GetService<IStorage<PoisonShotsConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonShotsConfig();
 
   public override void Dispose() {
     base.Dispose();
@@ -156,13 +156,6 @@ public class PoisonShotsListener(IServiceProvider provider)
     return 0;
   }
 
-  private class PoisonEffect(IPlayer player, IPlayer shooter) {
-    public IPlayer Player { get; } = player;
-    public IPlayer Shooter { get; } = shooter;
-    public int Ticks { get; set; }
-    public int DamageGiven { get; set; }
-  }
-
 
   [UsedImplicitly]
   [EventHandler]
@@ -173,4 +166,11 @@ public class PoisonShotsListener(IServiceProvider provider)
       return;
     ev.Body.Killer = shooter as IOnlinePlayer;
   }
+
+  private class PoisonEffect(IPlayer player, IPlayer shooter) {
+    public IPlayer Player { get; } = player;
+    public IPlayer Shooter { get; } = shooter;
+    public int Ticks { get; set; }
+    public int DamageGiven { get; set; }
+  }
 }

TTT/CS2/Items/PoisonSmoke/PoisonSmokeListener.cs

@@ -12,7 +12,6 @@ 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.Extensions;
 using TTT.Game.Events.Body;
@@ -25,20 +24,20 @@ namespace TTT.CS2.Items.PoisonSmoke;
 
 public class PoisonSmokeListener(IServiceProvider provider)
   : BaseListener(provider), IPluginModule {
-  private PoisonSmokeConfig config
-    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new PoisonSmokeConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly ISet<string> killedWithPoison = new HashSet<string>();
+
   private readonly List<IDisposable> poisonSmokes = [];
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
-  private readonly ISet<string> killedWithPoison = new HashSet<string>();
+  private PoisonSmokeConfig config
+    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonSmokeConfig();
 
   public override void Dispose() {
     base.Dispose();
@@ -129,15 +128,6 @@ public class PoisonSmokeListener(IServiceProvider provider)
     return effect.DamageGiven < config.PoisonConfig.TotalDamage;
   }
 
-  private class PoisonEffect(CSmokeGrenadeProjectile projectile,
-    IOnlinePlayer attacker) {
-    public int Ticks { get; set; }
-    public int DamageGiven { get; set; }
-    public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
-    public CSmokeGrenadeProjectile Projectile { get; } = projectile;
-    public IPlayer Attacker { get; } = attacker;
-  }
-
   [UsedImplicitly]
   [EventHandler]
   public void OnGameEnd(GameStateUpdateEvent ev) {
@@ -153,4 +143,13 @@ public class PoisonSmokeListener(IServiceProvider provider)
     if (ev.Body.Killer == null || ev.Body.Killer.Id == ev.Body.OfPlayer.Id)
       ev.IsCanceled = true;
   }
+
+  private class PoisonEffect(CSmokeGrenadeProjectile projectile,
+    IOnlinePlayer attacker) {
+    public int Ticks { get; set; }
+    public int DamageGiven { get; set; }
+    public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
+    public CSmokeGrenadeProjectile Projectile { get; } = projectile;
+    public IPlayer Attacker { get; } = attacker;
+  }
 }

TTT/CS2/Items/SilentAWP/SilentAWPItem.cs

@@ -24,18 +24,18 @@ public static class SilentAWPServiceCollection {
 
 public class SilentAWPItem(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
-  private SilentAWPConfig config
-    => Provider.GetService<IStorage<SilentAWPConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new SilentAWPConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> playerConverter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
   private readonly IDictionary<string, int> silentShots =
     new Dictionary<string, int>();
 
+  private SilentAWPConfig config
+    => Provider.GetService<IStorage<SilentAWPConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new SilentAWPConfig();
+
   public override string Name => Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP];
 
   public override string Description

TTT/CS2/Items/Station/DamageStation.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI.Configs.Traitor;
@@ -7,10 +8,8 @@ using TTT.API.Events;
 using TTT.API.Extensions;
 using TTT.API.Game;
 using TTT.API.Player;
-using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
-using TTT.CS2.Utils;
 using TTT.Game.Events.Body;
 using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
@@ -38,20 +37,23 @@ public class DamageStation(IServiceProvider provider)
   private readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
 
-  private readonly IRoleAssigner roles =
-    provider.GetRequiredService<IRoleAssigner>();
+  private readonly Dictionary<string, StationInfo> killedWithStation = new();
 
   public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HURT];
 
   public override string Description
     => Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
 
-  private Dictionary<string, StationInfo> killedWithStation =
-    new Dictionary<string, StationInfo>();
-
   override protected void onInterval() {
     var players  = finder.GetOnline();
     var toRemove = new List<CPhysicsPropMultiplayer>();
+    var playerMapping = players
+     .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)) {
@@ -66,12 +68,7 @@ public class DamageStation(IServiceProvider provider)
 
       var propPos = prop.AbsOrigin;
 
-      var playerMapping = players.Select(p
-          => (ApiPlayer: p, GamePlayer: converter.GetPlayer(p)))
-       .Where(m => m.GamePlayer != null);
-
       var playerDists = playerMapping
-       .Where(t => !roles.GetRoles(t.ApiPlayer).OfType<TraitorRole>().Any())
        .Select(t => (t.ApiPlayer, Origin: t.GamePlayer!.Pawn.Value?.AbsOrigin,
           t.GamePlayer))
        .Where(t => t is { Origin: not null, ApiPlayer.IsAlive: true })
@@ -100,16 +97,19 @@ public class DamageStation(IServiceProvider provider)
           bus.Dispatch(playerDeath);
         }
 
+        gamePlayer.EmitSound("Player.DamageFall", SELF(gamePlayer.Slot), 0.2f);
         player.Health    += damageAmount;
         info.HealthGiven += damageAmount;
-
-        gamePlayer.EmitSound("Player.DamageFall", null, 0.2f);
       }
     }
 
     foreach (var prop in toRemove) props.Remove(prop);
   }
 
+  private static RecipientFilter SELF(int slot) {
+    return new RecipientFilter(slot);
+  }
+
   [UsedImplicitly]
   [EventHandler]
   public void OnGameEnd(GameStateUpdateEvent ev) {

TTT/CS2/Items/Station/HealthStation.cs

@@ -10,7 +10,8 @@ using TTT.Game.Roles;
 namespace TTT.CS2.Items.Station;
 
 public static class HealthStationCollection {
-  public static void AddHealthStationServices(this IServiceCollection collection) {
+  public static void
+    AddHealthStationServices(this IServiceCollection collection) {
     collection.AddModBehavior<HealthStation>();
   }
 }

TTT/CS2/Items/Station/StationItem.cs

@@ -20,10 +20,10 @@ 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 = 500;
+  private readonly long PROP_SIZE_SQUARED = 700;
 
   protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
     new();
@@ -105,8 +105,8 @@ public abstract class StationItem<T>(IServiceProvider provider,
       "weapon_deagle"                              => 40,
       _ when Tag.PISTOLS.Contains(designerWeapon)  => 10,
       _ when Tag.SMGS.Contains(designerWeapon)     => 15,
-      _ when Tag.SHOTGUNS.Contains(designerWeapon) => 25,
-      _ when Tag.RIFLES.Contains(designerWeapon)   => 45,
+      _ when Tag.SHOTGUNS.Contains(designerWeapon) => 15,
+      _ when Tag.RIFLES.Contains(designerWeapon)   => 35,
       _                                            => 5
     };
   }
@@ -124,7 +124,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
       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/TeleportDecoy/TeleportDecoyListener.cs

@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;

TTT/CS2/Items/Tripwire/TripwireItem.cs

@@ -0,0 +1,164 @@
+using System.Drawing;
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
+using TTT.CS2.RayTrace.Enum;
+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>();
+  }
+}
+
+public class TripwireItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
+  public override string Name => Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE];
+
+  private readonly IScheduler scheduler =
+    provider.GetRequiredService<IScheduler>();
+
+  protected readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public record TripwireInstance(IOnlinePlayer owner, CEnvBeam Beam,
+    CDynamicProp TripwireProp, Vector StartPos, Vector EndPos);
+
+  private TripwireConfig config = provider
+   .GetService<IStorage<TripwireConfig>>()
+  ?.Load()
+   .GetAwaiter()
+   .GetResult() ?? new TripwireConfig();
+
+  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
+    ?.RegisterListener<
+        CounterStrikeSharp.API.Core.Listeners.OnServerPrecacheResources>(
+        onPrecache);
+  }
+
+  private void onPrecache(ResourceManifest manifest) {
+    manifest.AddResource(
+      "models/generic/conveyor_control_panel_01/conveyor_button_02.vmdl");
+  }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    PurchaseResult result = base.CanPurchase(player);
+    if (result != PurchaseResult.SUCCESS) return result;
+    Server.NextWorldUpdateAsync(() => {
+        var gamePlayer = converter.GetPlayer(player);
+        if (gamePlayer == null) {
+          result = PurchaseResult.UNKNOWN_ERROR;
+          return;
+        }
+
+        var trace = gamePlayer.GetGameTraceByEyePosition(TraceMask.MaskSolid,
+          Contents.NoDraw, gamePlayer);
+        if (trace == null) {
+          result = PurchaseResult.TRIPWIRE_TOO_FAR;
+          return;
+        }
+
+        var endPos = trace.Value.EndPos;
+        var distance = gamePlayer.GetEyePosition()
+         .DistanceSquared(endPos.toVector());
+        if (distance > 2500) {
+          result = PurchaseResult.TRIPWIRE_TOO_FAR;
+          return;
+        }
+      })
+     .GetAwaiter()
+     .GetResult();
+
+    return result;
+  }
+
+  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;
+
+      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());
+        });
+      });
+    });
+  }
+
+  private void createBeam(IOnlinePlayer owner, CDynamicProp prop, Vector start,
+    Vector end) {
+    prop.EmitSound("C4.ExplodeTriggerTrip");
+    var beam = createBeamEnt(start, end);
+    if (beam == null) return;
+
+    var instance = new TripwireInstance(owner, beam, prop, start, end);
+    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.EndPos.X   = end.X;
+    beam.EndPos.Y   = end.Y;
+    beam.EndPos.Z   = end.Z;
+    beam.Teleport(start);
+    return beam;
+  }
+}

TTT/CS2/Items/Tripwire/TripwireMovementListener.cs

@@ -0,0 +1,117 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Timers;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Events;
+using TTT.API.Game;
+using TTT.API.Player;
+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;
+
+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>();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    if (item == null) return;
+    plugin?.AddTimer(0.1f, 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) {
+      var ray = TraceRay.TraceShape(wire.StartPos, wire.EndPos, Contents.Player,
+        wire.TripwireProp.Handle);
+      if (!ray.DidHit() || !ray.HitPlayer(out _)) 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);
+      }
+
+      player.Health -= damage;
+      gamePlayer.EmitSound("Player.BurnDamage");
+    }
+  }
+
+  private static readonly float fallofDelay = 0.01f;
+
+  private float getDamage(float distance) {
+    return 1000.0f * MathF.Pow(MathF.E, -distance * fallofDelay);
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    killedWithTripwire.Clear();
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRagdollSpawn(BodyCreateEvent ev) {
+    if (!killedWithTripwire.TryGetValue(ev.Body.Id, out var info)) return;
+    if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
+      return;
+    ev.Body.Killer = info.owner;
+  }
+}

TTT/CS2/Items/Tripwire/TripwireMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.Tripwire;
+
+public class TripwireMsgs {
+  public static IMsg SHOP_ITEM_TRIPWIRE
+    => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE));
+
+  public static IMsg SHOP_ITEM_TRIPWIRE_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DESC));
+}

TTT/CS2/Listeners/AfkTimerListener.cs

@@ -1,5 +1,4 @@
-using System.Drawing;
-using System.Reactive.Concurrency;
+using System.Reactive.Concurrency;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
@@ -11,27 +10,25 @@ using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
 using TTT.CS2.lang;
-using TTT.CS2.Utils;
 using TTT.Game;
 using TTT.Game.Events.Game;
 using TTT.Game.Listeners;
-using TTT.Game.Roles;
 
 namespace TTT.CS2.Listeners;
 
 public class AfkTimerListener(IServiceProvider provider)
   : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private IDisposable? specTimer, specWarnTimer;
+
   private TTTConfig config
     => Provider.GetRequiredService<IStorage<TTTConfig>>()
      .Load()
      .GetAwaiter()
      .GetResult() ?? new TTTConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
-  private IDisposable? specTimer, specWarnTimer;
-
   public override void Dispose() {
     base.Dispose();
 

TTT/CS2/Listeners/BodyPickupListener.cs

@@ -8,7 +8,6 @@ using TTT.API.Player;
 using TTT.CS2.API;
 using TTT.CS2.Events;
 using TTT.CS2.Extensions;
-using TTT.Game;
 using TTT.Game.Events.Body;
 using TTT.Game.lang;
 using TTT.Game.Listeners;
@@ -35,6 +34,8 @@ public class BodyPickupListener(IServiceProvider provider)
     if (ev.Player is not IOnlinePlayer online)
       throw new InvalidOperationException("Player is not an online player.");
 
+    if (ev.Player.Id == body.OfPlayer.Id) return;
+
     var identifyEvent = new BodyIdentifyEvent(body, online);
 
     Bus.Dispatch(identifyEvent);

TTT/CS2/Listeners/KarmaBanner.cs

@@ -15,12 +15,6 @@ using TTT.Karma.lang;
 namespace TTT.CS2.Listeners;
 
 public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
-  private KarmaConfig config
-    => Provider.GetService<IStorage<KarmaConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new KarmaConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
@@ -31,6 +25,12 @@ public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
 
   private readonly Dictionary<IPlayer, DateTime> lastWarned = new();
 
+  private KarmaConfig config
+    => Provider.GetService<IStorage<KarmaConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new KarmaConfig();
+
   [UsedImplicitly]
   [EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
   public void OnKarmaUpdate(KarmaUpdateEvent ev) {

TTT/CS2/Listeners/PlayerStatsTracker.cs

@@ -20,8 +20,8 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
 
   private readonly ISet<int> revealedDeaths = new HashSet<int>();
 
-  private readonly IDictionary<int, (int, int)> roundKillsAndAssists =
-    new Dictionary<int, (int, int)>();
+  private readonly IDictionary<int, RoundData> roundStats =
+    new Dictionary<int, RoundData>();
 
   public void Dispose() { }
 
@@ -50,24 +50,39 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
       ev.Assister == null ? null : converter.GetPlayer(ev.Assister);
 
     if (killer != null) {
-      roundKillsAndAssists.TryGetValue(killer.Slot, out var def);
-      def.Item1++;
-      roundKillsAndAssists[killer.Slot] = def;
+      roundStats.TryGetValue(killer.Slot, out var def);
+      def ??= new RoundData();
+      def.Kills++;
+      roundStats[killer.Slot] = def;
     }
 
     if (assister != null && assister != killer) {
-      roundKillsAndAssists.TryGetValue(assister.Slot, out var def);
-      def.Item2++;
-      roundKillsAndAssists[assister.Slot] = def;
+      roundStats.TryGetValue(assister.Slot, out var def);
+      def ??= new RoundData();
+      def.Assists++;
+      roundStats[assister.Slot] = def;
     }
   }
 
+  [UsedImplicitly]
+  [EventHandler(Priority = Priority.HIGH)]
+  public void OnDamage(PlayerDamagedEvent ev) {
+    var attacker =
+      ev.Attacker == null ? null : converter.GetPlayer(ev.Attacker);
+    if (attacker == null) return;
+
+    roundStats.TryGetValue(attacker.Slot, out var def);
+    def                       ??= new RoundData();
+    def.Damage                +=  ev.DmgDealt;
+    roundStats[attacker.Slot] =   def;
+  }
+
   [UsedImplicitly]
   [EventHandler]
   public void OnRoundEnd(GameStateUpdateEvent ev) {
     if (ev.NewState == State.IN_PROGRESS) {
       revealedDeaths.Clear();
-      roundKillsAndAssists.Clear();
+      roundStats.Clear();
       return;
     }
 
@@ -100,17 +115,24 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
     var online = finder.GetOnline()
      .Select(p => converter.GetPlayer(p))
      .OfType<CCSPlayerController>()
-     .Where(p => p.IsValid && roundKillsAndAssists.ContainsKey(p.Slot));
+     .Where(p => p.IsValid && roundStats.ContainsKey(p.Slot));
 
     foreach (var player in online) {
       var stats = player.ActionTrackingServices?.MatchStats;
       if (stats == null) continue;
 
-      var (kills, assists) =  roundKillsAndAssists[player.Slot];
-      stats.Kills          += kills;
-      stats.Assists        += assists;
+      if (!roundStats.TryGetValue(player.Slot, out var data)) continue;
+
+      stats.Kills   += data.Kills;
+      stats.Assists += data.Assists;
       Utilities.SetStateChanged(player, "CCSPlayerController",
         "m_pActionTrackingServices");
     }
   }
+
+  private record RoundData {
+    public int Assists;
+    public int Damage;
+    public int Kills;
+  }
 }

TTT/CS2/Listeners/RoundTimerListener.cs

@@ -22,17 +22,17 @@ namespace TTT.CS2.Listeners;
 
 public class RoundTimerListener(IServiceProvider provider)
   : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public IDisposable? EndTimer;
+
   private TTTConfig config
     => Provider.GetRequiredService<IStorage<TTTConfig>>()
      .Load()
      .GetAwaiter()
      .GetResult() ?? new TTTConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
-  public IDisposable? EndTimer;
-
   [UsedImplicitly]
   [EventHandler(IgnoreCanceled = true)]
   public void OnRoundStart(GameStateUpdateEvent ev) {

TTT/CS2/Listeners/WardenTagAssigner.cs

@@ -0,0 +1,55 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Events;
+using TTT.API.Player;
+using TTT.CS2.ThirdParties.eGO;
+using TTT.Game.Events.Player;
+using TTT.Game.Listeners;
+using TTT.Game.Roles;
+
+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>>();
+
+  [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;
+
+      Task.Run(async () => {
+        if (ev.Role is DetectiveRole) {
+          var oldTag = await maul.getTagService().GetTag(gamePlayer.SteamID);
+          var oldTagColor =
+            await maul.getTagService().GetTagColor(gamePlayer.SteamID);
+          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.LightBlue, 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);
+          }
+        });
+      });
+    });
+  }
+}

TTT/CS2/Player/CS2AliveSpoofer.cs

@@ -9,8 +9,8 @@ namespace TTT.CS2.Player;
 
 public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
   private readonly HashSet<CCSPlayerController> _fakeAlivePlayers = new();
+  private BasePlugin? plugin;
   public ISet<CCSPlayerController> FakeAlivePlayers => _fakeAlivePlayers;
-  private BasePlugin? plugin = null;
 
   public void SpoofAlive(CCSPlayerController player) {
     if (player.IsBot) {

TTT/CS2/Player/CS2Player.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
 using TTT.API.Player;
 
 namespace TTT.CS2.Player;
@@ -53,7 +54,7 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
   }
 
   public string Id { get; }
-  public string Name { get; }
+  public string Name { get; set; }
 
   public int Health {
     get => Player?.Pawn.Value != null ? Player.Pawn.Value.Health : 0;
@@ -96,7 +97,11 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
   }
 
   public bool IsAlive {
-    get => Player != null && Player.Pawn.Value is { Health: > 0 };
+    get
+      => Player != null && Player is {
+        Team             : CsTeam.CounterTerrorist or CsTeam.Terrorist,
+        Pawn.Value.Health: > 0
+      };
 
     set
       => throw new NotSupportedException(
@@ -114,14 +119,7 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
 
   // Goal: Pad the name to a fixed width for better alignment in logs
   // Left-align ID, right-align name
-  private string createPaddedName() {
-    var onlineLengths = Utilities.GetPlayers()
-     .Select(p => p.PlayerName.Length)
-     .ToList();
-    if (onlineLengths.Count == 0) return CreatePaddedName(Id, Name, 13);
-    var namePadding = Math.Min(onlineLengths.Max(), 24);
-    return CreatePaddedName(Id, Name, namePadding + 8);
-  }
+  private string createPaddedName() { return CreatePaddedName(Id, Name, 24); }
 
   public static string CreatePaddedName(string id, string name, int len) {
     var suffix = id.Length > 5 ? id[^5..] : id.PadLeft(5, '0');

TTT/CS2/Utils/DamageDealingHelper.cs

@@ -1,7 +1,4 @@
-using System.Net;
-using System.Numerics;
-using System.Runtime.InteropServices;
-using CounterStrikeSharp.API;
+using System.Runtime.InteropServices;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
 using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;

TTT/CS2/Utils/GrenadeDataHelper.cs

@@ -18,13 +18,13 @@ public class GrenadeDataHelper {
           heGrenadeSignature);
   }
 
-  private delegate int CHEGrenadeProjectile_CreateDelegate(IntPtr position,
-    IntPtr angle, IntPtr velocity, IntPtr velocityAngle, IntPtr thrower,
-    int weaponId, byte team);
-
   public static int CreateGrenade(Vector position, QAngle angle,
     Vector velocity, Vector velocityAngle, IntPtr thrower, CsTeam team) {
     return CHEGrenadeProjectile_CreateFunc(position.Handle, angle.Handle,
       velocity.Handle, velocityAngle.Handle, thrower, 44, (byte)team);
   }
+
+  private delegate int CHEGrenadeProjectile_CreateDelegate(IntPtr position,
+    IntPtr angle, IntPtr velocity, IntPtr velocityAngle, IntPtr thrower,
+    int weaponId, byte team);
 }

TTT/CS2/lang/CS2Msgs.cs

@@ -1,6 +1,5 @@
 using TTT.API.Player;
 using TTT.API.Role;
-using TTT.Game;
 using TTT.Game.lang;
 using TTT.Locale;
 
@@ -13,6 +12,8 @@ public static class CS2Msgs {
   public static IMsg DEAD_MUTE_REMINDER
     => MsgFactory.Create(nameof(DEAD_MUTE_REMINDER));
 
+  public static IMsg AFK_MOVED => MsgFactory.Create(nameof(AFK_MOVED));
+
   public static IMsg TASER_SCANNED(IPlayer scannedPlayer, IRole role) {
     var rolePrefix = GameMsgs.GetRolePrefix(role);
     return MsgFactory.Create(nameof(TASER_SCANNED),
@@ -23,8 +24,6 @@ public static class CS2Msgs {
     return MsgFactory.Create(nameof(AFK_WARNING), span.TotalSeconds);
   }
 
-  public static IMsg AFK_MOVED => MsgFactory.Create(nameof(AFK_MOVED));
-
   public static IMsg TRAITOR_CHAT_FORMAT(IOnlinePlayer player, string msg) {
     return MsgFactory.Create(nameof(TRAITOR_CHAT_FORMAT), player.Name, msg);
   }

TTT/CS2/lang/en.yml

@@ -52,4 +52,7 @@ SHOP_ITEM_CLUSTER_GRENADE: "Cluster Grenade"
 SHOP_ITEM_CLUSTER_GRENADE_DESC: "A grenade that splits into multiple smaller grenades."
 
 SHOP_ITEM_TELEPORT_DECOY: "Teleport Decoy"
-SHOP_ITEM_TELEPORT_DECOY_DESC: "A decoy that teleports you to it upon explosion."
+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."

TTT/Game/Actions/DamagedAction.cs

@@ -29,7 +29,7 @@ public class DamagedAction(IRoleAssigner roles, IPlayer victim,
     => PlayerRole != null && OtherRole != null
       && PlayerRole is TraitorRole != OtherRole is TraitorRole ?
         "" :
-        "[BAD ACTION] ";
+        "[BAD] ";
 
   #region ConstructorAliases
 

TTT/Game/Actions/DeathAction.cs

@@ -35,15 +35,15 @@ public class DeathAction(IRoleAssigner roles, IPlayer victim, IPlayer? killer)
       $" [{OtherRole.Name.First(char.IsAsciiLetter)}]" :
       "";
     return Other is not null ?
-      $"{Other}{oRole} {Verb} {Player}{pRole} {Details}" :
-      $"{Player}{pRole} {Verb} {Details}";
+      $"{Prefix}{Other}{oRole} {Verb} {Player}{pRole} {Details}" :
+      $"{Prefix}{Player}{pRole} {Verb} {Details}";
   }
 
   public string Prefix
     => PlayerRole != null && OtherRole != null
       && PlayerRole is TraitorRole != OtherRole is TraitorRole ?
         "" :
-        "[BAD ACTION] ";
+        "[BAD] ";
 
   #region ConstructorAliases
 

TTT/Game/Actions/RoleAssignedAction.cs

@@ -11,5 +11,7 @@ public class RoleAssignedAction(IPlayer player, IRole role) : IAction {
   public IRole? OtherRole { get; } = null;
   public string Id => "basegame.action.roleassigned";
   public string Verb => "was assigned";
-  public string Details { get; } = role.Name;
+
+  public string Details { get; } =
+    new(role.Name.Where(char.IsAsciiLetter).ToArray());
 }

TTT/Game/Game.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Listeners\Stats\" />
+    <Folder Include="Listeners\Stats\"/>
   </ItemGroup>
 
 </Project>

TTT/Game/Listeners/GameRestartListener.cs

@@ -11,7 +11,7 @@ namespace TTT.Game.Listeners;
 
 public class GameRestartListener(IServiceProvider provider)
   : BaseListener(provider) {
-  private TTTConfig config =
+  private readonly TTTConfig config =
     provider.GetService<IStorage<TTTConfig>>()?.Load().GetAwaiter().GetResult()
     ?? new TTTConfig();
 

TTT/Game/Roles/BaseRole.cs

@@ -10,12 +10,6 @@ using TTT.Locale;
 namespace TTT.Game.Roles;
 
 public abstract class BaseRole(IServiceProvider provider) : IRole {
-  protected TTTConfig Config
-    => Provider.GetRequiredService<IStorage<TTTConfig>>()
-     .Load()
-     .GetAwaiter()
-     .GetResult() ?? new TTTConfig();
-
   protected readonly IInventoryManager Inventory =
     provider.GetRequiredService<IInventoryManager>();
 
@@ -29,6 +23,12 @@ public abstract class BaseRole(IServiceProvider provider) : IRole {
   protected readonly IRoleAssigner Roles =
     provider.GetRequiredService<IRoleAssigner>();
 
+  protected TTTConfig Config
+    => Provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
   public abstract string Id { get; }
   public abstract string Name { get; }
   public abstract Color Color { get; }

TTT/Game/Roles/RoleAssigner.cs

@@ -8,8 +8,10 @@ using TTT.Game.Events.Player;
 namespace TTT.Game.Roles;
 
 public class RoleAssigner(IServiceProvider provider) : IRoleAssigner {
-  private readonly IDictionary<IPlayer, ICollection<IRole>> assignedRoles =
-    new Dictionary<IPlayer, ICollection<IRole>>();
+  private static readonly Random rng = new();
+
+  private readonly IDictionary<string, ICollection<IRole>> assignedRoles =
+    new Dictionary<string, ICollection<IRole>>();
 
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
@@ -18,18 +20,18 @@ public class RoleAssigner(IServiceProvider provider) : IRoleAssigner {
 
   public void AssignRoles(ISet<IOnlinePlayer> players, IList<IRole> roles) {
     assignedRoles.Clear();
-    var  shuffled = players.OrderBy(_ => Guid.NewGuid()).ToHashSet();
+    var  shuffled = players.OrderBy(_ => rng.NextDouble()).ToHashSet();
     bool roleAssigned;
     do { roleAssigned = tryAssignRole(shuffled, roles); } while (roleAssigned);
   }
 
   public Task<ICollection<IRole>?> Load(IPlayer key) {
-    assignedRoles.TryGetValue(key, out var roles);
+    assignedRoles.TryGetValue(key.Id, out var roles);
     return Task.FromResult(roles);
   }
 
   public Task Write(IPlayer key, ICollection<IRole> newData) {
-    assignedRoles[key] = newData;
+    assignedRoles[key.Id] = newData;
     return Task.CompletedTask;
   }
 
@@ -44,9 +46,9 @@ public class RoleAssigner(IServiceProvider provider) : IRoleAssigner {
 
       if (ev.IsCanceled) continue;
 
-      if (!assignedRoles.ContainsKey(player))
-        assignedRoles[player] = new List<IRole>();
-      assignedRoles[player].Add(ev.Role);
+      if (!assignedRoles.ContainsKey(player.Id))
+        assignedRoles[player.Id] = new List<IRole>();
+      assignedRoles[player.Id].Add(ev.Role);
       ev.Role.OnAssign(player);
 
       onlineMessenger?.Debug(

TTT/Game/RoundBasedGame.cs

@@ -16,12 +16,6 @@ using TTT.Locale;
 namespace TTT.Game;
 
 public class RoundBasedGame(IServiceProvider provider) : IGame {
-  private TTTConfig config
-    => provider.GetRequiredService<IStorage<TTTConfig>>()
-     .Load()
-     .GetAwaiter()
-     .GetResult() ?? new TTTConfig();
-
   protected readonly IMsgLocalizer Locale =
     provider.GetRequiredService<IMsgLocalizer>();
 
@@ -29,6 +23,12 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
 
   protected State state = State.WAITING;
 
+  private TTTConfig config
+    => provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
   public virtual IList<IRole> Roles { get; } = [
     new InnocentRole(provider), new TraitorRole(provider),
     new DetectiveRole(provider)

TTT/Game/TTTConfig.cs

@@ -9,11 +9,12 @@ public record TTTConfig {
     public Func<int, int> TraitorCount { get; init; } =
       p => (int)Math.Ceiling((p - 1) / 5f);
 
-    public Func<int, int> DetectiveCount { get; init; } =
-      p => (int)Math.Floor(p / 8f);
+    public Func<int, int> DetectiveCount { get; init; } = p
+      => (int)Math.Ceiling(Math.Floor(p / 8f) / 1.5f);
 
     public Func<int, int> InnocentCount { get; init; } = p
-      => p - (int)Math.Ceiling((p - 1) / 5f) - (int)Math.Floor(p / 8f);
+      => p - (int)Math.Ceiling((p - 1) / 5f)
+      - (int)Math.Ceiling(Math.Floor(p / 8f) / 1.5f);
   }
 
   public record RoleConfig {

TTT/Karma/KarmaListener.cs

@@ -15,12 +15,6 @@ namespace TTT.Karma;
 public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
   private readonly Dictionary<string, int> badKills = new();
 
-  private KarmaConfig config
-    => Provider.GetService<IStorage<KarmaConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new KarmaConfig();
-
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
@@ -34,6 +28,12 @@ public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
 
   public bool GiveKarmaOnRoundEnd = true;
 
+  private KarmaConfig config
+    => Provider.GetService<IStorage<KarmaConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new KarmaConfig();
+
   [EventHandler]
   [UsedImplicitly]
   public void OnRoundStart(GameStateUpdateEvent ev) { badKills.Clear(); }

TTT/Karma/KarmaStorage.cs

@@ -1,9 +1,5 @@
-using System.Collections.Concurrent;
-using System.Data;
-using System.Diagnostics;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
+using System.Text;
+using System.Text.Json;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
 using TTT.API.Player;
@@ -28,7 +24,7 @@ public sealed class KarmaStorage(IServiceProvider provider) : IKarmaService {
     if (!result.IsSuccessStatusCode) return config.DefaultKarma;
 
     var content = await result.Content.ReadAsStringAsync();
-    var json    = System.Text.Json.JsonDocument.Parse(content);
+    var json    = JsonDocument.Parse(content);
     if (!json.RootElement.TryGetProperty("karma", out var karmaElement))
       return config.DefaultKarma;
 
@@ -42,9 +38,8 @@ public sealed class KarmaStorage(IServiceProvider provider) : IKarmaService {
     if (karmaUpdateEvent.IsCanceled) return;
 
     var data = new { steam_id = key.Id, karma = karmaUpdateEvent.Karma };
-    var payload = new StringContent(
-      System.Text.Json.JsonSerializer.Serialize(data),
-      System.Text.Encoding.UTF8, "application/json");
+    var payload = new StringContent(JsonSerializer.Serialize(data),
+      Encoding.UTF8, "application/json");
 
     await client.PatchAsync("user/" + key.Id, payload);
   }

TTT/Plugin/TTT.cs

@@ -64,5 +64,4 @@ public class TTT(IServiceProvider provider) : BasePlugin {
 
     base.Dispose(disposing);
   }
-
 }

TTT/Plugin/TTTServiceCollection.cs

@@ -1,7 +1,6 @@
 using System.Reactive.Concurrency;
 using CounterStrikeSharp.API.Core;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using SpecialRound;
 using Stats;
 using TTT.CS2;

TTT/RTD/AutoRTDCommand.cs

@@ -1,13 +1,10 @@
 using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
 using JetBrains.Annotations;
 using MAULActainShared.plugin.models;
 using Microsoft.Extensions.DependencyInjection;
-using TTT.API;
 using TTT.API.Command;
 using TTT.API.Events;
-using TTT.API.Game;
 using TTT.API.Messages;
 using TTT.API.Player;
 using TTT.CS2.Command;
@@ -19,18 +16,19 @@ using TTT.RTD.lang;
 namespace TTT.RTD;
 
 public class AutoRTDCommand(IServiceProvider provider) : ICommand, IListener {
-  public string Id => "autortd";
-  private ICookie? autoRtdCookie;
+  private readonly ICommandManager commands =
+    provider.GetRequiredService<ICommandManager>();
 
   private readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
 
-  private readonly ICommandManager commands =
-    provider.GetRequiredService<ICommandManager>();
-
   private readonly IMsgLocalizer localizer =
     provider.GetRequiredService<IMsgLocalizer>();
 
+  private readonly Dictionary<string, bool> playerStatuses = new();
+  private ICookie? autoRtdCookie;
+  public string Id => "autortd";
+
   public bool MustBeOnMainThread => true;
 
   public void Dispose() { }
@@ -47,7 +45,6 @@ public class AutoRTDCommand(IServiceProvider provider) : ICommand, IListener {
   }
 
   public string[] RequiredFlags => ["@ttt/autortd"];
-  private Dictionary<string, bool> playerStatuses = new();
 
   public async Task<CommandResult> Execute(IOnlinePlayer? executor,
     ICommandInfo info) {

TTT/RTD/RTD.csproj

@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\API\API.csproj" />
-    <ProjectReference Include="..\CS2\CS2.csproj" />
-    <ProjectReference Include="..\Game\Game.csproj" />
-    <ProjectReference Include="..\ShopAPI\ShopAPI.csproj" />
-    <ProjectReference Include="..\Shop\Shop.csproj" />
+    <ProjectReference Include="..\API\API.csproj"/>
+    <ProjectReference Include="..\CS2\CS2.csproj"/>
+    <ProjectReference Include="..\Game\Game.csproj"/>
+    <ProjectReference Include="..\ShopAPI\ShopAPI.csproj"/>
+    <ProjectReference Include="..\Shop\Shop.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

TTT/RTD/RewardGenerator.cs

@@ -13,8 +13,6 @@ namespace TTT.RTD;
 
 public class RewardGenerator(IServiceProvider provider)
   : IRewardGenerator, IPluginModule {
-  private readonly List<(IRtdReward, float)> rewards = new();
-
   private const float PROB_LOTTERY = 1 / 5000f;
   private const float PROB_EXTREMELY_LOW = 1 / 800f;
   private const float PROB_VERY_LOW = 1 / 100f;
@@ -22,28 +20,7 @@ public class RewardGenerator(IServiceProvider provider)
   private const float PROB_MEDIUM = 1 / 10f;
   private const float PROB_OFTEN = 1 / 5f;
   private const float PROB_VERY_OFTEN = 1 / 2f;
-
-  public IEnumerator<(IRtdReward, float)> GetEnumerator() {
-    return rewards.GetEnumerator();
-  }
-
-  IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
-  public int Count => rewards.Count;
-
-  public IRtdReward GetReward() {
-    var totalWeight = 0f;
-    foreach (var (_, weight) in rewards) { totalWeight += weight; }
-
-    var randomValue      = Random.Shared.NextSingle() * totalWeight;
-    var cumulativeWeight = 0f;
-
-    foreach (var (reward, weight) in rewards) {
-      cumulativeWeight += weight;
-      if (randomValue <= cumulativeWeight) { return reward; }
-    }
-
-    return rewards[^1].Item1;
-  }
+  private readonly List<(IRtdReward, float)> rewards = new();
 
   public void Start() {
     rewards.AddRange([
@@ -65,7 +42,7 @@ public class RewardGenerator(IServiceProvider provider)
       (new ShopItemReward<HealthStation>(provider), PROB_EXTREMELY_LOW),
       (new HealthReward(provider, 1), PROB_EXTREMELY_LOW),
       (new CreditReward(provider, 100), PROB_EXTREMELY_LOW),
-      (new HealthReward(provider, 200), PROB_EXTREMELY_LOW),
+      (new HealthReward(provider, 200), PROB_EXTREMELY_LOW)
     ]);
 
     rewards.ForEach(r => r.Item1.Start());
@@ -73,10 +50,32 @@ public class RewardGenerator(IServiceProvider provider)
 
   public void Start(BasePlugin? plugin) {
     Start();
-    foreach (var (reward, _) in rewards) {
-      if (reward is IPluginModule module) { module.Start(plugin); }
-    }
+    foreach (var (reward, _) in rewards)
+      if (reward is IPluginModule module)
+        module.Start(plugin);
   }
 
   public void Dispose() { }
+
+  public IEnumerator<(IRtdReward, float)> GetEnumerator() {
+    return rewards.GetEnumerator();
+  }
+
+  IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
+  public int Count => rewards.Count;
+
+  public IRtdReward GetReward() {
+    var totalWeight                                  = 0f;
+    foreach (var (_, weight) in rewards) totalWeight += weight;
+
+    var randomValue      = Random.Shared.NextSingle() * totalWeight;
+    var cumulativeWeight = 0f;
+
+    foreach (var (reward, weight) in rewards) {
+      cumulativeWeight += weight;
+      if (randomValue <= cumulativeWeight) return reward;
+    }
+
+    return rewards[^1].Item1;
+  }
 }

TTT/RTD/Rewards/CreditReward.cs

@@ -1,21 +1,18 @@
-using CounterStrikeSharp.API;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
 using TTT.API.Player;
 using TTT.RTD.lang;
-using TTT.Shop;
 
 namespace TTT.RTD.Rewards;
 
 public class CreditReward(IServiceProvider provider, int amo)
   : RoundStartReward(provider) {
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
   public override string Name => Locale[RtdMsgs.CREDITS_REWARD(amo)];
 
   public override string Description
     => Locale[RtdMsgs.CREDITS_REWARD_DESC(amo)];
 
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
-
   public override void GiveOnRound(IOnlinePlayer player) {
     shop.AddBalance(player, amo, "RTD Reward");
   }

TTT/RTD/Rewards/MuteReward.cs

@@ -3,7 +3,6 @@ using CounterStrikeSharp.API.Core;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Game;
-using TTT.API.Messages;
 using TTT.API.Player;
 using TTT.Game.Events.Game;
 using TTT.Locale;
@@ -13,24 +12,23 @@ namespace TTT.RTD.Rewards;
 
 public class MuteReward(IServiceProvider provider)
   : RoundStartReward(provider), IPluginModule {
+  private readonly IMsgLocalizer locale =
+    provider.GetRequiredService<IMsgLocalizer>();
+
+  private readonly IMuted mutedPlayers = provider.GetRequiredService<IMuted>();
   public override string Name => "Mute";
 
   public override string Description
     => "you will not be able to communicate next round";
 
-  private readonly IMuted mutedPlayers = provider.GetRequiredService<IMuted>();
-
-  private readonly IMsgLocalizer locale =
-    provider.GetRequiredService<IMsgLocalizer>();
+  public void Start(BasePlugin? plugin) {
+    plugin?.RegisterListener<Listeners.OnClientVoice>(onVoice);
+  }
 
   public override void GiveOnRound(IOnlinePlayer player) {
     mutedPlayers.Add(player.Id);
   }
 
-  public void Start(BasePlugin? plugin) {
-    plugin?.RegisterListener<Listeners.OnClientVoice>(onVoice);
-  }
-
   private void onVoice(int playerSlot) {
     var player = Utilities.GetPlayerFromSlot(playerSlot);
     if (player == null) return;

TTT/RTD/Rewards/ProvenReward.cs

@@ -7,12 +7,12 @@ namespace TTT.RTD.Rewards;
 
 public class ProvenReward(IServiceProvider provider)
   : RoundStartReward(provider) {
-  private readonly IRoleAssigner roles =
-    provider.GetRequiredService<IRoleAssigner>();
-
   private readonly IIconManager icons =
     provider.GetRequiredService<IIconManager>();
 
+  private readonly IRoleAssigner roles =
+    provider.GetRequiredService<IRoleAssigner>();
+
   public override string Name => "Proven If Inno";
 
   public override string Description

TTT/RTD/Rewards/ShopItemReward.cs

@@ -12,7 +12,7 @@ public class ShopItemReward<TItem>(IServiceProvider provider)
     => shop.Items.OfType<TItem>().FirstOrDefault()?.Name ?? typeof(TItem).Name;
 
   public override string Description
-    => $"you will receive {("aeiou".Contains(Name.ToLower()[0]) ? "an" : "a")} {typeof(TItem).Name} item next round";
+    => $"you will receive {("aeiou".Contains(Name.ToLower()[0]) ? "an" : "a")} {Name} item next round";
 
   public override void GiveOnRound(IOnlinePlayer player) {
     var instance = shop.Items.OfType<TItem>().FirstOrDefault();

TTT/RTD/RoundStartReward.cs

@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
 using TTT.API.Game;
@@ -13,10 +12,13 @@ namespace TTT.RTD;
 
 public abstract class RoundStartReward(IServiceProvider provider)
   : IRtdReward, IListener {
+  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
+
   private readonly ISet<IOnlinePlayer> givenPlayers =
     new HashSet<IOnlinePlayer>();
 
-  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
+  protected readonly IMsgLocalizer Locale =
+    provider.GetRequiredService<IMsgLocalizer>();
 
   private readonly IRoleAssigner roles =
     provider.GetRequiredService<IRoleAssigner>();
@@ -25,10 +27,11 @@ public abstract class RoundStartReward(IServiceProvider provider)
   public abstract string Description { get; }
 
   public void GrantReward(IOnlinePlayer player) { givenPlayers.Add(player); }
-  public abstract void GiveOnRound(IOnlinePlayer player);
 
-  protected readonly IMsgLocalizer Locale =
-    provider.GetRequiredService<IMsgLocalizer>();
+  public void Start() { bus.RegisterListener(this); }
+
+  public void Dispose() { bus.UnregisterListener(this); }
+  public abstract void GiveOnRound(IOnlinePlayer player);
 
   [UsedImplicitly]
   [EventHandler(Priority = Priority.LOW)]
@@ -42,8 +45,4 @@ public abstract class RoundStartReward(IServiceProvider provider)
 
     givenPlayers.Clear();
   }
-
-  public void Start() { bus.RegisterListener(this); }
-
-  public void Dispose() { bus.UnregisterListener(this); }
 }

TTT/RTD/RtdCommand.cs

@@ -13,10 +13,9 @@ namespace TTT.RTD;
 
 public class RTDCommand(IRewardGenerator generator, IPermissionManager perms,
   IMsgLocalizer locale) : ICommand, IPluginModule, IListener {
+  private readonly Dictionary<string, IRtdReward> playerRewards = new();
   private bool inBetweenRounds = true;
 
-  private Dictionary<string, IRtdReward> playerRewards = new();
-
   public bool MustBeOnMainThread => true;
 
   public string Id => "rtd";
@@ -34,12 +33,11 @@ public class RTDCommand(IRewardGenerator generator, IPermissionManager perms,
       return Task.FromResult(CommandResult.SUCCESS);
     }
 
-    if (!bypass) {
+    if (!bypass)
       if (!inBetweenRounds && !RoundUtil.IsWarmup() && executor.IsAlive) {
         info.ReplySync(locale[RtdMsgs.RTD_CANNOT_ROLL_YET]);
         return Task.FromResult(CommandResult.SUCCESS);
       }
-    }
 
     var reward = generator.GetReward();
     if (bypass) {
@@ -67,6 +65,9 @@ public class RTDCommand(IRewardGenerator generator, IPermissionManager perms,
     return Task.FromResult(CommandResult.SUCCESS);
   }
 
+  public void Dispose() { }
+  public void Start() { }
+
   [UsedImplicitly]
   [EventHandler]
   public void OnGameState(GameStateUpdateEvent ev) {
@@ -80,7 +81,4 @@ public class RTDCommand(IRewardGenerator generator, IPermissionManager perms,
         break;
     }
   }
-
-  public void Dispose() { }
-  public void Start() { }
 }

TTT/RTD/RtdStatsCommand.cs

@@ -18,7 +18,7 @@ public class RtdStatsCommand(IRewardGenerator generator) : ICommand {
 
     var index = 0;
     foreach (var (reward, prob) in rewards) {
-      var percent = (prob / total) * 100;
+      var percent = prob / total * 100;
       info.ReplySync(
         $" {ChatColors.Orange}{index}. {ChatColors.Default}{reward.Name}{ChatColors.Grey}: {ChatColors.Yellow}{percent:0.00}%");
       index++;