feat: Add pistol rounds (resolves #169)

This reverts commit bacd288fe7.

SpecialRoundAPI/SpecialRoundAPI/AbstractSpecialRound.cs

@@ -1,16 +1,16 @@
 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>();
 
@@ -18,9 +18,6 @@ public abstract class AbstractSpecialRound(IServiceProvider provider)
   public abstract IMsg Description { get; }
   public abstract SpecialRoundConfig Config { get; }
 
-  public void Dispose() { }
-  public void Start() { }
-
   public abstract void ApplyRoundEffects();
 
   [UsedImplicitly]

SpecialRoundAPI/SpecialRoundAPI/BhopRoundConfig.cs

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

SpecialRoundAPI/SpecialRoundAPI/Configs/BhopRoundConfig.cs

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

SpecialRoundAPI/SpecialRoundAPI/Configs/PistolRoundConfig.cs

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

SpecialRoundAPI/SpecialRoundAPI/Configs/SilentRoundConfig.cs

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

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.6f;
+  public override float Weight { get; init; } = 1;
 
   public TimeSpan InitialSeconds { get; init; } = TimeSpan.FromSeconds(40);
-  public TimeSpan SecondsPerKill { get; init; } = TimeSpan.FromSeconds(10);
+  public TimeSpan SecondsPerKill { get; init; } = TimeSpan.FromSeconds(80);
+  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.75f;
+}

SpecialRoundAPI/SpecialRoundAPI/Configs/VanillaRoundConfig.cs

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

SpecialRoundAPI/SpecialRoundAPI/VanillaRoundConfig.cs

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

TTT/CS2/CS2ServiceCollection.cs

@@ -72,20 +72,19 @@ public static class CS2ServiceCollection {
 
     // 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<NameUpdater>();
-    // collection.AddModBehavior<EntityTargetHandlers>();
 
     // Damage Cancelers
     collection.AddModBehavior<OutOfRoundCanceler>();
@@ -95,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/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/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/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(

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/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,7 +50,19 @@ 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));

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;
@@ -46,6 +47,13 @@ public class DamageStation(IServiceProvider provider)
   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)) {
@@ -60,10 +68,6 @@ 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
        .Select(t => (t.ApiPlayer, Origin: t.GamePlayer!.Pawn.Value?.AbsOrigin,
           t.GamePlayer))
@@ -74,11 +78,6 @@ public class DamageStation(IServiceProvider provider)
        .ToList();
 
       foreach (var (player, dist, gamePlayer) in playerDists) {
-        if ((gamePlayer.Buttons & PlayerButtons.Walk) != PlayerButtons.Walk) {
-          gamePlayer.EmitSound("Player.DamageFall", null, 0.2f);
-          if (Roles.GetRoles(player).Any(r => r is TraitorRole)) continue;
-        }
-
         var healthScale = 1.0 - dist / _Config.MaxRange;
         var damageAmount =
           (int)Math.Floor(_Config.HealthIncrements * healthScale);
@@ -98,6 +97,7 @@ public class DamageStation(IServiceProvider provider)
           bus.Dispatch(playerDeath);
         }
 
+        gamePlayer.EmitSound("Player.DamageFall", SELF(gamePlayer.Slot), 0.2f);
         player.Health    += damageAmount;
         info.HealthGiven += damageAmount;
       }
@@ -106,6 +106,10 @@ public class DamageStation(IServiceProvider provider)
     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/StationItem.cs

