Ticket #3731: t3731_observer_selection_panels_v1.patch

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

@@ -683 +683 @@
                 var result = updateBuildingPlacementPreview(); // includes an update of the snap entity candidates
 
                 if (result && result.cost)
                 {
                     placementSupport.tooltipMessage = getEntityCostTooltip(result);
-                    var neededResources = Engine.GuiInterfaceCall("GetNeededResources", result.cost);
+                    var neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost": result.cost });
                     if (neededResources)
                         placementSupport.tooltipMessage += getNeededResourcesTooltip(neededResources);
                 }
 
                 break;
@@ -1079 +1079 @@
                 placementSupport.wallSnapEntitiesIncludeOffscreen = false;
             }
             else
             {
                 // cancel if not enough resources
-                if (placementSupport.template && Engine.GuiInterfaceCall("GetNeededResources", GetTemplateData(placementSupport.template).cost))
+                if (placementSupport.template && Engine.GuiInterfaceCall("GetNeededResources", { "cost": GetTemplateData(placementSupport.template).cost }))
                 {
                     placementSupport.Reset();
                     inputState = INPUT_NORMAL;
                     return true;
                 }
@@ -1412 +1412 @@
                         inputState = INPUT_NORMAL;
                 }
                 else if (limits.canBeAddedCount == undefined ||
                     limits.canBeAddedCount > batchTrainingCount * appropriateBuildings.length)
                 {
-                    if (Engine.GuiInterfaceCall("GetNeededResources", multiplyEntityCosts(
-                        template, batchTrainingCount + batchIncrementSize)))
+                    if (Engine.GuiInterfaceCall("GetNeededResources", { "cost":
+                        multiplyEntityCosts(template, batchTrainingCount + batchIncrementSize) }))
                         return;
 
                     batchTrainingCount += batchIncrementSize;
                 }
                 batchTrainingEntityAllowedCount = limits.canBeAddedCount;
@@ -1430 +1430 @@
                 // fall through to create the new batch
             }
         }
 
         // Don't start a new batch if decrementing or unable to afford it.
-        if (decrement || Engine.GuiInterfaceCall("GetNeededResources",
-            multiplyEntityCosts(template, batchIncrementSize)))
+        if (decrement || Engine.GuiInterfaceCall("GetNeededResources", { "cost":
+            multiplyEntityCosts(template, batchIncrementSize) }))
             return;
 
         inputState = INPUT_BATCHTRAINING;
         batchTrainingEntities = selection;
         batchTrainingType = trainEntType;

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

@@ -412 +412 @@
         displayMultiple(selection);
 
     // Show basic details.
     detailsPanel.hidden = false;
 
-    if (g_IsObserver)
-    {
-        // Observers don't need these displayed.
-        supplementalDetailsPanel.hidden = true;
-        commandsPanel.hidden = true;
-    }
-    else
-    {
-        // Fill out commands panel for specific unit selected (or first unit of primary group)
-        updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, selection);
-    }
+    // Fill out commands panel for specific unit selected (or first unit of primary group)
+    updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, selection);
 }

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

@@ -88 +88 @@
         else if (data.item == "end")
         {
             data.button.hidden = !data.unitEntState.alertRaiser.hasRaisedAlert;
             data.icon.sprite = "stretched:session/icons/bell_level0.png";
         }
