Fix issues with release (FAForever#3822)

Fixes various sound issues, a miss matching file, some issues with the UEF Build Effect and the AI blueprint view window.
Zjonn · Apr 29, 2022 · 7afd6de · 7afd6de
1 parent dbdfca9
commit 7afd6de
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.../emitters/antiair_muzzle_fire_01_emit .bp → ...s/emitters/antiair_muzzle_fire_01_emit.bp b/.../emitters/antiair_muzzle_fire_01_emit .bp → ...s/emitters/antiair_muzzle_fire_01_emit.bp
diff --git a/lua/EffectUtilitiesUEF.lua b/lua/EffectUtilitiesUEF.lua
@@ -297,7 +297,7 @@ function CreateBuildCubeThread(
     CoroutineYield(BuildCubeDelay)
 
     -- always check if we're still there after waiting
-    if EntityBeenDestroyed(unitBeingBuilt) then
+    if EntityBeenDestroyed(unitBeingBuilt) or EntityBeenDestroyed(BuildBaseEffect) then
         return
     end
 
@@ -317,7 +317,7 @@ function CreateBuildCubeThread(
     WaitSeconds(BuildCubeFirstSliceDelay)
 
     -- always check if we're still there after waiting
-    if unitBeingBuilt.Dead then
+    if EntityBeenDestroyed(unitBeingBuilt) or EntityBeenDestroyed(BuildBaseEffect) then
         return
     end
 

diff --git a/lua/sim/Unit.lua b/lua/sim/Unit.lua
@@ -1215,7 +1215,9 @@ Unit = Class(moho.unit_methods) {
             -- Handle ships that can walk on land
             self:PlayUnitSound('AmphibiousFloatingKilledOnLand')
         else
-            self:PlayUnitSound('Killed')
+            if not self:PlayUnitSound('Killed') then 
+                self:PlayUnitSound('Destroyed')
+            end
         end
 
         -- apply death animation on half built units (do not apply for ML and mega)
@@ -1859,7 +1861,11 @@ Unit = Class(moho.unit_methods) {
         -- wait at least 1 tick before destroying unit
         WaitSeconds(math.max(0.1, self.DeathThreadDestructionWaitTime))
 
-        self:PlayUnitSound('Destroyed')
+        -- do not play sound after sinking
+        if not self.Sinking then 
+            self:PlayUnitSound('Destroyed')
+        end
+
         self:Destroy()
     end,
 

diff --git a/lua/ui/dialogs/AIUtilitiesView.lua b/lua/ui/dialogs/AIUtilitiesView.lua
@@ -217,7 +217,7 @@ function OpenWindow()
         SPEW("Created AI utilities window")
 
         -- create the window
-        State.GUI = Window.CreateDefaultWindow(
+        State.GUI = UIUtil.CreateWindowStd(
             GetFrame(0), 
             "AI blueprint information", 
             false, 

diff --git a/projectiles/ShieldCollider/ShieldCollider_script.lua b/projectiles/ShieldCollider/ShieldCollider_script.lua
@@ -65,6 +65,7 @@ ShieldCollider = Class(Projectile) {
                 if not self.Plane.GroundImpacted then
                     self.Plane:OnImpact(targetType)
                 end
+
                 self:Destroy()
             elseif targetType == 'Shield' and targetEntity and not targetEntity:BeenDestroyed() and targetEntity.ShieldType == 'Bubble' then
                 if not self.ShieldImpacted and not self.Plane.GroundImpacted then