@@ -20,7 +20,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
   : RoleRestrictedItem<T>(provider), IPluginModule where T : IRole {
   protected readonly StationConfig _Config = config;
 
-  protected readonly IPlayerConverter<CCSPlayerController> Converter =
+  protected readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
   private readonly long PROP_SIZE_SQUARED = 700;
@@ -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/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/BodyPickupListener.cs

@@ -34,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/MapHookListener.cs

@@ -19,24 +19,20 @@ public class MapHookListener(IServiceProvider provider)
   [UsedImplicitly]
   [EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
   public void OnRoleAssign(PlayerRoleAssignEvent ev) {
-    Server.NextWorldUpdate(() => {
-      var player = converter.GetPlayer(ev.Player);
-      if (player == null) return;
+    var player = converter.GetPlayer(ev.Player);
+    if (player == null) return;
 
-      switch (ev.Role) {
-        case TraitorRole:
-          player.Pawn.Value?.AcceptInput("AddContext", null, null, "TRAITOR:1");
-          break;
-        case DetectiveRole:
-          player.Pawn.Value?.AcceptInput("AddContext", null, null,
-            "DETECTIVE:1");
-          break;
-        case InnocentRole:
-          player.Pawn.Value?.AcceptInput("AddContext", null, null,
-            "INNOCENT:1");
-          break;
-      }
-    });
+    switch (ev.Role) {
+      case TraitorRole:
+        player.Pawn.Value?.AcceptInput("AddContext", null, null, "TRAITOR:1");
+        break;
+      case DetectiveRole:
+        player.Pawn.Value?.AcceptInput("AddContext", null, null, "DETECTIVE:1");
+        break;
+      case InnocentRole:
+        player.Pawn.Value?.AcceptInput("AddContext", null, null, "INNOCENT:1");
+        break;
+    }
   }
 
   [UsedImplicitly]

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/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/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/Shop/Commands/ListCommand.cs

@@ -74,6 +74,12 @@ public class ListCommand(IServiceProvider provider) : ICommand, IItemSorter {
     return time;
   }
 
+  public void InvalidateOrder(IOnlinePlayer? player) {
+    if (player == null) return;
+    cache.Remove(player.Id);
+    lastUpdate.Remove(player.Id);
+  }
+
   private List<IShopItem> calculateSortedItems(IOnlinePlayer? player) {
     var items = new List<IShopItem>(shop.Items).Where(item
         => player == null

TTT/Shop/Commands/ShopCommand.cs

@@ -72,4 +72,8 @@ public class ShopCommand(IServiceProvider provider) : ICommand, IItemSorter {
   public DateTime? GetLastUpdate(IOnlinePlayer? player) {
     return listCmd.GetLastUpdate(player);
   }
+
+  public void InvalidateOrder(IOnlinePlayer? player) {
+    listCmd.InvalidateOrder(player);
+  }
 }

TTT/Shop/Items/OneShotDeagle/DeagleDamageListener.cs

@@ -54,5 +54,6 @@ public class DeagleDamageListener(IServiceProvider provider)
     }
 
     ev.HpLeft = -100;
+    Messenger.Message(victim, Locale[DeagleMsgs.SHOP_ITEM_DEAGLE_VICTIM]);
   }
 }

TTT/Shop/Items/OneShotDeagle/DeagleMsgs.cs

@@ -11,4 +11,7 @@ public class DeagleMsgs {
 
   public static IMsg SHOP_ITEM_DEAGLE_HIT_FF
     => MsgFactory.Create(nameof(SHOP_ITEM_DEAGLE_HIT_FF));
+
+  public static IMsg SHOP_ITEM_DEAGLE_VICTIM
+    => MsgFactory.Create(nameof(SHOP_ITEM_DEAGLE_VICTIM));
 }

TTT/Shop/ShopServiceCollection.cs

@@ -13,6 +13,7 @@ using TTT.CS2.Items.PoisonSmoke;
 using TTT.CS2.Items.SilentAWP;
 using TTT.CS2.Items.Station;
 using TTT.CS2.Items.TeleportDecoy;
+using TTT.CS2.Items.Tripwire;
 using TTT.Shop.Commands;
 using TTT.Shop.Items;
 using TTT.Shop.Items.Detective.Stickers;
@@ -61,5 +62,6 @@ public static class ShopServiceCollection {
     collection.AddStickerServices();
     collection.AddTaserServices();
     collection.AddTeleportDecoyServices();
+    collection.AddTripwireServices();
   }
 }

TTT/Shop/lang/en.yml

@@ -5,6 +5,7 @@ SHOP_ITEM_NOT_FOUND: "%SHOP_PREFIX%Could not find an item named \"{default}{0}{g
 SHOP_ITEM_DEAGLE: "One-Hit Revolver"
 SHOP_ITEM_DEAGLE_DESC: "A one-hit kill revolver with a single bullet. Aim carefully!"
 SHOP_ITEM_DEAGLE_HIT_FF: "%PREFIX%You hit a teammate!"