-        data.button.enabled = !data.button.hidden;
+        data.button.enabled = !data.button.hidden && IsPlaying();
     },
 };
 
 // BARTER
 g_SelectionPanels.Barter = {
@@ -156 +156 @@
         var grayscale = data.isSelected ? "color: 0 0 0 100:grayscale:" : "";
 
         // do we have enough of this resource to sell?
         var neededRes = {};
         neededRes[data.item] = data.amountToSell;
-        var canSellCurrent = Engine.GuiInterfaceCall("GetNeededResources", neededRes) != undefined ? "color:255 0 0 80:" : "";
+        var canSellCurrent = Engine.GuiInterfaceCall("GetNeededResources", {
+            "cost": neededRes,
+            "player": data.unitEntState.player
+        }) ? "color:255 0 0 80:" : "";
+
         // Let's see if we have enough resources to barter.
         neededRes = {};
         neededRes[g_barterSell] = data.amountToSell;
-        var canBuyAny = Engine.GuiInterfaceCall("GetNeededResources", neededRes) != undefined ? "color:255 0 0 80:" : "";
+        var canBuyAny = Engine.GuiInterfaceCall("GetNeededResources", {
+            "cost": neededRes,
+            "player": data.unitEntState.player
+        }) ? "color:255 0 0 80:" : "";
 
         data.icon.Sell.sprite = canSellCurrent + "stretched:"+grayscale+"session/icons/resources/" + data.item + ".png";
         data.icon.Buy.sprite = canBuyAny + "stretched:"+grayscale+"session/icons/resources/" + data.item + ".png";
 
         data.button.Buy.hidden = data.isSelected;
+        data.button.Buy.enabled = IsPlaying();
         data.button.Sell.hidden = false;
         data.selectionIcon.hidden = !data.isSelected;
     },
     "setPosition": function(data)
     {
@@ -210 +218 @@
         data.countDisplay.caption = data.item.count || "";
     },
     "setGraphics": function(data)
     {
         data.icon.sprite = "stretched:session/icons/" + data.item.icon;
+        data.button.enabled = IsPlaying();
     },
     "setPosition": function(data)
     {
         var size = data.button.size;
         // count on square buttons, so size.bottom is the width too
@@ -260 +269 @@
         data.countDisplay.caption = data.item.count || "";
     },
     "setGraphics": function(data)
     {
         data.icon.sprite = "stretched:session/icons/" + data.item.icon;
+        data.button.enabled = IsPlaying();
     },
     "setPosition": function(data)
     {
         var size = data.button.size;
         // count on square buttons, so size.bottom is the width too
@@ -291 +301 @@
     {
         data.entType = data.item;
         data.template = GetTemplateData(data.entType);
         if (!data.template) // abort if no template
             return false;
-        data.technologyEnabled = Engine.GuiInterfaceCall("IsTechnologyResearched", data.template.requiredTechnology);
+
+        data.technologyEnabled = Engine.GuiInterfaceCall("IsTechnologyResearched", {
+            "tech": data.template.requiredTechnology,
+            "player": data.unitEntState.player
+        });
+
         if (data.template.cost)
-        {
-            var totalCost = multiplyEntityCosts(data.template, 1);
-            data.neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCost);
-        }
+            data.neededResources = Engine.GuiInterfaceCall("GetNeededResources", {
+                "cost": multiplyEntityCosts(data.template, 1),
+                "player": data.unitEntState.player
+            });
+
         data.limits = getEntityLimitAndCount(data.playerState, data.entType);
         return true;
     },
     "setAction": function(data)
     {
@@ -340 +356 @@
         else if (data.neededResources)
         {
             data.button.enabled = false;
             modifier += resourcesToAlphaMask(data.neededResources) +":";
         }
+        else
+            data.button.enabled = IsPlaying();
 
         if (data.template.icon)
             data.icon.sprite = modifier + "stretched:session/portraits/" + data.template.icon;
     },
     "setPosition": function(data)
@@ -392 +410 @@
             tooltip += "\n" + "[color=\"red\"]" + translate(data.formationInfo.tooltip) + "[/color]";
         data.button.tooltip = tooltip;
     },
     "setGraphics": function(data)
     {
-        data.button.enabled = data.formationOk;
+        data.button.enabled = data.formationOk && IsPlaying();
         var grayscale = data.formationOk ? "" : "grayscale:";
         data.guiSelection.hidden = !data.formationSelected;
         data.icon.sprite = "stretched:"+grayscale+"session/icons/"+data.formationInfo.icon;
     },
 };
@@ -543 +561 @@
                     return count;
                 }, 0);
 
             tooltip += "\n" + getEntityCostTooltip(data.template, data.wallCount);
 
+            data.neededResources = Engine.GuiInterfaceCall("GetNeededResources", { "cost":
+                multiplyEntityCosts(data.template, data.wallCount) });
 
