Merge branch 'deploy/fafdevelop' into Tempest_AntiTorp

Basilisk3 · Apr 16, 2024 · f03f229 · f03f229
2 parents e31bd32 + fb9aade
commit f03f229
Show file tree

Hide file tree

Showing 210 changed files with 28 additions and 838 deletions.
diff --git a/changelog/3809.md b/changelog/3809.md
@@ -58,6 +58,15 @@
         - BuildTime: 750 --> 1200
         - BuildTime: 900 --> 1400 (Cybran)
 
+- (#6082) The `BuildRate` and `BuildTime` stats of several Shield Generators are updated to be more streamlined. The Seraphim Tech 2 Shield Generator gains build power, as it previously had a very low amount. The Aeon Tech 2 Shield Generator loses its build power, as it cannot be upgraded.
+    - Tech 2 Shield Generators
+        - BuildRate: 13.66 --> 0 (Aeon)
+        - BuildRate: 12.98 --> 20 (Seraphim)
+        - BuildRate: 19.95 --> 20 (UEF)
+    - Tech 3 Shield Generators
+        - BuildTime: 5841 --> 5800 (Seraphim)
+        - BuildTime: 4988 --> 5000 (UEF)
+
 ## Features
 
 <!-- Remove header when empty -->
@@ -76,10 +85,15 @@
 
 - (#6067) Fix a performance issue related to AIs and their transport logic
 
+- (#6041, #6055) Clean up the blueprint-files of various structures.
+
 - (#6042) Improve annotations for `OnMotionHorzEventChange` and `OnMotionVertEventChange`
 
 - (#6077) Improve the targeting of the Tempest's anti-torpedo weapon.
 
+- (#6086) Ensure that the Cooper's hitbox aligns with its model.
+
+
 ## Contributors
 
 With thanks to the following people who contributed through coding:

diff --git a/lua/EffectUtilities.lua b/lua/EffectUtilities.lua
@@ -1033,7 +1033,7 @@ function PlayTeleportChargingEffects(unit, teleDest, effectsBag, teleDelay)
             for _, effect in telefx do
                 local fx = CreateEmitterAtEntity(teleportDestFxEntity, unitArmy, effect)
                 IEffectOffsetEmitter(fx, 0, offsetY, 0)
-                IEffectScaleEmitter(fx, 0.75)
+                IEffectScaleEmitter(fx, 0.9375)
                 IEffectSetEmitterCurveParam(fx, 'Y_POSITION_CURVE', 0, offsetY * 2) -- To make effects cover entire height of unit
                 IEffectSetEmitterCurveParam(fx, 'ROTATION_RATE_CURVE', 1, 0) -- Small initial rotation, will be faster as charging
                 TableInsert(unit.TeleportDestChargeBag, fx)
@@ -1048,7 +1048,7 @@ function PlayTeleportChargingEffects(unit, teleDest, effectsBag, teleDelay)
 
             for _, effect in telefx do
                 local fx = CreateEmitterAtEntity(sphere, unitArmy, effect)
-                IEffectScaleEmitter(fx, 0.01 * unit.TeleportCybranSphereScale)
+                IEffectScaleEmitter(fx, 0.0125 * unit.TeleportCybranSphereScale)
                 TableInsert(unit.TeleportDestChargeBag, fx)
                 TrashBagAdd(effectsBag, fx)
             end
@@ -1057,7 +1057,7 @@ function PlayTeleportChargingEffects(unit, teleDest, effectsBag, teleDelay)
             for _, effect in telefx do
                 local fx = CreateEmitterAtEntity(teleportDestFxEntity, unitArmy, effect)
                 IEffectOffsetEmitter(fx, 0, offsetY, 0)
-                IEffectScaleEmitter(fx, 0.01)
+                IEffectScaleEmitter(fx, 0.0125)
                 TableInsert(unit.TeleportDestChargeBag, fx)
                 TrashBagAdd(effectsBag, fx)
             end
@@ -1068,7 +1068,7 @@ function PlayTeleportChargingEffects(unit, teleDest, effectsBag, teleDelay)
             for _, effect in telefx do
                 local fx = CreateEmitterAtEntity(teleportDestFxEntity, unitArmy, effect)
                 IEffectOffsetEmitter(fx, 0, offsetY, 0)
-                IEffectScaleEmitter(fx, 0.01)
+                IEffectScaleEmitter(fx, 0.0125)
                 TableInsert(unit.TeleportDestChargeBag, fx)
                 TrashBagAdd(effectsBag, fx)
             end
@@ -1152,7 +1152,7 @@ end
 function TeleportCreateCybranSphere(unit, location, initialScale)
     -- Creates the sphere used by Cybran teleportation effects
     local sx, sy, sz = TeleportGetUnitSizes(unit)
-    local scale = 1.25 * MathMax(sx, sy, sz)
+    local scale = 1.5625 * MathMax(sx, sy, sz)
     unit.TeleportCybranSphereScale = scale
 
     local sphere = Entity()
@@ -1185,7 +1185,7 @@ function TeleportChargingProgress(unit, fraction)
             if unit.TeleportDestChargeBag then
                 local height = -(25 + 100 * fraction)
                 local size = 30 * fraction
-                local scale = 0.75 + 0.5 * MathMax(fraction, 0.01)
+                local scale = 0.9375 + 0.625 * MathMax(fraction, 0.01)
                 for _, fx in unit.TeleportDestChargeBag do
                     IEffectSetEmitterCurveParam(fx, 'ROTATION_RATE_CURVE', height, size)
                     IEffectScaleEmitter(fx, scale)
@@ -1198,7 +1198,7 @@ function TeleportChargingProgress(unit, fraction)
             end
         elseif faction == 'Cybran' then
             -- Increase size of sphere and effects as progressing
-            local scale = MathMax(fraction, 0.01) * (unit.TeleportCybranSphereScale or 5)
+            local scale = fraction * (unit.TeleportCybranSphereScale or 6.25)
             if unit.TeleportCybranSphere then
                 unit.TeleportCybranSphere:SetDrawScale(scale)
             end
@@ -1209,7 +1209,7 @@ function TeleportChargingProgress(unit, fraction)
             end
         elseif unit.TeleportDestChargeBag then
             -- Increase size of effects as progressing
-            local scale = 2 * fraction - MathPow(fraction, 2)
+            local scale = 2.5 * fraction - MathPow(fraction, 2.5)
             for _, fx in unit.TeleportDestChargeBag do
                 IEffectScaleEmitter(fx, scale)
             end

diff --git a/units/UAB0101/UAB0101_unit.bp b/units/UAB0101/UAB0101_unit.bp
@@ -129,15 +129,12 @@ UnitBlueprint{
     LifeBarOffset = 1.9,
     LifeBarSize = 4.5,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = { LAYER_Land = true },
         DragCoefficient = 0.2,
         FlattenSkirt = true,
-        MaxSteerForce = 0,
         MeshExtentsX = 4.5,
         MeshExtentsY = 1,
         MeshExtentsZ = 4.5,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RaisedPlatforms = {
             --X,     Z,     height -- Offsets from center
@@ -160,7 +157,6 @@ UnitBlueprint{
         SkirtOffsetZ = -1.5,
         SkirtSizeX = 8,
         SkirtSizeZ = 8,
-        TurnRate = 0,
     },
     SelectionSizeX = 2.75,
     SelectionSizeZ = 2.75,

diff --git a/units/UAB0102/UAB0102_unit.bp b/units/UAB0102/UAB0102_unit.bp
@@ -135,7 +135,6 @@ UnitBlueprint{
     LifeBarOffset = 1.55,
     LifeBarSize = 4.5,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,
             LAYER_Land = true,
@@ -146,11 +145,9 @@ UnitBlueprint{
         },
         DragCoefficient = 0.2,
         FlattenSkirt = true,
-        MaxSteerForce = 0,
         MeshExtentsX = 4.25,
         MeshExtentsY = 2.5,
         MeshExtentsZ = 5,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RaisedPlatforms = {
             --X,     Z,     height -- Offsets from center
@@ -179,7 +176,6 @@ UnitBlueprint{
         SkirtOffsetZ = -1.5,
         SkirtSizeX = 8,
         SkirtSizeZ = 8,
-        TurnRate = 0,
     },
     SelectionSizeX = 2.85,
     SelectionSizeZ = 2.75,

diff --git a/units/UAB0103/UAB0103_unit.bp b/units/UAB0103/UAB0103_unit.bp
@@ -124,7 +124,6 @@ UnitBlueprint{
     LifeBarOffset = 6.5,
     LifeBarSize = 4,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,
             LAYER_Land = false,
@@ -135,11 +134,9 @@ UnitBlueprint{
         },
         ComputeRollOffPoint = true,
         DragCoefficient = 0.2,
-        MaxSteerForce = 0,
         MeshExtentsX = 5,
         MeshExtentsY = 2,
         MeshExtentsZ = 10,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RollOffPoints = {
             { UnitSpin = 180,   X = -6,    Y = 0,     Z = -8 },
@@ -149,7 +146,6 @@ UnitBlueprint{
         SkirtOffsetZ = -2,
         SkirtSizeX = 12,
         SkirtSizeZ = 14,
-        TurnRate = 0,
     },
     SelectionSizeX = 2.5,
     SelectionSizeZ = 6.5,

diff --git a/units/UAB0201/UAB0201_unit.bp b/units/UAB0201/UAB0201_unit.bp
@@ -130,15 +130,12 @@ UnitBlueprint{
     LifeBarOffset = 1.95,
     LifeBarSize = 4.5,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = { LAYER_Land = true },
         DragCoefficient = 0.2,
         FlattenSkirt = true,
-        MaxSteerForce = 0,
         MeshExtentsX = 4.5,
         MeshExtentsY = 1.25,
         MeshExtentsZ = 4.5,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RaisedPlatforms = {
             --X,     Z,     height -- Offsets from center
@@ -161,7 +158,6 @@ UnitBlueprint{
         SkirtOffsetZ = -1.5,
         SkirtSizeX = 8,
         SkirtSizeZ = 8,
-        TurnRate = 0,
     },
     SelectionSizeX = 2.75,
     SelectionSizeZ = 2.75,

diff --git a/units/UAB0202/UAB0202_unit.bp b/units/UAB0202/UAB0202_unit.bp
@@ -132,7 +132,6 @@ UnitBlueprint{
     LifeBarOffset = 2,
     LifeBarSize = 4.5,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,
             LAYER_Land = true,
@@ -143,11 +142,9 @@ UnitBlueprint{
         },
         DragCoefficient = 0.2,
         FlattenSkirt = true,
-        MaxSteerForce = 0,
         MeshExtentsX = 5.5,
         MeshExtentsY = 3,
         MeshExtentsZ = 5.5,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RaisedPlatforms = {
             --X,     Z,     height -- Offsets from center
@@ -176,7 +173,6 @@ UnitBlueprint{
         SkirtOffsetZ = -1.5,
         SkirtSizeX = 8,
         SkirtSizeZ = 8,
-        TurnRate = 0,
     },
     SelectionCenterOffsetX = 0.22,
     SelectionCenterOffsetZ = -0.25,

diff --git a/units/UAB0203/UAB0203_unit.bp b/units/UAB0203/UAB0203_unit.bp
@@ -128,7 +128,6 @@ UnitBlueprint{
     LifeBarOffset = 6.5,
     LifeBarSize = 4.5,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,
             LAYER_Land = false,
@@ -139,11 +138,9 @@ UnitBlueprint{
         },
         ComputeRollOffPoint = true,
         DragCoefficient = 0.2,
-        MaxSteerForce = 0,
         MeshExtentsX = 5,
         MeshExtentsY = 2,
         MeshExtentsZ = 10,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RollOffPoints = {
             { UnitSpin = 180,   X = -6,    Y = 0,     Z = -8 },
@@ -153,7 +150,6 @@ UnitBlueprint{
         SkirtOffsetZ = -2,
         SkirtSizeX = 12,
         SkirtSizeZ = 14,
-        TurnRate = 0,
     },
     SelectionSizeX = 2.5,
     SelectionSizeZ = 7.5,

diff --git a/units/UAB0301/UAB0301_unit.bp b/units/UAB0301/UAB0301_unit.bp
@@ -129,15 +129,12 @@ UnitBlueprint{
     LifeBarOffset = 2,
     LifeBarSize = 4.5,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = { LAYER_Land = true },
         DragCoefficient = 0.2,
         FlattenSkirt = true,
-        MaxSteerForce = 0,
         MeshExtentsX = 4.5,
         MeshExtentsY = 1.5,
         MeshExtentsZ = 4.5,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RaisedPlatforms = {
             --X,     Z,     height -- Offsets from center
@@ -160,7 +157,6 @@ UnitBlueprint{
         SkirtOffsetZ = -1.5,
         SkirtSizeX = 8,
         SkirtSizeZ = 8,
-        TurnRate = 0,
     },
     SelectionSizeX = 2.75,
     SelectionSizeZ = 2.75,

diff --git a/units/UAB0302/UAB0302_unit.bp b/units/UAB0302/UAB0302_unit.bp
@@ -130,7 +130,6 @@ UnitBlueprint{
     LifeBarOffset = 2.1,
     LifeBarSize = 4.5,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,
             LAYER_Land = true,
@@ -141,11 +140,9 @@ UnitBlueprint{
         },
         DragCoefficient = 0.2,
         FlattenSkirt = true,
-        MaxSteerForce = 0,
         MeshExtentsX = 6,
         MeshExtentsY = 4,
         MeshExtentsZ = 6,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RaisedPlatforms = {
             --X,     Z,     height -- Offsets from center
@@ -174,7 +171,6 @@ UnitBlueprint{
         SkirtOffsetZ = -1.5,
         SkirtSizeX = 8,
         SkirtSizeZ = 8,
-        TurnRate = 0,
     },
     SelectionCenterOffsetX = 0,
     SelectionCenterOffsetZ = -0.25,

diff --git a/units/UAB0303/UAB0303_unit.bp b/units/UAB0303/UAB0303_unit.bp
@@ -126,7 +126,6 @@ UnitBlueprint{
     LifeBarOffset = 6.7,
     LifeBarSize = 4.75,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,
             LAYER_Land = false,
@@ -137,11 +136,9 @@ UnitBlueprint{
         },
         ComputeRollOffPoint = true,
         DragCoefficient = 0.2,
-        MaxSteerForce = 0,
         MeshExtentsX = 5,
         MeshExtentsY = 2,
         MeshExtentsZ = 14,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         RollOffPoints = {
             { UnitSpin = 180,   X = -6,    Y = 0,     Z = -8 },
@@ -151,7 +148,6 @@ UnitBlueprint{
         SkirtOffsetZ = -2,
         SkirtSizeX = 12,
         SkirtSizeZ = 14,
-        TurnRate = 0,
     },
     SelectionSizeX = 2.5,
     SelectionSizeZ = 8.8,

diff --git a/units/UAB0304/UAB0304_unit.bp b/units/UAB0304/UAB0304_unit.bp
@@ -127,7 +127,6 @@ UnitBlueprint{
     LifeBarOffset = 2.65,
     LifeBarSize = 5.5,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,
             LAYER_Land = true,
@@ -138,11 +137,9 @@ UnitBlueprint{
         },
         DragCoefficient = 0.2,
         FlattenSkirt = true,
-        MaxSteerForce = 0,
         MeshExtentsX = 7.5,
         MeshExtentsY = 2.5,
         MeshExtentsZ = 7.5,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         OccupyRects = {
             -3,
@@ -180,7 +177,6 @@ UnitBlueprint{
         SkirtOffsetZ = -1.5,
         SkirtSizeX = 10,
         SkirtSizeZ = 10,
-        TurnRate = 0,
     },
     SelectionSizeX = 3.75,
     SelectionSizeZ = 3.5,

diff --git a/units/UAB1101/UAB1101_unit.bp b/units/UAB1101/UAB1101_unit.bp
@@ -106,7 +106,6 @@ UnitBlueprint{
     LifeBarOffset = 0.35,
     LifeBarSize = 0.9,
     Physics = {
-        BankingSlope = 0,
         BuildOnLayerCaps = {
             LAYER_Air = false,
             LAYER_Land = true,
@@ -117,17 +116,14 @@ UnitBlueprint{
         },
         DragCoefficient = 0.2,
         FlattenSkirt = true,
-        MaxSteerForce = 0,
         MeshExtentsX = 1,
         MeshExtentsY = 0.75,
         MeshExtentsZ = 1,
-        MinSpeedPercent = 0,
         MotionType = "RULEUMT_None",
         SkirtOffsetX = -0.5,
         SkirtOffsetZ = -0.5,
         SkirtSizeX = 2,
         SkirtSizeZ = 2,
-        TurnRate = 0,
     },
     SelectionSizeX = 0.65,
     SelectionSizeZ = 0.65,