Ticket #643: Patch643.patch

gui/session/session.js

@@ -338 +338 @@
     var playerState = simState.players[Engine.GetPlayerID()];
     if (!playerState)
         return;
+        
+    var numResourceGatherers = Engine.GuiInterfaceCall("FindResourceGathererByType", playerState);
 
-    getGUIObjectByName("resourceFood").caption = playerState.resourceCounts.food;
-    getGUIObjectByName("resourceWood").caption = playerState.resourceCounts.wood;
-    getGUIObjectByName("resourceStone").caption = playerState.resourceCounts.stone;
-    getGUIObjectByName("resourceMetal").caption = playerState.resourceCounts.metal;
+    getGUIObjectByName("resourceFood").caption = playerState.resourceCounts.food + "(" + numResourceGatherers[0] + ")";
+    getGUIObjectByName("resourceWood").caption = playerState.resourceCounts.wood + "(" + numResourceGatherers[1] + ")";
+    getGUIObjectByName("resourceStone").caption = playerState.resourceCounts.stone + "(" + numResourceGatherers[2] + ")";
+    getGUIObjectByName("resourceMetal").caption = playerState.resourceCounts.metal + "(" + numResourceGatherers[3] + ")";
     getGUIObjectByName("resourcePop").caption = playerState.popCount + "/" + playerState.popLimit;
 
     g_IsTrainingQueueBlocked = playerState.trainingQueueBlocked;

gui/session/session.xml

@@ -42 +42 @@
             -->
 
         <object hotkey="leave">
-            <action on="Press">closeOpenDialogs();</action>
+            <action on="Press">closeOpenDialogs(); pauseShowMenu();</action>
         </object>
 
         <!-- Chat: Depending on the current state, it either opens message window or closes message window / posts message -->
@@ -52 +52 @@
 
         <!-- Menu -->
         <object hotkey="menu.toggle">
-            <action on="Press">openMenu();</action>
+            <action on="Press">toggleMenu();</action>
         </object>
 
         <!-- Pause -->
@@ -293 +293 @@
                 size="10 0 45% 100%"
             >
                 <!-- Food -->
-                <object size="0 0 90 100%" type="image" style="resourceCounter" tooltip="Food" tooltip_style="sessionToolTipBold">
+                <object size="0 0 90 100%" type="image" style="resourceCounter" tooltip="Food (Gatherers)" tooltip_style="sessionToolTipBold">
                     <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/food.png"/>
                     <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceFood"/>
                 </object>
 
                 <!-- Wood -->
-                <object size="90 0 180 100%" type="image" style="resourceCounter" tooltip="Wood" tooltip_style="sessionToolTipBold">
+                <object size="90 0 180 100%" type="image" style="resourceCounter" tooltip="Wood (Gatherers)" tooltip_style="sessionToolTipBold">
                     <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/wood.png"/>
                     <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceWood"/>
                 </object>
 
                 <!-- Stone -->
-                <object size="180 0 270 100%" type="image" style="resourceCounter" tooltip="Stone" tooltip_style="sessionToolTipBold">
+                <object size="180 0 270 100%" type="image" style="resourceCounter" tooltip="Stone (Gatherers)" tooltip_style="sessionToolTipBold">
                     <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/stone.png"/>
                     <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceStone"/>
                 </object>
 
                 <!-- Metal -->
-                <object size="270 0 360 100%"  type="image" style="resourceCounter" tooltip="Metal" tooltip_style="sessionToolTipBold">
+                <object size="270 0 360 100%"  type="image" style="resourceCounter" tooltip="Metal (Gatherers)" tooltip_style="sessionToolTipBold">
                     <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/metal.png"/>
                     <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceMetal"/>
                 </object>

simulation/components/GuiInterface.js

@@ -694 +694 @@
     PlaySound(data.name, data.entity);
 };
 
+function isWorkerGathering(ent)
+{
+    var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+    if ( !cmpUnitAI )
+        return false;
+    
+    var cmpResourceGatherer = Engine.QueryInterface(ent, IID_ResourceGatherer);
+    if ( !cmpResourceGatherer )
+        return false;
+    
+    return (cmpResourceGatherer.GetLastGathered() == undefined || cmpUnitAI.IsIdle()) ? false : true;
+}
+
 function isIdleUnit(ent, idleClass)
 {
     var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
@@ -720 +733 @@
     return 0;
 };
 
