Adjustments for Forrestal by Pene

Added Bell-47
2025-08-15 10:47:21 +00:00 · 2021-10-24 14:35:55 +02:00 · 2021-10-22 17:04:23 +02:00 · 2021-10-22 17:04:19 +02:00 · 2021-10-20 19:55:19 +02:00 · 2021-10-16 12:11:34 +02:00
4 changed files with 199 additions and 152 deletions
--- a/Development/Moose/Ops/Airboss.lua
+++ b/Development/Moose/Ops/Airboss.lua
@@ -27,10 +27,11 @@
 -- **Supported Carriers:**
 --
 --    * [USS John C. Stennis](https://en.wikipedia.org/wiki/USS_John_C._Stennis) (CVN-74)
--	  * [USS Theodore Roosevelt](https://en.wikipedia.org/wiki/USS_Theodore_Roosevelt_(CVN-71)) (CVN-71) [Super Carrier Module]
--	  * [USS Abraham Lincoln](https://en.wikipedia.org/wiki/USS_Abraham_Lincoln_(CVN-72)) (CVN-72) [Super Carrier Module]
--	  * [USS George Washington](https://en.wikipedia.org/wiki/USS_George_Washington_(CVN-73)) (CVN-73) [Super Carrier Module]
--	  * [USS Harry S. Truman](https://en.wikipedia.org/wiki/USS_Harry_S._Truman) (CVN-75) [Super Carrier Module]
+--    * [USS Theodore Roosevelt](https://en.wikipedia.org/wiki/USS_Theodore_Roosevelt_(CVN-71)) (CVN-71) [Super Carrier Module]
+--    * [USS Abraham Lincoln](https://en.wikipedia.org/wiki/USS_Abraham_Lincoln_(CVN-72)) (CVN-72) [Super Carrier Module]
+--    * [USS George Washington](https://en.wikipedia.org/wiki/USS_George_Washington_(CVN-73)) (CVN-73) [Super Carrier Module]
+--    * [USS Harry S. Truman](https://en.wikipedia.org/wiki/USS_Harry_S._Truman) (CVN-75) [Super Carrier Module]
+--    * [USS Forrestal](https://en.wikipedia.org/wiki/USS_Forrestal_(CV-59)) (CV-59) [Heatblur Carrier Module]
 --    * [USS Tarawa](https://en.wikipedia.org/wiki/USS_Tarawa_(LHA-1)) (LHA-1) [**WIP**]
 --    * [USS America](https://en.wikipedia.org/wiki/USS_America_(LHA-6)) (LHA-6) [**WIP**]
 --    * [Juan Carlos I](https://en.wikipedia.org/wiki/Spanish_amphibious_assault_ship_Juan_Carlos_I) (L61) [**WIP**]
@@ -299,7 +300,7 @@
 --
 -- 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 a straight approach offset 26 ft to port (left) 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 level cross to the tram line at the designated landing spot at land vertcally. 
+-- 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 level cross to the tram line at the designated landing spot at land vertcally.
 --
 --
 -- ## CASE III
@@ -1295,6 +1296,7 @@ AIRBOSS.AircraftCarrier={
 -- @field #string WASHINGTON USS George Washington (CVN-73) [Super Carrier Module]
 -- @field #string STENNIS USS John C. Stennis (CVN-74)
 -- @field #string TRUMAN USS Harry S. Truman (CVN-75) [Super Carrier Module]
+-- @field #string FORRESTAL USS Forrestal (CV-59) [Heatblur Carrier Module]
 -- @field #string VINSON USS Carl Vinson (CVN-70) [Obsolete]
 -- @field #string TARAWA USS Tarawa (LHA-1)
 -- @field #string AMERICA USS America (LHA-6)
@@ -1306,6 +1308,7 @@ AIRBOSS.CarrierType={
  WASHINGTON="CVN_73",
  TRUMAN="CVN_75",
  STENNIS="Stennis",
+  FORRESTAL="Forrestal",
  VINSON="VINSON",
  TARAWA="LHA_Tarawa",
  AMERICA="USS America LHA-6",
@@ -1723,7 +1726,7 @@ AIRBOSS.MenuF10Root=nil

 --- Airboss class version.
 -- @field #string version
-AIRBOSS.version="1.1.6"
+AIRBOSS.version="1.2.0"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -1974,6 +1977,8 @@ function AIRBOSS:New(carriername, alias)
    self:_InitNimitz()
  elseif self.carriertype==AIRBOSS.CarrierType.TRUMAN then
    self:_InitNimitz()
+  elseif self.carriertype==AIRBOSS.CarrierType.FORRESTAL then
+    self:_InitForrestal()
  elseif self.carriertype==AIRBOSS.CarrierType.VINSON then
    -- TODO: Carl Vinson parameters.
    self:_InitStennis()
@@ -2023,10 +2028,10 @@ function AIRBOSS:New(carriername, alias)
    self:_GetZonePlatform(case):SmokeZone(SMOKECOLOR.Blue, 45)
    self:_GetZoneCorridor(case):SmokeZone(SMOKECOLOR.Green, 45)
    self:_GetZoneHolding(case, 1):SmokeZone(SMOKECOLOR.White, 45)
-	  self:_GetZoneHolding(case, 2):SmokeZone(SMOKECOLOR.White, 45)
+    self:_GetZoneHolding(case, 2):SmokeZone(SMOKECOLOR.White, 45)
    self:_GetZoneInitial(case):SmokeZone(SMOKECOLOR.Orange, 45)
    self:_GetZoneCommence(case, 1):SmokeZone(SMOKECOLOR.Red, 45)
-	  self:_GetZoneCommence(case, 2):SmokeZone(SMOKECOLOR.Red, 45)
+    self:_GetZoneCommence(case, 2):SmokeZone(SMOKECOLOR.Red, 45)
    self:_GetZoneAbeamLandingSpot():SmokeZone(SMOKECOLOR.Red, 5)
    self:_GetZoneLandingSpot():SmokeZone(SMOKECOLOR.Red, 5)
  end
@@ -2041,7 +2046,7 @@ function AIRBOSS:New(carriername, alias)
    local stern=self:_GetSternCoord()

    -- Bow pos.
-    local bow=stern:Translate(self.carrierparam.totlength, hdg)
+    local bow=stern:Translate(self.carrierparam.totlength, hdg, true)

    -- End of rwy.
    local rwy=stern:Translate(self.carrierparam.rwylength, FB, true)
@@ -2059,31 +2064,31 @@ function AIRBOSS:New(carriername, alias)
      bow:FlareYellow()

      -- Runway half width = 10 m.
-      local r1=stern:Translate(self.carrierparam.rwywidth*0.5, FB+90)
-      local r2=stern:Translate(self.carrierparam.rwywidth*0.5, FB-90)
-      r1:FlareWhite()
-      r2:FlareWhite()
+      local r1=stern:Translate(self.carrierparam.rwywidth*0.5, FB+90, true)
+      local r2=stern:Translate(self.carrierparam.rwywidth*0.5, FB-90, true)
+      --r1:FlareWhite()
+      --r2:FlareWhite()

      -- End of runway.
      rwy:FlareRed()

      -- Right 30 meters from stern.
-      local cR=stern:Translate(self.carrierparam.totwidthstarboard, hdg+90)
-      cR:FlareYellow()
+      local cR=stern:Translate(self.carrierparam.totwidthstarboard, hdg+90, true)
+      --cR:FlareYellow()

      -- Left 40 meters from stern.
-      local cL=stern:Translate(self.carrierparam.totwidthport, hdg-90)
-      cL:FlareYellow()
+      local cL=stern:Translate(self.carrierparam.totwidthport, hdg-90, true)
+      --cL:FlareYellow()


      -- Carrier specific.
      if self.carrier:GetTypeName()~=AIRBOSS.CarrierType.TARAWA or self.carrier:GetTypeName()~=AIRBOSS.CarrierType.AMERICA or self.carrier:GetTypeName()~=AIRBOSS.CarrierType.JCARLOS then

        -- Flare wires.
-        local w1=stern:Translate(self.carrierparam.wire1, FB)
-        local w2=stern:Translate(self.carrierparam.wire2, FB)
-        local w3=stern:Translate(self.carrierparam.wire3, FB)
-        local w4=stern:Translate(self.carrierparam.wire4, FB)
+        local w1=stern:Translate(self.carrierparam.wire1, FB, true)
+        local w2=stern:Translate(self.carrierparam.wire2, FB, true)
+        local w3=stern:Translate(self.carrierparam.wire3, FB, true)
+        local w4=stern:Translate(self.carrierparam.wire4, FB, true)
        w1:FlareWhite()
        w2:FlareYellow()
        w3:FlareWhite()
@@ -2850,7 +2855,7 @@ function AIRBOSS:SetLineupErrorThresholds(_max,_min, Left, LeftMed, LEFT, Right,
  self.lue.LeftMed=LeftMed   or -2.0
  self.lue.LEFT=LEFT   or -3.0
  self.lue.Right=Right or  1.0
-  self.lue.RightMed=RightMed or  2.0 
+  self.lue.RightMed=RightMed or  2.0
  self.lue.RIGHT=RIGHT or  3.0
  return self
 end
@@ -4377,6 +4382,35 @@ function AIRBOSS:_InitNimitz()

 end

+--- Init parameters for Forrestal class super carriers.
+-- @param #AIRBOSS self
+function AIRBOSS:_InitForrestal()
+
+  -- Init Nimitz as default.
+  self:_InitNimitz()
+
+  -- Carrier Parameters.
+  self.carrierparam.sterndist  =-135.5
+  self.carrierparam.deckheight =  20 --20.1494  --DCS World OpenBeta\CoreMods\tech\USS_Nimitz\Database\USS_CVN_7X.lua
+
+  -- Total size of the carrier (approx as rectangle).
+  self.carrierparam.totlength=315         -- Wiki says 325 meters overall length.
+  self.carrierparam.totwidthport=45         -- Wiki says  73 meters overall beam.
+  self.carrierparam.totwidthstarboard=35
+
+  -- Landing runway.
+  self.carrierparam.rwyangle   =  -9.1359  --DCS World OpenBeta\CoreMods\tech\USS_Nimitz\scripts\USS_Nimitz_RunwaysAndRoutes.lua
+  self.carrierparam.rwylength  = 212
+  self.carrierparam.rwywidth   =  25
+
+  -- Wires.
+  self.carrierparam.wire1      =  44        -- Distance from stern to first wire. Original from Frank - 42
+  self.carrierparam.wire2      =  54        --51.5
+  self.carrierparam.wire3      =  64        --62
+  self.carrierparam.wire4      =  74        --72.5
+
+end
+
 --- Init parameters for LHA-1 Tarawa carrier.
 -- @param #AIRBOSS self
 function AIRBOSS:_InitTarawa()
@@ -4978,7 +5012,7 @@ function AIRBOSS:_InitVoiceOvers()
      duration=2.0,
      subduration=5,
    },
-	EXPECTSPOT5={
+  EXPECTSPOT5={
      file="LSO-ExpectSpot5",
      suffix="ogg",
      loud=false,
@@ -5817,8 +5851,8 @@ function AIRBOSS:_GetAircraftParameters(playerData, step)
    elseif skyhawk then
      alt=UTILS.FeetToMeters(600)
      speed=UTILS.KnotsToMps(250)
-	elseif goshawk then
-	  alt=UTILS.FeetToMeters(800)
+  elseif goshawk then
+    alt=UTILS.FeetToMeters(800)
      speed=UTILS.KnotsToMps(300)
    end

@@ -5830,8 +5864,8 @@ function AIRBOSS:_GetAircraftParameters(playerData, step)
    elseif skyhawk then
      alt=UTILS.FeetToMeters(600)
      speed=UTILS.KnotsToMps(250)
-	elseif goshawk then
-	  alt=UTILS.FeetToMeters(800)
+  elseif goshawk then
+    alt=UTILS.FeetToMeters(800)
      speed=UTILS.KnotsToMps(300)
    end

@@ -5868,7 +5902,7 @@ function AIRBOSS:_GetAircraftParameters(playerData, step)
      dist=UTILS.NMToMeters(1.2)
    end

-	if goshawk then
+  if goshawk then
      -- 0.9 to 1.1 NM per natops ch.4 page 48
      dist=UTILS.NMToMeters(0.9)
    else
@@ -5879,7 +5913,7 @@ function AIRBOSS:_GetAircraftParameters(playerData, step)

    if hornet or tomcat then
      alt=UTILS.FeetToMeters(500)
-	elseif goshawk then
+  elseif goshawk then
      alt=UTILS.FeetToMeters(450)
    elseif skyhawk then
      alt=UTILS.FeetToMeters(500)
@@ -5912,7 +5946,7 @@ function AIRBOSS:_GetAircraftParameters(playerData, step)
      alt=UTILS.FeetToMeters(300) --?
    elseif harrier then
      -- 300-325 ft
-      alt=UTILS.FeetToMeters(300)-- Need to verify 
+      alt=UTILS.FeetToMeters(300)-- Need to verify
    end

    aoa=aoaac.OnSpeed
@@ -6381,8 +6415,8 @@ function AIRBOSS:_MarshalPlayer(playerData, stack)
      -- Set stack flag.
      flight.flag=stack

-	  -- Trigger Marshal event.
-	  self:Marshal(flight)
+    -- Trigger Marshal event.
+    self:Marshal(flight)
    end

  else
@@ -9640,7 +9674,7 @@ function AIRBOSS:_Bullseye(playerData)
    self:_PlayerHint(playerData)

    -- LSO expect spot 5 or 7.5 call
-	if playerData.actype==AIRBOSS.AircraftCarrier.AV8B and self.carriertype==AIRBOSS.CarrierType.JCARLOS then
+  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)
@@ -9825,7 +9859,7 @@ function AIRBOSS:_Abeam(playerData)
    self:RadioTransmission(self.LSORadio, self.LSOCall.PADDLESCONTACT, nil, nil, nil, true)

     -- LSO expect spot 5 or 7.5 call
-	if playerData.actype==AIRBOSS.AircraftCarrier.AV8B and self.carriertype==AIRBOSS.CarrierType.JCARLOS then
+  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)
@@ -10215,25 +10249,25 @@ function AIRBOSS:_Groove(playerData)
      -- Distance in NM.
      local d=UTILS.MetersToNM(rho)

-	-- Drift on lineup.
-	  if rho>=RAR and rho<=RIM then
-	    if gd.LUE>0.22 and lineupError<-0.22 then 
-			env.info" Drift Right across centre ==> DR-"
-			gd.Drift=" DR"
-			self:T(self.lid..string.format("Got Drift Right across centre step %s, d=%.3f: Max LUE=%.3f, lower LUE=%.3f", gs, d, gd.LUE, lineupError))
-		 elseif gd.LUE<-0.22 and lineupError>0.22 then
-			env.info" Drift Left ==> DL-"
-			gd.Drift=" DL"
-			self:T(self.lid..string.format("Got Drift Left across centre at step %s, d=%.3f: Min LUE=%.3f, lower LUE=%.3f", gs, d, gd.LUE, lineupError))
-		 elseif gd.LUE>0.13 and lineupError<-0.14 then
-			env.info" Little Drift Right across centre ==> (DR-)"
-			gd.Drift=" (DR)"
-			self:T(self.lid..string.format("Got Little Drift Right across centre at step %s, d=%.3f: Max LUE=%.3f, lower LUE=%.3f", gs, d, gd.LUE, lineupError))
-		 elseif gd.LUE<-0.13 and lineupError>0.14 then
-			env.info" Little Drift Left across centre ==> (DL-)"
-			gd.Drift=" (DL)"
-			self:E(self.lid..string.format("Got Little Drift Left across centre at step %s, d=%.3f: Min LUE=%.3f, lower LUE=%.3f", gs, d, gd.LUE, lineupError))	
-		end
+  -- Drift on lineup.
+    if rho>=RAR and rho<=RIM then
+      if gd.LUE>0.22 and lineupError<-0.22 then
+      env.info" Drift Right across centre ==> DR-"
+      gd.Drift=" DR"
+      self:T(self.lid..string.format("Got Drift Right across centre step %s, d=%.3f: Max LUE=%.3f, lower LUE=%.3f", gs, d, gd.LUE, lineupError))
+     elseif gd.LUE<-0.22 and lineupError>0.22 then
+      env.info" Drift Left ==> DL-"
+      gd.Drift=" DL"
+      self:T(self.lid..string.format("Got Drift Left across centre at step %s, d=%.3f: Min LUE=%.3f, lower LUE=%.3f", gs, d, gd.LUE, lineupError))
+     elseif gd.LUE>0.13 and lineupError<-0.14 then
+      env.info" Little Drift Right across centre ==> (DR-)"
+      gd.Drift=" (DR)"
+      self:T(self.lid..string.format("Got Little Drift Right across centre at step %s, d=%.3f: Max LUE=%.3f, lower LUE=%.3f", gs, d, gd.LUE, lineupError))
+     elseif gd.LUE<-0.13 and lineupError>0.14 then
+      env.info" Little Drift Left across centre ==> (DL-)"
+      gd.Drift=" (DL)"
+      self:E(self.lid..string.format("Got Little Drift Left across centre at step %s, d=%.3f: Min LUE=%.3f, lower LUE=%.3f", gs, d, gd.LUE, lineupError))
+    end
      end

      -- Update max deviation of line up error.
@@ -10544,6 +10578,9 @@ function AIRBOSS:_GetSternCoord()
  elseif self.carriertype==AIRBOSS.CarrierType.STENNIS then
    -- Stennis: translate 7 meters starboard wrt Final bearing.
    self.sterncoord:Translate(self.carrierparam.sterndist, hdg, true, true):Translate(7, FB+90, true, true)
+  elseif self.carriertype==AIRBOSS.CarrierType.FORRESTAL then
+    -- Forrestal
+    self.sterncoord:Translate(self.carrierparam.sterndist, hdg, true, true):Translate(7.5, FB+90, true, true)
  else
    -- Nimitz SC: translate 8 meters starboard wrt Final bearing.
    self.sterncoord:Translate(self.carrierparam.sterndist, hdg, true, true):Translate(9.5, FB+90, true, true)
@@ -10576,10 +10613,10 @@ function AIRBOSS:_GetWire(Lcoord, dc)

  -- Corrected landing distance wrt to stern. Landing distance needs to be reduced due to delayed landing event for human players.
  local d=Ldist-dc
-  
+
  -- Multiplayer wire correction.
  if self.mpWireCorrection then
-	d=d-self.mpWireCorrection
+  d=d-self.mpWireCorrection
  end

  -- Shift wires from stern to their correct position.
@@ -10672,7 +10709,7 @@ function AIRBOSS:_Trapped(playerData)
    elseif playerData.actype==AIRBOSS.AircraftCarrier.A4EC then
      -- A-4E gets slowed down much faster the the F/A-18C!
      dcorr=56
-	elseif playerData.actype==AIRBOSS.AircraftCarrier.T45C then
+  elseif playerData.actype==AIRBOSS.AircraftCarrier.T45C then
     -- T-45 also gets slowed down much faster the the F/A-18C.
     dcorr=56
    end
@@ -11303,7 +11340,7 @@ function AIRBOSS:_GetZoneHolding(case, stack)
    -- So stay 0-5 NM (+1 NM error margin) port of carrier.
    self.zoneHolding=self.zoneHolding or ZONE_POLYGON_BASE:New("CASE II/III Holding Zone")

-	self.zoneHolding:UpdateFromVec2(p)
+  self.zoneHolding:UpdateFromVec2(p)
  end

  return self.zoneHolding
@@ -11349,12 +11386,12 @@ function AIRBOSS:_GetZoneCommence(case, stack)
    -- Create holding zone.
    self.zoneCommence=self.zoneCommence or ZONE_RADIUS:New("CASE I Commence Zone")

-	self.zoneCommence:UpdateFromVec2(Three:GetVec2(), R)
+  self.zoneCommence:UpdateFromVec2(Three:GetVec2(), R)

  else
    -- Case II/III

-	stack=stack or 1
+  stack=stack or 1

     -- Start point at 21 NM for stack=1.
    local l=20+stack
@@ -11382,7 +11419,7 @@ function AIRBOSS:_GetZoneCommence(case, stack)
    -- Zone polygon.
    self.zoneCommence=self.zoneCommence or ZONE_POLYGON_BASE:New("CASE II/III Commence Zone")

-	self.zoneCommence:UpdateFromVec2(p)
+  self.zoneCommence:UpdateFromVec2(p)

  end

@@ -11642,7 +11679,7 @@ function AIRBOSS:_GetOptLandingCoordinate()
  if self.carriertype==AIRBOSS.CarrierType.TARAWA then

    -- Landing 100 ft abeam, 120 ft alt.
-	self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-90, true, true)
+  self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-90, true, true)
    --stern=self:_GetLandingSpotCoordinate():Translate(35, FB-90)

    -- Alitude 120 ft.
@@ -11650,21 +11687,21 @@ function AIRBOSS:_GetOptLandingCoordinate()
  elseif self.carriertype==AIRBOSS.CarrierType.AMERICA then

    -- Landing 100 ft abeam, 120 ft alt. To allow adjustments to match different deck configurations.
-	self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-90, true, true)
+  self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-90, true, true)
    --stern=self:_GetLandingSpotCoordinate():Translate(35, FB-90)

    -- Alitude 120 ft.
    self.landingcoord:SetAltitude(UTILS.FeetToMeters(120))
-	
+
  elseif self.carriertype==AIRBOSS.CarrierType.JCARLOS then

    -- Landing 100 ft abeam, 120 ft alt.
-	self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-100, true, true)
+  self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-100, true, true)
    --stern=self:_GetLandingSpotCoordinate():Translate(35, FB-100)

    -- Alitude 120 ft.
    self.landingcoord:SetAltitude(UTILS.FeetToMeters(120))
-	
+
  else

    -- Ideally we want to land between 2nd and 3rd wire.
@@ -11706,7 +11743,7 @@ function AIRBOSS:_GetLandingSpotCoordinate()

    -- Primary landing spot 7.5 a little further forwad on the America
    self.landingspotcoord:Translate(59, hdg, true, true):SetAltitude(self.carrierparam.deckheight)
-	
+
  elseif self.carriertype==AIRBOSS.CarrierType.JCARLOS then

    -- Landing 100 ft abeam, 120 alt.
@@ -11714,7 +11751,7 @@ function AIRBOSS:_GetLandingSpotCoordinate()

    -- Primary landing spot 5.0 -- TODO voice for different landing Spots.
    self.landingspotcoord:Translate(89, hdg, true, true):SetAltitude(self.carrierparam.deckheight)
-	
+
  end

  return self.landingspotcoord
@@ -12204,10 +12241,10 @@ end
 -- * 12-21 seconds: OK (15-18 is ideal)
 -- * 22-24 seconds: Fair "(OK)
 -- * > 24 seconds: No Grade "--"
-- 
+--
 -- If you manage to be between 16.4 and and 16.6 seconds, you will even get and okay underline "\_OK\_".
 -- No groove time for Harrier on LHA, LHD set to Tgroove Unicorn as starting point to allow possible _OK_ 5.0.
-- If time in the AV-8B 
+-- If time in the AV-8B
 --
 -- * < 90 seconds: OK V/STOL
 -- * > 91 Seconds: SLOW V/STOL (Early hover stop selection)
@@ -12219,7 +12256,7 @@ function AIRBOSS:_EvalGrooveTime(playerData)

  -- Time in groove.
  local t=playerData.Tgroove
-  
+
  local grade=""
  if t<9 then
    grade="_NESA_"
@@ -12239,12 +12276,12 @@ function AIRBOSS:_EvalGrooveTime(playerData)
  else
    grade="LIG"
  end
-    
+
  -- The unicorn!
  if t>=16.4 and t<=16.6 then
    grade="_OK_"
  end
-  
+
  -- V/STOL Unicorn!
  if playerData.actype==AIRBOSS.AircraftCarrier.AV8B and (t>=65.0 and t<=75.0) then
    grade="_OK_ V/STOL"
@@ -12285,7 +12322,7 @@ function AIRBOSS:_LSOgrade(playerData)
  local Tgroove=playerData.Tgroove
  local TgrooveUnicorn=Tgroove and (Tgroove>=15.0 and Tgroove<=18.99) or false
  local TgrooveVstolUnicorn=Tgroove and (Tgroove>=65.0 and Tgroove<=70.0)and playerData.actype==AIRBOSS.AircraftCarrier.AV8B or false
-  
+
  local grade
  local points
  if N==0 and (TgrooveUnicorn or TgrooveVstolUnicorn ) then
@@ -12294,18 +12331,18 @@ function AIRBOSS:_LSOgrade(playerData)
    points=5.0
    G="Unicorn"
  else
-    
-	  -- Add AV-8B Harrier devation allowances due to lower groundspeed and 3x conventional groove time, this allows to maintain LSO tolerances while respecting the deviations are not unsafe. (WIP requires feedback)
+
+    -- Add AV-8B Harrier devation allowances due to lower groundspeed and 3x conventional groove time, this allows to maintain LSO tolerances while respecting the deviations are not unsafe. (WIP requires feedback)
      -- Large devaitions still result in a No Grade, A Unicorn still requires a clean pass with no deviation.
-	if nL>3 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then 
+  if nL>3 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
      -- Larger deviations ==> "No grade" 2.0 points.
      grade="--"
      points=2.0
-	elseif nN>2 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+  elseif nN>2 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
      -- Only average deviations ==>  "Fair Pass" Pass with average deviations and corrections.
      grade="(OK)"
      points=3.0
-	elseif nL>0 then
+  elseif nL>0 then
      -- Larger deviations ==> "No grade" 2.0 points.
      grade="--"
      points=2.0
@@ -12318,7 +12355,7 @@ function AIRBOSS:_LSOgrade(playerData)
      grade="OK"
      points=4.0
    end
-	
+
 end

  -- Replace" )"( and "__"
@@ -12429,35 +12466,35 @@ function AIRBOSS:_Flightdata2Text(playerData, groovestep)

  -- Aircraft specific AoA values.
  local acaoa=self:_GetAircraftAoA(playerData)
-  
+
  --Angled Approach.
  local P=nil
  if step==AIRBOSS.PatternStep.GROOVE_XX and ROL<=4.0 and playerData.case<3 then
-	  if LUE>self.lue.RIGHT then
-		P=underline("AA")
-	  elseif 
-		LUE>self.lue.RightMed then
-		P="AA "
-	  elseif 
-		LUE>self.lue.Right then
-		P=little("AA")
-	  end
+    if LUE>self.lue.RIGHT then
+    P=underline("AA")
+    elseif
+    LUE>self.lue.RightMed then
+    P="AA "
+    elseif
+    LUE>self.lue.Right then
+    P=little("AA")
+    end
  end
- 
+
  --Overshoot Start.
  local O=nil
  if step==AIRBOSS.PatternStep.GROOVE_XX then
-	  if LUE<self.lue.LEFT then 
-		O=underline("OS")
-	  elseif 
-		LUE<self.lue.Left then
-		O="OS"
-	  elseif 
-		LUE<self.lue._min then
-		O=little("OS")
-	  end	
+    if LUE<self.lue.LEFT then
+    O=underline("OS")
+    elseif
+    LUE<self.lue.Left then
+    O="OS"
+    elseif
+    LUE<self.lue._min then
+    O=little("OS")
+    end
  end
-  
+
  -- Speed via AoA. Depends on aircraft type.
  local S=nil
  if AOA>acaoa.SLOW then
@@ -12499,21 +12536,21 @@ function AIRBOSS:_Flightdata2Text(playerData, groovestep)
  elseif LUE>self.lue._max then
    D=little("LUL")
  elseif playerData.case<3 then
-	  if LUE<self.lue.LEFT and step~=AIRBOSS.PatternStep.GROOVE_XX then
-		D=underline("LUR")
-	  elseif LUE<self.lue.Left and step~=AIRBOSS.PatternStep.GROOVE_XX then
-		D="LUR"
-	  elseif LUE<self.lue._min and step~=AIRBOSS.PatternStep.GROOVE_XX then
-		D=little("LUR")
-	 end
+    if LUE<self.lue.LEFT and step~=AIRBOSS.PatternStep.GROOVE_XX then
+    D=underline("LUR")
+    elseif LUE<self.lue.Left and step~=AIRBOSS.PatternStep.GROOVE_XX then
+    D="LUR"
+    elseif LUE<self.lue._min and step~=AIRBOSS.PatternStep.GROOVE_XX then
+    D=little("LUR")
+   end
  elseif playerData.case==3 then
-	  if LUE<self.lue.LEFT then
-		D=underline("LUR")
-	  elseif LUE<self.lue.Left then
-		D="LUR"
-	  elseif LUE<self.lue._min then
-		D=little("LUR")
-	 end
+    if LUE<self.lue.LEFT then
+    D=underline("LUR")
+    elseif LUE<self.lue.Left then
+    D="LUR"
+    elseif LUE<self.lue._min then
+    D=little("LUR")
+   end
  end

  -- Compile.
@@ -12527,7 +12564,7 @@ function AIRBOSS:_Flightdata2Text(playerData, groovestep)
  if P then
    G=G..P
    n=n
-  end  
+  end
  -- Speed.
  if S then
    G=G..S
@@ -12546,14 +12583,14 @@ function AIRBOSS:_Flightdata2Text(playerData, groovestep)
  --Drift in Lineup
  if fdata.Drift then
    G=G..fdata.Drift
-	n=n -- Drift doesn't affect score, advisory only.
+  n=n -- Drift doesn't affect score, advisory only.
  end
  -- Overshoot.
  if O then
    G=G..O
    n=n+1
  end
-  
+
  -- Add current step.
  local step=self:_GS(step)
  step=step:gsub("XX","X")
@@ -14818,8 +14855,8 @@ end
 -- @param #table param Parameters.
 -- @param #number time Time.
 function AIRBOSS._CheckRadioQueueT(param, time)
-	AIRBOSS._CheckRadioQueue(param.airboss, param.radioqueue, param.name)
-	return time+0.05
+  AIRBOSS._CheckRadioQueue(param.airboss, param.radioqueue, param.name)
+  return time+0.05
 end

 --- Radio queue item.
@@ -14843,15 +14880,15 @@ function AIRBOSS:_CheckRadioQueue(radioqueue, name)
  -- Check if queue is empty.
  if #radioqueue==0 then

-  	if name=="LSO" then
-  	  self:T(self.lid..string.format("Stopping LSO radio queue."))
-  	  self.radiotimer:Stop(self.RQLid)
-  	  self.RQLid=nil
-  	elseif name=="MARSHAL" then
-  	  self:T(self.lid..string.format("Stopping Marshal radio queue."))
-  	  self.radiotimer:Stop(self.RQMid)
-  	  self.RQMid=nil
-  	end
+    if name=="LSO" then
+      self:T(self.lid..string.format("Stopping LSO radio queue."))
+      self.radiotimer:Stop(self.RQLid)
+      self.RQLid=nil
+    elseif name=="MARSHAL" then
+      self:T(self.lid..string.format("Stopping Marshal radio queue."))
+      self.radiotimer:Stop(self.RQMid)
+      self.RQMid=nil
+    end

    return
  end
@@ -14993,11 +15030,11 @@ function AIRBOSS:RadioTransmission(radio, call, loud, delay, interval, click, pi

    caller="LSOCall"

-  	-- Schedule radio queue checks.
-  	if not self.RQLid then
+    -- Schedule radio queue checks.
+    if not self.RQLid then
      self:T(self.lid..string.format("Starting LSO radio queue."))
-  	  self.RQLid=self.radiotimer:Schedule(nil, AIRBOSS._CheckRadioQueue, {self, self.RQLSO, "LSO"}, 0.02, 0.05)
-  	end
+      self.RQLid=self.radiotimer:Schedule(nil, AIRBOSS._CheckRadioQueue, {self, self.RQLSO, "LSO"}, 0.02, 0.05)
+    end

  elseif radio.alias=="MARSHAL" then

@@ -15005,10 +15042,10 @@ function AIRBOSS:RadioTransmission(radio, call, loud, delay, interval, click, pi

    caller="MarshalCall"

-  	if not self.RQMid then
-  		self:T(self.lid..string.format("Starting Marhal radio queue."))
-  		self.RQMid=self.radiotimer:Schedule(nil, AIRBOSS._CheckRadioQueue, {self, self.RQMarshal, "MARSHAL"}, 0.02, 0.05)
-  	end
+    if not self.RQMid then
+      self:T(self.lid..string.format("Starting Marhal radio queue."))
+      self.RQMid=self.radiotimer:Schedule(nil, AIRBOSS._CheckRadioQueue, {self, self.RQMarshal, "MARSHAL"}, 0.02, 0.05)
+    end

  end

@@ -16175,9 +16212,9 @@ function AIRBOSS:_SkipperStartRecovery(_unitName, case)

      -- Inform player.
      local text=string.format("affirm, Case %d recovery will start in 5 min for %d min. Wind on deck %d knots. U-turn=%s.", case, self.skipperTime, self.skipperSpeed, tostring(self.skipperUturn))
-	  if case>1 then
-		text=text..string.format(" Marshal radial %d°.", self.skipperOffset)
-	  end
+    if case>1 then
+    text=text..string.format(" Marshal radial %d°.", self.skipperOffset)
+    end
      if self:IsRecovering() then
        text="negative, carrier is already recovering."
        self:MessageToPlayer(playerData, text, "AIRBOSS")
@@ -18028,12 +18065,12 @@ function AIRBOSS:_SaveTrapSheet(playerData, grade)
  for i=1,9999 do

    -- Create file name
-	if self.trapprefix then
-		filename=string.format("%s_%s-%04d.csv", self.trapprefix, playerData.actype, i)
-	else
-		local name=UTILS.ReplaceIllegalCharacters(playerData.name, "_")
-		filename=string.format("AIRBOSS-%s_Trapsheet-%s_%s-%04d.csv", self.alias, name, playerData.actype, i)
-	end
+  if self.trapprefix then
+    filename=string.format("%s_%s-%04d.csv", self.trapprefix, playerData.actype, i)
+  else
+    local name=UTILS.ReplaceIllegalCharacters(playerData.name, "_")
+    filename=string.format("AIRBOSS-%s_Trapsheet-%s_%s-%04d.csv", self.alias, name, playerData.actype, i)
+  end

    -- Set path.
    if path~=nil then
--- a/Development/Moose/Ops/CSAR.lua
+++ b/Development/Moose/Ops/CSAR.lua
@@ -238,10 +238,11 @@ CSAR.AircraftType["Mi-8MTV2"] = 12
 CSAR.AircraftType["Mi-8MT"] = 12  
 CSAR.AircraftType["Mi-24P"] = 8 
 CSAR.AircraftType["Mi-24V"] = 8
+CSAR.AircraftType["Bell-47"] = 2

 --- CSAR class version.
 -- @field #string version
-CSAR.version="0.1.11r1"
+CSAR.version="0.1.11r2"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
--- a/Development/Moose/Utilities/Utils.lua
+++ b/Development/Moose/Utilities/Utils.lua
@@ -1612,7 +1612,12 @@ function UTILS.IsLoadingDoorOpen( unit_name )
          BASE:T(unit_name .. " side door is open")
          ret_val =  true
      end
-
+      
+      if string.find(type_name, "Bell-47") then -- bell aint got no doors so always ready to load injured soldiers
+          BASE:T(unit_name .. " door is open")
+          ret_val =  true
+      end
+      
      if ret_val == false then
          BASE:T(unit_name .. " all doors are closed")
      end
--- a/Development/Moose/Wrapper/Group.lua
+++ b/Development/Moose/Wrapper/Group.lua
@@ -2578,8 +2578,10 @@ end
 -- @return #GROUP self 
 function GROUP:SetCommandInvisible(switch)
  self:F2( self.GroupName )
-  local switch = switch or false
-  local SetInvisible = {id = 'SetInvisible', params = {value = true}}
+  if switch==nil then
+    switch=false
+  end
+  local SetInvisible = {id = 'SetInvisible', params = {value = switch}}
  self:SetCommand(SetInvisible)
  return self
 end
@@ -2590,9 +2592,11 @@ end
 -- @return #GROUP self 
 function GROUP:SetCommandImmortal(switch)
  self:F2( self.GroupName )
-  local switch = switch or false
-  local SetInvisible = {id = 'SetImmortal', params = {value = true}}
-  self:SetCommand(SetInvisible)
+  if switch==nil then
+    switch=false
+  end
+  local SetImmortal = {id = 'SetImmortal', params = {value = switch}}
+  self:SetCommand(SetImmortal)
  return self
 end
Author	SHA1	Message	Date
Applevangelist	8af3f89c14	Adjustments for Forrestal by Pene	2021-10-24 14:35:55 +02:00
Applevangelist	fe3079caad	Added Bell-47	2021-10-22 17:04:23 +02:00
Applevangelist	61ac6b4131	Added Bell-47	2021-10-22 17:04:19 +02:00
Frank	36cb189512	Merge pull request #1612 from FlightControl-Master/FF/MasterDevel AIRBOSS v1.2.0	2021-10-20 19:55:19 +02:00
Frank	15f9843878	AIRBOSS v1.2.0 - Added Forrestal carrier CV-59	2021-10-16 12:11:34 +02:00
Frank	67f847dd16	Update Group.lua - Fixed SetInvisible and SetImmortal functions to acknowledge parameter false.	2021-10-12 22:16:18 +02:00