Ticket #3702: lockedTeams3.patch

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

@@ -34 +34 @@
 var g_IsMenuOpen = false;
 
 var g_IsDiplomacyOpen = false;
 var g_IsTradeOpen = false;
 
-// Redefined every time someone makes a tribute (so we can save some data in a closure). Called in input.js handleInputBeforeGui.
+/**
+ * Redefined every time someone makes a tribute (so we can save some data in a closure).
+ * Called in input.js handleInputBeforeGui.
+ */
 var g_FlushTributing = function() {};
 
 // Ignore size defined in XML and set the actual menu size here
 function initMenuPosition()
 {
@@ -252 +255 @@
 
     updateTeamCheckbox(teamChat);
     chatWindow.hidden = !hidden;
 }
 
-function setDiplomacy(data)
-{
-    Engine.PostNetworkCommand({ "type": "diplomacy", "to": data.to, "player": data.player });
-}
-
-function tributeResource(data)
-{
-    Engine.PostNetworkCommand({ "type": "tribute", "player": data.player, "amounts":  data.amounts });
-}
-
 function openDiplomacy()
 {
     closeOpenDialogs();
 
     if (g_ViewedPlayer < 1)
         return;
 
     g_IsDiplomacyOpen = true;
 
     let isCeasefireActive = GetSimState().ceasefireActive;
+    for (let i = 1; i < g_Players.length; ++i)
+    {
+        diplomacySetupTexts(i);
+
+        let playerInactive = i == g_ViewedPlayer || isPlayerObserver(g_ViewedPlayer) || isPlayerObserver(i);
+        let hasAllies = g_Players.filter(player => player.isMutualAlly[g_ViewedPlayer]).length > 1;
+
+        diplomacyFormatTributeButtons(i, playerInactive);
+        diplomacyFormatStanceButtons(i, playerInactive || isCeasefireActive || g_Players[g_ViewedPlayer].teamsLocked);
+        diplomacyFormatAttackRequestButton(i, playerInactive || isCeasefireActive || !hasAllies || !g_Players[i].isEnemy[g_ViewedPlayer]);
+    }
+
+    Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false;
+}
 