+GuiInterface.prototype.FindResourceGathererByType = function(player)
+{
+    var cmpResourceGatherer;
+    var numResourceGatherers = new Array();
+    numResourceGatherers[0] = 0;
+    numResourceGatherers[1] = 0;
+    numResourceGatherers[2] = 0;
+    numResourceGatherers[3] = 0;
+    
+    // TODO: can we filter this list to just workers to save time?
+    var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    var playerEntities = rangeMan.GetEntitiesByPlayer(player);
+
+    for each (var ent in playerEntities)
+    {
+        if ( isWorkerGathering(ent) )
+        {       
+            cmpResourceGatherer = Engine.QueryInterface(ent, IID_ResourceGatherer);
+            if ( cmpResourceGatherer )
+            {
+                // ensure they're actively gathering something
+                var resourceType = cmpResourceGatherer.GetLastGathered();
+                
+                if ( resourceType == "food" )
+                {
+                    numResourceGatherers[0]++;
+                }
+                else if ( resourceType == "wood" )
+                {
+                    numResourceGatherers[1]++;
+                }
+                else if ( resourceType == "stone" )
+                {
+                    numResourceGatherers[2]++;
+                }
+                else if ( resourceType == "metal" )
+                {
+                    numResourceGatherers[3]++;
+                }
+            }
+        }
+    }
+    return numResourceGatherers;
+};
+
 GuiInterface.prototype.GetTradingDetails = function(player, data)
 {
     var cmpEntityTrader = Engine.QueryInterface(data.trader, IID_Trader);
@@ -826 +884 @@
     "GetFoundationSnapData": 1,
     "PlaySound": 1,
     "FindIdleUnit": 1,
+    "FindResourceGathererByType": 1,
     "GetTradingDetails": 1,
 
     "SetPathfinderDebugOverlay": 1,

simulation/components/ResourceGatherer.js

@@ -65 +65 @@
 
     // The last exact type gathered, so we can render appropriate props
     this.lastCarriedType = undefined; // { generic, specific }
+    this.lastGathered = undefined;
 };
 
 /**
@@ -125 +126 @@
         return undefined;
 };
 
+ResourceGatherer.prototype.GetLastGathered = function()
+{
+    if ( this.lastGathered )
+        return this.lastGathered.generic;
+    else
+        return undefined;
+}
+
+ResourceGatherer.prototype.SetIdleNoGathering = function()
+{
+    this.lastGathered = undefined;
+}
+
 ResourceGatherer.prototype.GetGatherRates = function()
 {
     var ret = {};
@@ -188 +202 @@
     this.carrying[type.generic] += status.amount;
 
     this.lastCarriedType = type;
+    this.lastGathered = type;
 
     // Update stats of how much the player collected.
     // (We have to do it here rather than at the dropsite, because we

simulation/helpers/Commands.js

@@ -2 +2 @@
 //  are likely to fail, which may be useful for debugging AIs
 var g_DebugCommands = false;
 
+// cycles through all entities (after a command is given) and sets their gathering status to idle
+// if the unit has been instructed to gather resources, gathering status is updated once it begins gathering
+function setNotGathering(entities)
+{
+    for each ( var ent in entities )
+    {
+        var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
+        if ( cmpIdentity )
+        {
+            if ( cmpIdentity.HasClass("Worker") || cmpIdentity.HasClass("Female") || 
+                 cmpIdentity.HasClass("CitizenSoldier") || cmpIdentity.HasClass("FishingBoat") )
+            {
+                var cmpResourceGatherer = Engine.QueryInterface(ent, IID_ResourceGatherer);
+                if ( cmpResourceGatherer )
+                {
+                    cmpResourceGatherer.SetIdleNoGathering();
+                }
+            }
+        }
+    }
+}
+
 function ProcessCommand(player, cmd)
 {
     // Do some basic checks here that commanding player is valid
@@ -50 +72 @@
         GetFormationUnitAIs(entities).forEach(function(cmpUnitAI) {
             cmpUnitAI.Walk(cmd.x, cmd.z, cmd.queued);
         });
+        setNotGathering(entities);
         break;
 
     case "attack":
@@ -64 +87 @@
         GetFormationUnitAIs(entities).forEach(function(cmpUnitAI) {
             cmpUnitAI.Attack(cmd.target, cmd.queued);
         });
+        setNotGathering(entities);
         break;
 
     case "heal":
@@ -93 +117 @@
         GetFormationUnitAIs(entities).forEach(function(cmpUnitAI) {
             cmpUnitAI.Repair(cmd.target, cmd.autocontinue, cmd.queued);
         });
+        setNotGathering(entities);
         break;
 
     case "gather":
@@ -107 +132 @@
         GetFormationUnitAIs(entities).forEach(function(cmpUnitAI) {
             cmpUnitAI.Gather(cmd.target, cmd.queued);
         });
+        setNotGathering(entities);
         break;
         
     case "gather-near-position":
@@ -114 +140 @@
         GetFormationUnitAIs(entities).forEach(function(cmpUnitAI) {
             cmpUnitAI.GatherNearPosition(cmd.x, cmd.z, cmd.resourceType, cmd.queued);
         });
+        setNotGathering(entities);
         break;
 
     case "returnresource":
@@ -288 +315 @@
                 "queued": cmd.queued
             });
         }
-
+        
+        setNotGathering(entities);
         break;
 
     case "delete-entities":
@@ -339 +367 @@
             GetFormationUnitAIs(entities).forEach(function(cmpUnitAI) {
                 cmpUnitAI.Garrison(cmd.target);
             });
+            setNotGathering(entities);
         }
         else if (g_DebugCommands)
         {