Fix station spawn positioning (resolves #106)

- Introduce `PlayerMuter` class in `GameHandlers` for muting dead players and send appropriate messages
- Add `PlayerMuter` behavior to `CS2ServiceCollection` and organize mod behaviors
- Remove unnecessary debug print and simplify logic in `SilentAWPItem`'s `onWeaponSound` method
- Add reminder message in `en.yml` for dead players indicating they cannot be heard
- Add `DEAD_MUTE_REMINDER` message in `CS2Msgs.cs` to notify muted dead players

TTT/CS2/CS2.csproj

@@ -15,6 +15,12 @@
     <ProjectReference Include="..\ShopAPI\ShopAPI.csproj"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="MAULActainShared.dll">
+      <HintPath>./ThirdParties/Binaries/MAULActainShared.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="RayTrace\"/>
   </ItemGroup>

TTT/CS2/CS2Logger.cs

@@ -1,5 +1,4 @@
 using CounterStrikeSharp.API;
-using Serilog;
 using TTT.API.Game;
 using TTT.API.Player;
 using TTT.Game.Loggers;

TTT/CS2/CS2ServiceCollection.cs

@@ -64,6 +64,8 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<MapZoneRemover>();
     collection.AddModBehavior<BuyMenuHandler>();
     collection.AddModBehavior<TeamChangeHandler>();
+    collection.AddModBehavior<TraitorChatHandler>();
+    collection.AddModBehavior<PlayerMuter>();
 
     // Damage Cancelers
     collection.AddModBehavior<OutOfRoundCanceler>();

TTT/CS2/Command/PlayerPingShopAlias.cs

@@ -44,7 +44,9 @@ public class PlayerPingShopAlias(IServiceProvider provider) : IPluginModule {
     if (converter.GetPlayer(player) is not IOnlinePlayer gamePlayer) return;
 
     var lastUpdated = itemSorter.GetLastUpdate(gamePlayer);
-    if (lastUpdated == null || DateTime.Now - lastUpdated > TimeSpan.FromSeconds(20)) return;
+    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;

TTT/CS2/Configs/CS2KarmaConfig.cs

@@ -1,15 +1,12 @@
-using TTT.API.Storage;
-
-namespace TTT.CS2.Configs;
-
-using System;
-using System.Threading.Tasks;
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Cvars;
 using CounterStrikeSharp.API.Modules.Cvars.Validators;
 using TTT.API;
-using Karma;
+using TTT.API.Storage;
+using TTT.Karma;
+
+namespace TTT.CS2.Configs;
 
 public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
   public static readonly FakeConVar<string> CV_DB_STRING = new(
@@ -47,7 +44,7 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
   // Karma deltas
   public static readonly FakeConVar<int> CV_INNO_ON_TRAITOR = new(
     "css_ttt_karma_inno_on_traitor",
-    "Karma gained when Innocent kills a Traitor", 5, ConVarFlags.FCVAR_NONE,
+    "Karma gained when Innocent kills a Traitor", 4, ConVarFlags.FCVAR_NONE,
     new RangeValidator<int>(-50, 50));
 
   public static readonly FakeConVar<int> CV_TRAITOR_ON_DETECTIVE = new(
@@ -62,19 +59,29 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
 
   public static readonly FakeConVar<int> CV_INNO_ON_INNO = new(
     "css_ttt_karma_inno_on_inno",
-    "Karma lost when Innocent kills another Innocent", -4,
+    "Karma lost when Innocent kills another Innocent", -5,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(-50, 50));
 
   public static readonly FakeConVar<int> CV_TRAITOR_ON_TRAITOR = new(
     "css_ttt_karma_traitor_on_traitor",
-    "Karma lost when Traitor kills another Traitor", -5, ConVarFlags.FCVAR_NONE,
+    "Karma lost when Traitor kills another Traitor", -6, ConVarFlags.FCVAR_NONE,
     new RangeValidator<int>(-50, 50));
 
   public static readonly FakeConVar<int> CV_INNO_ON_DETECTIVE = new(
     "css_ttt_karma_inno_on_detective",
-    "Karma lost when Innocent kills a Detective", -6, ConVarFlags.FCVAR_NONE,
+    "Karma lost when Innocent kills a Detective", -8, ConVarFlags.FCVAR_NONE,
     new RangeValidator<int>(-50, 50));
 
+  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,
+    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));
+
   public void Dispose() { }
 
   public void Start() { }
@@ -93,6 +100,8 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
       KarmaTimeoutThreshold = CV_TIMEOUT_THRESHOLD.Value,
       KarmaRoundTimeout     = CV_ROUND_TIMEOUT.Value,
       KarmaWarningWindow    = TimeSpan.FromHours(CV_WARNING_WINDOW_HOURS.Value),
+      KarmaPerRound         = CV_KARMA_PER_ROUND.Value,
+      KarmaPerRoundWin      = CV_KARMA_PER_ROUND_WIN.Value,
       INNO_ON_TRAITOR       = CV_INNO_ON_TRAITOR.Value,
       TRAITOR_ON_DETECTIVE  = CV_TRAITOR_ON_DETECTIVE.Value,
       INNO_ON_INNO_VICTIM   = CV_INNO_ON_INNO_VICTIM.Value,

TTT/CS2/Game/CS2Game.cs

@@ -1,7 +1,10 @@
 using System.Reactive.Linq;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Game;
+using TTT.API.Player;
 using TTT.API.Role;
 using TTT.CS2.Roles;
 using TTT.CS2.Utils;
@@ -30,6 +33,9 @@ public class CS2Game(IServiceProvider provider) : RoundBasedGame(provider) {
     new TraitorRole(provider), new DetectiveRole(provider)
   ];
 
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
   override protected void StartRound() {
     Server.NextWorldUpdate(() => {
       base.StartRound();
@@ -70,4 +76,13 @@ public class CS2Game(IServiceProvider provider) : RoundBasedGame(provider) {
 
     return timer;
   }
+
+  override protected ISet<IOnlinePlayer> GetParticipants() {
+    var players = Utilities.GetPlayers()
+     .Where(p => p is { Team: CsTeam.Terrorist or CsTeam.CounterTerrorist });
+
+    return players.Select(p => converter.GetPlayer(p))
+     .OfType<IOnlinePlayer>()
+     .ToHashSet();
+  }
 }

TTT/CS2/GameHandlers/DamageCanceler.cs

@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using Microsoft.Extensions.DependencyInjection;

TTT/CS2/GameHandlers/PlayerMuter.cs

@@ -0,0 +1,56 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Messages;
+using TTT.API.Player;
+using TTT.CS2.lang;
+using TTT.Game.Listeners;
+using TTT.Locale;
+
+namespace TTT.CS2.GameHandlers;
+
+public class PlayerMuter(IServiceProvider provider) : IPluginModule {
+  private readonly IMsgLocalizer locale =
+    provider.GetRequiredService<IMsgLocalizer>();
+
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin
+    ?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnClientVoice>(
+        onVoice);
+  }
+
+  private void onVoice(int playerSlot) {
+    var player = Utilities.GetPlayerFromSlot(playerSlot);
+    if (player == null) return;
+
+    if (player.Pawn.Value is { Health: > 0 }) return;
+
+    if ((player.VoiceFlags & VoiceFlags.Muted) != VoiceFlags.Muted) {
+      var apiPlayer = converter.GetPlayer(player);
+      messenger.Message(apiPlayer, locale[CS2Msgs.DEAD_MUTE_REMINDER]);
+    }
+
+    player.VoiceFlags |= VoiceFlags.Muted;
+  }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnSpawn(EventPlayerSpawn ev, GameEventInfo _) {
+    var player = ev.Userid;
+    if (player == null) return HookResult.Continue;
+    player.VoiceFlags &= ~VoiceFlags.Muted;
+    return HookResult.Continue;
+  }
+}

TTT/CS2/GameHandlers/RoundStart_GameStartHandler.cs

@@ -39,4 +39,18 @@ public class RoundStart_GameStartHandler(IServiceProvider provider)
     game?.Start(config.RoundCfg.CountDownDuration);
     return HookResult.Continue;
   }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnWarmupEnd(EventWarmupEnd ev, GameEventInfo _1) {
+    if (games.ActiveGame is { State: State.IN_PROGRESS or State.COUNTDOWN })
+      return HookResult.Continue;
+
+    var count = finder.GetOnline().Count;
+    if (count < config.RoundCfg.MinimumPlayers) return HookResult.Continue;
+
+    var game = games.CreateGame();
+    game?.Start(config.RoundCfg.CountDownDuration);
+    return HookResult.Continue;
+  }
 }

TTT/CS2/GameHandlers/TeamChangeHandler.cs

@@ -14,13 +14,13 @@ using TTT.Game.Events.Player;
 namespace TTT.CS2.GameHandlers;
 
 public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
-  private readonly IGameManager games =
-    provider.GetRequiredService<IGameManager>();
+  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
+  private readonly IGameManager games =
+    provider.GetRequiredService<IGameManager>();
 
   public void Dispose() { }
   public void Start() { }

TTT/CS2/GameHandlers/TraitorChatHandler.cs

@@ -0,0 +1,86 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Commands;
+using MAULActainShared.plugin;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Game;
+using TTT.API.Messages;
+using TTT.API.Player;
+using TTT.API.Role;
+using TTT.CS2.lang;
+using TTT.CS2.ThirdParties.eGO;
+using TTT.Game.Roles;
+using TTT.Locale;
+
+namespace TTT.CS2.GameHandlers;
+
+public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
+  private readonly IGameManager game =
+    provider.GetRequiredService<IGameManager>();
+
+  private readonly IRoleAssigner roles =
+    provider.GetRequiredService<IRoleAssigner>();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
+  private readonly IMsgLocalizer locale =
+    provider.GetRequiredService<IMsgLocalizer>();
+
+  private IActain? maulService = null;
+
+  public void Start(BasePlugin? plugin) {
+    try {
+      maulService ??= EgoApi.MAUL.Get();
+      if (maulService != null) {
+        maulService.getChatShareService().OnChatShare += OnOnChatShare;
+        return;
+      }
+
+      plugin?.AddCommandListener("say_team", onSay);
+    } catch (KeyNotFoundException) {
+      plugin?.AddCommandListener("say_team", onSay);
+    }
+  }
+
+  private void OnOnChatShare(CCSPlayerController? player, CommandInfo info,
+    ref bool canceled) {
+    if (!info.GetArg(0).Equals("say_team", StringComparison.OrdinalIgnoreCase))
+      return;
+    var result                                 = onSay(player, info);
+    if (result == HookResult.Handled) canceled = true;
+  }
+
+  private HookResult onSay(CCSPlayerController? player,
+    CommandInfo commandInfo) {
+    if (player == null
+      || game.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED }
+      || converter.GetPlayer(player) is not IOnlinePlayer apiPlayer
+      || !roles.GetRoles(apiPlayer).Any(r => r is TraitorRole))
+      return HookResult.Continue;
+
+    var teammates = game.ActiveGame?.Players.Where(p
+        => roles.GetRoles(p).Any(r => r is TraitorRole))
+     .ToList();
+    if (teammates == null) return HookResult.Continue;
+
+    var msg = commandInfo.ArgString;
+    if (msg.StartsWith('"') && msg.EndsWith('"') && msg.Length >= 2)
+      msg = msg[1..^1];
+    var formatted = locale[CS2Msgs.TRAITOR_CHAT_FORMAT(apiPlayer, msg)];
+
+    foreach (var mate in teammates) messenger.Message(mate, formatted);
+    return HookResult.Handled;
+  }
+
+  public void Dispose() {
+    if (maulService != null)
+      maulService.getChatShareService().OnChatShare -= OnOnChatShare;
+  }
+
+  public void Start() { }
+}

