Final tweaks

Jailbreak.sln

@@ -66,7 +66,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gangs.WardenIconPerk", "mod
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gangs.SpecialIconPerk", "mod\Gangs.SpecialIconPerk\Gangs.SpecialIconPerk.csproj", "{7F4BCD17-658C-4928-9AC1-61EFDEABDF5C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WardenPaintColorPerk", "mod\WardenPaintColorPerk\WardenPaintColorPerk.csproj", "{71D8A1A7-EB94-485A-82CC-D2D5124FE690}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gangs.WardenPaintColorPerk", "mod\Gangs.WardenPaintColorPerk\Gangs.WardenPaintColorPerk.csproj", "{71D8A1A7-EB94-485A-82CC-D2D5124FE690}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

mod/Gangs.BaseImpl/AbstractEnumCommand.cs

@@ -119,7 +119,7 @@ public abstract class AbstractEnumCommand<T>(IServiceProvider provider,
 
     await playerStats.SetForPlayer(executor, statId, val);
     executor.PrintToChat(
-      $"{localizer.Get(MSG.PREFIX)}Set your {ChatColors.BlueGrey + title}{ChatColors.Grey} to {formatItem(val)}.");
+      $"{localizer.Get(MSG.PREFIX)}Set your {title} to {formatItem(val)}.");
     return CommandResult.SUCCESS;
   }
 

mod/Gangs.Boostrap/Gangs.Boostrap.csproj

@@ -13,7 +13,7 @@
         <ProjectReference Include="..\Gangs.SpecialDayColorPerk\Gangs.SpecialDayColorPerk.csproj"/>
         <ProjectReference Include="..\Gangs.SpecialIconPerk\Gangs.SpecialIconPerk.csproj"/>
         <ProjectReference Include="..\Gangs.WardenIconPerk\Gangs.WardenIconPerk.csproj"/>
-        <ProjectReference Include="..\WardenPaintColorPerk\WardenPaintColorPerk.csproj" />
+        <ProjectReference Include="..\Gangs.WardenPaintColorPerk\Gangs.WardenPaintColorPerk.csproj" />
     </ItemGroup>
 
     <ItemGroup>

mod/Gangs.SpecialDayColorPerk/SDColorCommand.cs

@@ -1,4 +1,6 @@
-using Gangs.BombIconPerk;
+using CounterStrikeSharp.API.Modules.Utils;
+using Gangs.BaseImpl.Extensions;
+using Gangs.BombIconPerk;
 using GangsAPI;
 using GangsAPI.Data;
 using GangsAPI.Data.Command;
@@ -124,7 +126,8 @@ public class SDColorCommand(IServiceProvider provider) : ICommand {
 
     await gangChat.SendGangChat(player, gang,
       localizer.Get(MSG.GANG_THING_SET, "SD Color",
-        color.ToString().ToTitleCase()));
+        color.GetColor().GetChatColor() + color.ToString().ToTitleCase()
+        + ChatColors.Grey));
     return CommandResult.SUCCESS;
   }
 }

mod/Gangs.SpecialDayColorPerk/SDColorMenu.cs

@@ -22,6 +22,7 @@ public class SDColorMenu(IServiceProvider provider, SDColorData data)
 
   override protected string formatItem(SDColor item) {
     if (item == SDColor.RAINBOW) return IRainbowColorizer.RAINBOW;
-    return $"{item.GetColor().GetChatColor()}{item.ToString().ToTitleCase()}";
+    return
+      $"{item.GetColor().GetChatColor()}{item.ToString().ToTitleCase()}{ChatColors.Grey}";
   }
 }

mod/Gangs.WardenPaintColorPerk/Gangs.WardenPaintColorPerk.csproj

@@ -4,6 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <RootNamespace>WardenPaintColorPerk</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>

mod/Gangs.WardenPaintColorPerk/WardenColorCommand.cs

