Increase unit test delay again

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Isaac <git@msws.xyz>

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [msws] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: msws # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/release.yml

@@ -33,7 +33,31 @@ jobs:
         id: gitversion
         uses: gittools/actions/gitversion/execute@v4
 
+      # Early exit guard: if tag already exists, mark and skip all following steps
+      - name: Check if tag exists
+        id: tag_exists
+        run: |
+          set -euo pipefail
+          git fetch --tags --force
+          TAG="${{ steps.gitversion.outputs.fullSemVer }}"
+          if git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+            echo "Tag ${TAG} already exists locally."
+          elif git ls-remote --tags origin "refs/tags/${TAG}" | grep -q "refs/tags/${TAG}$"; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+            echo "Tag ${TAG} already exists on origin."
+          else
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+            echo "Tag ${TAG} does not exist. Continuing."
+          fi
+
+      # Short-circuit info step for logs
+      - name: Tag exists, nothing to do
+        if: steps.tag_exists.outputs.exists == 'true'
+        run: echo "Release already exists for tag ${{ steps.gitversion.outputs.fullSemVer }}. Exiting successfully."
+
       - name: Build Locale
+        if: steps.tag_exists.outputs.exists != 'true'
         run: |
           mkdir -p build/TTT/lang
           dotnet restore Locale/Locale.csproj