+function diplomacySetupTexts(i)
+{
     // Get offset for one line
     let onesize = Engine.GetGUIObjectByName("diplomacyPlayer[0]").size;
     let rowsize = onesize.bottom - onesize.top;
 
-    // We don't include gaia
-    for (let i = 1; i < g_Players.length; ++i)
-    {
-        // Apply offset
-        let row = Engine.GetGUIObjectByName("diplomacyPlayer["+(i-1)+"]");
-        let size = row.size;
-        size.top = rowsize*(i-1);
-        size.bottom = rowsize*i;
-        row.size = size;
-
-        // Set background color
-        let playerColor = rgbToGuiColor(g_Players[i].color);
-        row.sprite = "color: "+playerColor + " 32";
-
-        Engine.GetGUIObjectByName("diplomacyPlayerName["+(i-1)+"]").caption = "[color=\"" + playerColor + "\"]" + g_Players[i].name + "[/color]";
-        Engine.GetGUIObjectByName("diplomacyPlayerCiv["+(i-1)+"]").caption = g_CivData[g_Players[i].civ].Name;
-        Engine.GetGUIObjectByName("diplomacyPlayerTeam["+(i-1)+"]").caption = (g_Players[i].team < 0) ? translateWithContext("team", "None") : g_Players[i].team+1;
-        Engine.GetGUIObjectByName("diplomacyPlayerTheirs["+(i-1)+"]").caption = (i == g_ViewedPlayer) ? "" : (g_Players[i].isAlly[g_ViewedPlayer] ? translate("Ally") : (g_Players[i].isNeutral[g_ViewedPlayer] ? translate("Neutral") : translate("Enemy")));
+    let row = Engine.GetGUIObjectByName("diplomacyPlayer["+(i-1)+"]");
+    let size = row.size;
+    size.top = rowsize*(i-1);
+    size.bottom = rowsize*i;
+    row.size = size;
+    row.sprite = "color: " + rgbToGuiColor(g_Players[i].color) + " 32";
 
-        // Don't display the options for ourself, or if we or the other player aren't active anymore
-        if (i == g_ViewedPlayer || g_Players[i].state != "active")
-        {
-            // Hide the unused/unselectable options
-            for (let a of ["TributeFood", "TributeWood", "TributeStone", "TributeMetal", "Ally", "Neutral", "Enemy"])
-                Engine.GetGUIObjectByName("diplomacyPlayer"+a+"["+(i-1)+"]").hidden = true;
-            Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]").hidden = true;
-            continue;
-        }
+    Engine.GetGUIObjectByName("diplomacyPlayerName["+(i-1)+"]").caption = colorizePlayernameByID(i);
+    Engine.GetGUIObjectByName("diplomacyPlayerCiv["+(i-1)+"]").caption = g_CivData[g_Players[i].civ].Name;
 
-        // Tribute
-        for (let resource of RESOURCES)
-        {
-            let button = Engine.GetGUIObjectByName("diplomacyPlayerTribute"+resource[0].toUpperCase()+resource.substring(1)+"["+(i-1)+"]");
-            button.onpress = (function(player, resource, button){
-                // Implement something like how unit batch training works. Shift+click to send 500, shift+click+click to send 1000, etc.
-                // Also see input.js (searching for "INPUT_MASSTRIBUTING" should get all the relevant parts).
-                let multiplier = 1;
-                return function() {
-                    let isBatchTrainPressed = Engine.HotkeyIsPressed("session.masstribute");
-                    if (isBatchTrainPressed)
-                    {
-                        inputState = INPUT_MASSTRIBUTING;
-                        multiplier += multiplier == 1 ? 4 : 5;
-                    }
-                    let amounts = {
-                        "food": (resource == "food" ? 100 : 0) * multiplier,
-                        "wood": (resource == "wood" ? 100 : 0) * multiplier,
-                        "stone": (resource == "stone" ? 100 : 0) * multiplier,
-                        "metal": (resource == "metal" ? 100 : 0) * multiplier
-                    };
-                    button.tooltip = formatTributeTooltip(g_Players[player], resource, amounts[resource]);
-                    // This is in a closure so that we have access to `player`, `amounts`, and `multiplier` without some
-                    // evil global variable hackery.
-                    g_FlushTributing = function() {
-                        tributeResource({ "player": player, "amounts": amounts });
-                        multiplier = 1;
-                        button.tooltip = formatTributeTooltip(g_Players[player], resource, 100);
-                    };
-                    if (!isBatchTrainPressed)
-                        g_FlushTributing();
-                };
-            })(i, resource, button);
-            button.enabled = controlsPlayer(g_ViewedPlayer);
-            button.hidden = false;
-            button.tooltip = formatTributeTooltip(g_Players[i], resource, 100);
-        }
+    Engine.GetGUIObjectByName("diplomacyPlayerTeam["+(i-1)+"]").caption =
+        g_Players[i].team < 0 ? translateWithContext("team", "None") : g_Players[i].team+1;
 
-        // Attack Request
-        let button = Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]");
-        button.hidden = isCeasefireActive || !g_Players[i].isEnemy[g_ViewedPlayer];
-        button.enabled = controlsPlayer(g_ViewedPlayer);
-        button.tooltip = translate("Request your allies to attack this enemy");
-        button.onpress = (function(i) { return function() {
-            Engine.PostNetworkCommand({ "type": "attack-request", "source": g_ViewedPlayer, "target": i });
-        }; })(i);
+    Engine.GetGUIObjectByName("diplomacyPlayerTheirs["+(i-1)+"]").caption =
+        i == g_ViewedPlayer ? "" :
+        g_Players[i].isAlly[g_ViewedPlayer] ? translate("Ally") :
+        g_Players[i].isNeutral[g_ViewedPlayer] ? translate("Neutral") : translate("Enemy");
+}
 
