Fix issues with terrain alignment of structures (FAForever#4724)

ageekhere · Feb 23, 2023 · 42634f9 · 42634f9
1 parent 7f248cb
commit 42634f9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/lua/defaultunits.lua b/lua/defaultunits.lua
@@ -75,13 +75,14 @@ StructureUnit = ClassUnit(Unit) {
         local flatten = physicsBlueprint.FlattenSkirt
         if flatten then
             self:FlattenSkirt()
-    end
+        end
 
         -- check for terrain orientation
         if not (
                 physicsBlueprint.AltitudeToTerrain or
                 physicsBlueprint.StandUpright
             ) and (flatten or physicsBlueprint.AlwaysAlignToTerrain)
+            and self.Layer == 'Land'
         then
             -- rotate structure to match terrain gradient
             local a1, a2 = TerrainUtils.GetTerrainSlopeAngles(
@@ -90,8 +91,8 @@ StructureUnit = ClassUnit(Unit) {
                 blueprint.Footprint.SizeZ or physicsBlueprint.SkirtSizeZ
             )
 
-            -- do not orientate structures that are on essentially flat ground
-            if MathAbs(a1) > 0.02 or MathAbs(a2) > 0.02 then
+            -- do not orientate structures that are on flat ground
+            if a1 != 0 or a2 != 0 then
                 self:SetOrientation(EulerToQuaternion(-1 * a1, a2, 0), true)
 
                 -- technically obsolete, but as this is part of an integration we don't want to break

diff --git a/units/UAB2101/UAB2101_unit.bp b/units/UAB2101/UAB2101_unit.bp
@@ -120,6 +120,7 @@ UnitBlueprint {
     LifeBarOffset = 0.35,
     LifeBarSize = 0.9,
     Physics = {
+        AlwaysAlignToTerrain = true,
         BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,

diff --git a/units/UEB2101/UEB2101_unit.bp b/units/UEB2101/UEB2101_unit.bp
@@ -112,6 +112,7 @@ UnitBlueprint {
     LifeBarOffset = 0.35,
     LifeBarSize = 0.9,
     Physics = {
+        AlwaysAlignToTerrain = true,
         BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,

diff --git a/units/URB2101/URB2101_unit.bp b/units/URB2101/URB2101_unit.bp
@@ -117,6 +117,7 @@ UnitBlueprint {
     LifeBarOffset = 0.25,
     LifeBarSize = 0.75,
     Physics = {
+        AlwaysAlignToTerrain = true,
         BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,

diff --git a/units/XSB2101/XSB2101_unit.bp b/units/XSB2101/XSB2101_unit.bp
@@ -135,6 +135,7 @@ UnitBlueprint {
     LifeBarOffset = 0.4,
     LifeBarSize = 0.9,
     Physics = {
+        AlwaysAlignToTerrain = true,
         BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,