Ticket #3501: 3501-4.patch

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

@@ -51 +51 @@
             {"nick": "Dave", "name": "David Protasowski"},
             {"nick": "dax", "name": "Dacian Fiordean"},
             {"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"},
             {"nick": "eihrul", "name": "Lee Salzman"},
             {"nick": "elexis", "name": "Alexander Heinsius"},

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

@@ -46 +46 @@
     "disconnect": msg => sprintf(translate("%(player)s has left the game."), { "player": colorizePlayernameByGUID(msg.guid) }),
     "rejoined": msg => sprintf(translate("%(player)s has rejoined the game."), { "player": colorizePlayernameByGUID(msg.guid) }),
     "clientlist": msg => getUsernameList(),
     "message": msg => formatChatCommand(msg),
     "defeat": msg => formatDefeatMessage(msg),
+    "resign": msg => formatResignMessage(msg),
     "diplomacy": msg => formatDiplomacyMessage(msg),
     "tribute": msg => formatTributeMessage(msg),
     "attack": msg => formatAttackMessage(msg)
 };
 
@@ -184 +185 @@
         addChatMessage(message);
     },
     "defeat": function(notification, player)
     {
         addChatMessage({
-            "type": "defeat",
+            "type": !!notification.resign ? "resign" : "defeat",
             "guid": findGuidForPlayerID(player),
             "player": player
         });
 
         updateDiplomacy();
@@ -652 +653 @@
 
 function formatDefeatMessage(msg)
 {
     // In singleplayer, the local player is "You". "You has" is incorrect.
     if (!g_IsNetworked && msg.player == Engine.GetPlayerID())
-        return translate("You have been defeated.");
+        return sprintf(translate("%(You)s have been defeated."), {
+            "You": colorizePlayernameByID(msg.player)
+        });
 
     return sprintf(translate("%(player)s has been defeated."), {
         "player": colorizePlayernameByID(msg.player)
     });
 }
 
+function formatResignMessage(msg)
+{
+    // In singleplayer, the local player is "You". "You has" is incorrect.
+    if (!g_IsNetworked && msg.player == Engine.GetPlayerID())
+        return sprintf(translate("%(You)s have resigned."), {
+            "You": colorizePlayernameByID(msg.player)
+        });
+
+    return sprintf(translate("%(player)s has resigned."), {
+        "player": colorizePlayernameByID(msg.player)
+    });
+}
+
 function formatDiplomacyMessage(msg)
 {
     let messageType;
 
     if (g_IsObserver)

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

@@ -424 +424 @@
     if (g_IsObserver || g_Disconnected)
         return;
 
     Engine.PostNetworkCommand({
         "type": "defeat-player",
-        "playerId": Engine.GetPlayerID()
+        "playerId": Engine.GetPlayerID(),
+        "resign": true
     });
 
     updateTopPanel();
 
     global.music.setState(global.music.states.DEFEAT);

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

@@ -669 +669 @@
 
     // Send a chat message notifying of the player's defeat.
     var cmpGUIInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
     cmpGUIInterface.PushNotification({
         "type": "defeat",
-        "players": [this.playerID]
+        "players": [this.playerID],
+        "resign": !!msg.resign
     });
 };
 
 Player.prototype.OnResearchFinished = function(msg)
 {

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

@@ -411 +411 @@
     },
 
     "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)
     {
         // Verify that the building can be controlled by the player or is mutualAlly