@@ -41,22 +65,26 @@ jobs:
           cp lang/*.json build/TTT/lang
 
       - name: Copy Gamedata
+        if: steps.tag_exists.outputs.exists != 'true'
         run: |
           mkdir -p build/TTT/gamedata
           cp -r TTT/CS2/gamedata/* build/TTT/gamedata
 
       - name: Publish Plugin
+        if: steps.tag_exists.outputs.exists != 'true'
         run: |
           dotnet restore TTT/Plugin/Plugin.csproj
           dotnet publish TTT/Plugin/Plugin.csproj --no-restore -c Release -o build/TTT
 
       - name: Zip Artifacts
+        if: steps.tag_exists.outputs.exists != 'true'
         run: |
           cd build/TTT
           zip -r TTT-${{ steps.gitversion.outputs.fullSemVer }}.zip *
 
       # 2. Get latest tag
       - name: Get latest tag
+        if: steps.tag_exists.outputs.exists != 'true'
         id: latest_tag
         run: |
           if git describe --tags --abbrev=0 >/dev/null 2>&1; then
@@ -66,58 +94,59 @@ jobs:
           fi
 
       - name: Create and push new tag
-        if: steps.gitversion.outputs.fullSemVer != steps.latest_tag.outputs.tag
+        if: steps.tag_exists.outputs.exists != 'true' && steps.gitversion.outputs.fullSemVer != steps.latest_tag.outputs.tag
         run: |
+          set -euo pipefail
+          TAG="${{ steps.gitversion.outputs.fullSemVer }}"
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git tag ${{ steps.gitversion.outputs.fullSemVer }}
-          git push origin ${{ steps.gitversion.outputs.fullSemVer }}
+          if ! git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
+            git tag "${TAG}"
+          fi
+          if git ls-remote --tags origin "refs/tags/${TAG}" | grep -q "refs/tags/${TAG}$"; then
+            echo "Tag ${TAG} already on origin. Skipping push."
+          else
+            git push origin "${TAG}"
+          fi
 
       - name: Determine previous relevant tag
+        if: steps.tag_exists.outputs.exists != 'true'
         id: prev_tag
         run: |
           set -euo pipefail
           branch="${GITHUB_REF_NAME}"
 
-          # Use HEAD^ to skip the tag we just created. If no parent, fall back to HEAD.
           if git rev-parse --verify -q HEAD^ >/dev/null; then
             base_rev="HEAD^"
           else
             base_rev="HEAD"
           fi
 
-          # Match stable tags on main and prerelease tags on non-main
           if [[ "$branch" == "main" ]]; then
             pattern='[0-9]*.[0-9]*.[0-9]*'
           else
             pattern='[0-9]*.[0-9]*.[0-9]*-*'
           fi
 
-          # Nearest tag reachable on this lineage, not just "second most recent by date"
           prev=$(git describe --tags --abbrev=0 --match "$pattern" --tags "$base_rev" 2>/dev/null || true)
-
           echo "tag=${prev:-0.0.0}" >> "$GITHUB_OUTPUT"
 
-
       - name: Generate changelog
+        if: steps.tag_exists.outputs.exists != 'true'
         run: |
           set -euo pipefail
 
           prev="${{ steps.prev_tag.outputs.tag }}"
           curr="${{ steps.gitversion.outputs.fullSemVer }}"
 
-          # Choose what you want in the raw feed: %s = subject only, %B = full message
           GIT_LOG_FORMAT='%B'
 
           if [[ "$prev" == "0.0.0" ]]; then
-            # First release: whole history to this tag, first-parent to reflect main’s narrative
             git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$curr" > CHANGELOG.md
           else
-            # Strict range between the previous reachable tag and the new tag on this lineage
             git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$prev..$curr" > CHANGELOG.md
           fi
 
-          # Fallback in case nothing was captured
           if [[ ! -s CHANGELOG.md ]]; then
             echo "No commits found between $prev and $curr on first-parent. Using full messages without first-parent filter." >&2
             if [[ "$prev" == "0.0.0" ]]; then
@@ -131,7 +160,7 @@ jobs:
 
       - name: Rewrite changelog with OpenAI
         id: ai_changelog
-        if: success()
+        if: steps.tag_exists.outputs.exists != 'true'
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           OPENAI_MODEL: ${{ env.OPENAI_MODEL }}
@@ -140,25 +169,19 @@ jobs:
         run: |
           set -euo pipefail
 
-          # Ensure we have a changelog to work with
           if [[ ! -s CHANGELOG.md ]]; then
             echo "CHANGELOG.md is empty. Skipping AI rewrite."
             echo "skipped=true" >> $GITHUB_OUTPUT
             exit 0
           fi
 
-          # Trim the input to a safe size for token limits
           head -c "${MAX_CHANGELOG_CHARS}" CHANGELOG.md > CHANGELOG_RAW.md
 
-          # Build the JSON body. We feed system guidance and the raw changelog
-          # See OpenAI Responses API docs for the schema and output_text helper. :contentReference[oaicite:0]{index=0}
           jq -Rs --arg sys "You are an expert release-notes writer. Given a list of changes in various formats (e.g: commits, merges, etc.), write release notes intended for reading by the public, grouping by features, features, and other pertinent groups where appropriate. Do not include a group if it is unnecessary. Remove internal ticket IDs and commit hashes unless essential. Merge duplicates. Use imperative, past tense voice with proper prose. Output valid Markdown only." \
                 --arg temp "${OPENAI_TEMPERATURE}" \
                 --arg model "${OPENAI_MODEL}" \
                 '{model:$model, temperature: ($temp|tonumber), input:[{role:"system", content:$sys},{role:"user", content:.}]}' CHANGELOG_RAW.md > request.json
 
-          # Call the API
-          # Basic retry on transient failures
           for i in 1 2 3; do
             HTTP_CODE=$(curl -sS -w "%{http_code}" -o ai_response.json \
               https://api.openai.com/v1/responses \
@@ -175,14 +198,12 @@ jobs:
             exit 0
           fi
 
-          # Prefer output_text if present. Fallback to first text item. :contentReference[oaicite:1]{index=1}
           if jq -e '.output_text' ai_response.json >/dev/null; then
             jq -r '.output_text' ai_response.json > CHANGELOG.md
           else
             jq -r '.output[0].content[] | select(.type=="output_text") | .text' ai_response.json | sed '/^[[:space:]]*$/d' > CHANGELOG.md
           fi
 
-          # If the rewrite somehow produced an empty file, keep the raw one
           if [[ ! -s CHANGELOG.md ]]; then
             echo "AI returned empty content. Restoring raw changelog."
             mv CHANGELOG_RAW.md CHANGELOG.md
@@ -195,6 +216,7 @@ jobs:
           cat CHANGELOG.md
 
       - name: Create GitHub release
+        if: steps.tag_exists.outputs.exists != 'true'
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.gitversion.outputs.fullSemVer }}
@@ -204,9 +226,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # 7. Cleanup old pre-releases
       - name: Delete old pre-releases
-        if: github.ref_name != 'main'
+        if: steps.tag_exists.outputs.exists != 'true' && github.ref_name != 'main'
         run: |
           gh release list --limit 100 --json name,isPrerelease \
             --jq '.[] | select(.isPrerelease) | .name' | tail -n +11 | \

README.md

@@ -14,8 +14,8 @@ survive while eliminating the traitors among them.
     - [X] Traitors
     - [X] Detectives
     - [X] Innocents
-- [ ] Shop
-- [ ] Karma
+- [X] Shop
+- [X] Karma
 - [ ] Statistics
 
 ## Versioning

TTT.sln

@@ -23,6 +23,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Karma", "TTT\Karma\Karma.cs
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShopAPI", "TTT\ShopAPI\ShopAPI.csproj", "{16F720B5-9D45-47BF-8C80-4F91005E36D1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RTD", "TTT\RTD\RTD.csproj", "{8A426E84-45DA-4558-A218-E042F1AC60B2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats", "TTT\Stats\Stats.csproj", "{256473A2-6ACD-440C-83FA-6056147656C7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +76,14 @@ Global
 		{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A426E84-45DA-4558-A218-E042F1AC60B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A426E84-45DA-4558-A218-E042F1AC60B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A426E84-45DA-4558-A218-E042F1AC60B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A426E84-45DA-4558-A218-E042F1AC60B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{256473A2-6ACD-440C-83FA-6056147656C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{256473A2-6ACD-440C-83FA-6056147656C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{256473A2-6ACD-440C-83FA-6056147656C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{256473A2-6ACD-440C-83FA-6056147656C7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection

TTT/API/Game/IActionLogger.cs

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

TTT/API/Game/IGame.cs

@@ -33,9 +33,6 @@ public interface IGame : IDisposable {
 
   bool CheckEndConditions();
 
-  [Obsolete("This method is ambiguous, check the game state directly.")]
-  bool IsInProgress() { return State is State.COUNTDOWN or State.IN_PROGRESS; }
-
   ISet<IOnlinePlayer> GetAlive() {
     return Players.OfType<IOnlinePlayer>().Where(p => p.IsAlive).ToHashSet();
   }

TTT/API/Player/IIconManager.cs

@@ -11,6 +11,8 @@ public interface IIconManager {
   void RevealToAll(int client);
   void AddVisiblePlayer(int client, int player);
   void RemoveVisiblePlayer(int client, int player);
+  void SetVisiblePlayers(IOnlinePlayer online, ulong playersBitmask);
+  void RevealToAll(IOnlinePlayer online);
 
   void ClearAllVisibility();
 }

TTT/API/Player/IMuted.cs

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

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

@@ -49,6 +49,7 @@ public static class CS2ServiceCollection {
     collection
      .AddModBehavior<IStorage<PoisonSmokeConfig>, CS2PoisonSmokeConfig>();
     collection.AddModBehavior<IStorage<KarmaConfig>, CS2KarmaConfig>();
+    collection.AddModBehavior<IStorage<CamoConfig>, CS2CamoConfig>();
 
     // TTT - CS2 Specific optionals
     collection.AddScoped<ITextSpawner, TextSpawner>();
@@ -64,12 +65,15 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<MapZoneRemover>();
     collection.AddModBehavior<BuyMenuHandler>();
     collection.AddModBehavior<TeamChangeHandler>();
+    collection.AddModBehavior<TraitorChatHandler>();
+    collection.AddModBehavior<PlayerMuter>();
 
     // Damage Cancelers
     collection.AddModBehavior<OutOfRoundCanceler>();
     collection.AddModBehavior<TaserListenCanceler>();
 
     // Listeners
+    collection.AddModBehavior<AfkTimerListener>();
     collection.AddModBehavior<BodyPickupListener>();
     collection.AddModBehavior<IBodyTracker, BodyTracker>();
     collection.AddModBehavior<LateSpawnListener>();
@@ -80,9 +84,7 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<KarmaSyncer>();
 
     // Commands
-#if DEBUG
     collection.AddModBehavior<TestCommand>();
-#endif
 
     collection.AddScoped<IGameManager, CS2GameManager>();
     collection.AddScoped<IInventoryManager, CS2InventoryManager>();

TTT/CS2/Command/CS2CommandManager.cs

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

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/Command/Test/GiveItemCommand.cs

@@ -58,7 +58,8 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {
 
   private IShopItem? searchItem(string query) {
     var item = shop.Items.FirstOrDefault(it
-      => it.Name.Equals(query, StringComparison.OrdinalIgnoreCase));
+      => it.Name.Replace(" ", "")
+       .Equals(query, StringComparison.OrdinalIgnoreCase));
 
     if (item != null) return item;
 

TTT/CS2/Command/Test/ReloadModuleCommand.cs

@@ -0,0 +1,62 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class ReloadModuleCommand(IServiceProvider provider)
+  : ICommand, IPluginModule {
+  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>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (info.ArgCount != 2) return Task.FromResult(CommandResult.INVALID_ARGS);
+
+    var moduleName = info.Args[1];
+    var modules    = provider.GetServices<ITerrorModule>();
+
+    var module = modules.FirstOrDefault(m
+      => m.Id.Equals(moduleName, StringComparison.OrdinalIgnoreCase));
+    if (module == null) {
+      info.ReplySync($"Module '{moduleName}' not found.");
+      return Task.FromResult(CommandResult.INVALID_ARGS);
+    }
+
+    info.ReplySync($"Reloading module '{moduleName}'...");
+    module.Dispose();
+
+    info.ReplySync($"Starting module '{moduleName}'...");
+    module.Start();
+    info.ReplySync($"Module '{moduleName}' reloaded successfully.");
+
+    if (plugin == null) {
+      info.ReplySync("Plugin context not found; skipping hotload steps.");
+      return Task.FromResult(CommandResult.SUCCESS);
+    }
+
+    if (module is not IPluginModule pluginModule)
+      return Task.FromResult(CommandResult.SUCCESS);
+
+    Server.NextWorldUpdate(() => {
+      info.ReplySync($"Hotloading plugin module '{moduleName}'...");
+      pluginModule.Start(plugin, true);
+      info.ReplySync($"Plugin module '{moduleName}' hotloaded successfully.");
+    });
+
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/SpecCommand.cs

@@ -0,0 +1,41 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class SpecCommand(IServiceProvider provider) : ICommand {
+  public void Dispose() { }
+  public void Start() { }
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    var target = executor;
+
+    if (info.ArgCount == 2) {
+      var finder = provider.GetRequiredService<IPlayerFinder>();
+      var result = finder.GetPlayerByName(info.Args[1]);
+      if (result == null) {
+        info.ReplySync($"Player '{info.Args[1]}' not found.");
+        return Task.FromResult(CommandResult.ERROR);
+      }
+
+      target = result;
+    } else if (target == null) {
+      return Task.FromResult(CommandResult.PLAYER_ONLY);
+    }
+
+    var converter =
+      provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+    Server.NextWorldUpdate(() => {
+      var player = converter.GetPlayer(target);
+      player?.ChangeTeam(CsTeam.Spectator);
+      info.ReplySync($"{target.Name} has been moved to Spectators.");
+    });
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/TestCommand.cs

@@ -26,12 +26,17 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
     subCommands.Add("sethealth", new SetHealthCommand());
     subCommands.Add("emitsound", new EmitSoundCommand(provider));
     subCommands.Add("credits", new CreditsCommand(provider));
+    subCommands.Add("spec", new SpecCommand(provider));
+    subCommands.Add("reload", new ReloadModuleCommand(provider));
   }
 
   public Task<CommandResult>
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
 
+    if (executor.Id != "76561198333588297")
+      return Task.FromResult(CommandResult.NO_PERMISSION);
+
     if (info.ArgCount == 1) {
       foreach (var c in subCommands.Values)
         info.ReplySync(

TTT/CS2/Configs/CS2GameConfig.cs

@@ -24,7 +24,7 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
 
   public static readonly FakeConVar<int> CV_ROUND_DURATION_PER_PLAYER = new(
     "css_ttt_round_duration_per_player",
-    "Additional round duration per player in seconds", 30,
+    "Additional round duration per player in seconds", 10,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 60));
 
   public static readonly FakeConVar<int> CV_ROUND_DURATION_MAX = new(

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(
@@ -27,7 +24,7 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
   public static readonly FakeConVar<string> CV_LOW_KARMA_COMMAND = new(
     "css_ttt_karma_low_command",
     "Command executed when a player's karma falls below the minimum (use {0} for player slot)",
-    "karmaban {0} Bad Player!");
+    "css_ban #{0} 2880 Low Karma");
 
   public static readonly FakeConVar<int> CV_TIMEOUT_THRESHOLD = new(
     "css_ttt_karma_timeout_threshold",
@@ -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", 2, 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/Configs/CS2ShopConfig.cs

@@ -10,15 +10,15 @@ namespace TTT.CS2.Configs;
 
 public class CS2ShopConfig : IStorage<ShopConfig>, IPluginModule {
   public static readonly FakeConVar<int> CV_STARTING_INNOCENT_CREDITS = new(
-    "css_ttt_shop_start_innocent", "Starting credits for Innocents", 100,
+    "css_ttt_shop_start_innocent", "Starting credits for Innocents", 80,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<int> CV_STARTING_TRAITOR_CREDITS = new(
-    "css_ttt_shop_start_traitor", "Starting credits for Traitors", 120,
+    "css_ttt_shop_start_traitor", "Starting credits for Traitors", 100,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<int> CV_STARTING_DETECTIVE_CREDITS = new(
-    "css_ttt_shop_start_detective", "Starting credits for Detectives", 150,
+    "css_ttt_shop_start_detective", "Starting credits for Detectives", 120,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<int> CV_INNO_V_INNO = new(

TTT/CS2/Configs/ShopItems/CS2CamoConfig.cs

@@ -0,0 +1,37 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2CamoConfig : IStorage<CamoConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_camo_price", "Price of the Camo item", 75,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  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.4f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<CamoConfig?> Load() {
+    var cfg = new CamoConfig {
+      Price = CV_PRICE.Value, CamoVisibility = CV_CAMO_VISIBILITY.Value
+    };
+
+    return Task.FromResult<CamoConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2M4A1Config.cs

@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;
 
 public class CS2M4A1Config : IStorage<M4A1Config>, IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_m4a1_price", "Price of the M4A1 item", 90,
+    "css_ttt_shop_m4a1_price", "Price of the M4A1 item", 75,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<string> CV_CLEAR_SLOTS = new(

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", 100,
+    "css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 110,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(

TTT/CS2/Extensions/PlayerExtensions.cs

@@ -2,6 +2,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.UserMessages;
+using CounterStrikeSharp.API.Modules.Utils;
 
 namespace TTT.CS2.Extensions;
 
@@ -107,4 +108,19 @@ public static class PlayerExtensions {
       color.R | color.G << 8 | color.B << 16 | color.A << 24);
     fadeMsg.Send(player);
   }
+
+  public static void DealPoisonDamage(this CCSPlayerController player,
+    int damage) {
+    if (player.Pawn.Value == null) return;
+    player.AddHealth(-damage);
+    player.PlayerPawn.Value?.EmitSound("Player.DamageBody.Onlooker",
+      OTHERS(player.Slot), 0.2f, 1);
+    player.PlayerPawn.Value?.EmitSound("Player.DamageBody.Victim",
+      SELF(player.Slot), 0.2f, 1);
+  }
+
+  private static RecipientFilter SELF(int slot) => new(slot);
+
+  private static RecipientFilter OTHERS(int slot)
+    => new(ulong.MaxValue & ~(1ul << slot));
 }

TTT/CS2/Game/CS2Game.cs

@@ -1,17 +1,24 @@
 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;
 using TTT.Game;
 using TTT.Game.Events.Game;
+using TTT.Game.lang;
 using TTT.Game.Roles;
 
 namespace TTT.CS2.Game;
 
 public class CS2Game(IServiceProvider provider) : RoundBasedGame(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
   public override State State {
     set {
       var ev = new GameStateUpdateEvent(this, value);
@@ -70,4 +77,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/BuyMenuHandler.cs

@@ -1,9 +1,12 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
+using CounterStrikeSharp.API.Modules.Commands;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
+using TTT.API.Command;
 using TTT.API.Player;
+using TTT.CS2.Command;
 using TTT.CS2.Extensions;
 using TTT.Game.Roles;
 
@@ -24,8 +27,11 @@ public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
     { "weapon_smokegrenade", "Poison Smoke" },
     { "weapon_m4a1_silencer", "M4A1" },
     { "weapon_usp_silencer", "M4A1" },
+    { "weapon_sg556", "M4A1" },
     { "weapon_mp5sd", "M4A1" },
-    { "weapon_decoy", "healthshot" }
+    { "weapon_decoy", "healthshot" },
+    { "weapon_awp", "AWP" },
+    { "weapon_hegrenade", "Cluster" }
   };
 
   public void Dispose() { }
@@ -44,8 +50,16 @@ public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
 
     inventory.RemoveWeapon(player, new BaseWeapon(ev.Weapon));
 
-    if (shopAliases.TryGetValue(ev.Weapon, out var alias))
-      ev.Userid.ExecuteClientCommandFromServer("css_buy " + alias);
+    if (!shopAliases.TryGetValue(ev.Weapon, out var alias))
+      return HookResult.Continue;
+
+    var commandManager = provider.GetRequiredService<ICommandManager>();
+    var newInfo = new CS2CommandInfo(provider, player, 0, "css_shop", "buy",
+      alias);
+
+    newInfo.CallingContext = CommandCallingContext.Chat;
+
+    commandManager.ProcessCommand(newInfo);
     return HookResult.Handled;
   }
 }

TTT/CS2/GameHandlers/CombatHandler.cs

@@ -36,19 +36,19 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
   [UsedImplicitly]
   [GameEventHandler(HookMode.Pre)]
   public HookResult OnPlayerDeath_Pre(EventPlayerDeath ev, GameEventInfo info) {
-    if (games.ActiveGame is not { State: State.IN_PROGRESS })
-      return HookResult.Continue;
     var player = ev.Userid;
     if (player == null) return HookResult.Continue;
     var deathEvent = new PlayerDeathEvent(converter, ev);
 
-    Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
-
-    info.DontBroadcast = true;
-
     hideAndTrackStats(ev, player);
 
+    if (games.ActiveGame is not { State: State.IN_PROGRESS })
+      return HookResult.Continue;
+
+    if (ev.Attacker != null) ev.FireEventToClient(ev.Attacker);
+    info.DontBroadcast = true;
     spoofer.SpoofAlive(player);
+    Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
     return HookResult.Continue;
   }
 
@@ -68,13 +68,16 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
         "CCSPlayerController_ActionTrackingServices",
         "m_pActionTrackingServices");
       if (killerStats == null) return;
-      killerStats.Kills  -= 1;
-      killerStats.Damage -= ev.DmgHealth;
+      killerStats.Kills         -= 1;
+      killerStats.Damage        -= ev.DmgHealth;
+      killerStats.UtilityDamage =  0;
       if (ev.Attacker.ActionTrackingServices != null)
         ev.Attacker.ActionTrackingServices.NumRoundKills--;
+      Utilities.SetStateChanged(ev.Attacker, "CSPerRoundStats_t", "m_iDamage");
+      Utilities.SetStateChanged(ev.Attacker, "CSPerRoundStats_t",
+        "m_iUtilityDamage");
       Utilities.SetStateChanged(ev.Attacker, "CCSPlayerController",
         "m_pActionTrackingServices");
-      ev.FireEventToClient(ev.Attacker);
     }
 
     var assisterStats = ev.Assister?.ActionTrackingServices?.MatchStats;

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/LateSpawnListener.cs

@@ -1,19 +1,24 @@
 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.Game;
 using TTT.API.Player;
+using TTT.CS2.Extensions;
+using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
 
-namespace TTT.CS2.Listeners;
+namespace TTT.CS2.GameHandlers;
 
 public class LateSpawnListener(IServiceProvider provider)
   : BaseListener(provider) {
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  [UsedImplicitly]
   [EventHandler]
   public void OnJoin(PlayerJoinEvent ev) {
     if (Games.ActiveGame is { State: State.IN_PROGRESS }) return;
@@ -24,4 +29,17 @@ public class LateSpawnListener(IServiceProvider provider)
       player.Respawn();
     });
   }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void GameState(GameStateUpdateEvent ev) {
+    if (ev.NewState is State.FINISHED or State.WAITING) return;
+
+    Server.NextWorldUpdate(() => {
+      foreach (var player in Utilities.GetPlayers()
+       .Where(p => p.GetHealth() <= 0 && p.Team != CsTeam.Spectator
+          && p.Team != CsTeam.None))
+        player.Respawn();
+    });
+  }
 }

TTT/CS2/GameHandlers/PlayerMuter.cs

@@ -0,0 +1,73 @@
+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.Events;
+using TTT.API.Game;
+using TTT.API.Messages;
+using TTT.API.Player;
+using TTT.CS2.lang;
+using TTT.Game.Events.Game;
+using TTT.Locale;
+
+namespace TTT.CS2.GameHandlers;
+
+public class PlayerMuter(IServiceProvider provider) : IPluginModule {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  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() { }
+
+  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 (game.ActiveGame is not { State: State.IN_PROGRESS }) 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;
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEvent(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    foreach (var p in Utilities.GetPlayers()) {
+      p.VoiceFlags &= ~VoiceFlags.Muted;
+    }
+  }
+}

TTT/CS2/GameHandlers/PropMover.cs

@@ -90,9 +90,13 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
     if (!released.HasFlag(PlayerButtons.Use)) return;
     playersPressingE.Remove(player);
     if (!heldItem.Ragdoll.IsValid) return;
-    heldItem.Ragdoll.AcceptInput("EnableMotion");
     if (heldItem.Beam != null && heldItem.Beam.IsValid)
       heldItem.Beam.AcceptInput("Kill");
+    // Check if any other players are still holding this ragdoll
+    foreach (var (_, info) in playersPressingE)
+      if (info.Ragdoll == heldItem.Ragdoll)
+        return;
+    heldItem.Ragdoll.AcceptInput("EnableMotion");
   }
 
   private void refreshHeld() {

TTT/CS2/GameHandlers/RoleIconsHandler.cs

@@ -69,6 +69,18 @@ public class RoleIconsHandler(IServiceProvider provider)
     visibilities[client] &= ~(1UL << player);
   }
 
+  public void SetVisiblePlayers(IOnlinePlayer online, ulong playersBitmask) {
+    var gamePlayer = players.GetPlayer(online);
+    if (gamePlayer == null || !gamePlayer.IsValid) return;
+    SetVisiblePlayers(gamePlayer.Slot, playersBitmask);
+  }
+
+  public void RevealToAll(IOnlinePlayer online) {
+    var gamePlayer = players.GetPlayer(online);
+    if (gamePlayer == null || !gamePlayer.IsValid) return;
+    RevealToAll(gamePlayer.Slot);
+  }
+
   public void ClearAllVisibility() {
     Array.Clear(visibilities, 0, visibilities.Length);
   }
@@ -92,8 +104,7 @@ public class RoleIconsHandler(IServiceProvider provider)
 
   [UsedImplicitly]
   [EventHandler(IgnoreCanceled = true)]
-  public void OnRoundStart(GameStateUpdateEvent ev) {
-    if (ev.NewState != State.FINISHED) return;
+  public void OnRoundStart(GameInitEvent ev) {
     for (var i = 0; i < icons.Length; i++) removeIcon(i);
     ClearAllVisibility();
     traitorsThisRound.Clear();

TTT/CS2/GameHandlers/RoundStart_GameStartHandler.cs

@@ -12,9 +12,11 @@ namespace TTT.CS2.GameHandlers;
 
 public class RoundStart_GameStartHandler(IServiceProvider provider)
   : IPluginModule {
-  private readonly TTTConfig config =
-    provider.GetService<IStorage<TTTConfig>>()?.Load().GetAwaiter().GetResult()
-    ?? new TTTConfig();
+  private TTTConfig config
+    => provider.GetService<IStorage<TTTConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
 
   private readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
@@ -39,4 +41,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

@@ -1,17 +1,33 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Commands;
 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.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 IEventBus bus = provider.GetRequiredService<IEventBus>();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
+  private readonly IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
   public void Dispose() { }
   public void Start() { }
 
@@ -23,6 +39,8 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
     CommandInfo commandInfo) {
     CsTeam requestedTeam;
 
+    if (player == null) return HookResult.Continue;
+
     if (int.TryParse(commandInfo.GetArg(1), out var teamIndex))
       requestedTeam = (CsTeam)teamIndex;
     else
@@ -34,15 +52,37 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
       };
 
     if (games.ActiveGame is not { State: State.IN_PROGRESS }) {
-      if (player != null && player.LifeState != (int)LifeState_t.LIFE_ALIVE)
-        Server.NextWorldUpdate(player.Respawn);
+      if (player.GetHealth() <= 0) Server.NextWorldUpdate(player.Respawn);
       return HookResult.Continue;
     }
 
     if (requestedTeam is CsTeam.CounterTerrorist or CsTeam.Terrorist)
-      if (player != null && player.Team is CsTeam.Spectator or CsTeam.None)
+      if (player.Team is CsTeam.Spectator or CsTeam.None)
         return HookResult.Continue;
 
+    var apiPlayer = converter.GetPlayer(player);
+
+    // If the player is dead and already identified, let them move to spec
+    if (bodies.Bodies.Keys.Any(b
+      => b.OfPlayer.Id == apiPlayer.Id && b.IsIdentified))
+      return HookResult.Continue;
+
     return HookResult.Handled;
   }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnChangeTeam(EventPlayerTeam ev, GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    var team = (CsTeam)ev.Team;
+    if (team is not (CsTeam.Spectator or CsTeam.None))
+      return HookResult.Continue;
+    var apiPlayer = converter.GetPlayer(ev.Userid);
+
+    Server.NextWorldUpdate(() => {
+      var playerDeath = new PlayerDeathEvent(apiPlayer);
+      bus.Dispatch(playerDeath);
+    });
+    return HookResult.Continue;
+  }
 }

TTT/CS2/GameHandlers/TraitorChatHandler.cs

@@ -0,0 +1,109 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Commands;
+using CounterStrikeSharp.API.Modules.Utils;
+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.Extensions;
+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 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 IRoleAssigner roles =
+    provider.GetRequiredService<IRoleAssigner>();
+
+  private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
+
+  private IActain? maulService;
+
+  public void Start(BasePlugin? plugin) {
+    try {
+      maulService ??= EgoApi.MAUL.Get();
+      if (maulService != null) {
+        maulService.getChatShareService().OnChatShare += OnChatShare;
+        return;
+      }
+
+      plugin?.AddCommandListener("say_team", onSay);
+      plugin?.AddCommandListener("say", onSay);
+    } catch (KeyNotFoundException) {
+      plugin?.AddCommandListener("say_team", onSay);
+      plugin?.AddCommandListener("say", onSay);
+    }
+  }
+
+  public void Dispose() {
+    if (maulService != null)
+      maulService.getChatShareService().OnChatShare -= OnChatShare;
+  }
+
+  public void Start() { }
+
+  private void OnChatShare(CCSPlayerController? player, CommandInfo info,
+    ref bool canceled) {
+    if (player == null) return;
+    if (mutedPlayers != null
+      && mutedPlayers.Contains(player.SteamID.ToString())) {
+      canceled = true;
+      return;
+    }
+
+    if (!info.GetArg(0).Equals("say_team", StringComparison.OrdinalIgnoreCase))
+      return;
+    if (player.Team == CsTeam.CounterTerrorist) return;
+    var result = onSay(player, info);
+    canceled = true;
+    if (result == HookResult.Handled) return;
+    player?.ExecuteClientCommandFromServer("say " + info.ArgString);
+  }
+
+  private HookResult onSay(CCSPlayerController? player,
+    CommandInfo commandInfo) {
+    if (mutedPlayers != null
+      && mutedPlayers.Contains(player?.SteamID.ToString() ?? ""))
+      return HookResult.Handled;
+
+    if (commandInfo.GetArg(0).Equals("say", StringComparison.OrdinalIgnoreCase))
+      return HookResult.Continue;
+
+    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)
+      || player.GetHealth() <= 0)
+      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;
+  }
+}

TTT/CS2/Items/Armor/ArmorItem.cs

@@ -16,11 +16,11 @@ public static class ArmorItemServicesCollection {
 }
 
 public class ArmorItem(IServiceProvider provider) : BaseItem(provider) {
-  private readonly ArmorConfig config = provider
-   .GetService<IStorage<ArmorConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new ArmorConfig();
+  private ArmorConfig config
+    => Provider.GetService<IStorage<ArmorConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new ArmorConfig();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

TTT/CS2/Items/BodyPaint/BodyPaintItem.cs

@@ -17,11 +17,11 @@ public static class BodyPaintServicesCollection {
 
 public class BodyPaintItem(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly BodyPaintConfig config = provider
-   .GetService<IStorage<BodyPaintConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new BodyPaintConfig();
+  private BodyPaintConfig config
+    => Provider.GetService<IStorage<BodyPaintConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new BodyPaintConfig();
 
   public override string Name => Locale[BodyPaintMsgs.SHOP_ITEM_BODY_PAINT];
 

TTT/CS2/Items/BodyPaint/BodyPaintListener.cs

@@ -17,8 +17,8 @@ public class BodyPaintListener(IServiceProvider provider)
   private readonly IBodyTracker bodies =
     provider.GetRequiredService<IBodyTracker>();
 
-  private readonly BodyPaintConfig config =
-    provider.GetService<IStorage<BodyPaintConfig>>()
+  private BodyPaintConfig config
+    => Provider.GetService<IStorage<BodyPaintConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new BodyPaintConfig();

TTT/CS2/Items/Camouflage/CamouflageItem.cs

@@ -18,9 +18,11 @@ public static class CamoServiceCollection {
 }
 
 public class CamouflageItem(IServiceProvider provider) : BaseItem(provider) {
-  private readonly CamoConfig config =
-    provider.GetService<IStorage<CamoConfig>>()?.Load().GetAwaiter().GetResult()
-    ?? new CamoConfig();
+  private CamoConfig config
+    => Provider.GetService<IStorage<CamoConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new CamoConfig();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

TTT/CS2/Items/ClusterGrenade/ClusterGrenadeItem.cs

@@ -0,0 +1,38 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.ClusterGrenade;
+
+public static class ClusterGrenadeServiceCollection {
+  public static void AddClusterGrenade(this IServiceCollection services) {
+    services.AddModBehavior<ClusterGrenadeItem>();
+    services.AddModBehavior<ClusterGrenadeListener>();
+  }
+}
+
+public class ClusterGrenadeItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider) {
+  private ClusterGrenadeConfig config
+    => Provider.GetService<IStorage<ClusterGrenadeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new ClusterGrenadeConfig();
+
+  public override string Name
+    => Locale[ClusterGrenadeMsgs.SHOP_ITEM_CLUSTER_GRENADE];
+
+  public override string Description
+    => Locale[ClusterGrenadeMsgs.SHOP_ITEM_CLUSTER_GRENADE_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Inventory.GiveWeapon(player, config);
+  }
+}

TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs

@@ -0,0 +1,66 @@
+using System.Reactive.Concurrency;
+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;
+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 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>();
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnHeGrenade(EventHegrenadeDetonate ev, GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    var player = converter.GetPlayer(ev.Userid) as IOnlinePlayer;
+    if (player == null) return HookResult.Continue;
+    if (!shop.HasItem<ClusterGrenadeItem>(player)) return HookResult.Continue;
+
+    shop.RemoveItem<ClusterGrenadeItem>(player);
+
+    for (var i = 0; i < config.GrenadeCount; i++) {
+      var entity =
+        Utilities.GetEntityFromIndex<CHEGrenadeProjectile>(ev.Entityid);
+
+      if (entity == null || entity.AbsOrigin == null) continue;
+
+      // Throw grenade in circular pattern
+      var angle = new Vector(
+        (float)(Math.Cos(2 * Math.PI / config.GrenadeCount * i)
+          * config.ThrowForce),
+        (float)(Math.Sin(2 * Math.PI / config.GrenadeCount * i)
+          * config.ThrowForce), config.UpForce);
+
+      if (ev.Userid.Pawn.Value == null) continue;
+
+      GrenadeDataHelper.CreateGrenade(entity.AbsOrigin, QAngle.Zero, angle,
+        Vector.Zero, ev.Userid.Pawn.Value.Handle, ev.Userid.Team);
+    }
+
+    return HookResult.Continue;
+  }
+
+  public void Dispose() { }
+  public void Start() { }
+}

TTT/CS2/Items/ClusterGrenade/ClusterGrenadeMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.ClusterGrenade;
+
+public class ClusterGrenadeMsgs {
+  public static IMsg SHOP_ITEM_CLUSTER_GRENADE
+    => MsgFactory.Create(nameof(SHOP_ITEM_CLUSTER_GRENADE));
+
+  public static IMsg SHOP_ITEM_CLUSTER_GRENADE_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_CLUSTER_GRENADE_DESC));
+}

TTT/CS2/Items/Compass/AbstractCompassItem.cs

@@ -0,0 +1,153 @@
+using System.Linq;
+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 ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Events;
+using TTT.API.Extensions;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Role;
+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.
+/// </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>();
+
+  protected AbstractCompassItem(IServiceProvider provider) : base(provider) {
+    _Config = provider.GetService<IStorage<CompassConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new CompassConfig();
+
+    Converter =
+      provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+  }
+
+  public override ShopItemConfig Config => _Config;
+
+  public void Start(BasePlugin? plugin) {
+    base.Start();
+    plugin?.AddTimer(0.1f, Tick, TimerFlags.REPEAT);
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRoundEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState == State.FINISHED) Owners.Clear();
+  }
+
+  /// <summary>
+  /// Return world positions to point at for this player.
+  /// </summary>
+  protected abstract IList<Vector> GetTargets(IOnlinePlayer requester);
+
+  /// <summary>
+  /// Whether this player currently owns/has this compass effect.
+  /// </summary>
+  protected abstract bool OwnsItem(IOnlinePlayer player);
+
+  public override void OnPurchase(IOnlinePlayer player) { Owners.Add(player); }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    return OwnsItem(player) ?
+      PurchaseResult.ALREADY_OWNED :
+      base.CanPurchase(player);
+  }
+
+  private void Tick() {
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
+      return;
+
+    foreach (var player in Owners.OfType<IOnlinePlayer>()) {
+      var gamePlayer = Converter.GetPlayer(player);
+      if (gamePlayer == null) continue;
+      if (!player.IsAlive) continue;
+      ShowCompass(gamePlayer, player);
+    }
+  }
+
+  private void ShowCompass(CCSPlayerController viewer, IOnlinePlayer online) {
+    if (Games.ActiveGame?.Players == null) return;
+    if (viewer.PlayerPawn.Value == null) return;
+
+    var src = viewer.Pawn.Value?.AbsOrigin.Clone();
+    if (src == null) return;
+
+    var targets = GetTargets(online).ToList();
+    if (targets.Count == 0) return;
+
+    var (nearest, distance) = GetNearestVector(src, targets);
+    if (nearest == null || distance > _Config.MaxRange) return;
+
+    var normalizedYaw = AdjustGameAngle(viewer.PlayerPawn.Value.EyeAngles.Y);
+
+    var diff      = (nearest - src).Normalized();
+    var targetYaw = MathF.Atan2(diff.Y, diff.X) * 180f / MathF.PI;
+    targetYaw = AdjustGameAngle(targetYaw);
+
+    var compass = GenerateCompass(normalizedYaw, targetYaw);
+    compass = "<font color=\"#777777\">" + compass;
+    foreach (var c in "NESW".ToCharArray())
+      compass = compass.Replace(c.ToString(),
+        $"</font><font color=\"#FFFF00\">{c}</font><font color=\"#777777\">");
+    compass = compass.Replace("X",
+      "</font><font color=\"#FF0000\">X</font><font color=\"#777777\">");
+    compass += "</font>";
+
+    viewer.PrintToCenterHtml($"{compass} {GetDistanceDescription(distance)}");
+  }
+
+  private static float AdjustGameAngle(float angle) {
+    return 360 - (angle + 360) % 360 + 90;
+  }
+
+  private string GenerateCompass(float pointing, float target) {
+    return TextCompass.GenerateCompass(_Config.CompassFOV,
+      _Config.CompassLength, pointing, targetDir: target);
+  }
+
+  private static string GetDistanceDescription(float distance) {
+    return distance switch {
+      > 2000 => "AWP Distance",
+      > 1500 => "Scout Distance",
+      > 1000 => "Rifle Distance",
+      > 500  => "Pistol",
+      > 250  => "Nearby",
+      _      => "Knife Range"
+    };
+  }
+
+  private static (Vector?, float) GetNearestVector(in Vector src,
+    IList<Vector> targets) {
+    var     minDistSq = float.MaxValue;
+    Vector? nearest   = null;
+
+    foreach (var v in targets) {
+      var d2 = v.Clone().DistanceSquared(src);
+      if (d2 >= minDistSq) continue;
+      minDistSq = d2;
+      nearest   = v;
+    }
+
+    return (nearest, MathF.Sqrt(minDistSq));
+  }
+}

TTT/CS2/Items/Compass/BodyCompassItem.cs

@@ -0,0 +1,53 @@
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Extensions;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.CS2.API;
+using TTT.CS2.Extensions;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.Compass;
+
+public static class BodyCompassItemExtensions {
+  public static void
+    AddBodyCompassServices(this IServiceCollection collection) {
+    collection.AddModBehavior<BodyCompassItem>();
+  }
+}
+
+public class BodyCompassItem(IServiceProvider provider)
+  : AbstractCompassItem<DetectiveRole>(provider) {
+  private readonly IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
+  public override string Name => Locale[CompassMsgs.SHOP_ITEM_COMPASS_BODY];
+
+  public override string Description
+    => 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.
+  /// </summary>
+  protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
+      return Array.Empty<Vector>();
+
+    List<Vector> vectors = [];
+
+    foreach (var (apiBody, body) in bodies.Bodies) {
+      if (apiBody.IsIdentified) continue;
+      var origin = body.AbsOrigin.Clone();
+      if (origin == null) continue;
+      vectors.Add(origin);
+    }
+
+    return vectors;
+  }
+
+  override protected bool OwnsItem(IOnlinePlayer player) {
+    return Shop.HasItem<BodyCompassItem>(player);
+  }
+}

TTT/CS2/Items/Compass/CompassItem.cs

@@ -1,162 +0,0 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Timers;
-using Microsoft.Extensions.DependencyInjection;
-using ShopAPI;
-using ShopAPI.Configs;
-using ShopAPI.Configs.Traitor;
-using TTT.API;
-using TTT.API.Extensions;
-using TTT.API.Game;
-using TTT.API.Player;
-using TTT.API.Storage;
-using TTT.CS2.Extensions;
-using TTT.CS2.Utils;
-using TTT.Game.Roles;
-
-namespace TTT.CS2.Items.Compass;
-
-public static class CompassServiceCollection {
-  public static void AddCompassServices(this IServiceCollection collection) {
-    collection.AddModBehavior<CompassItem>();
-  }
-}
-
-public class CompassItem(IServiceProvider provider)
-  : RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
-  private readonly CompassConfig config =
-    provider.GetService<IStorage<CompassConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new CompassConfig();
-
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
-  public override string Name => Locale[CompassMsgs.SHOP_ITEM_COMPASS];
-
-  public override string Description
-    => Locale[CompassMsgs.SHOP_ITEM_COMPASS_DESC];
-
-  public override ShopItemConfig Config => config;
-
-  public void Start(BasePlugin? plugin) {
-    base.Start();
-    plugin?.AddTimer(0.1f, tick, TimerFlags.REPEAT);
-  }
-
-  public override void OnPurchase(IOnlinePlayer player) { }
-
-  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
-    return Shop.HasItem<CompassItem>(player) ?
-      PurchaseResult.ALREADY_OWNED :
-      base.CanPurchase(player);
-  }
-
-  private void tick() {
-    if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
-      return;
-
-    var traitors = Games.ActiveGame.Players.OfType<IOnlinePlayer>()
-     .Where(p => p.IsAlive)
-     .Where(p => Roles.GetRoles(p).Any(r => r is TraitorRole))
-     .ToList();
-
-    var allies = Games.ActiveGame.Players.OfType<IOnlinePlayer>()
-     .Where(p => p.IsAlive)
-     .Where(p => !Roles.GetRoles(p).Any(r => r is TraitorRole))
-     .ToList();
-
-    foreach (var gamePlayer in Utilities.GetPlayers()) {
-      var player = converter.GetPlayer(gamePlayer);
-      if (player is not IOnlinePlayer online) continue;
-      if (!Shop.HasItem<CompassItem>(online)) continue;
-      showRadarTo(gamePlayer, online, traitors, allies);
-    }
-  }
-
-  private void showRadarTo(CCSPlayerController player, IOnlinePlayer online,
-    IList<IOnlinePlayer> traitors, List<IOnlinePlayer> allies) {
-    if (Games.ActiveGame?.Players == null) return;
-    if (player.PlayerPawn.Value == null) return;
-
-    var enemies = getEnemies(online, traitors, allies);
-    if (enemies.Count == 0) return;
-    var gameEnemies = enemies.Select(e => converter.GetPlayer(e))
-     .Where(e => e != null)
-     .Select(e => e!)
-     .ToList();
-    if (gameEnemies.Count == 0) return;
-
-    var (nearestPlayer, distance) =
-      getNearest(player, gameEnemies) ?? (null, 0);
-    if (nearestPlayer == null || distance > config.MaxRange) return;
-    var src = player.Pawn.Value?.AbsOrigin.Clone();
-    var dst = nearestPlayer.Pawn.Value?.AbsOrigin.Clone();
-    if (src == null || dst == null) return;
-    var normalizedYaw = adjustGameAngle(player.PlayerPawn.Value.EyeAngles.Y);
-
-    var diff      = (dst - src).Normalized();
-    var targetYaw = MathF.Atan2(diff.Y, diff.X) * 180f / MathF.PI;
-    targetYaw = adjustGameAngle(targetYaw);
-
-    var compass = generateCompass(normalizedYaw, targetYaw);
-    compass = "<font color=\"#777777\">" + compass;
-    foreach (var c in "NESW".ToCharArray())
-      compass = compass.Replace(c.ToString(),
-        $"</font><font color=\"#FFFF00\">{c}</font><font color=\"#777777\">");
-    compass = compass.Replace("X",
-      "</font><font color=\"#FF0000\">X</font><font color=\"#777777\">");
-    compass += "</font>";
-
-    player.PrintToCenterHtml($"{compass} {getDistanceDescription(distance)}");
-  }
-
-  private float adjustGameAngle(float angle) {
-    return 360 - (angle + 360) % 360 + 90;
-  }
-
-  private string generateCompass(float pointing, float target) {
-    return TextCompass.GenerateCompass(config.CompassFOV, config.CompassLength,
-      pointing, targetDir: target);
-  }
-
-  private string getDistanceDescription(float distance) {
-    return distance switch {
-      > 2000 => "AWP Distance",
-      > 1500 => "Scout Distance",
-      > 1000 => "Rifle Distance",
-      > 500  => "Pistol",
-      > 250  => "Nearby",
-      _      => "Knife Range"
-    };
-  }
-
-
-  private IList<IOnlinePlayer> getEnemies(IOnlinePlayer online,
-    IList<IOnlinePlayer> traitors, IList<IOnlinePlayer> allies) {
-    return Roles.GetRoles(online).Any(r => r is TraitorRole) ?
-      allies :
-      traitors;
-  }
-
-  private (CCSPlayerController?, float)? getNearest(CCSPlayerController source,
-    List<CCSPlayerController> others) {
-    if (others.Count == 0) return null;
-    var minDist   = float.MaxValue;
-    var minPlayer = others[0];
-    var src       = source.Pawn.Value?.AbsOrigin.Clone();
-    if (src == null) return null;
-
-    foreach (var player in others) {
-      if (player.Pawn.Value == null) continue;
-
-      var dist = player.Pawn.Value.AbsOrigin.Clone().DistanceSquared(src);
-      if (dist >= minDist) continue;
-      minDist   = dist;
-      minPlayer = player;
-    }
-
-    return (minPlayer, MathF.Sqrt(minDist));
-  }
-}

TTT/CS2/Items/Compass/CompassMsgs.cs

@@ -3,9 +3,15 @@ using TTT.Locale;
 namespace TTT.CS2.Items.Compass;
 
 public class CompassMsgs {
-  public static IMsg SHOP_ITEM_COMPASS
-    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS));
+  public static IMsg SHOP_ITEM_COMPASS_PLAYER
+    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_PLAYER));
 
-  public static IMsg SHOP_ITEM_COMPASS_DESC
-    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_DESC));
+  public static IMsg SHOP_ITEM_COMPASS_PLAYER_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_PLAYER_DESC));
+
+  public static IMsg SHOP_ITEM_COMPASS_BODY
+    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_BODY));
+
+  public static IMsg SHOP_ITEM_COMPASS_BODY_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_BODY_DESC));
 }

TTT/CS2/Items/Compass/InnoCompassItem.cs

@@ -0,0 +1,62 @@
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Extensions;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.CS2.Extensions;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.Compass;
+
+public static class InnoCompassItemExtensions {
+  public static void
+    AddInnoCompassServices(this IServiceCollection collection) {
+    collection.AddModBehavior<InnoCompassItem>();
+  }
+}
+
+public class InnoCompassItem(IServiceProvider provider)
+  : AbstractCompassItem<TraitorRole>(provider) {
+  public override string Name => Locale[CompassMsgs.SHOP_ITEM_COMPASS_PLAYER];
+
+  public override string Description
+    => 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.
+  /// </summary>
+  protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
+      return Array.Empty<Vector>();
+
+    var all = Games.ActiveGame.Players.OfType<IOnlinePlayer>()
+     .Where(p => p.IsAlive)
+     .ToList();
+
+    // Split by traitor role
+    var traitors = all.Where(p => Roles.GetRoles(p).Any(r => r is TraitorRole))
+     .ToList();
+    var allies = all.Where(p => !Roles.GetRoles(p).Any(r => r is TraitorRole))
+     .ToList();
+
+    var enemies = Roles.GetRoles(requester).Any(r => r is TraitorRole) ?
+      allies :
+      traitors;
+
+    // Convert to game controllers then to positions
+    var vectors = new List<Vector>(enemies.Count);
+    foreach (var enemy in enemies) {
+      var controller = Converter.GetPlayer(enemy);
+      var pos        = controller?.Pawn.Value?.AbsOrigin.Clone();
+      if (pos != null) vectors.Add(pos);
+    }
+
+    return vectors;
+  }
+
+  override protected bool OwnsItem(IOnlinePlayer player) {
+    return Shop.HasItem<InnoCompassItem>(player);
+  }
+}

TTT/CS2/Items/DNA/DnaListener.cs

@@ -28,11 +28,11 @@ public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
   private readonly IBodyTracker bodies =
     provider.GetRequiredService<IBodyTracker>();
 
-  private readonly DnaScannerConfig config = provider
-   .GetService<IStorage<DnaScannerConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new DnaScannerConfig();
+  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>();

TTT/CS2/Items/DNA/DnaMsgs.cs

@@ -1,6 +1,7 @@
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.Game;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.CS2.Items.DNA;

TTT/CS2/Items/DNA/DnaScanner.cs

@@ -18,11 +18,11 @@ public static class DnaScannerServiceCollection {
 
 public class DnaScanner(IServiceProvider provider)
   : RoleRestrictedItem<DetectiveRole>(provider) {
-  private readonly DnaScannerConfig config = provider
-   .GetService<IStorage<DnaScannerConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new DnaScannerConfig();
+  private DnaScannerConfig config
+    => Provider.GetService<IStorage<DnaScannerConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new DnaScannerConfig();
 
   public override string Name => Locale[DnaMsgs.SHOP_ITEM_DNA];
   public override string Description => Locale[DnaMsgs.SHOP_ITEM_DNA_DESC];

TTT/CS2/Items/OneHitKnife/OneHitKnife.cs

@@ -18,11 +18,11 @@ public static class OneHitKnifeServiceCollection {
 
 public class OneHitKnife(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly OneHitKnifeConfig config = provider
-   .GetService<IStorage<OneHitKnifeConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new OneHitKnifeConfig();
+  private OneHitKnifeConfig config
+    => Provider.GetService<IStorage<OneHitKnifeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new OneHitKnifeConfig();
 
   public override string Name
     => Locale[OneHitKnifeMsgs.SHOP_ITEM_ONE_HIT_KNIFE];

TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs

@@ -13,8 +13,8 @@ namespace TTT.CS2.Items.OneHitKnife;
 
 public class OneHitKnifeListener(IServiceProvider provider)
   : BaseListener(provider) {
-  private readonly OneHitKnifeConfig config =
-    provider.GetService<IStorage<OneHitKnifeConfig>>()
+  private OneHitKnifeConfig config
+    => Provider.GetService<IStorage<OneHitKnifeConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new OneHitKnifeConfig();
@@ -32,13 +32,12 @@ public class OneHitKnifeListener(IServiceProvider provider)
 
     if (attacker == null) return;
     if (!shop.HasItem<OneHitKnife>(attacker)) return;
-    if (victim is not IOnlinePlayer onlineVictim) return;
 
     var friendly = Roles.GetRoles(attacker)
      .Any(r => Roles.GetRoles(victim).Contains(r));
     if (friendly && !config.FriendlyFire) return;
 
     shop.RemoveItem<OneHitKnife>(attacker);
-    ev.HpLeft = 0;
+    ev.HpLeft = -100;
   }
 }

TTT/CS2/Items/PoisonShots/PoisonShotsItem.cs

@@ -18,11 +18,11 @@ public static class PoisonShotServiceCollection {
 
 public class PoisonShotsItem(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly PoisonShotsConfig config = provider
-   .GetService<IStorage<PoisonShotsConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new PoisonShotsConfig();
+  private PoisonShotsConfig config
+    => Provider.GetService<IStorage<PoisonShotsConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonShotsConfig();
 
   public override string Name => Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS];
 

TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs

@@ -13,6 +13,7 @@ using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
+using TTT.Game.Events.Body;
 using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
@@ -23,8 +24,8 @@ public class PoisonShotsListener(IServiceProvider provider)
   : BaseListener(provider), IPluginModule {
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
-  private readonly PoisonShotsConfig config =
-    provider.GetService<IStorage<PoisonShotsConfig>>()
+  private PoisonShotsConfig config
+    => Provider.GetService<IStorage<PoisonShotsConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new PoisonShotsConfig();
@@ -41,6 +42,8 @@ public class PoisonShotsListener(IServiceProvider provider)
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
+  private readonly Dictionary<string, IPlayer> killedWithPoison = new();
+
   public override void Dispose() {
     base.Dispose();
     foreach (var timer in poisonTimers) timer.Dispose();
@@ -80,6 +83,7 @@ public class PoisonShotsListener(IServiceProvider provider)
     foreach (var timer in poisonTimers) timer.Dispose();
     poisonTimers.Clear();
     poisonShots.Clear();
+    killedWithPoison.Clear();
   }
 
   [SuppressMessage("ReSharper", "AccessToModifiedClosure")]
@@ -114,19 +118,20 @@ public class PoisonShotsListener(IServiceProvider provider)
     if (dmgEvent.IsCanceled) return true;
 
     if (online.Health - config.PoisonConfig.DamagePerTick <= 0) {
+      killedWithPoison[online.Id] = effect.Shooter;
       var deathEvent = new PlayerDeathEvent(online)
        .WithKiller(effect.Shooter as IOnlinePlayer)
        .WithWeapon($"[{Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS]}]");
       bus.Dispatch(deathEvent);
     }
 
-    online.Health -= config.PoisonConfig.DamagePerTick;
     effect.Ticks++;
     effect.DamageGiven += config.PoisonConfig.DamagePerTick;
 
     var gamePlayer = converter.GetPlayer(online);
     gamePlayer?.ColorScreen(config.PoisonColor, 0.2f, 0.3f);
-    gamePlayer?.ExecuteClientCommand("play " + config.PoisonConfig.PoisonSound);
+    if (gamePlayer != null)
+      gamePlayer.DealPoisonDamage(config.PoisonConfig.DamagePerTick);
 
     return effect.DamageGiven < config.PoisonConfig.TotalDamage;
   }
@@ -157,4 +162,15 @@ public class PoisonShotsListener(IServiceProvider provider)
     public int Ticks { get; set; }
     public int DamageGiven { get; set; }
   }
+
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRagdollSpawn(BodyCreateEvent ev) {
+    if (!killedWithPoison.TryGetValue(ev.Body.OfPlayer.Id, out var shooter))
+      return;
+    if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
+      return;
+    ev.Body.Killer = shooter as IOnlinePlayer;
+  }
 }

TTT/CS2/Items/PoisonSmoke/PoisonSmokeItem.cs

@@ -18,8 +18,8 @@ public static class PoisonSmokeServiceCollection {
 
 public class PoisonSmokeItem(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly PoisonSmokeConfig config =
-    provider.GetService<IStorage<PoisonSmokeConfig>>()
+  private PoisonSmokeConfig config
+    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new PoisonSmokeConfig();

TTT/CS2/Items/PoisonSmoke/PoisonSmokeListener.cs

@@ -9,17 +9,24 @@ using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
 using ShopAPI.Configs.Traitor;
 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;
+using TTT.Game.Events.Game;
+using TTT.Game.Events.Player;
+using TTT.Game.Listeners;
 using TTT.Game.Roles;
 
 namespace TTT.CS2.Items.PoisonSmoke;
 
-public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
-  private readonly PoisonSmokeConfig config =
-    provider.GetService<IStorage<PoisonSmokeConfig>>()
+public class PoisonSmokeListener(IServiceProvider provider)
+  : BaseListener(provider), IPluginModule {
+  private PoisonSmokeConfig config
+    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new PoisonSmokeConfig();
@@ -27,26 +34,20 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly IPlayerFinder finder =
-    provider.GetRequiredService<IPlayerFinder>();
-
   private readonly List<IDisposable> poisonSmokes = [];
 
-  private readonly IRoleAssigner roleAssigner =
-    provider.GetRequiredService<IRoleAssigner>();
-
-  private readonly IScheduler scheduler =
-    provider.GetRequiredService<IScheduler>();
-
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
-  public void Dispose() {
+  private readonly ISet<string> killedWithPoison = new HashSet<string>();
+
+  public override void Dispose() {
+    base.Dispose();
     foreach (var timer in poisonSmokes) timer.Dispose();
 
     poisonSmokes.Clear();
+    killedWithPoison.Clear();
   }
 
-  public void Start() { }
 
   [UsedImplicitly]
   [GameEventHandler]
@@ -62,17 +63,18 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
     var projectile =
       Utilities.GetEntityFromIndex<CSmokeGrenadeProjectile>(ev.Entityid);
     if (projectile == null || !projectile.IsValid) return HookResult.Continue;
-    startPoisonEffect(projectile);
+    startPoisonEffect(projectile, player);
     return HookResult.Continue;
   }
 
   [SuppressMessage("ReSharper", "AccessToModifiedClosure")]
-  private void startPoisonEffect(CSmokeGrenadeProjectile projectile) {
+  private void startPoisonEffect(CSmokeGrenadeProjectile projectile,
+    IOnlinePlayer thrower) {
     IDisposable? timer = null;
 
-    var effect = new PoisonEffect(projectile);
+    var effect = new PoisonEffect(projectile, thrower);
 
-    timer = scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
+    timer = Scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
       => {
       Server.NextWorldUpdate(() => {
         if (tickPoisonEffect(effect) || timer == null) return;
@@ -88,31 +90,67 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
     if (!effect.Projectile.IsValid) return false;
     effect.Ticks++;
 
-    var players = finder.GetOnline()
-     .Where(player => player.IsAlive && roleAssigner.GetRoles(player)
+    var players = Finder.GetOnline()
+     .Where(player => player.IsAlive && Roles.GetRoles(player)
        .Any(role => role is InnocentRole or DetectiveRole));
 
-    var gamePlayers = players.Select(p => converter.GetPlayer(p))
-     .Where(p => p != null && p.Pawn.Value != null && p.Pawn.Value.IsValid)
-     .Select(p => (p!, p?.Pawn.Value?.AbsOrigin.Clone()!));
+    var gamePlayers = players.Select(p => (p, converter.GetPlayer(p)))
+     .Where(p => p.Item2 != null && p.Item2.Pawn.Value != null
+        && p.Item2.Pawn.Value.IsValid)
+     .Select(p => (p!, p.Item2?.Pawn.Value?.AbsOrigin.Clone()!));
 
     gamePlayers = gamePlayers.Where(t
       => t.Item2.Distance(effect.Origin) <= config.SmokeRadius);
 
-    foreach (var player in gamePlayers.Select(p => p.Item1)) {
+    foreach (var (apiPlayer, gamePlayer) in gamePlayers.Select(p => p.Item1)) {
       if (effect.DamageGiven >= config.PoisonConfig.TotalDamage) continue;
-      player.AddHealth(-config.PoisonConfig.DamagePerTick);
-      player.ExecuteClientCommand("play " + config.PoisonConfig.PoisonSound);
+      if (gamePlayer.GetHealth() - config.PoisonConfig.DamagePerTick <= 0) {
+        killedWithPoison.Add(apiPlayer.Id);
+        var playerDeathEvent = new PlayerDeathEvent(apiPlayer)
+         .WithKiller(effect.Attacker as IOnlinePlayer)
+         .WithWeapon("[Poison Smoke]");
+        Bus.Dispatch(playerDeathEvent);
+
+        gamePlayer.SetHealth(0);
+        continue;
+      }
+
+      var dmgEvent = new PlayerDamagedEvent(apiPlayer,
+        effect.Attacker as IOnlinePlayer, config.PoisonConfig.DamagePerTick) {
+        Weapon = "[Poison Smoke]"
+      };
+
+      Bus.Dispatch(dmgEvent);
+
+      gamePlayer.DealPoisonDamage(config.PoisonConfig.DamagePerTick);
       effect.DamageGiven += config.PoisonConfig.DamagePerTick;
     }
 
     return effect.DamageGiven < config.PoisonConfig.TotalDamage;
   }
 
-  private class PoisonEffect(CSmokeGrenadeProjectile projectile) {
+  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) {
+    if (ev.NewState != State.FINISHED) return;
+
+    killedWithPoison.Clear();
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRagdollSpawn(BodyCreateEvent ev) {
+    if (!killedWithPoison.Contains(ev.Body.OfPlayer.Id)) return;
+    if (ev.Body.Killer == null || ev.Body.Killer.Id == ev.Body.OfPlayer.Id)
+      ev.IsCanceled = true;
   }
 }

TTT/CS2/Items/SilentAWP/SilentAWPItem.cs

@@ -24,8 +24,8 @@ public static class SilentAWPServiceCollection {
 
 public class SilentAWPItem(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
-  private readonly SilentAWPConfig config =
-    provider.GetService<IStorage<SilentAWPConfig>>()
+  private SilentAWPConfig config
+    => Provider.GetService<IStorage<SilentAWPConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new SilentAWPConfig();
@@ -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,15 +78,16 @@ 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);
     }
 
+    msg.Recipients.Clear();
     return HookResult.Handled;
   }
 

TTT/CS2/Items/Station/DamageStation.cs

@@ -1,12 +1,18 @@
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI.Configs.Traitor;
 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;
 using TTT.Game.Roles;
 
@@ -23,7 +29,7 @@ public class DamageStation(IServiceProvider provider)
     provider.GetService<IStorage<DamageStationConfig>>()
     ?.Load()
      .GetAwaiter()
-     .GetResult() ?? new DamageStationConfig()) {
+     .GetResult() ?? new DamageStationConfig()), IListener {
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
@@ -40,6 +46,9 @@ public class DamageStation(IServiceProvider provider)
   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>();
@@ -50,8 +59,12 @@ public class DamageStation(IServiceProvider provider)
         continue;
       }
 
+      if (!prop.IsValid || prop.AbsOrigin == null) {
+        toRemove.Add(prop);
+        continue;
+      }
+
       var propPos = prop.AbsOrigin;
-      if (propPos == null) continue;
 
       var playerMapping = players.Select(p
           => (ApiPlayer: p, GamePlayer: converter.GetPlayer(p)))
@@ -79,20 +92,40 @@ public class DamageStation(IServiceProvider provider)
 
         damageAmount = -dmgEvent.DmgDealt;
 
-        player.Health    += damageAmount;
-        info.HealthGiven += damageAmount;
-
         if (player.Health + damageAmount <= 0) {
+          killedWithStation[player.Id] = info;
           var playerDeath = new PlayerDeathEvent(player)
            .WithKiller(info.Owner as IOnlinePlayer)
            .WithWeapon($"[{Name}]");
           bus.Dispatch(playerDeath);
         }
 
-        gamePlayer.ExecuteClientCommand("play " + _Config.UseSound);
+        player.Health    += damageAmount;
+        info.HealthGiven += damageAmount;
+
+        gamePlayer.EmitSound("Player.DamageFall", null, 0.2f);
       }
     }
 
     foreach (var prop in toRemove) props.Remove(prop);
   }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    killedWithStation.Clear();
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRagdollSpawn(BodyCreateEvent ev) {
+    if (!killedWithStation.TryGetValue(ev.Body.OfPlayer.Id,
+      out var stationInfo))
+      return;
+    if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
+      return;
+    ev.Body.Killer = stationInfo.Owner as IOnlinePlayer;
+  }
 }

TTT/CS2/Items/Station/HealthStation.cs

@@ -36,8 +36,12 @@ public class HealthStation(IServiceProvider provider)
         continue;
       }
 
+      if (!prop.IsValid || prop.AbsOrigin == null) {
+        toRemove.Add(prop);
+        continue;
+      }
+
       var propPos = prop.AbsOrigin;
-      if (propPos == null) continue;
 
       var playerDists = players
        .Select(p => (Player: p, Pos: p.Pawn.Value?.AbsOrigin))
@@ -49,13 +53,14 @@ public class HealthStation(IServiceProvider provider)
       foreach (var (player, dist) in playerDists) {
         var maxHp       = player.Pawn.Value?.MaxHealth ?? 100;
         var healthScale = 1.0 - dist / _Config.MaxRange;
-        var healAmount =
+        var maxHealAmo =
           (int)Math.Ceiling(_Config.HealthIncrements * healthScale);
-        var newHealth = Math.Min(player.GetHealth() + healAmount, maxHp);
+        var newHealth   = Math.Min(player.GetHealth() + maxHealAmo, maxHp);
+        var healthGiven = newHealth - player.GetHealth();
         player.SetHealth(newHealth);
-        info.HealthGiven += healAmount;
+        info.HealthGiven += healthGiven;
 
-        player.ExecuteClientCommand("play " + _Config.UseSound);
+        if (healthGiven > 0) player.EmitSound("HealthShot.Pickup", null, 0.1f);
       }
     }
 

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,12 +128,15 @@ 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;
-      }
+
+      var spawnPos = gamePlayer.GetEyePosition();
+      var forward  = gamePlayer.Pawn.Value.AbsRotation;
+
+      if (spawnPos == null) return;
+
+      if (forward == null) forward = new QAngle(0, 0, 0);
+
+      spawnPos += forward.ToForward() * 50;
 
       prop.Teleport(spawnPos);
     });

TTT/CS2/Listeners/AfkTimerListener.cs

@@ -0,0 +1,83 @@
+using System.Drawing;
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Events;
+using TTT.API.Game;
+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 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();
+
+    specTimer?.Dispose();
+    specWarnTimer?.Dispose();
+  }
+
+  [UsedImplicitly]
+  [EventHandler(IgnoreCanceled = true)]
+  public void OnRoundStart(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.IN_PROGRESS) {
+      specTimer?.Dispose();
+      specWarnTimer?.Dispose();
+      return;
+    }
+
+    specWarnTimer?.Dispose();
+    specWarnTimer = Scheduler.Schedule(config.RoundCfg.CheckAFKTimespan / 2, ()
+      => {
+      Server.NextWorldUpdate(() => {
+        foreach (var player in getAfkPlayers()) {
+          var apiPlayer = converter.GetPlayer(player);
+          var timetill  = config.RoundCfg.CheckAFKTimespan / 2;
+          Messenger.Message(apiPlayer, Locale[CS2Msgs.AFK_WARNING(timetill)]);
+        }
+      });
+    });
+
+    specTimer?.Dispose();
+    specTimer = Scheduler.Schedule(config.RoundCfg.CheckAFKTimespan, () => {
+      Server.NextWorldUpdate(() => {
+        foreach (var player in getAfkPlayers()) {
+          var apiPlayer = converter.GetPlayer(player);
+#if !DEBUG
+          player.ChangeTeam(CsTeam.Spectator);
+#endif
+          Messenger.Message(apiPlayer, Locale[CS2Msgs.AFK_MOVED]);
+        }
+      });
+    });
+  }
+
+  private List<CCSPlayerController> getAfkPlayers() {
+    return Utilities.GetPlayers()
+     .Where(p => p.PlayerPawn.Value != null
+        && !p.PlayerPawn.Value.HasMovedSinceSpawn)
+     .ToList();
+  }
+}

TTT/CS2/Listeners/BodyPickupListener.cs

@@ -10,6 +10,7 @@ using TTT.CS2.Events;
 using TTT.CS2.Extensions;
 using TTT.Game;
 using TTT.Game.Events.Body;
+using TTT.Game.lang;
 using TTT.Game.Listeners;
 using TTT.Game.Roles;
 
@@ -57,7 +58,8 @@ public class BodyPickupListener(IServiceProvider provider)
     if (ragdoll.IsValid) ragdoll.SetColor(primary.Color);
 
     var online = converter.GetPlayer(ev.Body.OfPlayer);
-    if (online is not { IsValid: true }) return;
+    if (online is not { IsValid: true } || online.Team == CsTeam.Spectator)
+      return;
 
     if (primary is InnocentRole) online.SwitchTeam(CsTeam.CounterTerrorist);
 

TTT/CS2/Listeners/KarmaBanner.cs

@@ -15,8 +15,8 @@ using TTT.Karma.lang;
 namespace TTT.CS2.Listeners;
 
 public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
-  private readonly KarmaConfig config =
-    provider.GetService<IStorage<KarmaConfig>>()
+  private KarmaConfig config
+    => Provider.GetService<IStorage<KarmaConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new KarmaConfig();

TTT/CS2/Listeners/PlayerStatsTracker.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
 using TTT.API.Game;
@@ -24,6 +25,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
 
   public void Dispose() { }
 
+  [UsedImplicitly]
   [EventHandler(Priority = Priority.MONITOR)]
   public void OnIdentify(BodyIdentifyEvent ev) {
     var gamePlayer = converter.GetPlayer(ev.Body.OfPlayer);
@@ -40,6 +42,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
 
   // Needs to be higher so we detect the kill before the game ends
   // in the case that this is the last player
+  [UsedImplicitly]
   [EventHandler(Priority = Priority.HIGH)]
   public void OnKill(PlayerDeathEvent ev) {
     var killer = ev.Killer == null ? null : converter.GetPlayer(ev.Killer);
@@ -59,6 +62,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
     }
   }
 
+  [UsedImplicitly]
   [EventHandler]
   public void OnRoundEnd(GameStateUpdateEvent ev) {
     if (ev.NewState == State.IN_PROGRESS) {

TTT/CS2/Listeners/RoundTimerListener.cs

@@ -22,18 +22,15 @@ namespace TTT.CS2.Listeners;
 
 public class RoundTimerListener(IServiceProvider provider)
   : BaseListener(provider) {
-  private readonly TTTConfig config = provider
-   .GetRequiredService<IStorage<TTTConfig>>()
-   .Load()
-   .GetAwaiter()
-   .GetResult() ?? new TTTConfig();
+  private TTTConfig config
+    => Provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly IScheduler scheduler = provider
-   .GetRequiredService<IScheduler>();
-
   private IDisposable? endTimer;
 
   [UsedImplicitly]
@@ -45,7 +42,9 @@ public class RoundTimerListener(IServiceProvider provider)
          .TotalSeconds);
         Server.ExecuteCommand("mp_ignore_round_win_conditions 1");
         foreach (var player in Utilities.GetPlayers()
-         .Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE))
+         .Where(p => p.GetHealth() <= 0 && p is {
+            Team: CsTeam.CounterTerrorist or CsTeam.Terrorist
+          }))
           player.Respawn();
 
         foreach (var player in Utilities.GetPlayers())
@@ -55,6 +54,15 @@ public class RoundTimerListener(IServiceProvider provider)
       return;
     }
 
+    if (ev.NewState == State.IN_PROGRESS)
+      Server.NextWorldUpdate(() => {
+        foreach (var player in Utilities.GetPlayers()
+         .Where(p => p.GetHealth() <= 0 && p is {
+            Team: CsTeam.CounterTerrorist or CsTeam.Terrorist
+          }))
+          player.Respawn();
+      });
+
     if (ev.NewState == State.FINISHED) endTimer?.Dispose();
     if (ev.NewState != State.IN_PROGRESS) return;
     var duration = config.RoundCfg.RoundDuration(ev.Game.Players.Count);
@@ -62,7 +70,7 @@ public class RoundTimerListener(IServiceProvider provider)
       => RoundUtil.SetTimeRemaining((int)duration.TotalSeconds));
 
     endTimer?.Dispose();
-    endTimer = scheduler.Schedule(duration,
+    endTimer = Scheduler.Schedule(duration,
       () => {
         Server.NextWorldUpdate(()
           => ev.Game.EndGame(EndReason.TIMEOUT(new InnocentRole(Provider))));
@@ -119,6 +127,7 @@ public class RoundTimerListener(IServiceProvider provider)
       var role = Roles.GetRoles(player).FirstOrDefault();
       if (role == null) continue;
       csPlayer.SetClan(role.Name, false);
+      if (csPlayer.Team == CsTeam.Spectator) continue;
       if (role is InnocentRole) csPlayer.SwitchTeam(CsTeam.CounterTerrorist);
     }
 

TTT/CS2/Player/CS2AliveSpoofer.cs

@@ -1,5 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using JetBrains.Annotations;
 using TTT.API;
 using TTT.CS2.API;
 
@@ -8,6 +10,7 @@ namespace TTT.CS2.Player;
 public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
   private readonly HashSet<CCSPlayerController> _fakeAlivePlayers = new();
   public ISet<CCSPlayerController> FakeAlivePlayers => _fakeAlivePlayers;
+  private BasePlugin? plugin = null;
 
   public void SpoofAlive(CCSPlayerController player) {
     if (player.IsBot) {
@@ -44,14 +47,29 @@ public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
     FakeAlivePlayers.Remove(player);
   }
 
-  public void Dispose() { }
+  public void Dispose() {
+    _fakeAlivePlayers.Clear();
+    plugin?.RemoveListener<CounterStrikeSharp.API.Core.Listeners.OnTick>(
+      onTick);
+  }
+
   public void Start() { }
 
   public void Start(BasePlugin? plugin) {
+    if (plugin == null) return;
+    this.plugin = plugin;
     plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnTick>(
       onTick);
   }
 
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnDisconnect(EventPlayerDisconnect ev, GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    _fakeAlivePlayers.Remove(ev.Userid);
+    return HookResult.Continue;
+  }
+
   private void onTick() {
     _fakeAlivePlayers.RemoveWhere(p => !p.IsValid || p.Handle == IntPtr.Zero);
     foreach (var player in _fakeAlivePlayers) {

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;
@@ -9,12 +8,9 @@ public class CS2PermManager(IPlayerConverter<CCSPlayerController> converter)
   : IPermissionManager {
   public bool HasFlags(IPlayer player, params string[] flags) {
     if (flags.Length == 0) return true;
-    Console.WriteLine("Checking flags for player: " + player.Id);
     var gamePlayer = converter.GetPlayer(player);
     if (gamePlayer == null) return false;
-
-    ulong.TryParse(player.Id, out var steamId);
-    return AdminManager.PlayerHasPermissions(new SteamID(steamId), flags);
+    return AdminManager.PlayerHasPermissions(gamePlayer, flags);
   }
 
   public bool InGroups(IPlayer player, params string[] groups) {

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/Utils/DamageDealingHelper.cs

@@ -0,0 +1,87 @@
+using System.Net;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
+
+namespace TTT.CS2.Utils;
+
+public class DamageDealingHelper {
+  public static void DealDamage(CCSPlayerController target,
+    CCSPlayerController? attacker, int damage, string source,
+    DamageTypes_t type = DamageTypes_t.DMG_BLAST_SURFACE) {
+    if (target.Pawn.Value == null) return;
+
+    var infoSize = Schema.GetClassSize("CTakeDamageInfo");
+    var infoPtr  = Marshal.AllocHGlobal(infoSize);
+
+    for (var i = 0; i < infoSize; i++) Marshal.WriteByte(infoPtr, i, 0);
+
+    var damageInfo = new CTakeDamageInfo(infoPtr);
+
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo", "m_hInflictor",
+      attacker != null ? attacker.Pawn.Raw : 0);
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo", "m_hAttacker",
+      attacker != null ? attacker.EntityHandle.Raw : 0);
+    damageInfo.Damage         = damage;
+    damageInfo.BitsDamageType = type;
+
+    if (target.Pawn.Value?.AbsOrigin != null)
+      Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo",
+        "m_vecDamagePosition",
+        target.Pawn.Value != null ?
+          target.Pawn.Value.AbsOrigin.Handle :
+          Vector.Zero.Handle);
+
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo",
+      "m_vecDamageForce", Vector.Zero.Handle);
+
+    var damageResultSize = Schema.GetClassSize("CTakeDamageResult");
+    var damageResultPtr  = Marshal.AllocHGlobal(damageResultSize);
+    for (var i = 0; i < damageResultSize; i++)
+      Marshal.WriteByte(damageResultPtr, i, 0);
+
+    var damageResult = new CTakeDamageResult(damageResultPtr);
+    Schema.SetSchemaValue(damageResult.Handle, "CTakeDamageResult",
+      "m_pOriginatingInfo", damageInfo.Handle);
+
+    damageResult.HealthLost          = damage;
+    damageResult.DamageDealt         = damage;
+    damageResult.TotalledHealthLost  = damage;
+    damageResult.TotalledDamageDealt = damage;
+    damageResult.WasDamageSuppressed = false;
+
+    if (target.EntityHandle.Value != null)
+      VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Invoke(
+        target.EntityHandle.Value, damageInfo, damageResult);
+
+    Marshal.FreeHGlobal(infoPtr);
+    Marshal.FreeHGlobal(damageResultPtr);
+  }
+}
+
+[StructLayout(LayoutKind.Explicit)]
+public struct CAttackerInfo {
+  [FieldOffset(0x0)]
+  public bool NeedInit;
+
+  [FieldOffset(0x1)]
+  public bool IsPawn;
+
+  [FieldOffset(0x2)]
+  public bool IsWorld;
+
+  [FieldOffset(0x4)]
+  public UInt32 AttackerPawn;
+
+  [FieldOffset(0x8)]
+  public ushort AttackerUserId;
+
+  [FieldOffset(0x0C)]
+  public int TeamChecked;
+
+  [FieldOffset(0x10)]
+  public int TeamNum;
+}

TTT/CS2/Utils/GrenadeDataHelper.cs

@@ -0,0 +1,30 @@
+using System.Runtime.InteropServices;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Utils;
+
+namespace TTT.CS2.Utils;
+
+public class GrenadeDataHelper {
+  private static readonly CHEGrenadeProjectile_CreateDelegate
+    CHEGrenadeProjectile_CreateFunc;
+
+  static GrenadeDataHelper() {
+    var heGrenadeSignature = NativeAPI.FindSignature(Addresses.ServerPath,
+      GameData.GetSignature("CHEGrenadeProjectile_CreateFunc"));
+    CHEGrenadeProjectile_CreateFunc =
+      Marshal
+       .GetDelegateForFunctionPointer<CHEGrenadeProjectile_CreateDelegate>(
+          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);
+  }
+}

TTT/CS2/Utils/WeaponTranslations.cs

@@ -0,0 +1,127 @@
+namespace TTT.CS2.Utils;
+
+public static class WeaponTranslations {
+  public static string GetFriendlyWeaponName(string designerName) {
+    switch (designerName) {
+      case "weapon_ak47":
+        return "AK-47";
+      case "weapon_aug":
+        return "AUG";
+      case "weapon_awp":
+        return "AWP";
+      case "weapon_bizon":
+        return "Bizon";
+      case "weapon_cz75a":
+        return "CZ75";
+      case "weapon_deagle":
+        return "Desert Eagle";
+      case "weapon_elite":
+        return "Dualies";
+      case "weapon_famas":
+        return "Famas";
+      case "weapon_fiveseven":
+        return "Five Seven";
+      case "weapon_g3sg1":
+        return "G3SG1";
+      case "weapon_galilar":
+        return "Galil";
+      case "weapon_glock":
+        return "Glock 18";
+      case "weapon_hkp2000":
+        return "HPK2000";
+      case "weapon_m249":
+        return "M249";
+      case "weapon_m4a1":
+        return "M4A1";
+      case "weapon_m4a1_silencer":
+        return "M4A1-S";
+      case "weapon_m4a4":
+        return "M4A4";
+      case "weapon_mac10":
+        return "MAC10";
+      case "weapon_mag7":
+        return "MAG7";
+      case "weapon_mp5sd":
+        return "MP5SD";
+      case "weapon_mp7":
+        return "MP7";
+      case "weapon_mp9":
+        return "MP9";
+      case "weapon_negev":
+        return "Negev";
+      case "weapon_nova":
+        return "Nova";
+      case "weapon_p250":
+        return "P250";
+      case "weapon_p90":
+        return "P90";
+      case "weapon_revolver":
+        return "Revolver";
+      case "weapon_sawedoff":
+        return "Sawed Off";
+      case "weapon_scar20":
+        return "Scar20";
+      case "weapon_sg553":
+        return "SG553";
+      case "weapon_sg556":
+        return "SG556";
+      case "weapon_ssg08":
+        return "SSG08";
+      case "weapon_taser":
+        return "Zeus";
+      case "weapon_tec9":
+        return "Tec9";
+      case "weapon_ump45":
+        return "UMP45";
+      case "weapon_usp_silencer":
+        return "USPS";
+      case "weapon_xm1014":
+        return "XM1014";
+      case "item_kevlar":
+        return "Kevlar";
+      case "item_assaultsuit":
+        return "Kevlar Helmet";
+      case "weapon_snowball":
+        return "Snowball";
+      case "weapon_shield":
+        return "Shield";
+      case "weapon_c4":
+        return "Bomb";
+      case "weapon_healthshot":
+        return "Healthshot";
+      case "weapon_breachcharge":
+        return "Breach Charge";
+      case "weapon_tablet":
+        return "Tablet";
+      case "weapon_bumpmine":
+        return "Bumpmine";
+      case "weapon_smokegrenade":
+        return "Smoke Grenade";
+      case "weapon_flashbang":
+        return "Flashbang";
+      case "weapon_hegrenade":
+        return "HE Grenade";
+      case "weapon_molotov":
+        return "Molotov";
+      case "weapon_incgrenade":
+        return "Incendiary Grenade";
+      case "weapon_decoy":
+        return "Decoy Grenade";
+      case "weapon_tagrenade":
+        return "TAGrenade";
+      case "weapon_frag":
+        return "Frag Grenade";
+      case "weapon_firebomb":
+        return "Firebomb";
+      case "weapon_diversion":
+        return "Diversion";
+      case "weapon_knife_t":
+      case "weapon_knife":
+        return "Knife";
+      default: {
+        var name = designerName.Replace("weapon_", "");
+        return char.ToUpper(name[0]) + name[1..];
+      }
+    }
+  }
+}

TTT/CS2/gamedata/TTT.gamedata.json

@@ -26,5 +26,12 @@
       "windows": "48 89 5C 24 ? 48 89 4C 24 ? 55 57",
       "linux": "55 48 89 E5 41 57 49 89 CF 41 56 49 89 F6 41 55 4D 89 C5 41 54 49 89 D4 53 4C 89 CB"
     }
+  },
+  "CHEGrenadeProjectile_CreateFunc": {
+    "signatures": {
+      "library": "server",
+      "windows": "48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 40 48 8B 6C 24 70",
+      "linux": "55 4C 89 C1 48 89 E5 41 57 49 89 D7"
+    }
   }
 }

TTT/CS2/lang/CS2Msgs.cs

@@ -1,6 +1,7 @@
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.Game;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.CS2.lang;
@@ -9,9 +10,22 @@ public static class CS2Msgs {
   public static IMsg ROLE_SPECTATOR
     => MsgFactory.Create(nameof(ROLE_SPECTATOR));
 
+  public static IMsg DEAD_MUTE_REMINDER
+    => MsgFactory.Create(nameof(DEAD_MUTE_REMINDER));
+
   public static IMsg TASER_SCANNED(IPlayer scannedPlayer, IRole role) {
     var rolePrefix = GameMsgs.GetRolePrefix(role);
     return MsgFactory.Create(nameof(TASER_SCANNED),
       rolePrefix + scannedPlayer.Name, role.Name);
   }
+
+  public static IMsg AFK_WARNING(TimeSpan span) {
+    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

@@ -1,6 +1,11 @@
 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}"
+AFK_WARNING: "%PREFIX%You will be moved to spectators in {yellow}{0} second%s%{grey} for being AFK."
+AFK_MOVED: "%PREFIX%You were moved to spectators for being AFK."
+
+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."
@@ -34,8 +39,14 @@ SHOP_ITEM_ARMOR_DESC: "Wear armor that reduces incoming damage."
 SHOP_ITEM_ONE_HIT_KNIFE: "One-Hit Knife"
 SHOP_ITEM_ONE_HIT_KNIFE_DESC: "Your next knife hit will be a guaranteed kill."
 
-SHOP_ITEM_COMPASS: "Player Compass"
-SHOP_ITEM_COMPASS_DESC: "Reveals the direction that the nearest non-Traitor is in."
+SHOP_ITEM_COMPASS_PLAYER: "Player Compass"
+SHOP_ITEM_COMPASS_PLAYER_DESC: "Reveals the direction that the nearest non-Traitor is in."
+
+SHOP_ITEM_COMPASS_BODY: "Body Compass"
+SHOP_ITEM_COMPASS_BODY_DESC: "Reveals the direction that the nearest unidentified body is in."
 
 SHOP_ITEM_SILENT_AWP: "Silent AWP"
-SHOP_ITEM_SILENT_AWP_DESC: "Receive a silenced AWP with limited ammo."
+SHOP_ITEM_SILENT_AWP_DESC: "Receive a silenced AWP with limited ammo."
+
+SHOP_ITEM_CLUSTER_GRENADE: "Cluster Grenade"
+SHOP_ITEM_CLUSTER_GRENADE_DESC: "A grenade that splits into multiple smaller grenades."

TTT/Directory.Build.props

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

TTT/Game/Commands/CommandManager.cs

@@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Command;
 using TTT.API.Player;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Commands;

TTT/Game/Commands/LogsCommand.cs

@@ -1,7 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Command;
 using TTT.API.Game;
+using TTT.API.Messages;
 using TTT.API.Player;
+using TTT.Game.lang;
+using TTT.Locale;
 
 namespace TTT.Game.Commands;
 
@@ -9,22 +12,38 @@ public class LogsCommand(IServiceProvider provider) : ICommand {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
+  private readonly IIconManager? icons = provider.GetService<IIconManager>();
+
+  private readonly IMsgLocalizer localizer =
+    provider.GetRequiredService<IMsgLocalizer>();
+
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
   public void Dispose() { }
+  public string[] RequiredFlags => ["@ttt/admin"];
+
+  public bool MustBeOnMainThread => true;
 
   public string Id => "logs";
   public void Start() { }
 
-  // TODO: Restrict and verbalize usage
-
   public Task<CommandResult>
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     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) {
+      icons.SetVisiblePlayers(executor, ulong.MaxValue);
+      messenger.Message(executor, localizer[GameMsgs.LOGS_VIEWED_INFO]);
+    }
+
     games.ActiveGame.Logger.PrintLogs(executor);
     return Task.FromResult(CommandResult.SUCCESS);
   }

TTT/Game/Commands/TTTCommand.cs

@@ -4,6 +4,7 @@ using TTT.API;
 using TTT.API.Command;
 using TTT.API.Events;
 using TTT.API.Player;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Commands;

TTT/Game/Game.csproj

@@ -12,4 +12,8 @@
     <ProjectReference Include="..\API\API.csproj"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Listeners\Stats\" />
+  </ItemGroup>
+
 </Project>

TTT/Game/Listeners/GameRestartListener.cs

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

TTT/Game/Listeners/PlayerDeathInformer.cs

@@ -1,6 +1,7 @@
 using JetBrains.Annotations;
 using TTT.API.Events;
 using TTT.Game.Events.Player;
+using TTT.Game.lang;
 
 namespace TTT.Game.Listeners;
 

TTT/Game/Listeners/PlayerJoinStarting.cs

@@ -9,9 +9,11 @@ namespace TTT.Game.Listeners;
 
 public class PlayerJoinStarting(IServiceProvider provider)
   : BaseListener(provider) {
-  private readonly TTTConfig config =
-    provider.GetService<IStorage<TTTConfig>>()?.Load().GetAwaiter().GetResult()
-    ?? new TTTConfig();
+  private TTTConfig config
+    => Provider.GetService<IStorage<TTTConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
 
   [EventHandler]
   [UsedImplicitly]

TTT/Game/Listeners/TraitorBuddyInformer.cs

@@ -3,6 +3,7 @@ using JetBrains.Annotations;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.Game.Events.Game;
+using TTT.Game.lang;
 using TTT.Game.Roles;
 
 namespace TTT.Game.Listeners;

TTT/Game/Loggers/SimpleLogger.cs

@@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Game;
 using TTT.API.Messages;
 using TTT.API.Player;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Loggers;
@@ -60,6 +61,15 @@ public class SimpleLogger(IServiceProvider provider) : IActionLogger {
     msg.Value.BackgroundMsg(player, locale[GameMsgs.GAME_LOGS_FOOTER]);
   }
 
+  public string[] MakeLogs() {
+    List<string> logLines = [];
+    logLines.Add(locale[GameMsgs.GAME_LOGS_HEADER]);
+    foreach (var (time, action) in GetActions())
+      logLines.Add($"{formatTime(time)} {action.Format()}");
+    logLines.Add(locale[GameMsgs.GAME_LOGS_FOOTER]);
+    return logLines.ToArray();
+  }
+
   private string formatTime(DateTime time) {
     if (epoch == null) return time.ToString("o");
     var span = time - epoch.Value;

TTT/Game/Roles/BaseRole.cs

@@ -4,16 +4,17 @@ using TTT.API.Messages;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.API.Storage;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Roles;
 
 public abstract class BaseRole(IServiceProvider provider) : IRole {
-  protected readonly TTTConfig Config = provider
-   .GetRequiredService<IStorage<TTTConfig>>()
-   .Load()
-   .GetAwaiter()
-   .GetResult() ?? new TTTConfig();
+  protected TTTConfig Config
+    => Provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
 
   protected readonly IInventoryManager Inventory =
     provider.GetRequiredService<IInventoryManager>();

TTT/Game/Roles/DetectiveRole.cs

@@ -1,5 +1,6 @@
 using System.Drawing;
 using TTT.API.Player;
+using TTT.Game.lang;
 
 namespace TTT.Game.Roles;
 

TTT/Game/Roles/InnocentRole.cs

@@ -1,6 +1,7 @@
 using System.Drawing;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Player;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Roles;

TTT/Game/Roles/RoleAssigner.cs

@@ -49,7 +49,7 @@ public class RoleAssigner(IServiceProvider provider) : IRoleAssigner {
       assignedRoles[player].Add(ev.Role);
       ev.Role.OnAssign(player);
 
-      onlineMessenger?.BackgroundMsgAll(
+      onlineMessenger?.Debug(
         $"{player.Name} was assigned the role of {role.Name}.");
       return true;
     }

TTT/Game/Roles/TraitorRole.cs

@@ -1,5 +1,6 @@
 using System.Drawing;
 using TTT.API.Player;
+using TTT.Game.lang;
 
 namespace TTT.Game.Roles;
 

TTT/Game/RoundBasedGame.cs

@@ -8,6 +8,7 @@ using TTT.API.Player;
 using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.Game.Events.Game;
+using TTT.Game.lang;
 using TTT.Game.Loggers;
 using TTT.Game.Roles;
 using TTT.Locale;
@@ -15,11 +16,11 @@ using TTT.Locale;
 namespace TTT.Game;
 
 public class RoundBasedGame(IServiceProvider provider) : IGame {
-  private readonly TTTConfig config = provider
-   .GetRequiredService<IStorage<TTTConfig>>()
-   .Load()
-   .GetAwaiter()
-   .GetResult() ?? new TTTConfig();
+  private TTTConfig config
+    => provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
 
   protected readonly IMsgLocalizer Locale =
     provider.GetRequiredService<IMsgLocalizer>();
@@ -147,10 +148,11 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
       case > 0 when nonTraitorsAlive == 0:
         winningTeam = traitorRole;
         return true;
+      case > 0 when nonTraitorsAlive == detectivesAlive:
+        winningTeam = detectiveRole;
+        return true;
       case 0 when nonTraitorsAlive > 0:
-        winningTeam = nonTraitorsAlive == detectivesAlive ?
-          detectiveRole :
-          innocentRole;
+        winningTeam = innocentRole;
         return true;
       default:
         winningTeam = null;
@@ -159,7 +161,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(
@@ -170,6 +172,7 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
 
     StartedAt = DateTime.Now;
     RoleAssigner.AssignRoles(online, Roles);
+
     players.AddRange(online.Where(p
       => RoleAssigner.GetRoles(p)
        .Any(r => r is TraitorRole or DetectiveRole or InnocentRole)));
@@ -182,6 +185,10 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
       GameMsgs.GAME_STATE_STARTED(traitors, nonTraitors)]);
   }
 
+  virtual protected ISet<IOnlinePlayer> GetParticipants() {
+    return finder.GetOnline();
+  }
+
   #region classDeps
 
   protected readonly IEventBus Bus = provider.GetRequiredService<IEventBus>();

TTT/Game/TTTConfig.cs

@@ -38,6 +38,7 @@ public record TTTConfig {
   public record RoundConfig {
     public TimeSpan CountDownDuration { get; init; } = TimeSpan.FromSeconds(10);
     public TimeSpan TimeBetweenRounds { get; init; } = TimeSpan.FromSeconds(5);
+    public TimeSpan CheckAFKTimespan { get; init; } = TimeSpan.FromSeconds(60);
     public int MinimumPlayers { get; init; } = 2;
 
     public virtual TimeSpan RoundDuration(int players) {

TTT/Game/lang/GameMsgs.cs

@@ -4,7 +4,7 @@ using TTT.API.Role;
 using TTT.Game.Roles;
 using TTT.Locale;
 
-namespace TTT.Game;
+namespace TTT.Game.lang;
 
 public static class GameMsgs {
   public static IMsg PREFIX => MsgFactory.Create(nameof(PREFIX));
@@ -27,6 +27,12 @@ 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 LOGS_VIEWED_INFO
+    => MsgFactory.Create(nameof(LOGS_VIEWED_INFO));
+
   public static IMsg ROLE_REVEAL_DEATH(IRole killerRole) {
     return MsgFactory.Create(nameof(ROLE_REVEAL_DEATH),
       GetRolePrefix(killerRole) + killerRole.Name);
@@ -79,6 +85,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) {

TTT/Game/lang/en.yml

@@ -21,4 +21,7 @@ GAME_STATE_ENDED_OTHER: "%PREFIX%{blue}GAME! {default}{0}{grey}."
 NOT_ENOUGH_PLAYERS: "%PREFIX%{red}Game was canceled due to having fewer than {yellow}{0}{red} player%s%."
 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_FOOTER: "-------------------------------"
+GAME_LOGS_NONE: "%PREFIX%There is no game active."
+LOGS_VIEWED_ALIVE: "%PREFIX%{red}{0}{grey} viewed the logs while alive."
+LOGS_VIEWED_INFO: "%PREFIX%Logs printed to console. All players' roles have been shown."

TTT/Karma/Karma.csproj

@@ -11,11 +11,4 @@
     <ProjectReference Include="..\Game\Game.csproj"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.1.66"/>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9"/>
-    <PackageReference Include="MySqlConnector" Version="2.4.0"/>
-    <PackageReference Include="SQLite" Version="3.13.0"/>
-  </ItemGroup>
-
 </Project>

TTT/Karma/KarmaConfig.cs

@@ -6,51 +6,58 @@ 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.
+  /// </summary>
+  public int KarmaPerRound { get; init; } = 1;
 
-  public int INNO_ON_TRAITOR { get; init; } = 2;
+  public int KarmaPerRoundWin { get; init; } = 2;
+
+  public int INNO_ON_TRAITOR { get; init; } = 5;
   public int TRAITOR_ON_DETECTIVE { get; init; } = 1;
   public int INNO_ON_INNO_VICTIM { get; init; } = -1;
   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 KarmaConfig config
+    => Provider.GetService<IStorage<KarmaConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new KarmaConfig();
+
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
@@ -26,11 +32,7 @@ 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]
   [UsedImplicitly]
@@ -45,7 +47,7 @@ public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
     var killer = ev.Killer;
 
     if (killer == null) return;
-    if (victim == killer) return;
+    if (victim.Id == killer.Id) return;
 
     var victimRole = roles.GetRoles(victim).First();
     var killerRole = roles.GetRoles(killer).First();
@@ -94,6 +96,18 @@ public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
   public void OnRoundEnd(GameStateUpdateEvent ev) {
     if (ev.NewState != State.FINISHED) return;
 
+    var winner = ev.Game.WinningRole;
+    if (GiveKarmaOnRoundEnd)
+      foreach (var player in ev.Game.Players)
+        if (Roles.GetRoles(player).Any(r => r.GetType() == winner?.GetType()))
+          queuedKarmaUpdates[player] =
+            queuedKarmaUpdates.GetValueOrDefault(player, 0)
+            + config.KarmaPerRoundWin;
+        else
+          queuedKarmaUpdates[player] =
+            queuedKarmaUpdates.GetValueOrDefault(player, 0)
+            + config.KarmaPerRound;
+
     foreach (var (player, karmaDelta) in queuedKarmaUpdates)
       Task.Run(async () => {
         var newKarma = await karma.Load(player) + karmaDelta;

TTT/Karma/KarmaStorage.cs

@@ -1,10 +1,9 @@
 using System.Collections.Concurrent;
 using System.Data;
+using System.Diagnostics;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Reactive.Threading.Tasks;
-using Dapper;
-using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
 using TTT.API.Player;
@@ -14,156 +13,38 @@ using TTT.Karma.Events;
 namespace TTT.Karma;
 
 public sealed class KarmaStorage(IServiceProvider provider) : IKarmaService {
-  private readonly IEventBus _bus = provider.GetRequiredService<IEventBus>();
+  private readonly HttpClient client =
+    provider.GetRequiredService<HttpClient>();
 
-  private readonly IScheduler _scheduler =
-    provider.GetRequiredService<IScheduler>();
+  private KarmaConfig config
+    => provider.GetService<IStorage<KarmaConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new KarmaConfig();
 
-  private readonly IStorage<KarmaConfig>? _configStorage =
-    provider.GetService<IStorage<KarmaConfig>>();
+  public async Task<int> Load(IPlayer key) {
+    var result = await client.GetAsync("user/" + key.Id);
 
-  // Cache keyed by stable player id to avoid relying on IPlayer equality
-  private readonly ConcurrentDictionary<string, int> _karmaCache = new();
+    if (!result.IsSuccessStatusCode) return config.DefaultKarma;
 
-  private KarmaConfig _config = new();
-  private IDbConnection? _connection;
-  private IDisposable? _flushSubscription;
-  private readonly SemaphoreSlim _flushGate = new(1, 1);
+    var content = await result.Content.ReadAsStringAsync();
+    var json    = System.Text.Json.JsonDocument.Parse(content);
+    if (!json.RootElement.TryGetProperty("karma", out var karmaElement))
+      return config.DefaultKarma;
 
-  // 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) {
-      // 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);
-    _connection.Open();
-
-    // Ensure schema before any reads or writes
-    _connection.Execute(@"CREATE TABLE IF NOT EXISTS PlayerKarma (
-          PlayerId TEXT PRIMARY KEY,
-          Karma    INTEGER NOT NULL
-        )");
-
-    // Periodic flush with proper error handling and serialization
-    _flushSubscription = Observable
-     .Interval(TimeSpan.FromSeconds(30), _scheduler)
-     .SelectMany(_ => FlushAsync().ToObservable())
-     .Subscribe(_ => { }, // no-op on success
-        ex => {
-          // Replace with your logger if available
-          System.Diagnostics.Trace.TraceError($"Karma flush failed: {ex}");
-        });
+    return karmaElement.GetInt32();
   }
 
-  public async Task<int> Load(IPlayer player) {
-    if (player is null) throw new ArgumentNullException(nameof(player));
-    var key = player.Id;
+  public Task Write(IPlayer key, int newData) {
+    var data = new { steam_id = key.Id, karma = newData };
 
-    if (EnableCache && _karmaCache.TryGetValue(key, out var cached))
-      return cached;
+    var payload = new StringContent(
+      System.Text.Json.JsonSerializer.Serialize(data),
+      System.Text.Encoding.UTF8, "application/json");
 
-    var conn = EnsureConnection();
-
-    // Parameterize the default value to keep SQL static
-    var sql = @"
-SELECT COALESCE(
-  (SELECT Karma FROM PlayerKarma WHERE PlayerId = @PlayerId),
-  @DefaultKarma
-)";
-    var karma = await conn.QuerySingleAsync<int>(sql,
-      new { PlayerId = key, DefaultKarma = _config.DefaultKarma });
-
-    if (EnableCache) _karmaCache[key] = karma;
-    return karma;
+    return client.PatchAsync("user/" + key.Id, payload);
   }
 
-  public async Task Write(IPlayer player, int newValue) {
-    if (player is null) throw new ArgumentNullException(nameof(player));
-    var key = player.Id;
-
-    var max = _config.MaxKarma(player);
-    if (newValue > max)
-      throw new ArgumentOutOfRangeException(nameof(newValue),
-        $"Karma must be less than {max} for player {key}.");
-
-    int 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.");
-      throw;
-    }
-
-    if (evt.IsCanceled) return;
-
-    _karmaCache[key] = newValue;
-
-    if (!EnableCache) await FlushAsync();
-  }
-
-  private async Task FlushAsync() {
-    var conn = EnsureConnection();
-
-    // Fast path if there is nothing to flush
-    if (_karmaCache.IsEmpty) return;
-
-    await _flushGate.WaitAsync().ConfigureAwait(false);
-    try {
-      // Snapshot to avoid long lock on dictionary and to provide a stable view
-      var snapshot = _karmaCache.ToArray();
-      if (snapshot.Length == 0) return;
-
-      using var tx = conn.BeginTransaction();
-      const string upsert = @"
-INSERT INTO PlayerKarma (PlayerId, Karma)
-VALUES (@PlayerId, @Karma)
-ON CONFLICT(PlayerId) DO UPDATE SET Karma = excluded.Karma
-";
-      foreach (var (playerId, karma) in snapshot) {
-        await conn.ExecuteAsync(upsert,
-          new { PlayerId = playerId, Karma = karma }, tx);
-      }
-
-      tx.Commit();
-    } finally { _flushGate.Release(); }
-  }
-
-  private IDbConnection EnsureConnection() {
-    if (_connection is not { State: ConnectionState.Open })
-      throw new InvalidOperationException(
-        "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();
-    }
-  }
+  public void Dispose() { }
+  public void Start() { }
 }

TTT/Plugin/Plugin.csproj

@@ -12,6 +12,8 @@
     <ProjectReference Include="..\CS2\CS2.csproj"/>
     <ProjectReference Include="..\Karma\Karma.csproj"/>
     <ProjectReference Include="..\Shop\Shop.csproj"/>
+    <ProjectReference Include="..\RTD\RTD.csproj"/>
+    <ProjectReference Include="..\Stats\Stats.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

TTT/Plugin/TTT.cs

@@ -36,6 +36,8 @@ public class TTT(IServiceProvider provider) : BasePlugin {
       $"Found {pluginModules.Count} plugin modules, loading...");
 
     foreach (var module in pluginModules) {
+      Logger.LogInformation(
+        $"Registering {module.Version} {module.Id} {module.GetType().Namespace}");
       module.Start(this, hotReload);
       RegisterAllAttributes(module);
       loadedModules.Add(module);
@@ -62,4 +64,5 @@ public class TTT(IServiceProvider provider) : BasePlugin {
 
     base.Dispose(disposing);
   }
+
 }