Fix the roll off order for the Tempest (FAForever#5357)

speed2CZ · Aug 25, 2023 · bec3183 · bec3183
1 parent b7fe398
commit bec3183
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/engine/Sim/Unit.lua b/engine/Sim/Unit.lua
@@ -83,6 +83,7 @@ end
 --- Calculates the desired world position from the supplied relative vector from the center of the unit.
 --- Used for naval factories to set rally point under them.
 ---@param vector Vector
+---@return Vector
 function Unit:CalculateWorldPositionFromRelative(vector)
 end
 

diff --git a/units/UAS0401/UAS0401_script.lua b/units/UAS0401/UAS0401_script.lua
@@ -119,7 +119,7 @@ UAS0401 = ClassUnit(ASeaUnit, ExternalFactoryComponent) {
         end
     end,
 
-    ---@param self UEL0401
+    ---@param self UAS0401
     ---@param new Layer
     ---@param old Layer
     OnLayerChange = function(self, new, old)
@@ -136,6 +136,13 @@ UAS0401 = ClassUnit(ASeaUnit, ExternalFactoryComponent) {
         ExternalFactoryComponent.OnUnpaused(self)
     end,
 
+    RolloffBody = function(self)
+    end,
+
+    ---@param self ExternalFactoryUnit
+    RollOffUnit = function(self)
+    end,
+
     DiveDepthThread = function(self)
         -- Takes the given location, adjusts the Y value to the surface height on that location, with an offset
         local Yoffset = 1.2 -- The default (built in) offset appears to be 0.25 - if the place where thats set is found, that would be epic.
@@ -190,8 +197,15 @@ UAS0401 = ClassUnit(ASeaUnit, ExternalFactoryComponent) {
             self.UnitDoneBeingBuilt = false
         end,
 
+        ---@param self UAS0401
+        ---@param unitBeingBuilt Unit
         OnStopBuild = function(self, unitBeingBuilt)
             ASeaUnit.OnStopBuild(self, unitBeingBuilt)
+
+            local blueprint = unitBeingBuilt.Blueprint
+            local distance = math.max(blueprint.SizeX, blueprint.SizeZ, 6)
+            local worldPos = self:CalculateWorldPositionFromRelative({0, 0, - 2 * distance})
+            IssueMoveOffFactory({unitBeingBuilt}, worldPos)
             ChangeState(self, self.RollingOffState)
         end,
     },
@@ -201,8 +215,6 @@ UAS0401 = ClassUnit(ASeaUnit, ExternalFactoryComponent) {
             local unitBuilding = self.UnitBeingBuilt
             unitBuilding:DetachFrom(true)
             self:DetachAll(self.BuildAttachBone)
-            local worldPos = self:CalculateWorldPositionFromRelative({0, 0, -20})
-            IssueMoveOffFactory({unitBuilding}, worldPos)
 
             WaitTicks(21)