admin2: Allow user nicknames to be colorcoded

Author: xLuxy

[admin]/admin2/server/admin_functions.lua

@@ -47,7 +47,7 @@ aFunctions = {
             local textDisplay = textCreateDisplay()
             local textItem =
                 textCreateTextItem(
-                "(ADMIN)" .. getPlayerName(source) .. ":\n\n" .. text,
+                "(ADMIN)" .. stripColorCodes(getPlayerName(source)) .. ":\n\n" .. text,
                 0.5,
                 0.5,
                 2,

[admin]/admin2/server/admin_server.lua

@@ -98,26 +98,31 @@ end
 
 function aAction(type, action, admin, player, data, more)
     if (aLogMessages[type]) then
-        function aStripString(string)
+        function aStripString(string, hex)
+            if not hex then
+                hex = ""
+            end
             string = tostring(string)
-            string = string.gsub(string, "$admin", getPlayerName(admin))
+            string = string.gsub(string, "$admin", getPlayerName(admin) .. hex)
             string = string.gsub(string, "$data2", more or "")
             if (player) then
-                string = string.gsub(string, "$player", getPlayerName(player))
+                string = string.gsub(string, "$player", getPlayerName(player) .. hex)
             end
-            return tostring(string.gsub(string, "$data", data or ""))
+            return string.gsub(string, "$data", (data and data .. hex or ""))
         end
         local node = aLogMessages[type][action]
         if (node) then
             local r, g, b = node["r"], node["g"], node["b"]
+            local hex = RGBToHex(r, g, b)
+
             if (node["all"]) then
-                outputChatBox(aStripString(node["all"]), root, r, g, b)
+                outputChatBox(aStripString(node["all"], hex), root, r, g, b, true)
             end
             if (node["admin"]) and (admin ~= player) then
-                outputChatBox(aStripString(node["admin"]), admin, r, g, b)
+                outputChatBox(aStripString(node["admin"], hex), admin, r, g, b, true)
             end
             if (node["player"]) then
-                outputChatBox(aStripString(node["player"]), player, r, g, b)
+                outputChatBox(aStripString(node["player"], hex), player, r, g, b, true)
             end
             if (node["log"]) then
                 outputServerLog(aStripString(node["log"]))

[admin]/admin2/shared/utils.lua

@@ -16,3 +16,17 @@ function stripColorCodes(str)
     until str:len() == oldLen
     return str
 end
+
+function RGBToHex(red, green, blue, alpha)
+    -- Make sure RGB values passed to this function are correct
+    if( ( red < 0 or red > 255 or green < 0 or green > 255 or blue < 0 or blue > 255 ) or ( alpha and ( alpha < 0 or alpha > 255 ) ) ) then
+        return nil
+    end
+
+    -- Alpha check
+    if alpha then
+        return string.format("#%.2X%.2X%.2X%.2X", red, green, blue, alpha)
+    else
+        return string.format("#%.2X%.2X%.2X", red, green, blue)
+    end
+end