+SHOP_ITEM_DEAGLE_VICTIM: "%PREFIX%You were hit by a {yellow}One-Hit Revolver{grey}."
 
 SHOP_ITEM_STICKERS: "Stickers"
 SHOP_ITEM_STICKERS_DESC: "Reveal the roles of all players you taser to others."

TTT/ShopAPI/Configs/Traitor/TripwireConfig.cs

@@ -0,0 +1,6 @@
+namespace ShopAPI.Configs.Traitor;
+
+public record TripwireConfig : ShopItemConfig {
+  public override int Price { get; init; } = 60;
+  public int ExplosionPower { get; init; } = 100;
+}

TTT/ShopAPI/IItemSorter.cs

@@ -5,4 +5,5 @@ namespace ShopAPI;
 public interface IItemSorter {
   List<IShopItem> GetSortedItems(IOnlinePlayer? player, bool refresh = false);
   DateTime? GetLastUpdate(IOnlinePlayer? player);
+  void InvalidateOrder(IOnlinePlayer? player);
 }

TTT/ShopAPI/PurchaseResult.cs

@@ -40,7 +40,12 @@ public enum PurchaseResult {
   /// <summary>
   ///   The item cannot be purchased multiple times, and the player already owns it.
   /// </summary>
-  ALREADY_OWNED
+  ALREADY_OWNED,
+
+  /// <summary>
+  ///  The tripwire placement is too far from the player.
+  /// </summary>
+  TRIPWIRE_TOO_FAR
 }
 
 public static class PurchaseResultExtensions {
@@ -58,7 +63,9 @@ public static class PurchaseResultExtensions {
       PurchaseResult.WRONG_ROLE =>
         "You do not have the required role to purchase this item",
       PurchaseResult.ALREADY_OWNED =>
-        "You already own this item and cannot purchase it again",
+        "You have purchased the maximum amount of this item",
+      PurchaseResult.TRIPWIRE_TOO_FAR =>
+        "The tripwire placement is too far from you",
       _ => "An unexpected error occurred"
     };
   }

TTT/SpecialRound/Rounds/BhopRound.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using SpecialRound.lang;
 using SpecialRoundAPI;
+using SpecialRoundAPI.Configs;
 using TTT.API.Game;
 using TTT.API.Storage;
 using TTT.Game.Events.Game;

TTT/SpecialRound/Rounds/PistolRound.cs

@@ -0,0 +1,66 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using SpecialRound.lang;
+using SpecialRoundAPI;
+using SpecialRoundAPI.Configs;
+using TTT.API;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Events.Game;
+using TTT.Locale;
+
+namespace SpecialRound.Rounds;
+
+public class PistolRound(IServiceProvider provider)
+  : AbstractSpecialRound(provider), IPluginModule {
+  public override string Name => "Pistol";
+  public override IMsg Description => RoundMsgs.SPECIAL_ROUND_PISTOL;
+  private BasePlugin? plugin;
+
+  private PistolRoundConfig config
+    => Provider.GetService<IStorage<PistolRoundConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PistolRoundConfig();
+
+  private IInventoryManager inventory = provider
+   .GetRequiredService<IInventoryManager>();
+
+  public override SpecialRoundConfig Config => config;
+
+  public void Start(BasePlugin? newPluing) { plugin = newPluing; }
+
+  public override void ApplyRoundEffects() {
+    VirtualFunctions.CCSPlayer_ItemServices_CanAcquireFunc.Hook(canAcquire,
+      HookMode.Pre);
+    foreach (var player in Finder.GetOnline())
+      inventory.RemoveWeaponInSlot(player, 0);
+  }
+
+  private HookResult canAcquire(DynamicHook hook) {
+    var player = hook.GetParam<CCSPlayer_ItemServices>(0)
+     .Pawn.Value.Controller.Value?.As<CCSPlayerController>();
+    var data = VirtualFunctions.GetCSWeaponDataFromKey.Invoke(-1,
+      hook.GetParam<CEconItemView>(1).ItemDefinitionIndex.ToString());
+
+    if (player == null || !player.IsValid) return HookResult.Continue;
+
+    if (Tag.RIFLES.Contains(data.Name)) {
+      hook.SetReturn(AcquireResult.NotAllowedByMode);
+      return HookResult.Handled;
+    }
+
+    return HookResult.Continue;
+  }
+
+  public override void OnGameState(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    VirtualFunctions.CCSPlayer_ItemServices_CanAcquireFunc.Unhook(canAcquire,
+      HookMode.Pre);
+  }
+}

