Skip to content

Commit 9963c73

Browse files
Merge pull request #2599 from FlightControl-Master/master-ng
Merge from master
2 parents 73d3ed1 + 5005203 commit 9963c73

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

Moose Development/Moose/Ops/Airboss.lua

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4201,13 +4201,16 @@ function AIRBOSS:_CheckRecoveryTimes()
42014201
-- Time into the wind 1 day or if longer recovery time + the 5 min early.
42024202
local t = math.max( nextwindow.STOP - nextwindow.START + self.dTturn, 60 * 60 * 24 )
42034203

4204-
-- Recovery wind on deck in knots.
4204+
-- Recovery wind on deck in knots.
4205+
-- NOTE: Do NOT clamp the desired wind-over-deck (WOD) to the carrier's max hull
4206+
-- speed here. WOD = carrier speed + headwind, so a WOD target above the hull's
4207+
-- top speed is achievable whenever there is wind. CarrierTurnIntoWind ->
4208+
-- GetHeadingIntoWind already converts the WOD target into the required hull
4209+
-- speed and caps THAT at the carrier's max speed (Vmax) internally. Clamping the
4210+
-- WOD target itself capped achievable WOD at ~30 kts (the supercarrier's max
4211+
-- hull speed) even in strong wind, which made high-WOD recovery windows fall
4212+
-- short of their requested value.
42054213
local v = UTILS.KnotsToMps( nextwindow.SPEED )
4206-
4207-
-- Check that we do not go above max possible speed.
4208-
local vmax = self.carrier:GetSpeedMax() / 3.6 -- convert to m/s
4209-
v = math.min( v, vmax )
4210-
42114214
-- Route carrier into the wind. Sets self.turnintowind=true
42124215
self:CarrierTurnIntoWind( t, v, uturn )
42134216

0 commit comments

Comments
 (0)