-        // Skip our own teams on teams locked
-        if (g_Players[g_ViewedPlayer].teamsLocked && g_Players[g_ViewedPlayer].team != -1 && g_Players[g_ViewedPlayer].team == g_Players[i].team)
+function diplomacyFormatTributeButtons(i, hidden)
+{
+    for (let resource of RESOURCES)
+    {
+        let button = Engine.GetGUIObjectByName("diplomacyPlayerTribute"+resource[0].toUpperCase()+resource.substring(1)+"["+(i-1)+"]");
+        button.hidden = hidden;
+        if (hidden)
             continue;
+        button.enabled = controlsPlayer(g_ViewedPlayer);
+        button.tooltip = formatTributeTooltip(g_Players[i], resource, 100);
+        button.onpress = (function(i, resource, button) {
+            // Shift+click to send 500, shift+click+click to send 1000, etc.
+            // Also see INPUT_MASSTRIBUTING in input.js
+            let multiplier = 1;
+            return function() {
+                let isBatchTrainPressed = Engine.HotkeyIsPressed("session.masstribute");
+                if (isBatchTrainPressed)
+                {
+                    inputState = INPUT_MASSTRIBUTING;
+                    multiplier += multiplier == 1 ? 4 : 5;
+                }
+                let amounts = {
+                    "food": (resource == "food" ? 100 : 0) * multiplier,
+                    "wood": (resource == "wood" ? 100 : 0) * multiplier,
+                    "stone": (resource == "stone" ? 100 : 0) * multiplier,
+                    "metal": (resource == "metal" ? 100 : 0) * multiplier
+                };
+                button.tooltip = formatTributeTooltip(g_Players[i], resource, amounts[resource]);
+                // This is in a closure so that we have access to `player`, `amounts`, and `multiplier` without some
+                // evil global variable hackery.
+                g_FlushTributing = function() {
+                    Engine.PostNetworkCommand({ "type": "tribute", "player": i, "amounts":  amounts });
+                    multiplier = 1;
+                    button.tooltip = formatTributeTooltip(g_Players[i], resource, 100);
+                };
+                if (!isBatchTrainPressed)
+                    g_FlushTributing();
+            };
+        })(i, resource, button);
+    }
+}
 
-        // Diplomacy settings
-        // Set up the buttons
-        for (let setting of ["Ally", "Neutral", "Enemy"])
-        {
-            let button = Engine.GetGUIObjectByName("diplomacyPlayer"+setting+"["+(i-1)+"]");
+function diplomacyFormatAttackRequestButton(i, hidden)
+{
+    let button = Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]");
+    button.hidden = hidden;
+    if (hidden)
+        return;
 
-            button.caption = g_Players[g_ViewedPlayer]["is" + setting][i] ? translate("x") : "";
-            button.onpress = (function(e){ return function() { setDiplomacy(e); }; })({ "player": i, "to": setting.toLowerCase() });
-            button.enabled = controlsPlayer(g_ViewedPlayer);
-            button.hidden = isCeasefireActive;
-        }
-    }
+    button.enabled = controlsPlayer(g_ViewedPlayer);
+    button.tooltip = translate("Request your allies to attack this enemy");
+    button.onpress = (function(i) { return function() {
+        Engine.PostNetworkCommand({ "type": "attack-request", "source": g_ViewedPlayer, "target": i });
+    }; })(i);
+}
 
-    Engine.GetGUIObjectByName("diplomacyDialogPanel").hidden = false;
+function diplomacyFormatStanceButtons(i, hidden)
+{
+    for (let stance of ["Ally", "Neutral", "Enemy"])
+    {
+        let button = Engine.GetGUIObjectByName("diplomacyPlayer"+stance+"["+(i-1)+"]");
+        button.hidden = hidden;
+        if (hidden)
+            continue;
+
+        button.caption = g_Players[g_ViewedPlayer]["is" + stance][i] ? translate("x") : "";
+        button.enabled = controlsPlayer(g_ViewedPlayer);
+        button.onpress = (function(player, stance) { return function() {
+            Engine.PostNetworkCommand({ "type": "diplomacy", "player": i, "to": stance.toLowerCase() });
+        }; })(i, stance);
+    }
 }
 
 function closeDiplomacy()
 {
     g_IsDiplomacyOpen = false;

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

@@ -361 +361 @@
     return this.team;
 };
 
 Player.prototype.SetTeam = function(team)
 {
-    if (!this.teamsLocked)
-    {
-        this.team = team;
+    this.team = team;
 
-        var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
-        if (cmpPlayerManager && this.team != -1)
+    let cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    if (cmpPlayerManager && this.team != -1)
+    {
+        // Set all team members as allies
+        for (let i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
         {
-            // Set all team members as allies
-            for (var i = 0; i < cmpPlayerManager.GetNumPlayers(); ++i)
-            {
-                var cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player);
-                if (this.team == cmpPlayer.GetTeam())
-                {
-                    this.SetAlly(i);
-                    cmpPlayer.SetAlly(this.playerID);
-                }
-            }
-        }
+            let cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player);
+            if (this.team != cmpPlayer.GetTeam())
+                continue;
 
-        Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
+            this.SetAlly(i);
+            cmpPlayer.SetAlly(this.playerID);
+        }
     }