TTT/SpecialRound/Rounds/SilentRound.cs

@@ -0,0 +1,30 @@
+using CounterStrikeSharp.API;
+using Microsoft.Extensions.DependencyInjection;
+using SpecialRound.lang;
+using SpecialRoundAPI;
+using SpecialRoundAPI.Configs;
+using TTT.API.Storage;
+using TTT.Game.Events.Game;
+using TTT.Locale;
+
+namespace SpecialRound.Rounds;
+
+public class SilentRound(IServiceProvider provider)
+  : AbstractSpecialRound(provider) {
+  public override string Name => "Silent";
+  public override IMsg Description => RoundMsgs.SPECIAL_ROUND_SILENT;
+  public override SpecialRoundConfig Config => config;
+
+  private SilentRoundConfig config
+    => Provider.GetService<IStorage<SilentRoundConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new SilentRoundConfig();
+
+  public override void ApplyRoundEffects() {
+    foreach (var player in Utilities.GetPlayers())
+      player.VoiceFlags |= VoiceFlags.Muted;
+  }
+
+  public override void OnGameState(GameStateUpdateEvent ev) { }
+}

TTT/SpecialRound/Rounds/SpeedRound.cs

@@ -4,6 +4,7 @@ using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using SpecialRound.lang;
 using SpecialRoundAPI;
+using SpecialRoundAPI.Configs;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Role;
@@ -58,6 +59,8 @@ public class SpeedRound(IServiceProvider provider)
   }
 
   private void setTime(TimeSpan span) {
+    span = TimeSpan.FromSeconds(Math.Min(span.TotalSeconds,
+      config.MaxTimeEver.TotalSeconds));
     Server.NextWorldUpdate(() => {
       RoundUtil.SetTimeRemaining((int)span.TotalSeconds);
     });

TTT/SpecialRound/Rounds/SuppressedRound.cs

@@ -0,0 +1,61 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.UserMessages;
+using Microsoft.Extensions.DependencyInjection;
+using SpecialRound.lang;
+using SpecialRoundAPI;
+using SpecialRoundAPI.Configs;
+using TTT.API;
+using TTT.API.Game;
+using TTT.API.Storage;
+using TTT.Game.Events.Game;
+using TTT.Locale;
+
+namespace SpecialRound.Rounds;
+
+public class SuppressedRound(IServiceProvider provider)
+  : AbstractSpecialRound(provider), IPluginModule {
+  public override string Name => "Suppressed";
+  public override IMsg Description => RoundMsgs.SPECIAL_ROUND_SUPPRESSED;
+  public override SpecialRoundConfig Config => config;
+  private BasePlugin? plugin;
+
+  private SuppressedRoundConfig config
+    => Provider.GetService<IStorage<SuppressedRoundConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new SuppressedRoundConfig();
+
+  public void Start(BasePlugin? newPlugin) { plugin ??= newPlugin; }
+
+  public override void ApplyRoundEffects() {
+    plugin?.HookUserMessage(452, onWeaponSound);
+  }
+
+  private static readonly HashSet<uint> silencedWeapons = new() {
+    1,  // deagle
+    2,  // dual berettas
+    3,  // five seven
+    30, // tec9
+    32, // p2000
+    36, // p250
+    4,  // glock
+    61, // usp-s
+    63, // cz75 auto
+    64  // r8 revolver
+  };
+
+  private HookResult onWeaponSound(UserMessage msg) {
+    var defIndex = msg.ReadUInt("item_def_index");
+
+    if (!silencedWeapons.Contains(defIndex)) return HookResult.Continue;
+
+    msg.Recipients.Clear();
+    return HookResult.Handled;
+  }
+
+  public override void OnGameState(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+    plugin?.UnhookUserMessage(452, onWeaponSound);
+  }
+}

TTT/SpecialRound/Rounds/VanillaRound.cs

@@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
 using ShopAPI.Events;
 using SpecialRound.lang;
 using SpecialRoundAPI;
+using SpecialRoundAPI.Configs;
 using TTT.API.Events;
 using TTT.API.Messages;
 using TTT.API.Storage;

TTT/SpecialRound/SpecialRoundCollection.cs

@@ -13,5 +13,8 @@ public static class SpecialRoundCollection {
     services.AddModBehavior<SpeedRound>();
     services.AddModBehavior<BhopRound>();
     services.AddModBehavior<VanillaRound>();
+    services.AddModBehavior<SuppressedRound>();
+    services.AddModBehavior<SilentRound>();
+    services.AddModBehavior<PistolRound>();
   }
 }

