Ticket #3702: lockedTeams2.patch

gui/session/menu.js

@@ -295 +295 @@
         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")));
-
-        // 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;
+        
+        // Don't display the options for ourself
+        if (i == g_ViewedPlayer || g_Players[g_ViewedPlayer].state != "active" || g_Players[i].state != "active")
+        {
+            // Hide the unused/unselectable options
+            for (let action of ["TributeFood", "TributeWood", "TributeStone", "TributeMetal", "Ally", "Neutral", "Enemy"])
+                Engine.GetGUIObjectByName("diplomacyPlayer"+action+"["+(i-1)+"]").hidden = true;
+            Engine.GetGUIObjectByName("diplomacyAttackRequest["+(i-1)+"]").hidden = true;
             continue;
-        }
-
+        }
+        
         // Tribute
         for (let resource of RESOURCES)
         {
@@ -353 +353 @@
         button.onpress = (function(i) { return function() {
             Engine.PostNetworkCommand({ "type": "attack-request", "source": g_ViewedPlayer, "target": i });
         }; })(i);
+        
+        //Don't display tribute options but do display attack options if teams locked and not on our team
+        if (g_Players[g_ViewedPlayer].teamsLocked && (g_Players[g_ViewedPlayer].team != -1 && g_Players[i].team != -1 && g_Players[i].team != g_Players[g_ViewedPlayer].team))
+        {
+            // Hide the unused/unselectable options
+            for (let action of ["TributeFood", "TributeWood", "TributeStone", "TributeMetal", "Ally", "Neutral", "Enemy"])
+                Engine.GetGUIObjectByName("diplomacyPlayer"+action+"["+(i-1)+"]").hidden = true;
+        }
 
-        // 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)
+        // Skip our own teams and other teams on teams locked
+        if (g_Players[g_ViewedPlayer].teamsLocked && g_Players[g_ViewedPlayer].team != -1 && g_Players[i].team != -1)
             continue;
 
         // Diplomacy settings

simulation/components/Player.js

@@ -403 +403 @@
 
 Player.prototype.SetDiplomacy = function(dipl)
 {
-    // Should we check for teamsLocked here?
     this.diplomacy = dipl;
     Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
 };
@@ -424 +423 @@
     // 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)
         {
-            // Break alliance or declare war
-            if (Math.min(this.diplomacy[idx],cmpPlayer.diplomacy[this.playerID]) > value)
+            // Can't stab your team members in the back
+            if (this.team == -1 || cmpPlayer.GetTeam() == -1 || this.team != cmpPlayer.GetTeam())
             {
                 this.diplomacy[idx] = value;
                 cmpPlayer.SetDiplomacyIndex(this.playerID, value);
             }
-            else
-            {
+        }
+        else
+        {
+            //Allow upgrading relations to neutral only
+            if (this.team == -1 || cmpPlayer.GetTeam() == -1 || (this.team != cmpPlayer.GetTeam() && value == 0))
                 this.diplomacy[idx] = value;
-            }
-            Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
         }
+        Engine.BroadcastMessage(MT_DiplomacyChanged, {"player": this.playerID});
     }
     else
     {
@@ -714 +715 @@
 
     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;