diff --git a/Moose Development/Moose/Functional/ATC_Ground.lua b/Moose Development/Moose/Functional/ATC_Ground.lua index cdb90e712..8953bd13c 100644 --- a/Moose Development/Moose/Functional/ATC_Ground.lua +++ b/Moose Development/Moose/Functional/ATC_Ground.lua @@ -1035,23 +1035,23 @@ end -- The following airbases are monitored at the Nevada region. -- Use the @{Wrapper.Airbase#AIRBASE.Nevada} enumeration to select the airbases to be monitored. -- --- * `AIRBASE.Nevada.Beatty_Airport` --- * `AIRBASE.Nevada.Boulder_City_Airport` --- * `AIRBASE.Nevada.Creech_AFB` +-- * `AIRBASE.Nevada.Beatty` +-- * `AIRBASE.Nevada.Boulder_City` +-- * `AIRBASE.Nevada.Creech` -- * `AIRBASE.Nevada.Echo_Bay` --- * `AIRBASE.Nevada.Groom_Lake_AFB` --- * `AIRBASE.Nevada.Henderson_Executive_Airport` --- * `AIRBASE.Nevada.Jean_Airport` --- * `AIRBASE.Nevada.Laughlin_Airport` +-- * `AIRBASE.Nevada.Groom_Lake` +-- * `AIRBASE.Nevada.Henderson_Executive` +-- * `AIRBASE.Nevada.Jean` +-- * `AIRBASE.Nevada.Laughlin` -- * `AIRBASE.Nevada.Lincoln_County` --- * `AIRBASE.Nevada.McCarran_International_Airport` +-- * `AIRBASE.Nevada.McCarran_International` -- * `AIRBASE.Nevada.Mesquite` --- * `AIRBASE.Nevada.Mina_Airport` --- * `AIRBASE.Nevada.Nellis_AFB` +-- * `AIRBASE.Nevada.Mina` +-- * `AIRBASE.Nevada.Nellis` -- * `AIRBASE.Nevada.North_Las_Vegas` --- * `AIRBASE.Nevada.Pahute_Mesa_Airstrip` --- * `AIRBASE.Nevada.Tonopah_Airport` --- * `AIRBASE.Nevada.Tonopah_Test_Range_Airfield` +-- * `AIRBASE.Nevada.Pahute_Mesa` +-- * `AIRBASE.Nevada.Tonopah` +-- * `AIRBASE.Nevada.Tonopah_Test_Range` -- -- # Installation -- @@ -1088,10 +1088,10 @@ end -- -- -- Monitor specific airbases. -- ATC_Ground = ATC_GROUND_NEVADA:New( --- { AIRBASE.Nevada.Laughlin_Airport, +-- { AIRBASE.Nevada.Laughlin, -- AIRBASE.Nevada.Lincoln_County, -- AIRBASE.Nevada.North_Las_Vegas, --- AIRBASE.Nevada.McCarran_International_Airport +-- AIRBASE.Nevada.McCarran_International -- } -- ) -- @@ -1330,33 +1330,33 @@ end -- The following airbases are monitored at the PersianGulf region. -- Use the @{Wrapper.Airbase#AIRBASE.PersianGulf} enumeration to select the airbases to be monitored. -- --- * `AIRBASE.PersianGulf.Abu_Musa_Island_Airport` --- * `AIRBASE.PersianGulf.Al_Dhafra_AB` +-- * `AIRBASE.PersianGulf.Abu_Musa_Island` +-- * `AIRBASE.PersianGulf.Al_Dhafra_AFB` -- * `AIRBASE.PersianGulf.Al_Maktoum_Intl` --- * `AIRBASE.PersianGulf.Al_Minhad_AB` +-- * `AIRBASE.PersianGulf.Al_Minhad_AFB` -- * `AIRBASE.PersianGulf.Bandar_Abbas_Intl` -- * `AIRBASE.PersianGulf.Bandar_Lengeh` -- * `AIRBASE.PersianGulf.Dubai_Intl` -- * `AIRBASE.PersianGulf.Fujairah_Intl` -- * `AIRBASE.PersianGulf.Havadarya` --- * `AIRBASE.PersianGulf.Kerman_Airport` +-- * `AIRBASE.PersianGulf.Kerman` -- * `AIRBASE.PersianGulf.Khasab` --- * `AIRBASE.PersianGulf.Lar_Airbase` +-- * `AIRBASE.PersianGulf.Lar` -- * `AIRBASE.PersianGulf.Qeshm_Island` -- * `AIRBASE.PersianGulf.Sharjah_Intl` --- * `AIRBASE.PersianGulf.Shiraz_International_Airport` +-- * `AIRBASE.PersianGulf.Shiraz_Intl` -- * `AIRBASE.PersianGulf.Sir_Abu_Nuayr` -- * `AIRBASE.PersianGulf.Sirri_Island` -- * `AIRBASE.PersianGulf.Tunb_Island_AFB` -- * `AIRBASE.PersianGulf.Tunb_Kochak` --- * `AIRBASE.PersianGulf.Sas_Al_Nakheel_Airport` --- * `AIRBASE.PersianGulf.Bandar_e_Jask_airfield` --- * `AIRBASE.PersianGulf.Abu_Dhabi_International_Airport` --- * `AIRBASE.PersianGulf.Al_Bateen_Airport` --- * `AIRBASE.PersianGulf.Kish_International_Airport` --- * `AIRBASE.PersianGulf.Al_Ain_International_Airport` --- * `AIRBASE.PersianGulf.Lavan_Island_Airport` --- * `AIRBASE.PersianGulf.Jiroft_Airport` +-- * `AIRBASE.PersianGulf.Sas_Al_Nakheel` +-- * `AIRBASE.PersianGulf.Bandar_e_Jask` +-- * `AIRBASE.PersianGulf.Abu_Dhabi_Intl` +-- * `AIRBASE.PersianGulf.Al_Bateen` +-- * `AIRBASE.PersianGulf.Kish_Intl` +-- * `AIRBASE.PersianGulf.Al_Ain_Intl` +-- * `AIRBASE.PersianGulf.Lavan_Island` +-- * `AIRBASE.PersianGulf.Jiroft` -- -- # Installation -- @@ -1391,8 +1391,8 @@ end -- AirbasePoliceCaucasus = ATC_GROUND_PERSIANGULF:New() -- -- ATC_Ground = ATC_GROUND_PERSIANGULF:New( --- { AIRBASE.PersianGulf.Kerman_Airport, --- AIRBASE.PersianGulf.Al_Minhad_AB +-- { AIRBASE.PersianGulf.Kerman, +-- AIRBASE.PersianGulf.Al_Minhad_AFB -- } -- ) -- diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index ac2a5ed07..b6b4f2be4 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -291,7 +291,7 @@ -- ## Nevada: Nellis AFB -- -- -- ATIS Nellis AFB on 270.10 MHz AM. --- atisNellis=ATIS:New(AIRBASE.Nevada.Nellis_AFB, 270.1) +-- atisNellis=ATIS:New(AIRBASE.Nevada.Nellis, 270.1) -- atisNellis:SetRadioRelayUnitName("Radio Relay Nellis") -- atisNellis:SetActiveRunway("21L") -- atisNellis:SetTowerFrequencies({327.000, 132.550}) @@ -302,7 +302,7 @@ -- ## Persian Gulf: Abu Dhabi International Airport -- -- -- ATIS Abu Dhabi International on 125.1 MHz AM. --- atisAbuDhabi=ATIS:New(AIRBASE.PersianGulf.Abu_Dhabi_International_Airport, 125.1) +-- atisAbuDhabi=ATIS:New(AIRBASE.PersianGulf.Abu_Dhabi_Intl, 125.1) -- atisAbuDhabi:SetRadioRelayUnitName("Radio Relay Abu Dhabi International Airport") -- atisAbuDhabi:SetMetricUnits() -- atisAbuDhabi:SetActiveRunway("L") diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua index 464be6780..f1e8d5b57 100644 --- a/Moose Development/Moose/Ops/CTLD.lua +++ b/Moose Development/Moose/Ops/CTLD.lua @@ -836,6 +836,8 @@ do -- my_ctld.enableChinookGCLoading = true -- this will effectively suppress the crate load and drop for CTLD_CARGO.Enum.STATIc types for CTLD for the Chinook -- my_ctld.TroopUnloadDistGround = 5 -- If hovering, spawn dropped troops this far away in meters from the helo -- my_ctld.TroopUnloadDistHover = 1.5 -- If grounded, spawn dropped troops this far away in meters from the helo +-- my_ctld.TroopUnloadDistGroundHerc = 25 -- On the ground, unload troops this far behind the Hercules +-- my_ctld.TroopUnloadDistGroundHook = 15 -- On the ground, unload troops this far behind the Chinook -- -- ## 2.1 CH-47 Chinook support -- @@ -1233,6 +1235,8 @@ CTLD = { DynamicCargo = {}, ChinookTroopCircleRadius = 5, TroopUnloadDistGround = 5, + TroopUnloadDistGroundHerc = 25, + TroopUnloadDistGroundHook = 15, TroopUnloadDistHover = 1.5, UserSetGroup = nil, } @@ -1339,7 +1343,7 @@ CTLD.UnitTypeCapabilities = { --- CTLD class version. -- @field #string version -CTLD.version="1.1.16" +CTLD.version="1.1.17" --- Instantiate a new CTLD. -- @param #CTLD self @@ -3484,7 +3488,10 @@ function CTLD:_UnloadTroops(Group, Unit) randomcoord = Group:GetCoordinate() -- slightly left from us local Angle = (heading+270)%360 + if IsHerc or IsHook then Angle = (heading+180)%360 end local offset = hoverunload and self.TroopUnloadDistHover or self.TroopUnloadDistGround + if IsHerc then offset = self.TroopUnloadDistGroundHerc or 25 end + if IsHook then offset = self.TroopUnloadDistGroundHook or 15 end randomcoord:Translate(offset,Angle,nil,true) end local tempcount = 0 @@ -3494,7 +3501,7 @@ function CTLD:_UnloadTroops(Group, Unit) self.TroopCounter = self.TroopCounter + 1 tempcount = tempcount+1 local alias = string.format("%s-%d", _template, math.random(1,100000)) - local rad = 2.5+tempcount + local rad = 2.5+(tempcount*2) local Positions = self:_GetUnitPositions(randomcoord,rad,heading,_template) self.DroppedTroops[self.TroopCounter] = SPAWN:NewWithAlias(_template,alias) --:InitRandomizeUnits(true,20,2)