Ticket #3409: t3409_v6.patch

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -46 +46 @@
     "banned": (msg, user) => systemMessage(sprintf(translate("%(username)s has been banned"), { "username": user })),
     "chat": (msg, user) => sprintf(translate("%(username)s %(message)s"), {
         "username": senderFont(sprintf(translate("<%(username)s>"), { "username": user })),
-        "message": escapeText(msg.text || "")
+        "message": colorizePlayernameInWideText(msg.text || "")
     }),
     "ready": (msg, user) => sprintf(translate("* %(username)s is ready!"), {
         "username": user
@@ -115 +115 @@
 const g_UnassignedColor = "140 140 140";
 
 /**
+ * Highlight unassigned players in the dropdownlist.
+ */
+const g_UnassignedPlayerColor = "170 170 250";
+
+/**
+ * Highlight observer players in the dropdownlist.
+ */
+const g_ObserverColor = "170 170 250";
+
+/**
  * Highlight ready players.
  */
 const g_ReadyColor = "green";
@@ -213 +223 @@
         g_DefaultPlayerData[i].Civ = "random";
 }
 
+function colorizePlayernameInWideText(message)
+{
+    var colorizedNames = [];
+    var names = [];
+    var ret = "";
+
+    for (let guid in g_PlayerAssignments)
+    {
+        let player = g_PlayerAssignments[guid];
+        if (player.player > 0)
+        {
+            colorizedNames.push(colorizePlayernameByGUID(guid, player.name));
+            names.push(player.name);
+      }
+        else
+        {
+            colorizedNames.push(player.name);
+            names.push(player.name);
+        }
+    }
+
+    var tmpBuffer = "";
+    var fixedMessage = "";
+    for(let charIndex in message)
+    {
+        tmpBuffer += message[charIndex];
+
+        for(let nameIndex in names)
+        {
+            var beginCharIndex = tmpBuffer.indexOf( names[ nameIndex ] );
+            if( beginCharIndex != -1 )
+            {
+                var leftPartBuffer = tmpBuffer.substr( 0, beginCharIndex );
+                fixedMessage += escapeText( leftPartBuffer ) + colorizedNames[ nameIndex ];
+                tmpBuffer = "";
+            }
+        }
+  }
+
+    if( tmpBuffer.length != 0 )
+        fixedMessage += escapeText( tmpBuffer );
+
+    return fixedMessage;
+}
+
 /**
  * Called after the first tick.
  */
@@ -1422 +1477 @@
     let aiAssignments = {};
     let noAssignment;
     let assignedCount = 0;
+    var unnasignedPlayers = [];
 
+    //add assigned players
     for (let guid in g_PlayerAssignments)
     {
         let player = g_PlayerAssignments[guid].player;
 
+        if (player == -1)
+            continue;
+    
         hostNameList.push(g_PlayerAssignments[guid].name);
         hostGuidList.push(guid);
         assignments[player] = hostNameList.length-1;
+        assignedCount++;
+    } 
+    
+    //add observer players
+    for (let guid in g_PlayerAssignments)
+    {
+        let player = g_PlayerAssignments[guid].player;
 
         if (player != -1)
-            assignedCount++;
-    }
+            continue;
 
+        hostNameList.push("[color=\""+ g_ObserverColor + "\"]" + g_PlayerAssignments[guid].name + "[/color]");
+        hostGuidList.push(guid);
+        assignments[player] = hostNameList.length-1;
+    } 
+    
     // Only enable start button if we have enough assigned players
     if (g_IsController)
         Engine.GetGUIObjectByName("startGame").enabled = assignedCount > 0;

binaries/data/mods/public/gui/session/messages.js

@@ -238 +238 @@
         g_Selection.rebuildSelection({});
     }
 };
-
 /**
  * Loads all known cheat commands.
  *
@@ -566 +582 @@
     });
 }
 
+function colorizePlayernameInWideText(message)
+{
+    var colorizedNames = [];
+    var names = [];
+    var ret = "";
+
+    for (let id in g_Players)
+    {
+        let player = g_Players[id];
+        colorizedNames.push( colorizePlayernameByID(id) );
+        names.push( player.name );
+    }
+
+    var tmpBuffer = "";
+    var fixedMessage = "";
+    for(let charIndex in message)
+    {
+        tmpBuffer += message[charIndex];
+
+        for(let nameIndex in names)
+        {
+            var beginCharIndex = tmpBuffer.indexOf( names[ nameIndex ] );
+            if( beginCharIndex != -1 )
+            {
+                var leftPartBuffer = tmpBuffer.substr( 0, beginCharIndex );
+                fixedMessage += escapeText( leftPartBuffer ) + colorizedNames[ nameIndex ];
+                tmpBuffer = "";
+            }
+        }
+  }
+
+    if( tmpBuffer.length != 0 )
+        fixedMessage += escapeText( tmpBuffer );
+
+    return fixedMessage;
+}
+
 function formatDiplomacyMessage(msg)
 {
     let messageType;
@@ -649 +709 @@
         }
     }
     else
-        msg.text = escapeText(msg.text);
+        msg.text = colorizePlayernameInWideText(msg.text);
 
     // GUID for players, playerID for AIs
     let coloredUsername = msg.guid != -1 ? colorizePlayernameByGUID(msg.guid) : colorizePlayernameByID(msg.player);