TTT/SpecialRound/SpecialRoundsConfig.cs

@@ -2,7 +2,7 @@
 
 public record SpecialRoundsConfig {
   public int MinRoundsBetweenSpecial { get; init; } = 3;
-  public int MinPlayersForSpecial { get; init; } = 8;
+  public int MinPlayersForSpecial { get; init; } = 5;
   public int MinRoundsAfterMapChange { get; init; } = 2;
   public float SpecialRoundChance { get; init; } = 0.2f;
 }

TTT/SpecialRound/lang/RoundMsgs.cs

@@ -16,6 +16,15 @@ public class RoundMsgs {
   public static IMsg VANILLA_ROUND_REMINDER
     => MsgFactory.Create(nameof(VANILLA_ROUND_REMINDER));
 
+  public static IMsg SPECIAL_ROUND_SUPPRESSED
+    => MsgFactory.Create(nameof(SPECIAL_ROUND_SUPPRESSED));
+
+  public static IMsg SPECIAL_ROUND_SILENT
+    => MsgFactory.Create(nameof(SPECIAL_ROUND_SILENT));
+
+  public static IMsg SPECIAL_ROUND_PISTOL
+    => MsgFactory.Create(nameof(SPECIAL_ROUND_PISTOL));
+
   public static IMsg SPECIAL_ROUND_STARTED(AbstractSpecialRound round) {
     return MsgFactory.Create(nameof(SPECIAL_ROUND_STARTED), round.Name);
   }

TTT/SpecialRound/lang/en.yml

@@ -2,4 +2,7 @@
 SPECIAL_ROUND_SPEED: " {yellow}SPEED{grey}: The round is faster than usual! {red}Traitors{grey} must kill to gain more time."
 SPECIAL_ROUND_BHOP: " {Yellow}BHOP{grey}: Bunny hopping is enabled! Hold jump to move faster!"
 SPECIAL_ROUND_VANILLA: " {green}VANILLA{grey}: The shop has been disabled!"
+SPECIAL_ROUND_SUPPRESSED: " {grey}SUPPRESSED{grey}: All pistols are silent!"
+SPECIAL_ROUND_SILENT: " {grey}SILENT{grey}: All players are muted!"
+SPECIAL_ROUND_PISTOL: " {blue}PISTOL{grey}: You can only use pistols this round!"
 VANILLA_ROUND_REMINDER: "%SHOP_PREFIX%This is a {purple}Vanilla{grey} round. The shop is disabled."

TTT/Test/Game/Roles/RoleAssignerTest.cs

@@ -53,10 +53,10 @@ public class RoleAssignerTest(IServiceProvider provider) {
   [InlineData(9, 6, 2, 1)]
   [InlineData(10, 7, 2, 1)]
   [InlineData(20, 14, 4, 2)]
-  [InlineData(30, 21, 6, 3)]
-  [InlineData(32, 21, 7, 4)]
-  [InlineData(60, 41, 12, 7)]
-  [InlineData(64, 43, 13, 8)]
+  [InlineData(30, 22, 6, 2)]
+  [InlineData(32, 22, 7, 3)]
+  [InlineData(60, 43, 12, 5)]
+  [InlineData(64, 45, 13, 6)]
   public void AssignRole_AssignsBalanced_Roles(int players, int innos,
     int traitors, int detectives) {
     var playerList = new HashSet<IOnlinePlayer>();