-            data.neededResources = Engine.GuiInterfaceCall("GetNeededResources", multiplyEntityCosts(data.template, data.wallCount));
             if (data.neededResources)
                 tooltip += getNeededResourcesTooltip(data.neededResources);
         }
         data.button.tooltip = tooltip;
     },
     "setGraphics": function(data)
     {
+        data.button.enabled = IsPlaying();
         var gateIcon;
         if (data.item.gate)
         {
             // If already a gate, show locking actions
             gateIcon = "icons/lock_" + GATE_ACTIONS[data.item.locked ? 0 : 1] + "ed.png";
@@ -638 +658 @@
             data.icon.sprite = "stretched:session/icons/cancel.png";
         else if (data.item.packed)
             data.icon.sprite = "stretched:session/icons/unpack.png";
         else
             data.icon.sprite = "stretched:session/icons/pack.png";
+
+        data.button.enabled = IsPlaying();
     },
     "setPosition": function(data)
     {
         var index = data.i + getNumberOfRightPanelButtons();
         setPanelObjectPosition(data.button, index, data.rowLength);
@@ -718 +740 @@
     },
     "setGraphics": function(data)
     {
         if (data.template.icon)
             data.icon.sprite = "stretched:session/portraits/" + data.template.icon;
+
+        data.button.enabled = IsPlaying();
     },
 };
 
 // RESEARCH
 g_SelectionPanels.Research = {
@@ -777 +801 @@
         data.unchosenIcon = data.positions.map(function(p) { 
             return Engine.GetGUIObjectByName("unitResearchUnchosenIcon["+p+"]");
         });
 
         data.neededResources = data.template.map(function(t) { 
-            return Engine.GuiInterfaceCall("GetNeededResources", t.cost);
+            return Engine.GuiInterfaceCall("GetNeededResources", {
+                "cost": t.cost,
+                "player": data.unitEntState.player
+            });
         });
 
         data.requirementsPassed = data.entType.map(function(e) { 
-            return Engine.GuiInterfaceCall("CheckTechnologyRequirements",e); 
+            return Engine.GuiInterfaceCall("CheckTechnologyRequirements", {
+                "tech": e,
+                "player": data.unitEntState.player
+            });
         });
 
         data.pair = Engine.GetGUIObjectByName("unitResearchPair["+data.i+"]");
 
         return true;
@@ -804 +834 @@
             if (!data.requirementsPassed[i])
             {
                 tooltip += "\n" + template.requirementsTooltip;
                 if (template.classRequirements)
                 {
-                    var player = Engine.GetPlayerID();
+                    var player = data.unitEntState.player;
                     var current = GetSimState().players[player].classCounts[template.classRequirements.class] || 0;
                     var remaining = template.classRequirements.number - current;
                     tooltip += " " + sprintf(translatePlural("Remaining: %(number)s to build.", "Remaining: %(number)s to build.", remaining), { number: remaining});
                 }
             }
@@ -860 +890 @@
             {
                 button.enabled = false;
                 modifier += resourcesToAlphaMask(data.neededResources[i]) + ":";
             }
             else
-                button.enabled = true; 
+                button.enabled = IsPlaying();
 
             if (data.template[i].icon)
                 data.icon[i].sprite = modifier + "stretched:session/portraits/" + data.template[i].icon;
         }
         for (var button of data.buttonsToHide)
@@ -968 +998 @@
     },
     "setGraphics": function(data)
     {
         if (data.template.icon)
             data.icon.sprite = "stretched:session/portraits/" + data.template.icon;
+
+        data.button.enabled = IsPlaying();
     },
 };
 
 // STANCE
 g_SelectionPanels.Stance = {
@@ -1003 +1035 @@
     },
     "setGraphics": function(data)
     {
         data.guiSelection.hidden = !data.stanceSelected;
         data.icon.sprite = "stretched:session/icons/stances/"+data.item+".png";
+        data.button.enabled = IsPlaying();
     },
 };
 
 // TRAINING
 g_SelectionPanels.Training = {
@@ -1022 +1055 @@
     {
         data.entType = data.item;
         data.template = GetTemplateData(data.entType);
         if (!data.template)
             return false;
-        data.technologyEnabled = Engine.GuiInterfaceCall("IsTechnologyResearched", data.template.requiredTechnology);
+
+        data.technologyEnabled = Engine.GuiInterfaceCall("IsTechnologyResearched", {
+            "tech": data.template.requiredTechnology,
+            "player": data.unitEntState.player
+        });
 
         var [buildingsCountToTrainFullBatch, fullBatchSize, remainderBatch] =
             getTrainingBatchStatus(data.playerState, data.unitEntState.id, data.entType, data.selection);
         data.buildingsCountToTrainFullBatch = buildingsCountToTrainFullBatch;
         data.fullBatchSize = fullBatchSize;
@@ -1036 +1073 @@
             data.trainNum = buildingsCountToTrainFullBatch * fullBatchSize + remainderBatch;
 
         if (data.template.cost)
         {
             var totalCosts = multiplyEntityCosts(data.template, data.trainNum);
-            data.neededResources = Engine.GuiInterfaceCall("GetNeededResources", totalCosts);
+            data.neededResources = Engine.GuiInterfaceCall("GetNeededResources", {
+                "cost": totalCosts,
+                "player": data.unitEntState.player
+            });
         }
 
         return true;
     },
     "setAction": function(data)
@@ -1138 +1178 @@
     "Command",
     "AllyCommand",
     "Queue",
     "Selection",
 ];