TTT/CS2/Items/SilentAWP/SilentAWPItem.cs

@@ -33,8 +33,8 @@ public class SilentAWPItem(IServiceProvider provider)
   private readonly IPlayerConverter<CCSPlayerController> playerConverter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly IDictionary<IOnlinePlayer, int> silentShots =
-    new Dictionary<IOnlinePlayer, int>();
+  private readonly IDictionary<string, int> silentShots =
+    new Dictionary<string, int>();
 
   public override string Name => Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP];
 
@@ -49,8 +49,11 @@ public class SilentAWPItem(IServiceProvider provider)
   }
 
   public override void OnPurchase(IOnlinePlayer player) {
-    silentShots[player] = config.CurrentAmmo ?? 0 + config.ReserveAmmo ?? 0;
-    Inventory.GiveWeapon(player, config);
+    silentShots[player.Id] = config.CurrentAmmo ?? 0 + config.ReserveAmmo ?? 0;
+    Task.Run(async () => {
+      await Inventory.RemoveWeaponInSlot(player, 0);
+      await Inventory.GiveWeapon(player, config);
+    });
   }
 
   private HookResult onWeaponSound(UserMessage msg) {
@@ -75,12 +78,12 @@ public class SilentAWPItem(IServiceProvider provider)
     if (playerConverter.GetPlayer(player) is not IOnlinePlayer apiPlayer)
       return HookResult.Continue;
 
-    if (!silentShots.TryGetValue(apiPlayer, out var shots) || shots <= 0)
+    if (!silentShots.TryGetValue(apiPlayer.Id, out var shots) || shots <= 0)
       return HookResult.Continue;
 
-    silentShots[apiPlayer] = shots - 1;
-    if (silentShots[apiPlayer] == 0) {
-      silentShots.Remove(apiPlayer);
+    silentShots[apiPlayer.Id] = shots - 1;
+    if (silentShots[apiPlayer.Id] == 0) {
+      silentShots.Remove(apiPlayer.Id);
       Shop.RemoveItem<SilentAWPItem>(apiPlayer);
     }
 

TTT/CS2/Items/Station/StationItem.cs

@@ -11,6 +11,7 @@ using TTT.API;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
 
 namespace TTT.CS2.Items.Station;
 
@@ -127,14 +128,8 @@ public abstract class StationItem<T>(IServiceProvider provider,
       if (gamePlayer == null || !gamePlayer.Pawn.IsValid
         || gamePlayer.Pawn.Value == null)
         return;
-      var spawnPos = gamePlayer.Pawn.Value.AbsOrigin.Clone();
-      if (spawnPos != null && gamePlayer.PlayerPawn.Value != null) {
-        var forward = gamePlayer.PlayerPawn.Value.EyeAngles.ToForward();
-        forward.Z =  0;
-        spawnPos  += forward.Normalized() * 8;
-      }
 
-      prop.Teleport(spawnPos);
+      prop.Teleport(gamePlayer.GetEyePosition());
     });
   }
 

