Ticket #4276: 1910_splash_strengths.diff

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

@@ -547 +547 @@
         {
             data.friendlyFire = this.template.Ranged.Splash.FriendlyFire != "false";
             data.radius = +this.template.Ranged.Splash.Range;
             data.shape = this.template.Ranged.Splash.Shape;
             data.isSplash = true;
+            data.splashStrengths = this.GetAttackStrengths(type+".Splash");
         }
         cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_Damage, "MissileHit", timeToTarget * 1000, data);
     }
     else if (type == "Capture")
     {

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

@@ -103 +103 @@
         this.CauseSplashDamage({
             "attacker": data.attacker,
             "origin": Vector2D.from3D(data.position),
             "radius": data.radius,
             "shape": data.shape,
-            "strengths": data.strengths,
+            "strengths": data.splashStrengths,
             "direction": data.direction,
             "playersToDamage": playersToDamage,
             "type": data.type,
             "attackerOwner": data.attackerOwner
         });
@@ -128 +128 @@
         return;
 
     // If we didn't hit the main target look for nearby units
     let cmpPlayer = QueryPlayerIDInterface(data.attackerOwner);
     let ents = this.EntitiesNearPoint(Vector2D.from3D(data.position), targetPosition.horizDistanceTo(data.position) * 2, cmpPlayer.GetEnemies());
-    
     for (let ent of ents)
         if (!this.TestCollision(ent, data.position, lateness))
         {
             this.CauseDamage({
                 "strengths": data.strengths,