Ticket #252: t252_cleanupattack.diff

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

@@ -218 +218 @@
 
 Attack.prototype.GetPreferredClasses = function(type)
 {
-    if (this.template[type] && this.template[type].PreferredClasses &&
-        this.template[type].PreferredClasses._string)
-    {
+    if (this.template[type] && this.template[type].PreferredClasses && this.template[type].PreferredClasses._string)
         return this.template[type].PreferredClasses._string.split(/\s+/);
-    }
     return [];
 };
 
 Attack.prototype.GetRestrictedClasses = function(type)
 {
-    if (this.template[type] && this.template[type].RestrictedClasses &&
-        this.template[type].RestrictedClasses._string)
-    {
+    if (this.template[type] && this.template[type].RestrictedClasses && this.template[type].RestrictedClasses._string)
         return this.template[type].RestrictedClasses._string.split(/\s+/);
-    }
     return [];
 };
 
@@ -281 +275 @@
             canAttack = false;
             break;
         }
-        if (canAttack)
+        if (canAttack == "true")
             return true;
     }
 
@@ -327 +321 @@
         if (type == "Slaughter")
             continue;
         let range = this.GetRange(type);
-        if (range.min < ret.min)
-            ret.min = range.min;
-        if (range.max > ret.max)
-            ret.max = range.max;
+        ret.min = Math.min(ret.min, Range.min)
+        ret.max = Math.max(ret.max, Range.max)
     }
     return ret;
 };
@@ -486 +478 @@
     let a = Math.random();
     let b = Math.random();
 
-    let c = Math.sqrt(-2*Math.log(a)) * Math.cos(2*Math.PI*b);
-    let d = Math.sqrt(-2*Math.log(a)) * Math.sin(2*Math.PI*b);
+    let c = Math.sqrt(-2 * Math.log(a)) * Math.cos(2 * Math.PI * b);
+    let d = Math.sqrt(-2 * Math.log(a)) * Math.sin(2 * Math.PI * b);
 
     return [c, d];
 };
@@ -503 +495 @@
     if (type == "Ranged")
     {
         let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-        let turnLength = cmpTimer.GetLatestTurnLength()/1000;
+        let turnLength = cmpTimer.GetLatestTurnLength() / 1000;
         // In the future this could be extended:
         //  * Obstacles like trees could reduce the probability of the target being hit
         //  * Obstacles like walls should block projectiles entirely
@@ -620 +612 @@
 Attack.prototype.InterpolatedLocation = function(ent, lateness)
 {
     let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-    let turnLength = cmpTimer.GetLatestTurnLength()/1000;
+    let turnLength = cmpTimer.GetLatestTurnLength() / 1000;
     let cmpTargetPosition = Engine.QueryInterface(ent, IID_Position);
     if (!cmpTargetPosition || !cmpTargetPosition.IsInWorld()) // TODO: handle dead target properly
         return undefined;
@@ -658 +650 @@
         let d = Vector3D.sub(point, targetPosition);
         d = Vector2D.from3D(d).rotate(-angle);
 
-        return d.x < Math.abs(targetShape.width/2) && d.y < Math.abs(targetShape.depth/2);
+        return d.x < Math.abs(targetShape.width / 2) && d.y < Math.abs(targetShape.depth / 2);
     }
 };
 
@@ -740 +732 @@
         return;
 
     for (let type of this.GetAttackTypes())
-        if (msg.valueNames.indexOf("Attack/"+type+"/MaxRange") !== -1)
+        if (msg.valueNames.indexOf("Attack/" + type + "/MaxRange") !== -1)
         {
             cmpUnitAI.UpdateRangeQueries();
             return;