Skip to content

added Tomcat AA grading adjustments and T45 AOA adjustments #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 1, 2025
Merged

added Tomcat AA grading adjustments and T45 AOA adjustments #2425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 37 additions & 11 deletions Moose Development/Moose/Ops/Airboss.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5498,15 +5498,11 @@ function AIRBOSS:_GetAircraftAoA( playerData )
aoa.OnSpeedMin = self:_AoAUnit2Deg( playerData, 14.0 ) -- 14.17 --14.5 units -- VNAO Edit - Original value 14.5
aoa.Fast = self:_AoAUnit2Deg( playerData, 13.5 ) -- 13.33 --14.0 units -- VNAO Edit - Original value 14
aoa.FAST = self:_AoAUnit2Deg( playerData, 12.5 ) -- 11.67 --13.0 units -- VNAO Edit - Original value 13
elseif goshawk then
-- T-45C Goshawk parameters.
aoa.SLOW = 8.00 -- 19
aoa.Slow = 7.75 -- 18
aoa.OnSpeedMax = 7.25 -- 17.5
aoa.OnSpeed = 7.00 -- 17
aoa.OnSpeedMin = 6.75 -- 16.5
aoa.Fast = 6.25 -- 16
aoa.FAST = 6.00 -- 15
local hornet = playerData.actype == AIRBOSS.AircraftCarrier.HORNET
or playerData.actype == AIRBOSS.AircraftCarrier.RHINOE
or playerData.actype == AIRBOSS.AircraftCarrier.RHINOF
or playerData.actype == AIRBOSS.AircraftCarrier.GROWLER
local tomcat = playerData.actype == AIRBOSS.AircraftCarrier.F14A or playerData.actype == AIRBOSS.AircraftCarrier.F14B
elseif skyhawk then
-- A-4E-C Skyhawk parameters from https://forums.eagle.ru/showpost.php?p=3703467&postcount=390
-- Note that these are arbitrary UNITS and not degrees. We need a conversion formula!
Expand Down Expand Up @@ -8161,8 +8157,14 @@ function AIRBOSS:_CheckPlayerStatus()
-- TODO: This might cause problems if the CCA is set to be very small!
if unit:IsInZone( self.zoneCCA ) then

-- VNAO Edit - Added wrapped up call to LSO grading
if playerData.step==AIRBOSS.PatternStep.WAKE then-- VNAO Edit - Added
local hornet = playerData.actype == AIRBOSS.AircraftCarrier.HORNET
or playerData.actype == AIRBOSS.AircraftCarrier.RHINOE
or playerData.actype == AIRBOSS.AircraftCarrier.RHINOF
or playerData.actype == AIRBOSS.AircraftCarrier.GROWLER
local tomcat = playerData.actype == AIRBOSS.AircraftCarrier.F14A or playerData.actype == AIRBOSS.AircraftCarrier.F14B

-- VNAO Edit - Added wrapped up call to LSO grading Hornet
if playerData.step==AIRBOSS.PatternStep.WAKE and hornet then-- VNAO Edit - Added
if math.abs(playerData.unit:GetRoll())>35 and math.abs(playerData.unit:GetRoll())<=40 then-- VNAO Edit - Added
playerData.wrappedUpAtWakeLittle = true -- VNAO Edit - Added
elseif math.abs(playerData.unit:GetRoll()) >40 and math.abs(playerData.unit:GetRoll())<=45 then-- VNAO Edit - Added
Expand All @@ -8186,6 +8188,30 @@ function AIRBOSS:_CheckPlayerStatus()
end -- VNAO Edit - Added
end-- VNAO Edit - Added

-- VNAO Edit - Added wrapped up call to LSO grading Tomcat
if playerData.step==AIRBOSS.PatternStep.WAKE and tomcat then-- VNAO Edit - Added
if math.abs(playerData.unit:GetRoll())>35 and math.abs(playerData.unit:GetRoll())<=40 then-- VNAO Edit - Added
playerData.wrappedUpAtWakeLittle = true -- VNAO Edit - Added
elseif math.abs(playerData.unit:GetRoll()) >40 and math.abs(playerData.unit:GetRoll())<=45 then-- VNAO Edit - Added
playerData.wrappedUpAtWakeFull = true-- VNAO Edit - Added
elseif math.abs(playerData.unit:GetRoll()) >45 then-- VNAO Edit - Added
playerData.wrappedUpAtWakeUnderline = true -- VNAO Edit - Added
elseif math.abs(playerData.unit:GetRoll()) <12 and math.abs(playerData.unit:GetRoll()) >=5 then -- VNAO Edit - Added a new AA comment based on discussion with Lipps today, and going to replace the AA at the X with the original LUL comments
playerData.AAatWakeLittle = true -- VNAO Edit - Added
elseif math.abs(playerData.unit:GetRoll()) <5 and math.abs(playerData.unit:GetRoll()) >=2 then -- VNAO Edit - Added a new AA comment based on discussion with Lipps today, and going to replace the AA at the X with the original LUL comments
playerData.AAatWakeFull = true -- VNAO Edit - Added
elseif math.abs(playerData.unit:GetRoll()) <2 then -- VNAO Edit - Added a new AA comment based on discussion with Lipps today, and going to replace the AA at the X with the original LUL comments
playerData.AAatWakeUnderline = true -- VNAO Edit - Added
else -- VNAO Edit - Added
end -- VNAO Edit - Added

if math.abs(playerData.unit:GetAoA())>= 15 then -- VNAO Edit - Added
playerData.AFU = true -- VNAO Edit - Added
elseif math.abs(playerData.unit:GetAoA())<= 5 then -- VNAO Edit - Added
playerData.AFU = true -- VNAO Edit - Added
else -- VNAO Edit - Added
end -- VNAO Edit - Added
end-- VNAO Edit - Added

-- Display aircraft attitude and other parameters as message text.
if playerData.attitudemonitor then
Expand Down