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

Timestamp:

Apr 12, 2021, 8:51:39 AM (3 years ago)

Author:

Freagarach

Message:

Attack using cmpAttack instead of UnitAI.

Keep responsibilities separated, allow easier modding of attacking behaviour.
Ideally the BuildingAI attacking routine would be merged in here as well, but not done for now.

Part of #5810
Differential revision: D3816
Comments by: @smiley, @Stan

File:

• ps/trunk/binaries/data/mods/public/simulation/components/ResourceGatherer.js (modified) (2 diffs)

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

@@ -218 +218 @@
 ResourceGatherer.prototype.StopGathering = function(reason)
 {
-    if (this.timer)
-    {
-        let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-        cmpTimer.CancelTimer(this.timer);
-        delete this.timer;
-    }
-
-    if (this.target)
-    {
-        let cmpResourceSupply = Engine.QueryInterface(this.target, IID_ResourceSupply);
-        if (cmpResourceSupply)
-            cmpResourceSupply.RemoveGatherer(this.entity);
-        this.RemoveFromPlayerCounter();
-        delete this.target;
-    }
+    if (!this.target)
+        return;
+
+    let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    cmpTimer.CancelTimer(this.timer);
+    delete this.timer;
+
+    let cmpResourceSupply = Engine.QueryInterface(this.target, IID_ResourceSupply);
+    if (cmpResourceSupply)
+        cmpResourceSupply.RemoveGatherer(this.entity);
+    this.RemoveFromPlayerCounter();
+
+    delete this.target;
 
     let cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
@@ -238 +236 @@
         cmpVisual.SelectAnimation("idle", false, 1.0);
 
-    // The callerIID component may start gathering again,
+    // The callerIID component may start again,
     // replacing the callerIID, hence save that.
     let callerIID = this.callerIID;