Ticket #3501: 3501-3.patch

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

@@ -48 +48 @@
     "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)
@@ -186 +187 @@
     "defeat": function(notification, player)
     {
         addChatMessage({
-            "type": "defeat",
+            "type": !!notification.resign ? "resign" : "defeat",
             "guid": findGuidForPlayerID(player),
             "player": player
         });
@@ -652 +653 @@
 
 function formatDefeatMessage(msg)
 {
+    let defeatMsg;
+
     // In singleplayer, the local player is "You". "You has" is incorrect.
     if (!g_IsNetworked && msg.player == Engine.GetPlayerID())
-        return translate("You have been defeated.");
+        defeatMsg = "%(player)s have been defeated.";
+    else
+        defeatMsg = "%(player)s has been defeated.";
 
-    return sprintf(translate("%(player)s has been defeated."), {
+    return sprintf(translate(defeatMsg), {
         "player": colorizePlayernameByID(msg.player)
     });
 }
 
+function formatResignMessage(msg)
+{
+    let resignMsg;
+
+    // In singleplayer, the local player is "You". "You has" is incorrect.
+    if (!g_IsNetworked && msg.player == Engine.GetPlayerID())
+        resignMsg = "%(player)s have resigned";
+    else
+        resignMsg = "%(player)s has resigned";
+
+    return sprintf(translate(resignMsg), {
+        "player": colorizePlayernameByID(msg.player)
+    });
+}
+
 function formatDiplomacyMessage(msg)
 {
     let messageType;

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)