fix chat colours

destoer · Nov 22, 2023 · 0590239 · 0590239
1 parent 3b1e0c3
commit 0590239
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/src/Debug.cs b/src/Debug.cs
@@ -44,5 +44,5 @@ public static void test_laser(CCSPlayerController? invoke, CommandInfo command)
     // are these commands allowed or not?
     public static readonly bool enable  = true;
 
-    public static readonly String DEBUG_PREFIX = $"{ChatColors.Green}[DEBUG]: {ChatColors.White}";    
+    public static readonly String DEBUG_PREFIX = $" {ChatColors.Green}[DEBUG]: {ChatColors.White}";    
 }
diff --git a/src/LastRequest/LastRequest.cs b/src/LastRequest/LastRequest.cs
@@ -902,5 +902,5 @@ internal class LrChoice
 
     LrChoice[] lr_choice = new LrChoice[64];
 
-    public static readonly String LR_PREFIX = $"{ChatColors.Green}[LR]: {ChatColors.White}";
+    public static readonly String LR_PREFIX = $" {ChatColors.Green}[LR]: {ChatColors.White}";
 }
diff --git a/src/SpecialDay/SpecialDay.cs b/src/SpecialDay/SpecialDay.cs
@@ -126,7 +126,7 @@ public enum SDType
         NONE
     };
 
-    public static readonly String SPECIALDAY_PREFIX = "[Special day]: ";
+    public static readonly String SPECIALDAY_PREFIX = $"  {ChatColors.Green}[Special day]: {ChatColors.White}";
 
     static String[] SD_NAME = {
         "Friendly fire",

diff --git a/src/Warden/JailPlayer.cs b/src/Warden/JailPlayer.cs
@@ -63,7 +63,7 @@ public void rebel_death(CCSPlayerController? player,CCSPlayerController? killer)
         // print death if player is rebel and killer on CT
         if(is_rebel && killer.TeamNum == Lib.TEAM_CT)
         {
-            Server.PrintToChatAll($"{ChatColors.Green}[REBEL]: {ChatColors.White}{killer.PlayerName} killed the rebel {player.PlayerName}");
+            Server.PrintToChatAll($" {ChatColors.Green}[REBEL]: {ChatColors.White}{killer.PlayerName} killed the rebel {player.PlayerName}");
         }
     }
 

diff --git a/src/Warden/Mute.cs b/src/Warden/Mute.cs
@@ -130,7 +130,7 @@ public void switch_team(CCSPlayerController? player,int new_team)
 
     CSTimer.Timer? mute_timer = null;
 
-    static readonly String MUTE_PREFIX = $"{ChatColors.Green}[MUTE]: {ChatColors.White}";
+    static readonly String MUTE_PREFIX = $" {ChatColors.Green}[MUTE]: {ChatColors.White}";
 
     // has the mute timer finished?
     bool mute_active = false;

diff --git a/src/Warden/Warday.cs b/src/Warden/Warday.cs
@@ -29,7 +29,7 @@ void gun_callback()
                 }
             }
 
-            Lib.announce("[WARDAY]: ","Weapons live!");
+            Lib.announce(WARDAY_PREFIX,"Weapons live!");
         }
 
         warday_timer = null;
@@ -39,7 +39,7 @@ public bool start_warday(String location)
     {
         if(round_counter >= ROUND_LIMIT)
         {
-            Lib.announce("[WARDAY]: ",$"warday will start in 20 seconds at {location}");
+            Lib.announce(WARDAY_PREFIX,$"warday will start in 20 seconds at {location}");
 
             // must wait again to start a warday
             round_counter = 0;
@@ -86,6 +86,8 @@ public void map_start()
         round_counter = ROUND_LIMIT;
     }
 
+    String WARDAY_PREFIX = $" {ChatColors.Green} [Warday]: {ChatColors.White}";
+
     bool warday_active = false;
 
     public int round_counter = ROUND_LIMIT;

diff --git a/src/Warden/Warden.cs b/src/Warden/Warden.cs
@@ -420,7 +420,7 @@ public void weapon_fire(CCSPlayerController? player, String name)
 
     int warden_slot = INAVLID_SLOT;
 
-    public static readonly String WARDEN_PREFIX = $"{ChatColors.Green}[WARDEN]: {ChatColors.White}";
+    public static readonly String WARDEN_PREFIX = $" {ChatColors.Green}[WARDEN]: {ChatColors.White}";
 
 
     JailPlayer[] jail_players = new JailPlayer[64];