+
+    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID });
 };
 
 Player.prototype.SetLockTeams = function(value)
 {
     this.teamsLocked = value;
@@ -401 +398 @@
     return this.diplomacy;
 };
 
 Player.prototype.SetDiplomacy = function(dipl)
 {
-    // Should we check for teamsLocked here?
     this.diplomacy = dipl;
-    Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
+    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID });
 };
 
 Player.prototype.SetDiplomacyIndex = function(idx, value)
 {
     var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
@@ -419 +415 @@
         return;
 
     if (this.state != "active" || cmpPlayer.state != "active")
         return;
 
-    // You can have alliances with other players,
-    if (this.teamsLocked)
-    {
-        // but can't stab your team members in the back
-        if (this.team == -1 || this.team != cmpPlayer.GetTeam())
-        {
-            // Break alliance or declare war
-            if (Math.min(this.diplomacy[idx],cmpPlayer.diplomacy[this.playerID]) > value)
-            {
-                this.diplomacy[idx] = value;
-                cmpPlayer.SetDiplomacyIndex(this.playerID, value);
-            }
-            else
-            {
-                this.diplomacy[idx] = value;
-            }
-            Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
-        }
-    }
-    else
-    {
-        // Break alliance or declare war (worsening of relations is mutual)
-        if (Math.min(this.diplomacy[idx],cmpPlayer.diplomacy[this.playerID]) > value)
-        {
-            // This is duplicated because otherwise we get too much recursion
-            this.diplomacy[idx] = value;
-            cmpPlayer.SetDiplomacyIndex(this.playerID, value);
-        }
-        else
-        {
-            this.diplomacy[idx] = value;
-        }
+    this.diplomacy[idx] = value;
+    Engine.BroadcastMessage(MT_DiplomacyChanged, { "player": this.playerID });
 
-        Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
-    }
+    // Mutual worsening of relations
+    if (cmpPlayer.diplomacy[this.playerID] > value)
+        cmpPlayer.SetDiplomacyIndex(this.playerID, value);
 };
 
 Player.prototype.UpdateSharedLos = function()
 {
     let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);

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

@@ -73 +73 @@
         cmpGuiInterface.PushNotification({"type": "quit", "players": [player]});
     },
 
     "diplomacy": function(player, cmd, data)
     {
+        if (data.cmpPlayer.GetLockTeams())
+        {
+            warn("Can't change diplomacy of player " + player + " since teams are locked.");
+            return;
+        }
+
+        let cmpCeasefireManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_CeasefireManager);
+        if (cmpCeasefireManager && cmpCeasefireManager.IsCeasefireActive())
+        {
+            warn("Can't change diplomacy of player " + player + " while ceasefire is active.");
+            return;
+        }
+
         switch(cmd.to)
         {
         case "ally":
             data.cmpPlayer.SetAlly(cmd.player);
             break;
@@ -87 +100 @@
             data.cmpPlayer.SetEnemy(cmd.player);
             break;
         default:
             warn("Invalid command: Could not set "+player+" diplomacy status of player "+cmd.player+" to "+cmd.to);
         }
+
         var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
         cmpGuiInterface.PushNotification({
             "type": "diplomacy",
             "players": [player],
             "targetPlayer": cmd.player,