Ticket #3501: 3501-6.patch

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -53 +53 @@
             {"nick": "deebee", "name": "Deepak Anthony"},
             {"nick": "Deiz"},
             {"nick": "Dietger", "name": "Dietger van Antwerpen"},
+            {"nick": "dpiquet", "name": "Damien Piquet"},
             {"nick": "dumbo"},
             {"nick": "dvangennip", "name": "Doménique"},
             {"nick": "Echelon9", "name": "Rhys Kidd"},

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

@@ -188 +188 @@
         addChatMessage({
             "type": "defeat",
             "guid": findGuidForPlayerID(player),
-            "player": player
+            "player": player,
+            "resign": !!notification.resign
         });
 
         updateDiplomacy();
@@ -652 +653 @@
 
 function formatDefeatMessage(msg)
 {
+    let defeatMsg;
+    let playername;
+
     // In singleplayer, the local player is "You". "You has" is incorrect.
     if (!g_IsNetworked && msg.player == Engine.GetPlayerID())
-        return translate("You have been defeated.");
+    {
+        // Translation: String used to colorize the word "You" of that sentence
+        playername = colorizePlayernameHelper(translateWithContext("You have been defeated", "You"), msg.player);
+        if (msg.resign)
+            defeatMsg = "%(player)s have resigned.";
+        else
+            defeatMsg = "%(player)s have been defeated.";
+    }
+    else
+    {
+        playername = colorizePlayernameByID(msg.player);
+        if (msg.resign)
+            defeatMsg = "%(player)s has resigned.";
+        else
+            defeatMsg = "%(player)s has been defeated.";
+    }
 
-    return sprintf(translate("%(player)s has been defeated."), {
-        "player": colorizePlayernameByID(msg.player)
+    return sprintf(translate(defeatMsg), {
+        "player": playername
     });
 }
 

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

@@ -426 +426 @@
 
     Engine.PostNetworkCommand({
         "type": "defeat-player",
-        "playerId": Engine.GetPlayerID()
+        "playerId": Engine.GetPlayerID(),
+        "resign": true
     });
 
     updateTopPanel();

binaries/data/mods/public/simulation/components/Player.js

@@ -671 +671 @@
     var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     cmpGUIInterface.PushNotification({
         "type": "defeat",
-        "players": [this.playerID]
+        "players": [this.playerID],
+        "resign": !!msg.resign
     });
 };
 

binaries/data/mods/public/simulation/helpers/Commands.js

@@ -413 +413 @@
     "defeat-player": function(player, cmd, data)
     {
         // Send "OnPlayerDefeated" message to player
-        Engine.PostMessage(data.playerEnt, MT_PlayerDefeated, { "playerId": player } );
+        Engine.PostMessage(data.playerEnt, MT_PlayerDefeated, { "playerId": player, "resign": !!cmd.resign });
     },
 
     "garrison": function(player, cmd, data)