Changeset 25235 for ps/trunk/binaries/data/mods/public/simulation/components/Heal.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/Heal.js (modified) (3 diffs)

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

@@ -167 +167 @@
 
 /**
- * @param {string} reason - The reason why we stopped healing. Currently implemented are:
- *  "outOfRange", "targetInvalidated".
+ * @param {string} reason - The reason why we stopped healing.
  */
 Heal.prototype.StopHealing = function(reason)
 {
-    if (this.timer)
-    {
-        let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-        cmpTimer.CancelTimer(this.timer);
-        delete this.timer;
-    }
+    if (!this.target)
+        return;
+
+    let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+    cmpTimer.CancelTimer(this.timer);
+    delete this.timer;
+
+    delete this.target;
 
     let cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
@@ -183 +184 @@
         cmpVisual.SelectAnimation("idle", false, 1.0);
 
-    delete this.target;
-
-    // The callerIID component may start healing again,
+    // The callerIID component may start again,
     // replacing the callerIID, hence save that.
     let callerIID = this.callerIID;
@@ -200 +199 @@
 /**
  * Heal our target entity.
- * @params - data and lateness are unused.
+ * @param data - Unused.
+ * @param {number} lateness - The offset of the actual call and when it was expected.
  */
 Heal.prototype.PerformHeal = function(data, lateness)