Merge branch 'develop' into OrdersLuaAnnotations

FAForever · Nov 27, 2024 · 23c6f7b · 23c6f7b
2 parents 3cd76fe + 11a9f7c
commit 23c6f7b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/changelog/snippets/fix.6436.md b/changelog/snippets/fix.6436.md
@@ -1 +1 @@
-- (#6436, #6480) Prevent the logging of an unecessary warning when certain units make landfall.
+- (#6436, #6480, #6552) Prevent the logging of an unecessary warning when certain units make landfall.
diff --git a/lua/sim/Unit.lua b/lua/sim/Unit.lua
@@ -3729,8 +3729,8 @@ Unit = ClassUnit(moho.unit_methods, IntelComponent, VeterancyComponent, DebugUni
             local effectTypeGroups = bpTable.Effects
 
             if not effectTypeGroups or (effectTypeGroups and (table.empty(effectTypeGroups))) then
-                -- warning isn't needed if this layer's table is used for Footfall or Contrails without terrain effects
-                if not bpTable.Footfall and not bpTable.Contrails then
+                -- warning isn't needed if this layer's table is used for Footfall or Contrails or Treads without terrain movement effects
+                if not bpTable.Footfall and not bpTable.Contrails and not bpTable.Treads then
                     WARN('*No movement effect groups defined for unit ', repr(self.UnitId), ', Effect groups with bone lists must be defined to play movement effects. Add these to the Display.MovementEffects.', layer, '.Effects table in unit blueprint.')
                 end
                 return false

diff --git a/units/URL0208/URL0208_script.lua b/units/URL0208/URL0208_script.lua
@@ -11,16 +11,5 @@
 local CConstructionUnit = import("/lua/cybranunits.lua").CConstructionUnit
 
 ---@class URL0208 : CConstructionUnit
-URL0208 = ClassUnit(CConstructionUnit) {
-    Treads = {
-        ScrollTreads = true,
-        BoneName = 'URL0208',
-        TreadMarks = 'tank_treads_albedo',
-        TreadMarksSizeX = 0.65,
-        TreadMarksSizeZ = 0.4,
-        TreadMarksInterval = 0.3,
-        TreadOffset = { 0, 0, 0 },
-    },
-}
-
-TypeClass = URL0208
+URL0208 = ClassUnit(CConstructionUnit) {}
+TypeClass = URL0208
diff --git a/units/XEL0306/XEL0306_unit.bp b/units/XEL0306/XEL0306_unit.bp
@@ -60,9 +60,9 @@ UnitBlueprint{
                         {
                             BoneName = "XEL0306",
                             TreadMarks = "tank_treads_albedo",
-                            TreadMarksInterval = 0.6,
+                            TreadMarksInterval = 0.4,
                             TreadMarksSizeX = 1.3,
-                            TreadMarksSizeZ = 1,
+                            TreadMarksSizeZ = 1.12,
                             TreadOffset = { 0, 0, 0 },
                         },
                     },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		- (#6436, #6480) Prevent the logging of an unecessary warning when certain units make landfall.
		- (#6436, #6480, #6552) Prevent the logging of an unecessary warning when certain units make landfall.