Changeset 25243

Timestamp:

Apr 12, 2021, 2:50:17 PM (3 years ago)

Author:

Freagarach

Message:

Minor fixes after Gathering refactoring.

• initPos was used wrong.
• There were two CanGather functions in cmpResourceGatherer.
• Reduced some duplication in the ReturnResource order.

Differential revision: D3838.

Location:

ps/trunk/binaries/data/mods/public/simulation/components

Files:

• ResourceGatherer.js (modified) (1 diff)
• UnitAI.js (modified) (6 diffs)

ps/trunk/binaries/data/mods/public/simulation/components/ResourceGatherer.js

@@ -331 +331 @@
 
 /**
- * @param {number} target - The entity ID of the target to check.
- * @return {boolean} - Whether we can gather from the target.
- */
-ResourceGatherer.prototype.CanGather = function(target)
-{
-    return this.GetTargetGatherRate(target) > 0;
-};
-
-/**
  * Returns whether this unit can carry more of the given type of resource.
  * (This ignores whether the unit is actually able to gather that

ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js

@@ -559 +559 @@
 
     "Order.ReturnResource": function(msg) {
-        let cmpResourceGatherer = Engine.QueryInterface(this.entity, IID_ResourceGatherer);
-        if (this.CheckTargetRange(msg.data.target, IID_ResourceGatherer) &&
-            this.CanReturnResource(msg.data.target, true, cmpResourceGatherer))
-        {
-            cmpResourceGatherer.CommitResources(msg.data.target);
-            this.SetDefaultAnimationVariant();
-
-            // Our next order should always be a Gather,
-            // so just switch back to that order.
-            this.FinishOrder();
-        }
+        if (this.CheckTargetRange(msg.data.target, IID_ResourceGatherer))
+            this.SetNextState("RETURNRESOURCE.DROPPINGRESOURCES");
         else if (this.AbleToMove())
-            this.SetNextState("INDIVIDUAL.RETURNRESOURCE.APPROACHING");
+            this.SetNextState("RETURNRESOURCE.APPROACHING");
         else
             return this.FinishOrder();
@@ -2438 +2429 @@
 
                 "MovementUpdate": function(msg) {
-                    // If we failed, the GATHERING timer will handle finding a valid resource.
                     if (msg.likelyFailure || msg.obstructed && this.RelaxedMaxRangeCheck(this.order.data, this.DefaultRelaxedMaxRange) ||
                          this.CheckRange(this.order.data))
-                        this.SetNextState("GATHERING");
+                        this.SetNextState("");
                 },
             },
@@ -2558 +2548 @@
                         initPos = { 'x': pos.X, 'z': pos.Z };
                     else if (!nearbyResource)
-                        nearbyResource = this.FindNearbyResource(new Vector2D(initPos.X, initPos.Z), filter);
+                        nearbyResource = this.FindNearbyResource(new Vector2D(initPos.), filter);
 
                     if (nearbyResource)
@@ -2728 +2718 @@
                         this.SetDefaultAnimationVariant();
 
-                        // Our next order should always be a Gather,
-                        // so just switch back to that order.
                         this.FinishOrder();
                         return true;
@@ -4319 +4307 @@
         if (!this.CanGather(ent) || !this.CheckTargetVisible(ent))
             return false;
-        let cmpResourceSupply = Engine.QueryInterface(ent, IID_ResourceSupply);
-        let type = cmpResourceSupply.GetType();
-        let amount = cmpResourceSupply.GetCurrentAmount();
 
         let template = cmpTemplateManager.GetCurrentTemplateName(ent);
@@ -4327 +4312 @@
             template = template.slice(9);
 
-        return amount > 0 && cmpResourceSupply.IsAvailableTo(this.entity) && filter(ent, type, template);
+        let cmpResourceSupply = Engine.QueryInterface(ent, IID_ResourceSupply);
+        let type = cmpResourceSupply.GetType();
+        return cmpResourceSupply.IsAvailableTo(this.entity) && filter(ent, type, template);
     });
 };