TTT/CS2/Listeners/RoundTimerListener.cs

@@ -57,7 +57,7 @@ public class RoundTimerListener(IServiceProvider provider)
       return;
     }
 
-    if (ev.NewState == State.IN_PROGRESS) {
+    if (ev.NewState == State.IN_PROGRESS)
       Server.NextWorldUpdate(() => {
         foreach (var player in Utilities.GetPlayers()
          .Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE && p is {
@@ -65,7 +65,6 @@ public class RoundTimerListener(IServiceProvider provider)
           }))
           player.Respawn();
       });
-    }
 
     if (ev.NewState == State.FINISHED) endTimer?.Dispose();
     if (ev.NewState != State.IN_PROGRESS) return;

TTT/CS2/Player/CS2PermManager.cs

@@ -1,6 +1,5 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Admin;
-using CounterStrikeSharp.API.Modules.Entities;
 using TTT.API.Player;
 
 namespace TTT.CS2.Player;

TTT/CS2/ThirdParties/eGO/EgoApi.cs

@@ -0,0 +1,9 @@
+using CounterStrikeSharp.API.Core.Capabilities;
+using MAULActainShared.plugin;
+
+namespace TTT.CS2.ThirdParties.eGO;
+
+public class EgoApi {
+  public static PluginCapability<IActain> MAUL { get; } =
+    new("maulactain:core");
+}

