Ticket #3101: t3101_dynamically_hide_elements_for_observers_v2.patch

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

@@ -168 +168 @@
     // Cache civ data
     g_CivData = loadCivData();
     g_CivData["gaia"] = { "Code": "gaia", "Name": translate("Gaia") };
 
     if (Engine.GetPlayerID() <= 0)
-    {
         g_IsObserver = true;
-        // Hide stuff observers don't use.
-        Engine.GetGUIObjectByName("food").hidden = true;
-        Engine.GetGUIObjectByName("wood").hidden = true;
-        Engine.GetGUIObjectByName("stone").hidden = true;
-        Engine.GetGUIObjectByName("metal").hidden = true;
-        Engine.GetGUIObjectByName("population").hidden = true;
-        Engine.GetGUIObjectByName("diplomacyButton1").hidden = true;
-        Engine.GetGUIObjectByName("tradeButton1").hidden = true;
-        Engine.GetGUIObjectByName("menuResignButton").enabled = false;
-        Engine.GetGUIObjectByName("pauseButton").enabled = false;
-        Engine.GetGUIObjectByName("observerText").hidden = false;
-    }
-    else
-    {
-        var civName =  g_CivData[g_Players[Engine.GetPlayerID()].civ].Name;
-        // TODO: Get a civ icon for gaia/observers.
-        Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[Engine.GetPlayerID()].civ].Emblem;
-        Engine.GetGUIObjectByName("civIconOverlay").tooltip = sprintf(translate("%(civ)s - Structure Tree"), {"civ": civName});
-    }
+
+    updateTopPanel();
 
     g_GameSpeeds = initGameSpeeds();
     g_CurrentSpeed = Engine.GetSimRate();
     var gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
     gameSpeed.list = g_GameSpeeds.names;
@@ -246 +228 @@
 }
 
 function selectViewPlayer(playerID)
 {
     Engine.SetPlayerID(playerID);
-    if (playerID > 0)
+    updateTopPanel();
+}
+
+function updateTopPanel()
+{
+    var playerID = Engine.GetPlayerID();
+    var isPlayer =  playerID > 0;
+    if (isPlayer)
     {
         var civName = g_CivData[g_Players[playerID].civ].Name
+        // TODO: Get a civ icon for gaia/observers.
         Engine.GetGUIObjectByName("civIcon").sprite = "stretched:" + g_CivData[g_Players[playerID].civ].Emblem;
-        Engine.GetGUIObjectByName("civIconOverlay").tooltip =  sprintf(translate("%(civ)s - Structure Tree"), {"civ": civName});
+        Engine.GetGUIObjectByName("civIconOverlay").tooltip = sprintf(translate("%(civ)s - Structure Tree"), {"civ": civName});
     }
+    
+    // Hide stuff observers don't use.
+    Engine.GetGUIObjectByName("food").hidden = !isPlayer;
+    Engine.GetGUIObjectByName("wood").hidden = !isPlayer;
+    Engine.GetGUIObjectByName("stone").hidden = !isPlayer;
+    Engine.GetGUIObjectByName("metal").hidden = !isPlayer;
+    Engine.GetGUIObjectByName("population").hidden = !isPlayer;
+    Engine.GetGUIObjectByName("civIcon").hidden = !isPlayer;
+    Engine.GetGUIObjectByName("diplomacyButton1").hidden = !isPlayer;
+    Engine.GetGUIObjectByName("tradeButton1").hidden = !isPlayer;
+    Engine.GetGUIObjectByName("observerText").hidden = isPlayer;
+
+    // Disable stuff observers shouldn't use
+    var isActive = isPlayer && GetSimState().players[playerID].state == "active";
+    Engine.GetGUIObjectByName("pauseButton").enabled = isActive || !g_IsNetworked;
+    Engine.GetGUIObjectByName("menuResignButton").enabled = isActive;
 }
 
 function reportPerformance(time)
 {
     var settings = Engine.GetMapSettings();
@@ -286 +292 @@
     Engine.PostNetworkCommand({
         "type": "defeat-player",
         "playerId": Engine.GetPlayerID()
     });
     
-    Engine.GetGUIObjectByName("menuResignButton").enabled = false;
+    updateTopPanel();
     
     global.music.setState(global.music.states.DEFEAT);
     
     // Resume the game if not resigning.
     if (!leaveGameAfterResign)
@@ -456 +462 @@
 
     // If the local player hasn't finished playing, we return here to avoid the victory/defeat messages.
     if (playerState.state == "active")
         return;
 
-    // We can't resign once the game is over.
-    Engine.GetGUIObjectByName("menuResignButton").enabled = false;
-
+    // Disable resign and pause buttons (we can't resign once the game is over)
+    updateTopPanel();
+    
     // Make sure nothing is open to avoid stacking.
     closeMenu();
     closeOpenDialogs();
 
     // Make sure this doesn't run again.
@@ -591 +597 @@
 }
 
 
 function updateHero()
 {
-    var simState = GetSimState();
-    var playerState = simState.players[Engine.GetPlayerID()];
+    var playerState = GetSimState().players[Engine.GetPlayerID()];
     var unitHeroPanel = Engine.GetGUIObjectByName("unitHeroPanel");
     var heroButton = Engine.GetGUIObjectByName("unitHeroButton");
 
     if (!playerState || playerState.heroes.length <= 0)
     {
@@ -667 +672 @@
     }
 }
 
 function updateDebug()
 {
-    let simState = GetSimState();
     let debug = Engine.GetGUIObjectByName("debug");
 
     if (!Engine.GetGUIObjectByName("devDisplayState").checked)
     {
         debug.hidden = true;
         return;
     }
 
     debug.hidden = false;
 
-    let conciseSimState = deepcopy(simState);
+    let conciseSimState = deepcopy(GetSimState());
     conciseSimState.players = "<<<omitted>>>";
     let text = "simulation: " + uneval(conciseSimState);
 
     let selection = g_Selection.toList();
     if (selection.length)
@@ -701 +705 @@
     debug.caption = text.replace(/\[/g, "\\[");
 }
 
 function updatePlayerDisplay()
 {
-    var simState = GetSimState();
-    var playerState = simState.players[Engine.GetPlayerID()];
+    var playerState = GetSimState().players[Engine.GetPlayerID()];
     if (!playerState)
         return;
 
     Engine.GetGUIObjectByName("resourceFood").caption = Math.floor(playerState.resourceCounts.food);
     Engine.GetGUIObjectByName("resourceWood").caption = Math.floor(playerState.resourceCounts.wood);