From 9d3a7aae783d0df1f08760ba4e3c4958ef2f4f20 Mon Sep 17 00:00:00 2001 From: Penecruz <73371761+Penecruz@users.noreply.github.com> Date: Sat, 28 Aug 2021 10:25:54 +1000 Subject: [PATCH 1/5] Add Landing Spot 5 to JC --- Moose Development/Moose/Ops/Airboss.lua | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index e1e150265..95d4f5eda 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -1492,6 +1492,7 @@ AIRBOSS.GroovePos={ -- @field #AIRBOSS.RadioCall DEPARTANDREENTER "Depart and re-enter" call. -- @field #AIRBOSS.RadioCall EXPECTHEAVYWAVEOFF "Expect heavy wavoff" call. -- @field #AIRBOSS.RadioCall EXPECTSPOT75 "Expect spot 7.5" call. +-- @field #AIRBOSS.RadioCall EXPECTSPOT5 "Expect spot 5" call. -- @field #AIRBOSS.RadioCall FAST "You're fast" call. -- @field #AIRBOSS.RadioCall FOULDECK "Foul Deck" call. -- @field #AIRBOSS.RadioCall HIGH "You're high" call. @@ -4971,6 +4972,14 @@ function AIRBOSS:_InitVoiceOvers() subtitle="Expect spot 7.5", duration=2.0, subduration=5, + }, + EXPECTSPOT5={ + file="LSO-ExpectSpot5", + suffix="ogg", + loud=false, + subtitle="Expect spot 5", + duration=2.0, + subduration=5, }, STABILIZED={ file="LSO-Stabilized", @@ -9625,8 +9634,10 @@ function AIRBOSS:_Bullseye(playerData) -- Hint for player about altitude, AoA etc. self:_PlayerHint(playerData) - -- LSO expect spot 7.5 call - if playerData.actype==AIRBOSS.AircraftCarrier.AV8B then + -- LSO expect spot 5 or 7.5 call + if playerData.actype==AIRBOSS.AircraftCarrier.AV8B and self.carriertype==AIRBOSS.CarrierType.JCARLOS then + self:RadioTransmission(self.LSORadio, self.LSOCall.EXPECTSPOT5, nil, nil, nil, true) + elseif playerData.actype==AIRBOSS.AircraftCarrier.AV8B then self:RadioTransmission(self.LSORadio, self.LSOCall.EXPECTSPOT75, nil, nil, nil, true) end @@ -9808,8 +9819,10 @@ function AIRBOSS:_Abeam(playerData) -- Paddles contact. self:RadioTransmission(self.LSORadio, self.LSOCall.PADDLESCONTACT, nil, nil, nil, true) - -- LSO expect spot 7.5 call - if playerData.actype==AIRBOSS.AircraftCarrier.AV8B then + -- LSO expect spot 5 or 7.5 call + if playerData.actype==AIRBOSS.AircraftCarrier.AV8B and self.carriertype==AIRBOSS.CarrierType.JCARLOS then + self:RadioTransmission(self.LSORadio, self.LSOCall.EXPECTSPOT5, false, 5, nil, true) + elseif playerData.actype==AIRBOSS.AircraftCarrier.AV8B then self:RadioTransmission(self.LSORadio, self.LSOCall.EXPECTSPOT75, false, 5, nil, true) end @@ -11607,7 +11620,7 @@ function AIRBOSS:_GetAltCarrier(unit) return h end ---- Get optimal landing position of the aircraft. Usually between second and third wire. In case of Tarawa we take the abeam landing spot 120 ft abeam the 7.5 position. +--- Get optimal landing position of the aircraft. Usually between second and third wire. In case of Tarawa and America we take the abeam landing spot 120 ft abeam the 7.5 position, for the Juan Carlos I it is 120 ft and abeam the 5 position. -- @param #AIRBOSS self -- @return Core.Point#COORDINATE Optimal landing coordinate. function AIRBOSS:_GetOptLandingCoordinate() From 2cf939560eaf760ec4b8674f4ce50a04563d5774 Mon Sep 17 00:00:00 2001 From: Penecruz <73371761+Penecruz@users.noreply.github.com> Date: Sat, 28 Aug 2021 11:02:05 +1000 Subject: [PATCH 2/5] Allow for JC Spot 5 Voice over --- Moose Development/Moose/Ops/Airboss.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 95d4f5eda..09031a183 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -4978,7 +4978,7 @@ function AIRBOSS:_InitVoiceOvers() suffix="ogg", loud=false, subtitle="Expect spot 5", - duration=2.0, + duration=1.3, subduration=5, }, STABILIZED={ From c0a18957f0c0fbac28b1ccb5b700804f57625c13 Mon Sep 17 00:00:00 2001 From: Penecruz <73371761+Penecruz@users.noreply.github.com> Date: Sat, 28 Aug 2021 13:31:16 +1000 Subject: [PATCH 3/5] AoA for harrier and JC Spot 5 timings --- Moose Development/Moose/Ops/Airboss.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 09031a183..7f6ff2d4e 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -4647,6 +4647,7 @@ function AIRBOSS:SetVoiceOversLSOByRaynor(mizfolder) self.LSOCall.DEPARTANDREENTER.duration=1.10 self.LSOCall.EXPECTHEAVYWAVEOFF.duration=1.30 self.LSOCall.EXPECTSPOT75.duration=1.85 + self.LSOCall.EXPECTSPOT5.duration=1.3 self.LSOCall.FAST.duration=0.75 self.LSOCall.FOULDECK.duration=0.75 self.LSOCall.HIGH.duration=0.65 @@ -4705,6 +4706,7 @@ function AIRBOSS:SetVoiceOversLSOByFF(mizfolder) self.LSOCall.DEPARTANDREENTER.duration=1.10 self.LSOCall.EXPECTHEAVYWAVEOFF.duration=1.20 self.LSOCall.EXPECTSPOT75.duration=2.00 + self.LSOCall.EXPECTSPOT5.duration=1.3 self.LSOCall.FAST.duration=0.70 self.LSOCall.FOULDECK.duration=0.62 self.LSOCall.HIGH.duration=0.65 @@ -5640,14 +5642,14 @@ function AIRBOSS:_GetAircraftAoA(playerData) aoa.Fast = 8.25 --=17.5/2 aoa.FAST = 8.00 --=16.5/2 elseif harrier then - -- AV-8B Harrier parameters. This might need further tuning. + -- AV-8B Harrier parameters. Tuning done on the Fast AoA to allow for abeam and ninety at Nozzles 60 - 73. aoa.SLOW = 14.0 aoa.Slow = 13.0 aoa.OnSpeedMax = 12.0 aoa.OnSpeed = 11.0 aoa.OnSpeedMin = 10.0 - aoa.Fast = 9.0 - aoa.FAST = 8.0 + aoa.Fast = 8.0 + aoa.FAST = 7.5 end return aoa @@ -5907,7 +5909,7 @@ function AIRBOSS:_GetAircraftParameters(playerData, step) alt=UTILS.FeetToMeters(300) --? elseif harrier then -- 300-325 ft - alt=UTILS.FeetToMeters(300) + alt=UTILS.FeetToMeters(300)-- Need to verify end aoa=aoaac.OnSpeed From 555bb7e68b0028964af4db6bab248050bdac06d7 Mon Sep 17 00:00:00 2001 From: Penecruz <73371761+Penecruz@users.noreply.github.com> Date: Sat, 28 Aug 2021 14:27:32 +1000 Subject: [PATCH 4/5] Update instructions for AV-8B Harrier --- Moose Development/Moose/Ops/Airboss.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 7f6ff2d4e..8ef801b31 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -110,6 +110,7 @@ -- ### AV-8B Harrier at USS Tarawa -- -- * [Harrier Ship Landing Mission with Auto LSO!](https://www.youtube.com/watch?v=lqmVvpunk2c) +-- * [Harrier Practice pattern USS America](https://youtu.be/99NigITYmcI) -- -- === -- @@ -297,6 +298,8 @@ -- ![Banner Image](..\Presentations\AIRBOSS\Airboss_Case1_Landing.png) -- -- Once the aircraft reaches the Initial, the landing pattern begins. The important steps of the pattern are shown in the image above. +-- The AV-8B Harrier pattern is very similar, the only differences are as there is no angled deck there is no wake check. from the ninety you wil fly strait in to 26 ft to port of the tram line. +-- The aim is to arrive abeam the landing spot in a stable hover at 120 ft with forward speed matched to the boat. From there the LSO will call "cleared to land". You then cross to the tram line at the designated landing spot at land vertcally. -- -- -- ## CASE III @@ -921,9 +924,9 @@ -- -- ## Sound Packs -- --- The AIRBOSS currently has two different "sound packs" for both LSO and Marshal radios. These contain voice overs by different actors. +-- The AIRBOSS currently has two different "sound packs" for LSO and three different "sound Packs" for Marshal radios. These contain voice overs by different actors. -- These can be set by @{#AIRBOSS.SetVoiceOversLSOByRaynor}() and @{#AIRBOSS.SetVoiceOversMarshalByRaynor}(). These are the default settings. --- The other sound files can be set by @{#AIRBOSS.SetVoiceOversLSOByFF}() and @{#AIRBOSS.SetVoiceOversMarshalByFF}(). +-- The other sound files can be set by @{#AIRBOSS.SetVoiceOversLSOByFF}(),@{#AIRBOSS.SetVoiceOversMarshalByGabriella}() and @{#AIRBOSS.SetVoiceOversMarshalByFF}(). -- Also combinations can be used, e.g. -- -- airbossStennis:SetVoiceOversLSOByFF() From 909859056889888360db490f3280c291fbcf3c61 Mon Sep 17 00:00:00 2001 From: Penecruz <73371761+Penecruz@users.noreply.github.com> Date: Sat, 28 Aug 2021 14:50:40 +1000 Subject: [PATCH 5/5] Sound Pack Gabriella add --- Moose Development/Moose/Ops/Airboss.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 8ef801b31..085ec11b4 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -926,7 +926,7 @@ -- -- The AIRBOSS currently has two different "sound packs" for LSO and three different "sound Packs" for Marshal radios. These contain voice overs by different actors. -- These can be set by @{#AIRBOSS.SetVoiceOversLSOByRaynor}() and @{#AIRBOSS.SetVoiceOversMarshalByRaynor}(). These are the default settings. --- The other sound files can be set by @{#AIRBOSS.SetVoiceOversLSOByFF}(),@{#AIRBOSS.SetVoiceOversMarshalByGabriella}() and @{#AIRBOSS.SetVoiceOversMarshalByFF}(). +-- The other sound files can be set by @{#AIRBOSS.SetVoiceOversLSOByFF}(), @{#AIRBOSS.SetVoiceOversMarshalByGabriella}() and @{#AIRBOSS.SetVoiceOversMarshalByFF}(). -- Also combinations can be used, e.g. -- -- airbossStennis:SetVoiceOversLSOByFF()