TTT/CS2/lang/CS2Msgs.cs

@@ -14,4 +14,11 @@ public static class CS2Msgs {
     return MsgFactory.Create(nameof(TASER_SCANNED),
       rolePrefix + scannedPlayer.Name, role.Name);
   }
+
+  public static IMsg TRAITOR_CHAT_FORMAT(IOnlinePlayer player, string msg) {
+    return MsgFactory.Create(nameof(TRAITOR_CHAT_FORMAT), player.Name, msg);
+  }
+
+  public static IMsg DEAD_MUTE_REMINDER
+    => MsgFactory.Create(nameof(DEAD_MUTE_REMINDER));
 }

TTT/CS2/lang/en.yml

@@ -1,7 +1,10 @@
 ROLE_SPECTATOR: "Spectator"
+TRAITOR_CHAT_FORMAT: "{darkred}[TRAITORS] {red}{0}: {default}{1}"
 TASER_SCANNED: "%PREFIX%You scanned {0}{grey}, they are %an% {1}{grey}!"
 DNA_PREFIX: "{darkblue}D{blue}N{lightblue}A{grey} | {grey}"
 
+DEAD_MUTE_REMINDER: "%PREFIX%You are dead and cannot be heard."
+
 SHOP_ITEM_DNA: "DNA Scanner"
 SHOP_ITEM_DNA_DESC: "Scan bodies to reveal the person who killed them."
 SHOP_ITEM_DNA_SCANNED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, their killer was {red}{2}{grey}."

TTT/Game/Commands/LogsCommand.cs

