Ticket #3702: lockedTeams.patch

gui/session/menu.js

@@ -300 +300 @@
 
         if (i != we)
             Engine.GetGUIObjectByName("diplomacyPlayerTheirs["+(i-1)+"]").caption = (g_Players[i].isAlly[we] ? translate("Ally") : (g_Players[i].isNeutral[we] ? translate("Neutral") : translate("Enemy")));
-
-        // Don't display the options for ourself, or if we or the other player aren't active anymore
+        
+        // Attack Request
+        var simState = GetSimState();
+        let button = Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]");
+        button.hidden = simState.ceasefireActive || !(g_Players[i].isEnemy[we]);
+        button.tooltip = translate("Request your allies to attack this enemy");
+        button.onpress = (function(i, we){ return function() {
+            Engine.PostNetworkCommand({"type": "attack-request", "source": we, "target": i});
+        } })(i, we);
+        
+        // Don't display the options for ourself
         if (i == we || g_Players[we].state != "active" || g_Players[i].state != "active")
         {
             // Hide the unused/unselectable options
-            for each (let a in ["TributeFood", "TributeWood", "TributeStone", "TributeMetal", "Ally", "Neutral", "Enemy"])
+            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;
         }
+        
+        //Don't display tribute options but do display attack options if teams locked and not on our team
+        if (g_Players[we].teamsLocked && (g_Players[we].team != -1 && g_Players[i].team != -1 && g_Players[i].team != g_Players[we].team))
+        {
+            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 = false;
+            continue;
+        }
 
         // Tribute
-        for each (let resource in ["food", "wood", "stone", "metal"])
+        for (let resource of ["food", "wood", "stone", "metal"])
         {
             let button = Engine.GetGUIObjectByName("diplomacyPlayerTribute"+resource[0].toUpperCase()+resource.substring(1)+"["+(i-1)+"]");
             button.onpress = (function(player, resource, button){
@@ -348 +366 @@
             button.tooltip = formatTributeTooltip(g_Players[i], resource, 100);
         }
 
-        // Attack Request
-        var simState = GetSimState();
-        let button = Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]");
-        button.hidden = simState.ceasefireActive || !(g_Players[i].isEnemy[we]);
-        button.tooltip = translate("Request your allies to attack this enemy");
-        button.onpress = (function(i, we){ return function() {
-            Engine.PostNetworkCommand({"type": "attack-request", "source": we, "target": i});
-        } })(i, we);
-
-        // Skip our own teams on teams locked
-        if (g_Players[we].teamsLocked && g_Players[we].team != -1 && g_Players[we].team == g_Players[i].team)
+        // Skip our own teams and other teams on teams locked
+        if (g_Players[we].teamsLocked && g_Players[we].team != -1 && g_Players[i].team != -1)
             continue;
 
         // Diplomacy settings
         // Set up the buttons
-        for each (let setting in ["Ally", "Neutral", "Enemy"])
+        for (let setting of ["Ally", "Neutral", "Enemy"])
         {
             let button = Engine.GetGUIObjectByName("diplomacyPlayer"+setting+"["+(i-1)+"]");
 

simulation/components/Player.js

@@ -392 +392 @@
 
 Player.prototype.SetDiplomacy = function(dipl)
 {
-    // Should we check for teamsLocked here?
-    this.diplomacy = dipl;
-    Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
+    if (!this.teamsLocked)
+    {
+        this.diplomacy = dipl;
+        Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
+    }
 };
 
 Player.prototype.SetDiplomacyIndex = function(idx, value)
@@ -414 +416 @@
     if (this.teamsLocked)
     {
         // but can't stab your team members in the back
-        if (this.team == -1 || this.team != cmpPlayer.GetTeam())
+        if (this.team == -1 || cmpPlayer.GetTeam() == -1)
         {
             // Break alliance or declare war
             if (Math.min(this.diplomacy[idx],cmpPlayer.diplomacy[this.playerID]) > value)
@@ -703 +705 @@
 
     if (this.state != "active" || cmpPlayer.state != "active")
         return;
-
+    
+    if (this.teamsLocked && this.team != -1 && cmpPlayer.team != -1 && this.team != cmpPlayer.team)
+        return;
+    
     if (!this.SubtractResourcesOrNotify(amounts))
         return;