URA0103: resolve lingering bomb issue; fix failure to destroy on water impact

changelog/snippets/fix.7077.md

@@ -0,0 +1,4 @@
+- (#7077) Cybran T1 Bomber (URA0103):
+
+  - Fixed an issue where bombs would linger after impact, cluttering the screen.
+  - Fixed an issue where bombs failed to be destroyed upon water impact.

lua/cybranprojectiles.lua

@@ -483,6 +483,16 @@ CNeutronClusterBombProjectile = ClassProjectile(SinglePolyTrailProjectile) {
     OnCreate = function(self)
         SinglePolyTrailProjectile.OnCreate(self)
         self.Impacted = false
+        self.Trash:Add(ForkThread(self.FailsafeDestroyThread, self))
+    end,
+
+    --- Destroys the projectile in rare cases where no impact callback happens
+    ---@param self CNeutronClusterBombProjectile
+    FailsafeDestroyThread = function(self)
+        WaitTicks(120)
+        if not self:BeenDestroyed() then
+            self:Destroy()
+        end
     end,
 
     --- Note: Damage is done once in AOE by main projectile. Secondary projectiles
@@ -491,16 +501,22 @@ CNeutronClusterBombProjectile = ClassProjectile(SinglePolyTrailProjectile) {
     ---@param targetType string
     ---@param targetEntity Unit
     OnImpact = function(self, targetType, targetEntity)
-        if self.Impacted == false and targetType ~= 'Air' then
+        if self.Impacted == false then
             self.Impacted = true
-            local Random = Random 
-            self:CreateChildProjectile(self.ChildProjectile):SetVelocity(0,Random(1,3),Random(1.5,3))
-            self:CreateChildProjectile(self.ChildProjectile):SetVelocity(Random(1,2),Random(1,3),Random(1,2))
-            self:CreateChildProjectile(self.ChildProjectile):SetVelocity(0,Random(1,3),-Random(1.5,3))
-            self:CreateChildProjectile(self.ChildProjectile):SetVelocity(Random(1.5,3),Random(1,3),0)
-            self:CreateChildProjectile(self.ChildProjectile):SetVelocity(-Random(1,2),Random(1,3),-Random(1,2))
-            self:CreateChildProjectile(self.ChildProjectile):SetVelocity(-Random(1.5,2.5),Random(1,3),0)
-            self:CreateChildProjectile(self.ChildProjectile):SetVelocity(-Random(1,2),Random(1,3),Random(2,4))
+
+            if targetType ~= 'Air' then
+                local Random = Random
+                local child = self.ChildProjectile
+
+                self:CreateChildProjectile(child):SetVelocity(0, Random(1,3), Random(1.5,3))
+                self:CreateChildProjectile(child):SetVelocity(Random(1,2), Random(1,3), Random(1,2))
+                self:CreateChildProjectile(child):SetVelocity(0, Random(1,3), -Random(1.5,3))
+                self:CreateChildProjectile(child):SetVelocity(Random(1.5,3), Random(1,3), 0)
+                self:CreateChildProjectile(child):SetVelocity(-Random(1,2), Random(1,3), -Random(1,2))
+                self:CreateChildProjectile(child):SetVelocity(-Random(1.5,2.5), Random(1,3), 0)
+                self:CreateChildProjectile(child):SetVelocity(-Random(1,2), Random(1,3), Random(2,4))
+            end
+
             SinglePolyTrailProjectile.OnImpact(self, targetType, targetEntity)
         end
     end,

projectiles/CIFNeutronClusterBomb02/CIFNeutronClusterBomb02_proj.bp

@@ -31,6 +31,7 @@ ProjectileBlueprint{
     Interface = { HelpText = 0 },
     Physics = {
         Acceleration = 2,
+        DestroyOnWater = true,
         InitialSpeed = 1,
         InitialSpeedRange = 0,
         MaxSpeed = 105,