@@ -11,13 +11,13 @@ public class LogsCommand(IServiceProvider provider) : ICommand {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
-  private readonly IMessenger messenger =
-    provider.GetRequiredService<IMessenger>();
+  private readonly IIconManager? icons = provider.GetService<IIconManager>();
 
   private readonly IMsgLocalizer localizer =
     provider.GetRequiredService<IMsgLocalizer>();
 
-  private readonly IIconManager? icons = provider.GetService<IIconManager>();
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
 
   public void Dispose() { }
   public string[] RequiredFlags => ["@ttt/admin"];
@@ -32,16 +32,15 @@ public class LogsCommand(IServiceProvider provider) : ICommand {
     if (games.ActiveGame is not {
       State: State.IN_PROGRESS or State.FINISHED
     }) {
-      info.ReplySync("No active game to show logs for.");
+      messenger.Message(executor, localizer[GameMsgs.GAME_LOGS_NONE]);
       return Task.FromResult(CommandResult.ERROR);
     }
 
     if (executor is { IsAlive: true })
       messenger.MessageAll(localizer[GameMsgs.LOGS_VIEWED_ALIVE(executor)]);
-    else if (icons != null && executor != null) {
+    else if (icons != null && executor != null)
       if (int.TryParse(executor.Id, out var slot))
         icons.SetVisiblePlayers(slot, ulong.MaxValue);
-    }
 
     games.ActiveGame.Logger.PrintLogs(executor);
     return Task.FromResult(CommandResult.SUCCESS);

TTT/Game/RoundBasedGame.cs

@@ -159,7 +159,7 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
   }
 
   virtual protected void StartRound() {
-    var online = finder.GetOnline();
+    var online = GetParticipants();
 
     if (online.Count < config.RoundCfg.MinimumPlayers) {
       Messenger?.MessageAll(
@@ -183,6 +183,8 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
       GameMsgs.GAME_STATE_STARTED(traitors, nonTraitors)]);
   }
 
+  virtual protected ISet<IOnlinePlayer> GetParticipants() => finder.GetOnline();
+
   #region classDeps
 
   protected readonly IEventBus Bus = provider.GetRequiredService<IEventBus>();

TTT/Game/lang/GameMsgs.cs

@@ -26,6 +26,9 @@ public static class GameMsgs {
 
   public static IMsg GAME_LOGS_FOOTER
     => MsgFactory.Create(nameof(GAME_LOGS_FOOTER));
+  
+  public static IMsg GAME_LOGS_NONE 
+    => MsgFactory.Create(nameof(GAME_LOGS_NONE));
 
   public static IMsg ROLE_REVEAL_DEATH(IRole killerRole) {
     return MsgFactory.Create(nameof(ROLE_REVEAL_DEATH),
@@ -79,6 +82,10 @@ public static class GameMsgs {
 
   #endregion
 
+  public static IMsg LOGS_VIEWED_ALIVE(IPlayer player) {
+    return MsgFactory.Create(nameof(LOGS_VIEWED_ALIVE), player.Name);
+  }
+
   #region GENERIC
 
   public static IMsg GENERIC_UNKNOWN(string command) {
@@ -108,7 +115,4 @@ public static class GameMsgs {
   }
 
   #endregion
-
-  public static IMsg LOGS_VIEWED_ALIVE(IPlayer player)
-    => MsgFactory.Create(nameof(LOGS_VIEWED_ALIVE), player.Name);
 }

TTT/Game/lang/en.yml

@@ -22,4 +22,5 @@ NOT_ENOUGH_PLAYERS: "%PREFIX%{red}Game was canceled due to having fewer than {ye
 BODY_IDENTIFIED: "%PREFIX%{default}{0}{grey} identified the body of {blue}{1}{grey}, they were %an% {2}{grey}!"
 GAME_LOGS_HEADER: "---------- Game Logs ----------"
 GAME_LOGS_FOOTER: "-------------------------------"
+GAME_LOGS_NONE: "%PREFIX%There is no game active."
 LOGS_VIEWED_ALIVE: "%PREFIX%{red}{0}{grey} viewed the logs while alive."

TTT/Karma/KarmaConfig.cs

@@ -6,51 +6,50 @@ public record KarmaConfig {
   public string DbString { get; init; } = "Data Source=karma.db";
 
   /// <summary>
-  /// The minimum amount of karma a player can have.
-  /// If a player's karma falls below this value, the CommandUponLowKarma
-  /// will be executed.
+  ///   The minimum amount of karma a player can have.
+  ///   If a player's karma falls below this value, the CommandUponLowKarma
+  ///   will be executed.
   /// </summary>
   public int MinKarma { get; init; }
 
   /// <summary>
-  /// The default amount of karma a player starts with.
-  /// Once a player falls below MinKarma, their karma will
-  /// also be reset to this value.
+  ///   The default amount of karma a player starts with.
+  ///   Once a player falls below MinKarma, their karma will
+  ///   also be reset to this value.
   /// </summary>
   public int DefaultKarma { get; init; } = 50;
 
   /// <summary>
-  /// The command to execute when a player's karma falls below MinKarma.
-  /// The first argument will be the player's slot.
+  ///   The command to execute when a player's karma falls below MinKarma.
+  ///   The first argument will be the player's slot.
   /// </summary>
   public string CommandUponLowKarma { get; init; } = "karmaban {0} Bad Player!";
 
   /// <summary>
-  /// The minimum threshold that a player's karma must reach
-  /// before timing them out for KarmaRoundTimeout rounds;
+  ///   The minimum threshold that a player's karma must reach
+  ///   before timing them out for KarmaRoundTimeout rounds;
   /// </summary>
   public int KarmaTimeoutThreshold { get; init; } = 20;
 
   /// <summary>
-  /// The number of rounds a player will be timed out for
-  /// if their karma falls below KarmaTimeoutThreshold.
+  ///   The number of rounds a player will be timed out for
+  ///   if their karma falls below KarmaTimeoutThreshold.
   /// </summary>
   public int KarmaRoundTimeout { get; init; } = 4;
 
   /// <summary>
-  /// The time window in which a player will receive a warning
-  /// if their karma falls below KarmaWarningThreshold.
-  /// If the player has already received a warning within this time window,
-  /// no warning will be sent.
+  ///   The time window in which a player will receive a warning
+  ///   if their karma falls below KarmaWarningThreshold.
+  ///   If the player has already received a warning within this time window,
+  ///   no warning will be sent.
   /// </summary>
   public TimeSpan KarmaWarningWindow { get; init; } = TimeSpan.FromDays(1);
 
-  public int MaxKarma(IPlayer? player) { return 100; }
-
   /// <summary>
-  /// Amount of karma a player will gain at the end of each round.
+  ///   Amount of karma a player will gain at the end of each round.
   /// </summary>
   public int KarmaPerRound { get; init; } = 3;
+
   public int KarmaPerRoundWin { get; init; } = 5;
 
   public int INNO_ON_TRAITOR { get; init; } = 5;
@@ -59,4 +58,6 @@ public record KarmaConfig {
   public int INNO_ON_INNO { get; init; } = -4;
   public int TRAITOR_ON_TRAITOR { get; init; } = -5;
   public int INNO_ON_DETECTIVE { get; init; } = -6;
+
+  public int MaxKarma(IPlayer? player) { return 100; }
 }

TTT/Karma/KarmaListener.cs

@@ -15,6 +15,12 @@ namespace TTT.Karma;
 public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
   private readonly Dictionary<string, int> badKills = new();
 
+  private readonly KarmaConfig config =
+    provider.GetService<IStorage<KarmaConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new KarmaConfig();
+
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
@@ -26,12 +32,6 @@ public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
   private readonly IRoleAssigner roles =
     provider.GetRequiredService<IRoleAssigner>();
 
-  private readonly KarmaConfig config =
-    provider.GetService<IStorage<KarmaConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new KarmaConfig();
-
   public bool GiveKarmaOnRoundEnd = true;
 
   [EventHandler]
@@ -98,7 +98,7 @@ public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
 
     var winner = ev.Game.WinningRole;
     if (GiveKarmaOnRoundEnd)
-      foreach (var player in ev.Game.Players) {
+      foreach (var player in ev.Game.Players)
         if (Roles.GetRoles(player).Any(r => r.GetType() == winner?.GetType()))
           queuedKarmaUpdates[player] =
             queuedKarmaUpdates.GetValueOrDefault(player, 0)
@@ -107,7 +107,6 @@ public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
           queuedKarmaUpdates[player] =
             queuedKarmaUpdates.GetValueOrDefault(player, 0)
             + config.KarmaPerRound;
-      }
 
     foreach (var (player, karmaDelta) in queuedKarmaUpdates)
       Task.Run(async () => {

TTT/Karma/KarmaStorage.cs

@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using System.Data;
+using System.Diagnostics;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Reactive.Threading.Tasks;
@@ -14,35 +15,34 @@ using TTT.Karma.Events;
 namespace TTT.Karma;
 
 public sealed class KarmaStorage(IServiceProvider provider) : IKarmaService {
+  // Toggle immediate writes. If false, every Write triggers a flush
+  private const bool EnableCache = true;
   private readonly IEventBus _bus = provider.GetRequiredService<IEventBus>();
 
-  private readonly IScheduler _scheduler =
-    provider.GetRequiredService<IScheduler>();
-
   private readonly IStorage<KarmaConfig>? _configStorage =
     provider.GetService<IStorage<KarmaConfig>>();
 
+  private readonly SemaphoreSlim _flushGate = new(1, 1);
+
   // Cache keyed by stable player id to avoid relying on IPlayer equality
   private readonly ConcurrentDictionary<string, int> _karmaCache = new();
 
+  private readonly IScheduler _scheduler =
+    provider.GetRequiredService<IScheduler>();
+
   private KarmaConfig _config = new();
   private IDbConnection? _connection;
   private IDisposable? _flushSubscription;
-  private readonly SemaphoreSlim _flushGate = new(1, 1);
-
-  // Toggle immediate writes. If false, every Write triggers a flush
-  private const bool EnableCache = true;
 
   public string Id => nameof(KarmaStorage);
   public string Version => GitVersionInformation.FullSemVer;
 
   public void Start() {
     // Load configuration first
-    if (_configStorage is not null) {
+    if (_configStorage is not null)
       // Synchronously wait here since IKarmaService.Start is sync
       _config = _configStorage.Load().GetAwaiter().GetResult()
         ?? new KarmaConfig();
-    }
 
     // Open a dedicated connection used only by this service
     _connection = new SqliteConnection(_config.DbString);
@@ -61,7 +61,7 @@ public sealed class KarmaStorage(IServiceProvider provider) : IKarmaService {
      .Subscribe(_ => { }, // no-op on success
         ex => {
           // Replace with your logger if available
-          System.Diagnostics.Trace.TraceError($"Karma flush failed: {ex}");
+          Trace.TraceError($"Karma flush failed: {ex}");
         });
   }
 
@@ -81,7 +81,7 @@ SELECT COALESCE(
   @DefaultKarma
 )";
     var karma = await conn.QuerySingleAsync<int>(sql,
-      new { PlayerId = key, DefaultKarma = _config.DefaultKarma });
+      new { PlayerId = key, _config.DefaultKarma });
 
     if (EnableCache) _karmaCache[key] = karma;
     return karma;
@@ -97,17 +97,15 @@ SELECT COALESCE(
         $"Karma must be less than {max} for player {key}.");
 
     int oldValue;
-    if (!_karmaCache.TryGetValue(key, out oldValue)) {
+    if (!_karmaCache.TryGetValue(key, out oldValue))
       oldValue = await Load(player);
-    }
 
     if (oldValue == newValue) return;
 
     var evt = new KarmaUpdateEvent(player, oldValue, newValue);
     try { _bus.Dispatch(evt); } catch {
       // Replace with your logger if available
-      System.Diagnostics.Trace.TraceError(
-        "Exception during KarmaUpdateEvent dispatch.");
+      Trace.TraceError("Exception during KarmaUpdateEvent dispatch.");
       throw;
     }
 
@@ -118,6 +116,20 @@ SELECT COALESCE(
     if (!EnableCache) await FlushAsync();
   }
 
+  public void Dispose() {
+    try {
+      _flushSubscription?.Dispose();
+      // Best effort final flush
+      if (_connection is { State: ConnectionState.Open })
+        FlushAsync().GetAwaiter().GetResult();
+    } catch (Exception ex) {
+      Trace.TraceError($"Dispose flush failed: {ex}");
+    } finally {
+      _connection?.Dispose();
+      _flushGate.Dispose();
+    }
+  }
+
   private async Task FlushAsync() {
     var conn = EnsureConnection();
 
@@ -136,10 +148,9 @@ INSERT INTO PlayerKarma (PlayerId, Karma)
 VALUES (@PlayerId, @Karma)
 ON CONFLICT(PlayerId) DO UPDATE SET Karma = excluded.Karma
 ";
-      foreach (var (playerId, karma) in snapshot) {
+      foreach (var (playerId, karma) in snapshot)
         await conn.ExecuteAsync(upsert,
           new { PlayerId = playerId, Karma = karma }, tx);
-      }
 
       tx.Commit();
     } finally { _flushGate.Release(); }
@@ -151,19 +162,4 @@ ON CONFLICT(PlayerId) DO UPDATE SET Karma = excluded.Karma
         "Storage connection is not initialized.");
     return _connection;
   }
-
-  public void Dispose() {
-    try {
-      _flushSubscription?.Dispose();
-      // Best effort final flush
-      if (_connection is { State: ConnectionState.Open }) {
-        FlushAsync().GetAwaiter().GetResult();
-      }
-    } catch (Exception ex) {
-      System.Diagnostics.Trace.TraceError($"Dispose flush failed: {ex}");
-    } finally {
-      _connection?.Dispose();
-      _flushGate.Dispose();
-    }
-  }
 }

TTT/Shop/Commands/ListCommand.cs

@@ -1,5 +1,4 @@
-using System.Runtime.CompilerServices;
-using CounterStrikeSharp.API.Modules.Utils;
+using CounterStrikeSharp.API.Modules.Utils;
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
 using TTT.API.Command;
@@ -11,21 +10,21 @@ using TTT.Locale;
 namespace TTT.Shop.Commands;
 
 public class ListCommand(IServiceProvider provider) : ICommand, IItemSorter {
+  private readonly IDictionary<string, List<IShopItem>> cache =
+    new Dictionary<string, List<IShopItem>>();
+
   private readonly IGameManager games = provider
    .GetRequiredService<IGameManager>();
 
-  private readonly IDictionary<IOnlinePlayer, List<IShopItem>> cache =
-    new Dictionary<IOnlinePlayer, List<IShopItem>>();
-
-  private readonly IDictionary<IOnlinePlayer, DateTime> lastUpdate =
-    new Dictionary<IOnlinePlayer, DateTime>();
-
-  private readonly IRoleAssigner roles = provider
-   .GetRequiredService<IRoleAssigner>();
+  private readonly IDictionary<string, DateTime> lastUpdate =
+    new Dictionary<string, DateTime>();
 
   private readonly IMsgLocalizer locale = provider
    .GetRequiredService<IMsgLocalizer>();
 
+  private readonly IRoleAssigner roles = provider
+   .GetRequiredService<IRoleAssigner>();
+
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
   public void Dispose() { }
@@ -38,7 +37,7 @@ public class ListCommand(IServiceProvider provider) : ICommand, IItemSorter {
     ICommandInfo info) {
     var items = calculateSortedItems(executor);
 
-    if (executor != null) cache[executor] = items;
+    if (executor != null) cache[executor.Id] = items;
     items = new List<IShopItem>(items);
     items.Reverse();
 
@@ -61,6 +60,20 @@ public class ListCommand(IServiceProvider provider) : ICommand, IItemSorter {
     return CommandResult.SUCCESS;
   }
 
+  public List<IShopItem> GetSortedItems(IOnlinePlayer? player,
+    bool refresh = false) {
+    if (player == null) return calculateSortedItems(null);
+    if (refresh || !cache.ContainsKey(player.Id))
+      cache[player.Id] = calculateSortedItems(player);
+    return cache[player.Id];
+  }
+
+  public DateTime? GetLastUpdate(IOnlinePlayer? player) {
+    if (player == null) return null;
+    lastUpdate.TryGetValue(player.Id, out var time);
+    return time;
+  }
+
   private List<IShopItem> calculateSortedItems(IOnlinePlayer? player) {
     var items = new List<IShopItem>(shop.Items).Where(item
         => player == null
@@ -81,7 +94,7 @@ public class ListCommand(IServiceProvider provider) : ICommand, IItemSorter {
       return string.Compare(a.Name, b.Name, StringComparison.Ordinal);
     });
 
-    if (player != null) lastUpdate[player] = DateTime.Now;
+    if (player != null) lastUpdate[player.Id] = DateTime.Now;
     return items;
   }
 
@@ -90,10 +103,9 @@ public class ListCommand(IServiceProvider provider) : ICommand, IItemSorter {
       return
         $" {ChatColors.Grey}- [{ChatColors.DarkRed}{item.Config.Price}{ChatColors.Grey}] {ChatColors.Red}{item.Name}";
 
-    if (index > 9) {
+    if (index > 9)
       return
         $" {ChatColors.Default}- [{ChatColors.Yellow}{item.Config.Price}{ChatColors.Default}] {ChatColors.Green}{item.Name}";
-    }
 
     return
       $" {ChatColors.Blue}/{index} {ChatColors.Default}| [{ChatColors.Yellow}{item.Config.Price}{ChatColors.Default}] {ChatColors.Green}{item.Name}";
@@ -103,18 +115,4 @@ public class ListCommand(IServiceProvider provider) : ICommand, IItemSorter {
     return
       $" {formatPrefix(item, index, canBuy)} {ChatColors.Grey} | {item.Description}";
   }
-
-  public List<IShopItem> GetSortedItems(IOnlinePlayer? player,
-    bool refresh = false) {
-    if (player == null) return calculateSortedItems(null);
-    if (refresh || !cache.ContainsKey(player))
-      cache[player] = calculateSortedItems(player);
-    return cache[player];
-  }
-
-  public DateTime? GetLastUpdate(IOnlinePlayer? player) {
-    if (player == null) return null;
-    lastUpdate.TryGetValue(player, out var time);
-    return time;
-  }
 }

TTT/Shop/Commands/ShopCommand.cs

@@ -9,11 +9,11 @@ using TTT.Locale;
 namespace TTT.Shop.Commands;
 
 public class ShopCommand(IServiceProvider provider) : ICommand, IItemSorter {
+  private readonly ListCommand listCmd = new(provider);
+
   private readonly IMsgLocalizer locale = provider
    .GetRequiredService<IMsgLocalizer>();
 
-  private readonly ListCommand listCmd = new(provider);
-
   private Dictionary<string, ICommand>? subcommands;
 
   public void Dispose() { }

TTT/Shop/Shop.csproj.DotSettings

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

TTT/Shop/lang/ShopMsgs.cs

@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using ShopAPI;
 using TTT.API.Role;
-using TTT.Game;
 using TTT.Locale;
 
 namespace TTT.Shop;