@@ -1,4 +1,5 @@
-using Gangs.BaseImpl;
+using CounterStrikeSharp.API.Modules.Utils;
+using Gangs.BaseImpl;
 using Gangs.BaseImpl.Extensions;
 using GangsAPI.Data;
 using Jailbreak.Public.Extensions;
@@ -23,6 +24,7 @@ public class WardenColorCommand(IServiceProvider provider)
 
   override protected string formatItem(WardenPaintColor item) {
     if (item == WardenPaintColor.RAINBOW) return IRainbowColorizer.RAINBOW;
-    return $"{item.GetColor().GetChatColor()}{item.ToString().ToTitleCase()}";
+    return
+      $"{item.GetColor().GetChatColor()}{item.ToString().ToTitleCase()}{ChatColors.Grey}";
   }
 }

mod/Gangs.WardenPaintColorPerk/WardenPaintColorMenu.cs

@@ -1,4 +1,5 @@
-using Gangs.BaseImpl;
+using CounterStrikeSharp.API.Modules.Utils;
+using Gangs.BaseImpl;
 using Gangs.BaseImpl.Extensions;
 using Jailbreak.Public.Extensions;
 using Jailbreak.Public.Mod.Rainbow;
@@ -19,6 +20,7 @@ public class WardenPaintColorMenu(IServiceProvider provider,
 
   override protected string formatItem(WardenPaintColor item) {
     if (item == WardenPaintColor.RAINBOW) return IRainbowColorizer.RAINBOW;
-    return $"{item.GetColor().GetChatColor()}{item.ToString().ToTitleCase()}";
+    return
+      $"{item.GetColor().GetChatColor()}{item.ToString().ToTitleCase()}{ChatColors.Grey}";
   }
 }

mod/Jailbreak.Warden/Jailbreak.Warden.csproj

@@ -13,7 +13,7 @@
         <ProjectReference Include="..\Gangs.SpecialIconPerk\Gangs.SpecialIconPerk.csproj"/>
         <ProjectReference Include="..\Gangs.WardenIconPerk\Gangs.WardenIconPerk.csproj"/>
         <ProjectReference Include="..\Jailbreak.Zones\Jailbreak.Zones.csproj"/>
-        <ProjectReference Include="..\WardenPaintColorPerk\WardenPaintColorPerk.csproj" />
+        <ProjectReference Include="..\Gangs.WardenPaintColorPerk\Gangs.WardenPaintColorPerk.csproj" />
     </ItemGroup>
 
     <ItemGroup>

mod/Jailbreak.Warden/Paint/WardenPaintBehavior.cs

@@ -26,6 +26,7 @@ public class WardenPaintBehavior(IWardenService wardenService,
     provider.GetService<IRainbowColorizer>();
 
   private WardenPaintColor?[] colors = new WardenPaintColor?[65];
+  private bool[] fetched = new bool[65];
 
   public void Start(BasePlugin basePlugin) {
     parent = basePlugin;
@@ -34,7 +35,8 @@ public class WardenPaintBehavior(IWardenService wardenService,
 
   [GameEventHandler]
   public HookResult OnRoundStart(EventRoundStart ev, GameEventInfo info) {
-    colors = new WardenPaintColor?[65];
+    colors  = new WardenPaintColor?[65];
+    fetched = new bool[65];
     return HookResult.Continue;
   }
 
@@ -83,6 +85,8 @@ public class WardenPaintBehavior(IWardenService wardenService,
       return color.Value.GetColor() ?? Color.White;
     }
 
+    if (fetched[player.Index]) return Color.White;
+    fetched[player.Index] = true;
     var wrapper = new PlayerWrapper(player);
     Task.Run(async () => {
       color                = await fetchColor(wrapper);
@@ -118,6 +122,9 @@ public class WardenPaintBehavior(IWardenService wardenService,
     var (_, available) = await gangStats.GetForGang<WardenPaintColor>(gang,
       WardenPaintColorPerk.WardenPaintColorPerk.STAT_ID);
 
+    if (playerColors == WardenPaintColor.RANDOM)
+      return playerColors | available;
+
     return playerColors & available;
   }