Ticket #3726: gatheringTarget.patch

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

@@ -2143 +2143 @@
                     var cmpSupply = Engine.QueryInterface(this.gatheringTarget, IID_ResourceSupply);
                     if (cmpSupply)
                         cmpSupply.RemoveGatherer(this.entity);
-                    delete this.gatheringTarget;
+                    this.gatheringTarget = undefined;
                 },
             },
 
@@ -2261 +2261 @@
                     var cmpSupply = Engine.QueryInterface(this.gatheringTarget, IID_ResourceSupply);
                     if (cmpSupply)
                         cmpSupply.RemoveGatherer(this.entity);
-                    delete this.gatheringTarget;
+                    this.gatheringTarget = undefined;
 
                     // Show the carried resource, if we've gathered anything.
                     this.SetGathererAnimationOverride();
@@ -2306 +2306 @@
                                 {
                                     // (Keep this Gather order on the stack so we'll
                                     // continue gathering after returning)
-                                    this.PushOrderFront("ReturnResource", { "target": nearby, "force": false });
+                                    this.PushOrderFront("ReturnResource", { "target": nearby, "force": false, "supply": this.gatheringTarget });
                                     return;
                                 }
 
@@ -2542 +2542 @@
             "APPROACHING": {
                 "enter": function () {
                     this.SelectAnimation("move");
+
+                    if (this.order.data.supply)
+                    {
+                        let cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
+                        let cmpSupply = Engine.QueryInterface(this.order.data.supply, IID_ResourceSupply);
+                        if (cmpSupply)
+                            cmpSupply.AddGatherer(cmpOwnership.GetOwner(), this.entity);
+                        this.gatheringTarget = this.order.data.supply;
+                    }
                 },
 
                 "MoveCompleted": function() {
@@ -2580 +2589 @@
                     var nearby = this.FindNearestDropsite(genericType);
                     if (nearby)
                     {
+                        let data = { "target": nearby, "force": false };
+                        if (this.order.data.supply)
+                            data.supply = this.order.data.supply;
                         this.FinishOrder();
-                        this.PushOrderFront("ReturnResource", { "target": nearby, "force": false });
+                        this.PushOrderFront("ReturnResource", data);
                         return;
                     }
 
@@ -2588 +2600 @@
                     // Oh no, couldn't find any drop sites. Give up on returning.
                     this.FinishOrder();
                 },
+
+                "leave": function () {
+                    if (this.gatheringTarget)
+                    {
+                        let cmpSupply = Engine.QueryInterface(this.gatheringTarget, IID_ResourceSupply);
+                        if (cmpSupply)
+                            cmpSupply.RemoveGatherer(this.entity);
+                        this.gatheringTarget = undefined;
+                    }
+                },
             },
         },