+
+/**
+ * Returns true if the user is an assigned player or if an observer uses the change-perspective tool.
+ */
+function IsPlaying()
+{
+    return Engine.GetPlayerID() != -1;
+}

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

@@ -166 +166 @@
     // Get player state to check some constraints
     // e.g. presence of a hero or build limits
     var simState = GetSimState();
     var playerState = simState.players[player];
 
-    if (entState.player == player || g_DevSettings.controlAll)
+    if (entState.player == player || g_DevSettings.controlAll || g_IsObserver)
     {
         for (var guiName of g_PanelsOrder)
         {
             if (
                 g_SelectionPanels[guiName].conflictsWith && 
                 g_SelectionPanels[guiName].conflictsWith.some(function (p) { return g_SelectionPanels[p].used; })
             )
                 continue;
 
-            setupUnitPanel(guiName, entState, playerState);
+            setupUnitPanel(guiName, entState, simState.players[entState.player]);
         }
 
         supplementalDetailsPanel.hidden = false;
         commandsPanel.hidden = false;
     }

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

@@ -582 +582 @@
 
     let cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
     return GetTechnologyDataHelper(template, cmpPlayer.GetCiv());
 };
 
-GuiInterface.prototype.IsTechnologyResearched = function(player, tech)
+GuiInterface.prototype.IsTechnologyResearched = function(player, data)
 {
-    if (!tech)
+    if (!data.tech)
         return true;
 
-    let cmpTechnologyManager = QueryPlayerIDInterface(player, IID_TechnologyManager);
+    let cmpTechnologyManager = QueryPlayerIDInterface(data.player || player, IID_TechnologyManager);
 
     if (!cmpTechnologyManager)
         return false;
 
-    return cmpTechnologyManager.IsTechnologyResearched(tech);
+    return cmpTechnologyManager.IsTechnologyResearched(data.tech);
 };
 
 // Checks whether the requirements for this technology have been met
-GuiInterface.prototype.CheckTechnologyRequirements = function(player, tech)
+GuiInterface.prototype.CheckTechnologyRequirements = function(player, data)
 {
-    let cmpTechnologyManager = QueryPlayerIDInterface(player, IID_TechnologyManager);
+    let cmpTechnologyManager = QueryPlayerIDInterface(data.player || player, IID_TechnologyManager);
 
     if (!cmpTechnologyManager)
         return false;
 
-    return cmpTechnologyManager.CanResearch(tech);
+    return cmpTechnologyManager.CanResearch(data.tech);
 };
 
 // Returns technologies that are being actively researched, along with
 // which entity is researching them and how far along the research is.
 GuiInterface.prototype.GetStartedResearch = function(player)
@@ -645 +645 @@
 {
     return QueryPlayerIDInterface(player, IID_AttackDetection).GetIncomingAttacks();
 };
 
 // Used to show a red square over GUI elements you can't yet afford.
-GuiInterface.prototype.GetNeededResources = function(player, amounts)
+GuiInterface.prototype.GetNeededResources = function(player, data)
 {
-    return QueryPlayerIDInterface(player).GetNeededResources(amounts);
+    return QueryPlayerIDInterface(data.player || player).GetNeededResources(data.cost);
 };
 
 /**
  * Add a timed notification.
  * Warning: timed notifacations are serialised
@@ -1486 +1486 @@
             result.cost.time += tplData.cost.time;
         }
 
         let canAfford = true;
         let cmpPlayer = QueryPlayerIDInterface(player, IID_Player);
-        if (cmpPlayer && cmpPlayer.GetNeededResources(result.cost))
+        if (cmpPlayer && cmpPlayer.GetNeededResources({ "cost": result.cost }))
             canAfford = false;
 
         let cmpVisual = Engine.QueryInterface(ent, IID_Visual);
         if (cmpVisual)
         {