@jtff/miztemplate-lib 3.1.0 → 3.1.2

package/lua/lib/Moose_.lua

@@ -1,4 +1,4 @@
-env.info('*** MOOSE GITHUB Commit Hash ID: 2023-08-18T09:08:47.0000000Z-6b4c08d53f901678903a5cd2ead1dd5d4a4542d8 ***')
+env.info('*** MOOSE GITHUB Commit Hash ID: 2023-09-01T06:52:46.0000000Z-d7b87b63d8b9ec7fe737bc2aef7bd73817e7cea4 ***')
 env.info('*** MOOSE STATIC INCLUDE START *** ')
 ENUMS={}
 ENUMS.ROE={
@@ -415,6 +415,574 @@ Reaper="MQ-9",
 Predator="MQ-1A",
 }
 }
+ENUMS.Storage={
+weapons={
+missiles={},
+bombs={},
+nurs={},
+containers={},
+droptanks={},
+adapters={},
+torpedoes={},
+}
+}
+ENUMS.Storage.weapons.nurs.SNEB_TYPE253_F1B="weapons.nurs.SNEB_TYPE253_F1B"
+ENUMS.Storage.weapons.missiles.P_24T="weapons.missiles.P_24T"
+ENUMS.Storage.weapons.bombs.BLU_3B_OLD="weapons.bombs.BLU-3B_OLD"
+ENUMS.Storage.weapons.missiles.AGM_154="weapons.missiles.AGM_154"
+ENUMS.Storage.weapons.nurs.HYDRA_70_M151_M433="weapons.nurs.HYDRA_70_M151_M433"
+ENUMS.Storage.weapons.bombs.SAM_Avenger_M1097_Skid_7090lb="weapons.bombs.SAM Avenger M1097 Skid [7090lb]"
+ENUMS.Storage.weapons.bombs.British_GP_250LB_Bomb_Mk5="weapons.bombs.British_GP_250LB_Bomb_Mk5"
+ENUMS.Storage.weapons.containers.OV10_SMOKE="weapons.containers.{OV10_SMOKE}"
+ENUMS.Storage.weapons.bombs.BLU_4B_OLD="weapons.bombs.BLU-4B_OLD"
+ENUMS.Storage.weapons.bombs.FAB_500M54="weapons.bombs.FAB-500M54"
+ENUMS.Storage.weapons.bombs.GBU_38="weapons.bombs.GBU_38"
+ENUMS.Storage.weapons.containers.F_15E_AXQ_14_DATALINK="weapons.containers.F-15E_AXQ-14_DATALINK"
+ENUMS.Storage.weapons.bombs.BEER_BOMB="weapons.bombs.BEER_BOMB"
+ENUMS.Storage.weapons.bombs.P_50T="weapons.bombs.P-50T"
+ENUMS.Storage.weapons.nurs.C_8CM_GN="weapons.nurs.C_8CM_GN"
+ENUMS.Storage.weapons.bombs.FAB_500SL="weapons.bombs.FAB-500SL"
+ENUMS.Storage.weapons.bombs.KAB_1500Kr="weapons.bombs.KAB_1500Kr"
+ENUMS.Storage.weapons.bombs.two50_2="weapons.bombs.250-2"
+ENUMS.Storage.weapons.droptanks.Spitfire_tank_1="weapons.droptanks.Spitfire_tank_1"
+ENUMS.Storage.weapons.missiles.AGM_65G="weapons.missiles.AGM_65G"
+ENUMS.Storage.weapons.missiles.AGM_65A="weapons.missiles.AGM_65A"
+ENUMS.Storage.weapons.containers.Hercules_JATO="weapons.containers.Hercules_JATO"
+ENUMS.Storage.weapons.nurs.HYDRA_70_M259="weapons.nurs.HYDRA_70_M259"
+ENUMS.Storage.weapons.missiles.AGM_84E="weapons.missiles.AGM_84E"
+ENUMS.Storage.weapons.bombs.AN_M30A1="weapons.bombs.AN_M30A1"
+ENUMS.Storage.weapons.nurs.C_25="weapons.nurs.C_25"
+ENUMS.Storage.weapons.containers.AV8BNA_ALQ164="weapons.containers.AV8BNA_ALQ164"
+ENUMS.Storage.weapons.containers.lav_25="weapons.containers.lav-25"
+ENUMS.Storage.weapons.missiles.P_60="weapons.missiles.P_60"
+ENUMS.Storage.weapons.bombs.FAB_1500="weapons.bombs.FAB_1500"
+ENUMS.Storage.weapons.droptanks.FuelTank_350L="weapons.droptanks.FuelTank_350L"
+ENUMS.Storage.weapons.bombs.AAA_Vulcan_M163_Skid_21577lb="weapons.bombs.AAA Vulcan M163 Skid [21577lb]"
+ENUMS.Storage.weapons.missiles.Kormoran="weapons.missiles.Kormoran"
+ENUMS.Storage.weapons.droptanks.HB_F14_EXT_DROPTANK_EMPTY="weapons.droptanks.HB_F14_EXT_DROPTANK_EMPTY"
+ENUMS.Storage.weapons.droptanks.FuelTank_150L="weapons.droptanks.FuelTank_150L"
+ENUMS.Storage.weapons.missiles.Rb_15F_for_A_I="weapons.missiles.Rb 15F (for A.I.)"
+ENUMS.Storage.weapons.missiles.RB75T="weapons.missiles.RB75T"
+ENUMS.Storage.weapons.missiles.Vikhr_M="weapons.missiles.Vikhr_M"
+ENUMS.Storage.weapons.nurs.FFAR_M156_WP="weapons.nurs.FFAR M156 WP"
+ENUMS.Storage.weapons.nurs.British_HE_60LBSAPNo2_3INCHNo1="weapons.nurs.British_HE_60LBSAPNo2_3INCHNo1"
+ENUMS.Storage.weapons.missiles.DWS39_MJ2="weapons.missiles.DWS39_MJ2"
+ENUMS.Storage.weapons.bombs.HEBOMBD="weapons.bombs.HEBOMBD"
+ENUMS.Storage.weapons.missiles.CATM_9M="weapons.missiles.CATM_9M"
+ENUMS.Storage.weapons.bombs.Mk_81="weapons.bombs.Mk_81"
+ENUMS.Storage.weapons.droptanks.Drop_Tank_300_Liter="weapons.droptanks.Drop_Tank_300_Liter"
+ENUMS.Storage.weapons.containers.HMMWV_M1025="weapons.containers.HMMWV_M1025"
+ENUMS.Storage.weapons.bombs.SAM_CHAPARRAL_Air_21624lb="weapons.bombs.SAM CHAPARRAL Air [21624lb]"
+ENUMS.Storage.weapons.missiles.AGM_154A="weapons.missiles.AGM_154A"
+ENUMS.Storage.weapons.bombs.Mk_84AIR_TP="weapons.bombs.Mk_84AIR_TP"
+ENUMS.Storage.weapons.bombs.GBU_31_V_3B="weapons.bombs.GBU_31_V_3B"
+ENUMS.Storage.weapons.nurs.C_8CM_WH="weapons.nurs.C_8CM_WH"
+ENUMS.Storage.weapons.missiles.Matra_Super_530D="weapons.missiles.Matra Super 530D"
+ENUMS.Storage.weapons.nurs.ARF8M3TPSM="weapons.nurs.ARF8M3TPSM"
+ENUMS.Storage.weapons.missiles.TGM_65H="weapons.missiles.TGM_65H"
+ENUMS.Storage.weapons.nurs.M8rocket="weapons.nurs.M8rocket"
+ENUMS.Storage.weapons.bombs.GBU_27="weapons.bombs.GBU_27"
+ENUMS.Storage.weapons.missiles.AGR_20A="weapons.missiles.AGR_20A"
+ENUMS.Storage.weapons.missiles.LS_6_250="weapons.missiles.LS-6-250"
+ENUMS.Storage.weapons.droptanks.M2KC_RPL_522_EMPTY="weapons.droptanks.M2KC_RPL_522_EMPTY"
+ENUMS.Storage.weapons.droptanks.M2KC_02_RPL541="weapons.droptanks.M2KC_02_RPL541"
+ENUMS.Storage.weapons.missiles.AGM_45="weapons.missiles.AGM_45"
+ENUMS.Storage.weapons.missiles.AGM_84A="weapons.missiles.AGM_84A"
+ENUMS.Storage.weapons.bombs.APC_BTR_80_Air_23936lb="weapons.bombs.APC BTR-80 Air [23936lb]"
+ENUMS.Storage.weapons.missiles.P_33E="weapons.missiles.P_33E"
+ENUMS.Storage.weapons.missiles.Ataka_9M120="weapons.missiles.Ataka_9M120"
+ENUMS.Storage.weapons.bombs.MK76="weapons.bombs.MK76"
+ENUMS.Storage.weapons.bombs.AB_250_2_SD_2="weapons.bombs.AB_250_2_SD_2"
+ENUMS.Storage.weapons.missiles.Rb_05A="weapons.missiles.Rb 05A"
+ENUMS.Storage.weapons.bombs.ART_GVOZDIKA_34720lb="weapons.bombs.ART GVOZDIKA [34720lb]"
+ENUMS.Storage.weapons.bombs.Generic_Crate_20000lb="weapons.bombs.Generic Crate [20000lb]"
+ENUMS.Storage.weapons.bombs.FAB_100SV="weapons.bombs.FAB_100SV"
+ENUMS.Storage.weapons.bombs.BetAB_500="weapons.bombs.BetAB_500"
+ENUMS.Storage.weapons.droptanks.M2KC_02_RPL541_EMPTY="weapons.droptanks.M2KC_02_RPL541_EMPTY"
+ENUMS.Storage.weapons.droptanks.PTB600_MIG15="weapons.droptanks.PTB600_MIG15"
+ENUMS.Storage.weapons.missiles.Rb_24J="weapons.missiles.Rb 24J"
+ENUMS.Storage.weapons.nurs.C_8CM_BU="weapons.nurs.C_8CM_BU"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE259E_F1B="weapons.nurs.SNEB_TYPE259E_F1B"
+ENUMS.Storage.weapons.nurs.WGr21="weapons.nurs.WGr21"
+ENUMS.Storage.weapons.bombs.SAMP250HD="weapons.bombs.SAMP250HD"
+ENUMS.Storage.weapons.containers.alq_184long="weapons.containers.alq-184long"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE259E_H1="weapons.nurs.SNEB_TYPE259E_H1"
+ENUMS.Storage.weapons.bombs.British_SAP_250LB_Bomb_Mk5="weapons.bombs.British_SAP_250LB_Bomb_Mk5"
+ENUMS.Storage.weapons.bombs.Transport_UAZ_469_Air_3747lb="weapons.bombs.Transport UAZ-469 Air [3747lb]"
+ENUMS.Storage.weapons.bombs.Mk_83CT="weapons.bombs.Mk_83CT"
+ENUMS.Storage.weapons.missiles.AIM_7P="weapons.missiles.AIM-7P"
+ENUMS.Storage.weapons.missiles.AT_6="weapons.missiles.AT_6"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_H1_GREEN="weapons.nurs.SNEB_TYPE254_H1_GREEN"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE250_F1B="weapons.nurs.SNEB_TYPE250_F1B"
+ENUMS.Storage.weapons.containers.U22A="weapons.containers.U22A"
+ENUMS.Storage.weapons.bombs.British_GP_250LB_Bomb_Mk1="weapons.bombs.British_GP_250LB_Bomb_Mk1"
+ENUMS.Storage.weapons.bombs.CBU_105="weapons.bombs.CBU_105"
+ENUMS.Storage.weapons.droptanks.FW_190_Fuel_Tank="weapons.droptanks.FW-190_Fuel-Tank"
+ENUMS.Storage.weapons.missiles.X_58="weapons.missiles.X_58"
+ENUMS.Storage.weapons.missiles.BK90_MJ1_MJ2="weapons.missiles.BK90_MJ1_MJ2"
+ENUMS.Storage.weapons.missiles.TGM_65D="weapons.missiles.TGM_65D"
+ENUMS.Storage.weapons.containers.BRD_4_250="weapons.containers.BRD-4-250"
+ENUMS.Storage.weapons.missiles.P_73="weapons.missiles.P_73"
+ENUMS.Storage.weapons.bombs.AN_M66="weapons.bombs.AN_M66"
+ENUMS.Storage.weapons.bombs.APC_LAV_25_Air_22520lb="weapons.bombs.APC LAV-25 Air [22520lb]"
+ENUMS.Storage.weapons.missiles.AIM_7MH="weapons.missiles.AIM-7MH"
+ENUMS.Storage.weapons.containers.MB339_TravelPod="weapons.containers.MB339_TravelPod"
+ENUMS.Storage.weapons.bombs.GBU_12="weapons.bombs.GBU_12"
+ENUMS.Storage.weapons.bombs.SC_250_T3_J="weapons.bombs.SC_250_T3_J"
+ENUMS.Storage.weapons.missiles.KD_20="weapons.missiles.KD-20"
+ENUMS.Storage.weapons.missiles.AGM_86C="weapons.missiles.AGM_86C"
+ENUMS.Storage.weapons.missiles.X_35="weapons.missiles.X_35"
+ENUMS.Storage.weapons.bombs.MK106="weapons.bombs.MK106"
+ENUMS.Storage.weapons.bombs.BETAB_500S="weapons.bombs.BETAB-500S"
+ENUMS.Storage.weapons.nurs.C_5="weapons.nurs.C_5"
+ENUMS.Storage.weapons.nurs.S_24B="weapons.nurs.S-24B"
+ENUMS.Storage.weapons.bombs.British_MC_500LB_Bomb_Mk2="weapons.bombs.British_MC_500LB_Bomb_Mk2"
+ENUMS.Storage.weapons.containers.ANAWW_13="weapons.containers.ANAWW_13"
+ENUMS.Storage.weapons.droptanks.droptank_108_gal="weapons.droptanks.droptank_108_gal"
+ENUMS.Storage.weapons.droptanks.DFT_300_GAL_A4E_LR="weapons.droptanks.DFT_300_GAL_A4E_LR"
+ENUMS.Storage.weapons.bombs.CBU_87="weapons.bombs.CBU_87"
+ENUMS.Storage.weapons.missiles.GAR_8="weapons.missiles.GAR-8"
+ENUMS.Storage.weapons.bombs.BELOUGA="weapons.bombs.BELOUGA"
+ENUMS.Storage.weapons.containers.EclairM_33="weapons.containers.{EclairM_33}"
+ENUMS.Storage.weapons.bombs.ART_2S9_NONA_Air_19140lb="weapons.bombs.ART 2S9 NONA Air [19140lb]"
+ENUMS.Storage.weapons.bombs.BR_250="weapons.bombs.BR_250"
+ENUMS.Storage.weapons.bombs.IAB_500="weapons.bombs.IAB-500"
+ENUMS.Storage.weapons.containers.AN_ASQ_228="weapons.containers.AN_ASQ_228"
+ENUMS.Storage.weapons.missiles.P_27P="weapons.missiles.P_27P"
+ENUMS.Storage.weapons.bombs.SD_250_Stg="weapons.bombs.SD_250_Stg"
+ENUMS.Storage.weapons.missiles.R_530F_IR="weapons.missiles.R_530F_IR"
+ENUMS.Storage.weapons.bombs.British_SAP_500LB_Bomb_Mk5="weapons.bombs.British_SAP_500LB_Bomb_Mk5"
+ENUMS.Storage.weapons.bombs.FAB_250M54="weapons.bombs.FAB-250M54"
+ENUMS.Storage.weapons.containers.M2KC_AAF="weapons.containers.{M2KC_AAF}"
+ENUMS.Storage.weapons.missiles.CM_802AKG_AI="weapons.missiles.CM-802AKG_AI"
+ENUMS.Storage.weapons.bombs.CBU_103="weapons.bombs.CBU_103"
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_RED="weapons.containers.{US_M10_SMOKE_TANK_RED}"
+ENUMS.Storage.weapons.missiles.X_29T="weapons.missiles.X_29T"
+ENUMS.Storage.weapons.bombs.HEMTT_TFFT_34400lb="weapons.bombs.HEMTT TFFT [34400lb]"
+ENUMS.Storage.weapons.missiles.C_701IR="weapons.missiles.C-701IR"
+ENUMS.Storage.weapons.containers.fullCargoSeats="weapons.containers.fullCargoSeats"
+ENUMS.Storage.weapons.bombs.GBU_15_V_31_B="weapons.bombs.GBU_15_V_31_B"
+ENUMS.Storage.weapons.bombs.APC_M1043_HMMWV_Armament_Air_7023lb="weapons.bombs.APC M1043 HMMWV Armament Air [7023lb]"
+ENUMS.Storage.weapons.missiles.PL_5EII="weapons.missiles.PL-5EII"
+ENUMS.Storage.weapons.bombs.SC_250_T1_L2="weapons.bombs.SC_250_T1_L2"
+ENUMS.Storage.weapons.torpedoes.mk46torp_name="weapons.torpedoes.mk46torp_name"
+ENUMS.Storage.weapons.containers.F_15E_AAQ_33_XR_ATP_SE="weapons.containers.F-15E_AAQ-33_XR_ATP-SE"
+ENUMS.Storage.weapons.missiles.AIM_7="weapons.missiles.AIM_7"
+ENUMS.Storage.weapons.missiles.AGM_122="weapons.missiles.AGM_122"
+ENUMS.Storage.weapons.bombs.HEBOMB="weapons.bombs.HEBOMB"
+ENUMS.Storage.weapons.bombs.CBU_97="weapons.bombs.CBU_97"
+ENUMS.Storage.weapons.bombs.MK_81SE="weapons.bombs.MK-81SE"
+ENUMS.Storage.weapons.nurs.Zuni_127="weapons.nurs.Zuni_127"
+ENUMS.Storage.weapons.containers.M2KC_AGF="weapons.containers.{M2KC_AGF}"
+ENUMS.Storage.weapons.droptanks.Hercules_ExtFuelTank="weapons.droptanks.Hercules_ExtFuelTank"
+ENUMS.Storage.weapons.containers.SMOKE_WHITE="weapons.containers.{SMOKE_WHITE}"
+ENUMS.Storage.weapons.droptanks.droptank_150_gal="weapons.droptanks.droptank_150_gal"
+ENUMS.Storage.weapons.nurs.HYDRA_70_WTU1B="weapons.nurs.HYDRA_70_WTU1B"
+ENUMS.Storage.weapons.missiles.GB_6_SFW="weapons.missiles.GB-6-SFW"
+ENUMS.Storage.weapons.missiles.KD_63="weapons.missiles.KD-63"
+ENUMS.Storage.weapons.bombs.GBU_28="weapons.bombs.GBU_28"
+ENUMS.Storage.weapons.nurs.C_8CM_YE="weapons.nurs.C_8CM_YE"
+ENUMS.Storage.weapons.droptanks.HB_F14_EXT_DROPTANK="weapons.droptanks.HB_F14_EXT_DROPTANK"
+ENUMS.Storage.weapons.missiles.Super_530F="weapons.missiles.Super_530F"
+ENUMS.Storage.weapons.missiles.Ataka_9M220="weapons.missiles.Ataka_9M220"
+ENUMS.Storage.weapons.bombs.BDU_33="weapons.bombs.BDU_33"
+ENUMS.Storage.weapons.bombs.British_GP_250LB_Bomb_Mk4="weapons.bombs.British_GP_250LB_Bomb_Mk4"
+ENUMS.Storage.weapons.missiles.TOW="weapons.missiles.TOW"
+ENUMS.Storage.weapons.bombs.ATGM_M1045_HMMWV_TOW_Air_7183lb="weapons.bombs.ATGM M1045 HMMWV TOW Air [7183lb]"
+ENUMS.Storage.weapons.missiles.X_25MR="weapons.missiles.X_25MR"
+ENUMS.Storage.weapons.droptanks.fueltank230="weapons.droptanks.fueltank230"
+ENUMS.Storage.weapons.droptanks.PTB_490C_MIG21="weapons.droptanks.PTB-490C-MIG21"
+ENUMS.Storage.weapons.bombs.M1025_HMMWV_Air_6160lb="weapons.bombs.M1025 HMMWV Air [6160lb]"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_F1B_GREEN="weapons.nurs.SNEB_TYPE254_F1B_GREEN"
+ENUMS.Storage.weapons.missiles.R_550="weapons.missiles.R_550"
+ENUMS.Storage.weapons.bombs.KAB_1500LG="weapons.bombs.KAB_1500LG"
+ENUMS.Storage.weapons.missiles.AGM_84D="weapons.missiles.AGM_84D"
+ENUMS.Storage.weapons.missiles.YJ_83K="weapons.missiles.YJ-83K"
+ENUMS.Storage.weapons.missiles.AIM_54C_Mk47="weapons.missiles.AIM_54C_Mk47"
+ENUMS.Storage.weapons.missiles.BRM_1_90MM="weapons.missiles.BRM-1_90MM"
+ENUMS.Storage.weapons.missiles.Ataka_9M120F="weapons.missiles.Ataka_9M120F"
+ENUMS.Storage.weapons.droptanks.Eleven00L_Tank="weapons.droptanks.1100L Tank"
+ENUMS.Storage.weapons.bombs.BAP_100="weapons.bombs.BAP_100"
+ENUMS.Storage.weapons.adapters.lau_88="weapons.adapters.lau-88"
+ENUMS.Storage.weapons.missiles.P_40T="weapons.missiles.P_40T"
+ENUMS.Storage.weapons.missiles.GB_6="weapons.missiles.GB-6"
+ENUMS.Storage.weapons.bombs.FAB_250M54TU="weapons.bombs.FAB-250M54TU"
+ENUMS.Storage.weapons.missiles.DWS39_MJ1="weapons.missiles.DWS39_MJ1"
+ENUMS.Storage.weapons.missiles.CM_802AKG="weapons.missiles.CM-802AKG"
+ENUMS.Storage.weapons.bombs.FAB_250="weapons.bombs.FAB_250"
+ENUMS.Storage.weapons.missiles.C_802AK="weapons.missiles.C_802AK"
+ENUMS.Storage.weapons.bombs.SD_500_A="weapons.bombs.SD_500_A"
+ENUMS.Storage.weapons.bombs.GBU_32_V_2B="weapons.bombs.GBU_32_V_2B"
+ENUMS.Storage.weapons.containers.marder="weapons.containers.marder"
+ENUMS.Storage.weapons.missiles.ADM_141B="weapons.missiles.ADM_141B"
+ENUMS.Storage.weapons.bombs.ROCKEYE="weapons.bombs.ROCKEYE"
+ENUMS.Storage.weapons.missiles.BK90_MJ1="weapons.missiles.BK90_MJ1"
+ENUMS.Storage.weapons.containers.BTR_80="weapons.containers.BTR-80"
+ENUMS.Storage.weapons.bombs.SAM_ROLAND_ADS_34720lb="weapons.bombs.SAM ROLAND ADS [34720lb]"
+ENUMS.Storage.weapons.containers.wmd7="weapons.containers.wmd7"
+ENUMS.Storage.weapons.missiles.C_701T="weapons.missiles.C-701T"
+ENUMS.Storage.weapons.missiles.AIM_7E_2="weapons.missiles.AIM-7E-2"
+ENUMS.Storage.weapons.nurs.HVAR="weapons.nurs.HVAR"
+ENUMS.Storage.weapons.containers.HMMWV_M1043="weapons.containers.HMMWV_M1043"
+ENUMS.Storage.weapons.droptanks.PTB_800_MIG21="weapons.droptanks.PTB-800-MIG21"
+ENUMS.Storage.weapons.missiles.AGM_114="weapons.missiles.AGM_114"
+ENUMS.Storage.weapons.bombs.APC_M1126_Stryker_ICV_29542lb="weapons.bombs.APC M1126 Stryker ICV [29542lb]"
+ENUMS.Storage.weapons.bombs.APC_M113_Air_21624lb="weapons.bombs.APC M113 Air [21624lb]"
+ENUMS.Storage.weapons.bombs.M_117="weapons.bombs.M_117"
+ENUMS.Storage.weapons.missiles.AGM_65D="weapons.missiles.AGM_65D"
+ENUMS.Storage.weapons.droptanks.MB339_TT320_L="weapons.droptanks.MB339_TT320_L"
+ENUMS.Storage.weapons.missiles.AGM_86="weapons.missiles.AGM_86"
+ENUMS.Storage.weapons.bombs.BDU_45LGB="weapons.bombs.BDU_45LGB"
+ENUMS.Storage.weapons.missiles.AGM_65H="weapons.missiles.AGM_65H"
+ENUMS.Storage.weapons.nurs.RS_82="weapons.nurs.RS-82"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE252_F1B="weapons.nurs.SNEB_TYPE252_F1B"
+ENUMS.Storage.weapons.bombs.BL_755="weapons.bombs.BL_755"
+ENUMS.Storage.weapons.containers.F_15E_AAQ_28_LITENING="weapons.containers.F-15E_AAQ-28_LITENING"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE256_F1B="weapons.nurs.SNEB_TYPE256_F1B"
+ENUMS.Storage.weapons.missiles.AGM_84H="weapons.missiles.AGM_84H"
+ENUMS.Storage.weapons.missiles.AIM_54="weapons.missiles.AIM_54"
+ENUMS.Storage.weapons.missiles.X_31A="weapons.missiles.X_31A"
+ENUMS.Storage.weapons.bombs.KAB_500Kr="weapons.bombs.KAB_500Kr"
+ENUMS.Storage.weapons.containers.SPS_141_100="weapons.containers.SPS-141-100"
+ENUMS.Storage.weapons.missiles.BK90_MJ2="weapons.missiles.BK90_MJ2"
+ENUMS.Storage.weapons.missiles.Super_530D="weapons.missiles.Super_530D"
+ENUMS.Storage.weapons.bombs.CBU_52B="weapons.bombs.CBU_52B"
+ENUMS.Storage.weapons.droptanks.PTB_450="weapons.droptanks.PTB-450"
+ENUMS.Storage.weapons.bombs.IFV_MCV_80_34720lb="weapons.bombs.IFV MCV-80 [34720lb]"
+ENUMS.Storage.weapons.containers.Two_c9="weapons.containers.2-c9"
+ENUMS.Storage.weapons.missiles.AIM_9JULI="weapons.missiles.AIM-9JULI"
+ENUMS.Storage.weapons.droptanks.MB339_TT500_R="weapons.droptanks.MB339_TT500_R"
+ENUMS.Storage.weapons.nurs.C_8CM="weapons.nurs.C_8CM"
+ENUMS.Storage.weapons.containers.BARAX="weapons.containers.BARAX"
+ENUMS.Storage.weapons.missiles.P_40R="weapons.missiles.P_40R"
+ENUMS.Storage.weapons.missiles.YJ_12="weapons.missiles.YJ-12"
+ENUMS.Storage.weapons.missiles.CM_802AKG="weapons.missiles.CM_802AKG"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_H1_YELLOW="weapons.nurs.SNEB_TYPE254_H1_YELLOW"
+ENUMS.Storage.weapons.bombs.Durandal="weapons.bombs.Durandal"
+ENUMS.Storage.weapons.droptanks.i16_eft="weapons.droptanks.i16_eft"
+ENUMS.Storage.weapons.droptanks.AV8BNA_AERO1D_EMPTY="weapons.droptanks.AV8BNA_AERO1D_EMPTY"
+ENUMS.Storage.weapons.containers.Hercules_Battle_Station_TGP="weapons.containers.Hercules_Battle_Station_TGP"
+ENUMS.Storage.weapons.nurs.C_8CM_VT="weapons.nurs.C_8CM_VT"
+ENUMS.Storage.weapons.missiles.PL_12="weapons.missiles.PL-12"
+ENUMS.Storage.weapons.missiles.R_3R="weapons.missiles.R-3R"
+ENUMS.Storage.weapons.bombs.GBU_54_V_1B="weapons.bombs.GBU_54_V_1B"
+ENUMS.Storage.weapons.droptanks.MB339_TT320_R="weapons.droptanks.MB339_TT320_R"
+ENUMS.Storage.weapons.bombs.RN_24="weapons.bombs.RN-24"
+ENUMS.Storage.weapons.containers.Twoc6m="weapons.containers.2c6m"
+ENUMS.Storage.weapons.bombs.ARV_BRDM_2_Air_12320lb="weapons.bombs.ARV BRDM-2 Air [12320lb]"
+ENUMS.Storage.weapons.bombs.ARV_BRDM_2_Skid_12210lb="weapons.bombs.ARV BRDM-2 Skid [12210lb]"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE251_F1B="weapons.nurs.SNEB_TYPE251_F1B"
+ENUMS.Storage.weapons.missiles.X_41="weapons.missiles.X_41"
+ENUMS.Storage.weapons.containers.MIG21_SMOKE_WHITE="weapons.containers.{MIG21_SMOKE_WHITE}"
+ENUMS.Storage.weapons.bombs.MK_82AIR="weapons.bombs.MK_82AIR"
+ENUMS.Storage.weapons.missiles.R_530F_EM="weapons.missiles.R_530F_EM"
+ENUMS.Storage.weapons.bombs.SAMP400LD="weapons.bombs.SAMP400LD"
+ENUMS.Storage.weapons.bombs.FAB_50="weapons.bombs.FAB_50"
+ENUMS.Storage.weapons.bombs.AB_250_2_SD_10A="weapons.bombs.AB_250_2_SD_10A"
+ENUMS.Storage.weapons.missiles.ADM_141A="weapons.missiles.ADM_141A"
+ENUMS.Storage.weapons.containers.KBpod="weapons.containers.KBpod"
+ENUMS.Storage.weapons.bombs.British_GP_500LB_Bomb_Mk4="weapons.bombs.British_GP_500LB_Bomb_Mk4"
+ENUMS.Storage.weapons.missiles.AGM_65E="weapons.missiles.AGM_65E"
+ENUMS.Storage.weapons.containers.sa342_dipole_antenna="weapons.containers.sa342_dipole_antenna"
+ENUMS.Storage.weapons.bombs.OFAB_100_Jupiter="weapons.bombs.OFAB-100 Jupiter"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE257_F1B="weapons.nurs.SNEB_TYPE257_F1B"
+ENUMS.Storage.weapons.missiles.Rb_04E_for_A_I="weapons.missiles.Rb 04E (for A.I.)"
+ENUMS.Storage.weapons.bombs.AN_M66A2="weapons.bombs.AN-M66A2"
+ENUMS.Storage.weapons.missiles.P_27T="weapons.missiles.P_27T"
+ENUMS.Storage.weapons.droptanks.LNS_VIG_XTANK="weapons.droptanks.LNS_VIG_XTANK"
+ENUMS.Storage.weapons.missiles.R_55="weapons.missiles.R-55"
+ENUMS.Storage.weapons.torpedoes.YU_6="weapons.torpedoes.YU-6"
+ENUMS.Storage.weapons.bombs.British_MC_250LB_Bomb_Mk2="weapons.bombs.British_MC_250LB_Bomb_Mk2"
+ENUMS.Storage.weapons.droptanks.PTB_120_F86F35="weapons.droptanks.PTB_120_F86F35"
+ENUMS.Storage.weapons.missiles.PL_8B="weapons.missiles.PL-8B"
+ENUMS.Storage.weapons.droptanks.F_15E_Drop_Tank_Empty="weapons.droptanks.F-15E_Drop_Tank_Empty"
+ENUMS.Storage.weapons.nurs.British_HE_60LBFNo1_3INCHNo1="weapons.nurs.British_HE_60LBFNo1_3INCHNo1"
+ENUMS.Storage.weapons.missiles.P_77="weapons.missiles.P_77"
+ENUMS.Storage.weapons.torpedoes.LTF_5B="weapons.torpedoes.LTF_5B"
+ENUMS.Storage.weapons.missiles.R_3S="weapons.missiles.R-3S"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE253_H1="weapons.nurs.SNEB_TYPE253_H1"
+ENUMS.Storage.weapons.missiles.PL_8A="weapons.missiles.PL-8A"
+ENUMS.Storage.weapons.bombs.APC_BTR_82A_Skid_24888lb="weapons.bombs.APC BTR-82A Skid [24888lb]"
+ENUMS.Storage.weapons.containers.Sborka="weapons.containers.Sborka"
+ENUMS.Storage.weapons.missiles.AGM_65L="weapons.missiles.AGM_65L"
+ENUMS.Storage.weapons.missiles.X_28="weapons.missiles.X_28"
+ENUMS.Storage.weapons.missiles.TGM_65G="weapons.missiles.TGM_65G"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE257_H1="weapons.nurs.SNEB_TYPE257_H1"
+ENUMS.Storage.weapons.missiles.RB75B="weapons.missiles.RB75B"
+ENUMS.Storage.weapons.missiles.X_25ML="weapons.missiles.X_25ML"
+ENUMS.Storage.weapons.droptanks.FPU_8A="weapons.droptanks.FPU_8A"
+ENUMS.Storage.weapons.bombs.BLG66="weapons.bombs.BLG66"
+ENUMS.Storage.weapons.nurs.C_8CM_RD="weapons.nurs.C_8CM_RD"
+ENUMS.Storage.weapons.containers.EclairM_06="weapons.containers.{EclairM_06}"
+ENUMS.Storage.weapons.bombs.RBK_500AO="weapons.bombs.RBK_500AO"
+ENUMS.Storage.weapons.missiles.AIM_9P="weapons.missiles.AIM-9P"
+ENUMS.Storage.weapons.bombs.British_GP_500LB_Bomb_Mk4_Short="weapons.bombs.British_GP_500LB_Bomb_Mk4_Short"
+ENUMS.Storage.weapons.containers.MB339_Vinten="weapons.containers.MB339_Vinten"
+ENUMS.Storage.weapons.missiles.Rb_15F="weapons.missiles.Rb 15F"
+ENUMS.Storage.weapons.nurs.ARAKM70BHE="weapons.nurs.ARAKM70BHE"
+ENUMS.Storage.weapons.bombs.AAA_Vulcan_M163_Air_21666lb="weapons.bombs.AAA Vulcan M163 Air [21666lb]"
+ENUMS.Storage.weapons.missiles.X_29L="weapons.missiles.X_29L"
+ENUMS.Storage.weapons.containers.F14_LANTIRN_TP="weapons.containers.{F14-LANTIRN-TP}"
+ENUMS.Storage.weapons.bombs.FAB_250_M62="weapons.bombs.FAB-250-M62"
+ENUMS.Storage.weapons.missiles.AIM_120C="weapons.missiles.AIM_120C"
+ENUMS.Storage.weapons.bombs.EWR_SBORKA_Air_21624lb="weapons.bombs.EWR SBORKA Air [21624lb]"
+ENUMS.Storage.weapons.bombs.SAMP250LD="weapons.bombs.SAMP250LD"
+ENUMS.Storage.weapons.droptanks.Spitfire_slipper_tank="weapons.droptanks.Spitfire_slipper_tank"
+ENUMS.Storage.weapons.missiles.LS_6_500="weapons.missiles.LS-6-500"
+ENUMS.Storage.weapons.bombs.GBU_31_V_4B="weapons.bombs.GBU_31_V_4B"
+ENUMS.Storage.weapons.droptanks.PTB400_MIG15="weapons.droptanks.PTB400_MIG15"
+ENUMS.Storage.weapons.containers.m_113="weapons.containers.m-113"
+ENUMS.Storage.weapons.bombs.SPG_M1128_Stryker_MGS_33036lb="weapons.bombs.SPG M1128 Stryker MGS [33036lb]"
+ENUMS.Storage.weapons.missiles.AIM_9L="weapons.missiles.AIM-9L"
+ENUMS.Storage.weapons.missiles.AIM_9X="weapons.missiles.AIM_9X"
+ENUMS.Storage.weapons.nurs.C_8="weapons.nurs.C_8"
+ENUMS.Storage.weapons.bombs.SAM_CHAPARRAL_Skid_21516lb="weapons.bombs.SAM CHAPARRAL Skid [21516lb]"
+ENUMS.Storage.weapons.missiles.P_27TE="weapons.missiles.P_27TE"
+ENUMS.Storage.weapons.bombs.ODAB_500PM="weapons.bombs.ODAB-500PM"
+ENUMS.Storage.weapons.bombs.MK77mod1_WPN="weapons.bombs.MK77mod1-WPN"
+ENUMS.Storage.weapons.droptanks.PTB400_MIG19="weapons.droptanks.PTB400_MIG19"
+ENUMS.Storage.weapons.torpedoes.Mark_46="weapons.torpedoes.Mark_46"
+ENUMS.Storage.weapons.containers.rightSeat="weapons.containers.rightSeat"
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_ORANGE="weapons.containers.{US_M10_SMOKE_TANK_ORANGE}"
+ENUMS.Storage.weapons.bombs.SAB_100MN="weapons.bombs.SAB_100MN"
+ENUMS.Storage.weapons.nurs.FFAR_Mk5_HEAT="weapons.nurs.FFAR Mk5 HEAT"
+ENUMS.Storage.weapons.bombs.IFV_TPZ_FUCH_33440lb="weapons.bombs.IFV TPZ FUCH [33440lb]"
+ENUMS.Storage.weapons.bombs.IFV_M2A2_Bradley_34720lb="weapons.bombs.IFV M2A2 Bradley [34720lb]"
+ENUMS.Storage.weapons.bombs.MK77mod0_WPN="weapons.bombs.MK77mod0-WPN"
+ENUMS.Storage.weapons.containers.ASO_2="weapons.containers.ASO-2"
+ENUMS.Storage.weapons.bombs.Mk_84AIR_GP="weapons.bombs.Mk_84AIR_GP"
+ENUMS.Storage.weapons.nurs.S_24A="weapons.nurs.S-24A"
+ENUMS.Storage.weapons.bombs.RBK_250_275_AO_1SCH="weapons.bombs.RBK_250_275_AO_1SCH"
+ENUMS.Storage.weapons.bombs.Transport_Tigr_Skid_15730lb="weapons.bombs.Transport Tigr Skid [15730lb]"
+ENUMS.Storage.weapons.missiles.AIM_7F="weapons.missiles.AIM-7F"
+ENUMS.Storage.weapons.bombs.CBU_99="weapons.bombs.CBU_99"
+ENUMS.Storage.weapons.bombs.LUU_2B="weapons.bombs.LUU_2B"
+ENUMS.Storage.weapons.bombs.FAB_500TA="weapons.bombs.FAB-500TA"
+ENUMS.Storage.weapons.missiles.AGR_20_M282="weapons.missiles.AGR_20_M282"
+ENUMS.Storage.weapons.droptanks.MB339_FT330="weapons.droptanks.MB339_FT330"
+ENUMS.Storage.weapons.bombs.SAMP125LD="weapons.bombs.SAMP125LD"
+ENUMS.Storage.weapons.missiles.X_25MP="weapons.missiles.X_25MP"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE252_H1="weapons.nurs.SNEB_TYPE252_H1"
+ENUMS.Storage.weapons.missiles.AGM_65F="weapons.missiles.AGM_65F"
+ENUMS.Storage.weapons.missiles.AIM_9P5="weapons.missiles.AIM-9P5"
+ENUMS.Storage.weapons.bombs.Transport_Tigr_Air_15900lb="weapons.bombs.Transport Tigr Air [15900lb]"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_H1_RED="weapons.nurs.SNEB_TYPE254_H1_RED"
+ENUMS.Storage.weapons.nurs.FFAR_Mk1_HE="weapons.nurs.FFAR Mk1 HE"
+ENUMS.Storage.weapons.nurs.SPRD_99="weapons.nurs.SPRD-99"
+ENUMS.Storage.weapons.bombs.BIN_200="weapons.bombs.BIN_200"
+ENUMS.Storage.weapons.bombs.BLU_4B_GROUP="weapons.bombs.BLU_4B_GROUP"
+ENUMS.Storage.weapons.bombs.GBU_24="weapons.bombs.GBU_24"
+ENUMS.Storage.weapons.missiles.Rb_04E="weapons.missiles.Rb 04E"
+ENUMS.Storage.weapons.missiles.Rb_74="weapons.missiles.Rb 74"
+ENUMS.Storage.weapons.containers.leftSeat="weapons.containers.leftSeat"
+ENUMS.Storage.weapons.bombs.LS_6_100="weapons.bombs.LS-6-100"
+ENUMS.Storage.weapons.bombs.Transport_URAL_375_14815lb="weapons.bombs.Transport URAL-375 [14815lb]"
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_GREEN="weapons.containers.{US_M10_SMOKE_TANK_GREEN}"
+ENUMS.Storage.weapons.missiles.X_22="weapons.missiles.X_22"
+ENUMS.Storage.weapons.containers.FAS="weapons.containers.FAS"
+ENUMS.Storage.weapons.nurs.S_25_O="weapons.nurs.S-25-O"
+ENUMS.Storage.weapons.droptanks.para="weapons.droptanks.para"
+ENUMS.Storage.weapons.droptanks.F_15E_Drop_Tank="weapons.droptanks.F-15E_Drop_Tank"
+ENUMS.Storage.weapons.droptanks.M2KC_08_RPL541_EMPTY="weapons.droptanks.M2KC_08_RPL541_EMPTY"
+ENUMS.Storage.weapons.missiles.X_31P="weapons.missiles.X_31P"
+ENUMS.Storage.weapons.bombs.RBK_500U="weapons.bombs.RBK_500U"
+ENUMS.Storage.weapons.missiles.AIM_54A_Mk47="weapons.missiles.AIM_54A_Mk47"
+ENUMS.Storage.weapons.droptanks.oiltank="weapons.droptanks.oiltank"
+ENUMS.Storage.weapons.missiles.AGM_154B="weapons.missiles.AGM_154B"
+ENUMS.Storage.weapons.containers.MB339_SMOKE_POD="weapons.containers.MB339_SMOKE-POD"
+ENUMS.Storage.weapons.containers.ECM_POD_L_175V="weapons.containers.{ECM_POD_L_175V}"
+ENUMS.Storage.weapons.droptanks.PTB_580G_F1="weapons.droptanks.PTB_580G_F1"
+ENUMS.Storage.weapons.containers.EclairM_15="weapons.containers.{EclairM_15}"
+ENUMS.Storage.weapons.containers.F_15E_AAQ_13_LANTIRN="weapons.containers.F-15E_AAQ-13_LANTIRN"
+ENUMS.Storage.weapons.droptanks.Eight00L_Tank_Empty="weapons.droptanks.800L Tank Empty"
+ENUMS.Storage.weapons.containers.One6c_hts_pod="weapons.containers.16c_hts_pod"
+ENUMS.Storage.weapons.bombs.AN_M81="weapons.bombs.AN-M81"
+ENUMS.Storage.weapons.droptanks.Mosquito_Drop_Tank_100gal="weapons.droptanks.Mosquito_Drop_Tank_100gal"
+ENUMS.Storage.weapons.droptanks.Mosquito_Drop_Tank_50gal="weapons.droptanks.Mosquito_Drop_Tank_50gal"
+ENUMS.Storage.weapons.droptanks.DFT_150_GAL_A4E="weapons.droptanks.DFT_150_GAL_A4E"
+ENUMS.Storage.weapons.missiles.AIM_9="weapons.missiles.AIM_9"
+ENUMS.Storage.weapons.bombs.IFV_BTR_D_Air_18040lb="weapons.bombs.IFV BTR-D Air [18040lb]"
+ENUMS.Storage.weapons.containers.EclairM_42="weapons.containers.{EclairM_42}"
+ENUMS.Storage.weapons.bombs.KAB_1500T="weapons.bombs.KAB_1500T"
+ENUMS.Storage.weapons.droptanks.PTB_490_MIG21="weapons.droptanks.PTB-490-MIG21"
+ENUMS.Storage.weapons.droptanks.PTB_200_F86F35="weapons.droptanks.PTB_200_F86F35"
+ENUMS.Storage.weapons.droptanks.PTB760_MIG19="weapons.droptanks.PTB760_MIG19"
+ENUMS.Storage.weapons.bombs.GBU_43_B_MOAB="weapons.bombs.GBU-43/B(MOAB)"
+ENUMS.Storage.weapons.torpedoes.G7A_T1="weapons.torpedoes.G7A_T1"
+ENUMS.Storage.weapons.bombs.IFV_BMD_1_Air_18040lb="weapons.bombs.IFV BMD-1 Air [18040lb]"
+ENUMS.Storage.weapons.bombs.SAM_LINEBACKER_34720lb="weapons.bombs.SAM LINEBACKER [34720lb]"
+ENUMS.Storage.weapons.containers.ais_pod_t50_r="weapons.containers.ais-pod-t50_r"
+ENUMS.Storage.weapons.containers.CE2_SMOKE_WHITE="weapons.containers.{CE2_SMOKE_WHITE}"
+ENUMS.Storage.weapons.droptanks.fuel_tank_230="weapons.droptanks.fuel_tank_230"
+ENUMS.Storage.weapons.droptanks.M2KC_RPL_522="weapons.droptanks.M2KC_RPL_522"
+ENUMS.Storage.weapons.missiles.AGM_130="weapons.missiles.AGM_130"
+ENUMS.Storage.weapons.droptanks.Eight00L_Tank="weapons.droptanks.800L Tank"
+ENUMS.Storage.weapons.bombs.IFV_BTR_D_Skid_17930lb="weapons.bombs.IFV BTR-D Skid [17930lb]"
+ENUMS.Storage.weapons.containers.bmp_1="weapons.containers.bmp-1"
+ENUMS.Storage.weapons.bombs.GBU_31="weapons.bombs.GBU_31"
+ENUMS.Storage.weapons.containers.aaq_28LEFT_litening="weapons.containers.aaq-28LEFT litening"
+ENUMS.Storage.weapons.missiles.Kh_66_Grom="weapons.missiles.Kh-66_Grom"
+ENUMS.Storage.weapons.containers.MIG21_SMOKE_RED="weapons.containers.{MIG21_SMOKE_RED}"
+ENUMS.Storage.weapons.containers.U22="weapons.containers.U22"
+ENUMS.Storage.weapons.bombs.IFV_BMD_1_Skid_17930lb="weapons.bombs.IFV BMD-1 Skid [17930lb]"
+ENUMS.Storage.weapons.droptanks.Bidon="weapons.droptanks.Bidon"
+ENUMS.Storage.weapons.bombs.GBU_31_V_2B="weapons.bombs.GBU_31_V_2B"
+ENUMS.Storage.weapons.bombs.Mk_82Y="weapons.bombs.Mk_82Y"
+ENUMS.Storage.weapons.containers.pl5eii="weapons.containers.pl5eii"
+ENUMS.Storage.weapons.bombs.RBK_500U_OAB_2_5RT="weapons.bombs.RBK_500U_OAB_2_5RT"
+ENUMS.Storage.weapons.bombs.British_GP_500LB_Bomb_Mk5="weapons.bombs.British_GP_500LB_Bomb_Mk5"
+ENUMS.Storage.weapons.containers.Eclair="weapons.containers.{Eclair}"
+ENUMS.Storage.weapons.nurs.S5MO_HEFRAG_FFAR="weapons.nurs.S5MO_HEFRAG_FFAR"
+ENUMS.Storage.weapons.bombs.BETAB_500M="weapons.bombs.BETAB-500M"
+ENUMS.Storage.weapons.bombs.Transport_M818_16000lb="weapons.bombs.Transport M818 [16000lb]"
+ENUMS.Storage.weapons.bombs.British_MC_250LB_Bomb_Mk1="weapons.bombs.British_MC_250LB_Bomb_Mk1"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE251_H1="weapons.nurs.SNEB_TYPE251_H1"
+ENUMS.Storage.weapons.bombs.TYPE_200A="weapons.bombs.TYPE-200A"
+ENUMS.Storage.weapons.nurs.HYDRA_70_M151="weapons.nurs.HYDRA_70_M151"
+ENUMS.Storage.weapons.bombs.IFV_BMP_3_32912lb="weapons.bombs.IFV BMP-3 [32912lb]"
+ENUMS.Storage.weapons.bombs.APC_MTLB_Air_26400lb="weapons.bombs.APC MTLB Air [26400lb]"
+ENUMS.Storage.weapons.nurs.HYDRA_70_M229="weapons.nurs.HYDRA_70_M229"
+ENUMS.Storage.weapons.bombs.BDU_45="weapons.bombs.BDU_45"
+ENUMS.Storage.weapons.bombs.OFAB_100_120TU="weapons.bombs.OFAB-100-120TU"
+ENUMS.Storage.weapons.missiles.AIM_9J="weapons.missiles.AIM-9J"
+ENUMS.Storage.weapons.nurs.ARF8M3API="weapons.nurs.ARF8M3API"
+ENUMS.Storage.weapons.bombs.BetAB_500ShP="weapons.bombs.BetAB_500ShP"
+ENUMS.Storage.weapons.nurs.C_8OFP2="weapons.nurs.C_8OFP2"
+ENUMS.Storage.weapons.bombs.GBU_10="weapons.bombs.GBU_10"
+ENUMS.Storage.weapons.bombs.APC_MTLB_Skid_26290lb="weapons.bombs.APC MTLB Skid [26290lb]"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_F1B_RED="weapons.nurs.SNEB_TYPE254_F1B_RED"
+ENUMS.Storage.weapons.missiles.X_65="weapons.missiles.X_65"
+ENUMS.Storage.weapons.missiles.R_550_M1="weapons.missiles.R_550_M1"
+ENUMS.Storage.weapons.missiles.AGM_65K="weapons.missiles.AGM_65K"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_F1B_YELLOW="weapons.nurs.SNEB_TYPE254_F1B_YELLOW"
+ENUMS.Storage.weapons.missiles.AGM_88="weapons.missiles.AGM_88"
+ENUMS.Storage.weapons.nurs.C_8OM="weapons.nurs.C_8OM"
+ENUMS.Storage.weapons.bombs.SAM_ROLAND_LN_34720b="weapons.bombs.SAM ROLAND LN [34720b]"
+ENUMS.Storage.weapons.missiles.AIM_120="weapons.missiles.AIM_120"
+ENUMS.Storage.weapons.missiles.HOT3_MBDA="weapons.missiles.HOT3_MBDA"
+ENUMS.Storage.weapons.missiles.R_13M="weapons.missiles.R-13M"
+ENUMS.Storage.weapons.missiles.AIM_54C_Mk60="weapons.missiles.AIM_54C_Mk60"
+ENUMS.Storage.weapons.bombs.AAA_GEPARD_34720lb="weapons.bombs.AAA GEPARD [34720lb]"
+ENUMS.Storage.weapons.missiles.R_13M1="weapons.missiles.R-13M1"
+ENUMS.Storage.weapons.bombs.APC_Cobra_Air_10912lb="weapons.bombs.APC Cobra Air [10912lb]"
+ENUMS.Storage.weapons.bombs.RBK_250="weapons.bombs.RBK_250"
+ENUMS.Storage.weapons.bombs.SC_500_J="weapons.bombs.SC_500_J"
+ENUMS.Storage.weapons.missiles.AGM_114K="weapons.missiles.AGM_114K"
+ENUMS.Storage.weapons.missiles.ALARM="weapons.missiles.ALARM"
+ENUMS.Storage.weapons.bombs.Mk_83="weapons.bombs.Mk_83"
+ENUMS.Storage.weapons.missiles.AGM_65B="weapons.missiles.AGM_65B"
+ENUMS.Storage.weapons.bombs.MK_82SNAKEYE="weapons.bombs.MK_82SNAKEYE"
+ENUMS.Storage.weapons.nurs.HYDRA_70_MK1="weapons.nurs.HYDRA_70_MK1"
+ENUMS.Storage.weapons.bombs.BLG66_BELOUGA="weapons.bombs.BLG66_BELOUGA"
+ENUMS.Storage.weapons.containers.EclairM_51="weapons.containers.{EclairM_51}"
+ENUMS.Storage.weapons.missiles.AIM_54A_Mk60="weapons.missiles.AIM_54A_Mk60"
+ENUMS.Storage.weapons.droptanks.DFT_300_GAL_A4E="weapons.droptanks.DFT_300_GAL_A4E"
+ENUMS.Storage.weapons.bombs.ATGM_M1134_Stryker_30337lb="weapons.bombs.ATGM M1134 Stryker [30337lb]"
+ENUMS.Storage.weapons.bombs.BAT_120="weapons.bombs.BAT-120"
+ENUMS.Storage.weapons.missiles.DWS39_MJ1_MJ2="weapons.missiles.DWS39_MJ1_MJ2"
+ENUMS.Storage.weapons.containers.SPRD="weapons.containers.SPRD"
+ENUMS.Storage.weapons.bombs.BR_500="weapons.bombs.BR_500"
+ENUMS.Storage.weapons.bombs.British_GP_500LB_Bomb_Mk1="weapons.bombs.British_GP_500LB_Bomb_Mk1"
+ENUMS.Storage.weapons.bombs.BDU_50HD="weapons.bombs.BDU_50HD"
+ENUMS.Storage.weapons.missiles.RS2US="weapons.missiles.RS2US"
+ENUMS.Storage.weapons.bombs.IFV_BMP_2_25168lb="weapons.bombs.IFV BMP-2 [25168lb]"
+ENUMS.Storage.weapons.bombs.SAMP400HD="weapons.bombs.SAMP400HD"
+ENUMS.Storage.weapons.containers.Hercules_Battle_Station="weapons.containers.Hercules_Battle_Station"
+ENUMS.Storage.weapons.bombs.AN_M64="weapons.bombs.AN_M64"
+ENUMS.Storage.weapons.containers.rearCargoSeats="weapons.containers.rearCargoSeats"
+ENUMS.Storage.weapons.bombs.Mk_82="weapons.bombs.Mk_82"
+ENUMS.Storage.weapons.missiles.AKD_10="weapons.missiles.AKD-10"
+ENUMS.Storage.weapons.bombs.BDU_50LGB="weapons.bombs.BDU_50LGB"
+ENUMS.Storage.weapons.missiles.SD_10="weapons.missiles.SD-10"
+ENUMS.Storage.weapons.containers.IRDeflector="weapons.containers.IRDeflector"
+ENUMS.Storage.weapons.bombs.FAB_500="weapons.bombs.FAB_500"
+ENUMS.Storage.weapons.bombs.KAB_500="weapons.bombs.KAB_500"
+ENUMS.Storage.weapons.nurs.S_5M="weapons.nurs.S-5M"
+ENUMS.Storage.weapons.missiles.MICA_R="weapons.missiles.MICA_R"
+ENUMS.Storage.weapons.missiles.X_59M="weapons.missiles.X_59M"
+ENUMS.Storage.weapons.nurs.UG_90MM="weapons.nurs.UG_90MM"
+ENUMS.Storage.weapons.bombs.LYSBOMB="weapons.bombs.LYSBOMB"
+ENUMS.Storage.weapons.nurs.R4M="weapons.nurs.R4M"
+ENUMS.Storage.weapons.containers.dlpod_akg="weapons.containers.dlpod_akg"
+ENUMS.Storage.weapons.missiles.LD_10="weapons.missiles.LD-10"
+ENUMS.Storage.weapons.bombs.SC_50="weapons.bombs.SC_50"
+ENUMS.Storage.weapons.nurs.HYDRA_70_MK5="weapons.nurs.HYDRA_70_MK5"
+ENUMS.Storage.weapons.bombs.FAB_100M="weapons.bombs.FAB_100M"
+ENUMS.Storage.weapons.missiles.Rb_24="weapons.missiles.Rb 24"
+ENUMS.Storage.weapons.bombs.BDU_45B="weapons.bombs.BDU_45B"
+ENUMS.Storage.weapons.missiles.GB_6_HE="weapons.missiles.GB-6-HE"
+ENUMS.Storage.weapons.missiles.KD_63B="weapons.missiles.KD-63B"
+ENUMS.Storage.weapons.missiles.P_27PE="weapons.missiles.P_27PE"
+ENUMS.Storage.weapons.droptanks.PTB300_MIG15="weapons.droptanks.PTB300_MIG15"
+ENUMS.Storage.weapons.bombs.Two50_3="weapons.bombs.250-3"
+ENUMS.Storage.weapons.bombs.SC_500_L2="weapons.bombs.SC_500_L2"
+ENUMS.Storage.weapons.containers.HMMWV_M1045="weapons.containers.HMMWV_M1045"
+ENUMS.Storage.weapons.bombs.FAB_500M54TU="weapons.bombs.FAB-500M54TU"
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_YELLOW="weapons.containers.{US_M10_SMOKE_TANK_YELLOW}"
+ENUMS.Storage.weapons.containers.EclairM_60="weapons.containers.{EclairM_60}"
+ENUMS.Storage.weapons.bombs.SAB_250_200="weapons.bombs.SAB_250_200"
+ENUMS.Storage.weapons.bombs.FAB_100="weapons.bombs.FAB_100"
+ENUMS.Storage.weapons.bombs.KAB_500S="weapons.bombs.KAB_500S"
+ENUMS.Storage.weapons.missiles.AGM_45A="weapons.missiles.AGM_45A"
+ENUMS.Storage.weapons.missiles.Kh25MP_PRGS1VP="weapons.missiles.Kh25MP_PRGS1VP"
+ENUMS.Storage.weapons.nurs.S5M1_HEFRAG_FFAR="weapons.nurs.S5M1_HEFRAG_FFAR"
+ENUMS.Storage.weapons.containers.kg600="weapons.containers.kg600"
+ENUMS.Storage.weapons.bombs.AN_M65="weapons.bombs.AN_M65"
+ENUMS.Storage.weapons.bombs.AN_M57="weapons.bombs.AN_M57"
+ENUMS.Storage.weapons.bombs.BLU_3B_GROUP="weapons.bombs.BLU_3B_GROUP"
+ENUMS.Storage.weapons.bombs.BAP_100="weapons.bombs.BAP-100"
+ENUMS.Storage.weapons.containers.HEMTT="weapons.containers.HEMTT"
+ENUMS.Storage.weapons.bombs.British_MC_500LB_Bomb_Mk1_Short="weapons.bombs.British_MC_500LB_Bomb_Mk1_Short"
+ENUMS.Storage.weapons.nurs.ARAKM70BAP="weapons.nurs.ARAKM70BAP"
+ENUMS.Storage.weapons.missiles.AGM_119="weapons.missiles.AGM_119"
+ENUMS.Storage.weapons.missiles.MMagicII="weapons.missiles.MMagicII"
+ENUMS.Storage.weapons.bombs.AB_500_1_SD_10A="weapons.bombs.AB_500_1_SD_10A"
+ENUMS.Storage.weapons.nurs.HYDRA_70_M282="weapons.nurs.HYDRA_70_M282"
+ENUMS.Storage.weapons.droptanks.DFT_400_GAL_A4E="weapons.droptanks.DFT_400_GAL_A4E"
+ENUMS.Storage.weapons.nurs.HYDRA_70_M257="weapons.nurs.HYDRA_70_M257"
+ENUMS.Storage.weapons.droptanks.AV8BNA_AERO1D="weapons.droptanks.AV8BNA_AERO1D"
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_BLUE="weapons.containers.{US_M10_SMOKE_TANK_BLUE}"
+ENUMS.Storage.weapons.nurs.ARF8M3HEI="weapons.nurs.ARF8M3HEI"
+ENUMS.Storage.weapons.bombs.RN_28="weapons.bombs.RN-28"
+ENUMS.Storage.weapons.bombs.Squad_30_x_Soldier_7950lb="weapons.bombs.Squad 30 x Soldier [7950lb]"
+ENUMS.Storage.weapons.containers.uaz_469="weapons.containers.uaz-469"
+ENUMS.Storage.weapons.containers.Otokar_Cobra="weapons.containers.Otokar_Cobra"
+ENUMS.Storage.weapons.bombs.APC_BTR_82A_Air_24998lb="weapons.bombs.APC BTR-82A Air [24998lb]"
+ENUMS.Storage.weapons.nurs.HYDRA_70_M274="weapons.nurs.HYDRA_70_M274"
+ENUMS.Storage.weapons.missiles.P_24R="weapons.missiles.P_24R"
+ENUMS.Storage.weapons.nurs.HYDRA_70_MK61="weapons.nurs.HYDRA_70_MK61"
+ENUMS.Storage.weapons.missiles.Igla_1E="weapons.missiles.Igla_1E"
+ENUMS.Storage.weapons.missiles.C_802AK="weapons.missiles.C-802AK"
+ENUMS.Storage.weapons.nurs.C_24="weapons.nurs.C_24"
+ENUMS.Storage.weapons.droptanks.M2KC_08_RPL541="weapons.droptanks.M2KC_08_RPL541"
+ENUMS.Storage.weapons.nurs.C_13="weapons.nurs.C_13"
+ENUMS.Storage.weapons.droptanks.droptank_110_gal="weapons.droptanks.droptank_110_gal"
+ENUMS.Storage.weapons.bombs.Mk_84="weapons.bombs.Mk_84"
+ENUMS.Storage.weapons.missiles.Sea_Eagle="weapons.missiles.Sea_Eagle"
+ENUMS.Storage.weapons.droptanks.PTB_1200_F1="weapons.droptanks.PTB_1200_F1"
+ENUMS.Storage.weapons.nurs.SNEB_TYPE256_H1="weapons.nurs.SNEB_TYPE256_H1"
+ENUMS.Storage.weapons.containers.MATRA_PHIMAT="weapons.containers.MATRA-PHIMAT"
+ENUMS.Storage.weapons.containers.smoke_pod="weapons.containers.smoke_pod"
+ENUMS.Storage.weapons.containers.F_15E_AAQ_14_LANTIRN="weapons.containers.F-15E_AAQ-14_LANTIRN"
+ENUMS.Storage.weapons.containers.EclairM_24="weapons.containers.{EclairM_24}"
+ENUMS.Storage.weapons.bombs.GBU_16="weapons.bombs.GBU_16"
+ENUMS.Storage.weapons.nurs.HYDRA_70_M156="weapons.nurs.HYDRA_70_M156"
+ENUMS.Storage.weapons.missiles.R_60="weapons.missiles.R-60"
+ENUMS.Storage.weapons.containers.zsu_23_4="weapons.containers.zsu-23-4"
+ENUMS.Storage.weapons.missiles.RB75="weapons.missiles.RB75"
+ENUMS.Storage.weapons.missiles.Mistral="weapons.missiles.Mistral"
+ENUMS.Storage.weapons.droptanks.MB339_TT500_L="weapons.droptanks.MB339_TT500_L"
+ENUMS.Storage.weapons.bombs.SAM_SA_13_STRELA_21624lb="weapons.bombs.SAM SA-13 STRELA [21624lb]"
+ENUMS.Storage.weapons.bombs.SAM_Avenger_M1097_Air_7200lb="weapons.bombs.SAM Avenger M1097 Air [7200lb]"
+ENUMS.Storage.weapons.droptanks.Eleven00L_Tank_Empty="weapons.droptanks.1100L Tank Empty"
+ENUMS.Storage.weapons.bombs.AN_M88="weapons.bombs.AN-M88"
+ENUMS.Storage.weapons.missiles.S_25L="weapons.missiles.S_25L"
+ENUMS.Storage.weapons.nurs.British_AP_25LBNo1_3INCHNo1="weapons.nurs.British_AP_25LBNo1_3INCHNo1"
+ENUMS.Storage.weapons.bombs.BDU_50LD="weapons.bombs.BDU_50LD"
+ENUMS.Storage.weapons.bombs.AGM_62="weapons.bombs.AGM_62"
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_WHITE="weapons.containers.{US_M10_SMOKE_TANK_WHITE}"
+ENUMS.Storage.weapons.missiles.MICA_T="weapons.missiles.MICA_T"
+ENUMS.Storage.weapons.containers.HVAR_rocket="weapons.containers.HVAR_rocket"
 do
 FIFO={
 ClassName="FIFO",
@@ -24721,6 +25289,842 @@ end
 end
 return self
 end
+function CONTROLLABLE:TaskAerobatics()
+local DCSTaskAerobatics={
+id="Aerobatics",
+params={
+["maneuversSequency"]={},
+},
+["enabled"]=true,
+["auto"]=false,
+}
+return DCSTaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsCandle(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local CandleTask={
+["name"]="CANDLE",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+}
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],CandleTask)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsEdgeFlight(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,FlightTime,Side)
+local maxrepeats=10
+local maxflight=200
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local flighttime=FlightTime or 10
+if flighttime>200 then maxflight=flighttime end
+local EdgeTask={
+["name"]="EDGE_FLIGHT",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["FlightTime"]={
+["max_v"]=maxflight,
+["min_v"]=1,
+["order"]=6,
+["step"]=0.1,
+["value"]=flighttime or 10,
+},
+["SIDE"]={
+["order"]=7,
+["value"]=Side or 0,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],EdgeTask)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsWingoverFlight(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,FlightTime)
+local maxrepeats=10
+local maxflight=200
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local flighttime=FlightTime or 10
+if flighttime>200 then maxflight=flighttime end
+local WingoverTask={
+["name"]="WINGOVER_FLIGHT",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["FlightTime"]={
+["max_v"]=maxflight,
+["min_v"]=1,
+["order"]=6,
+["step"]=0.1,
+["value"]=flighttime or 10,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],WingoverTask)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsLoop(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local LoopTask={
+["name"]="LOOP",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+}
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],LoopTask)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsHorizontalEight(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,Side,RollDeg)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local LoopTask={
+["name"]="HORIZONTAL_EIGHT",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["SIDE"]={
+["order"]=6,
+["value"]=Side or 0,
+},
+["ROLL1"]={
+["order"]=7,
+["value"]=RollDeg or 60,
+},
+["ROLL2"]={
+["order"]=8,
+["value"]=RollDeg or 60,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],LoopTask)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsHammerhead(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,Side)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="HUMMERHEAD",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["SIDE"]={
+["order"]=6,
+["value"]=Side or 0,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsSkewedLoop(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,Side,RollDeg)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="SKEWED_LOOP",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["ROLL"]={
+["order"]=6,
+["value"]=RollDeg or 60,
+},
+["SIDE"]={
+["order"]=7,
+["value"]=Side or 0,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsTurn(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,Side,RollDeg,Pull,Angle)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="TURN",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["Ny_req"]={
+["order"]=6,
+["value"]=Pull or 2,
+},
+["ROLL"]={
+["order"]=7,
+["value"]=RollDeg or 60,
+},
+["SECTOR"]={
+["order"]=8,
+["value"]=Angle or 180,
+},
+["SIDE"]={
+["order"]=9,
+["value"]=Side or 0,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsDive(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,Angle,FinalAltitude)
+local maxrepeats=10
+local angle=Angle
+if angle<15 then angle=15 elseif angle>90 then angle=90 end
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="DIVE",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 5000,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["Angle"]={
+["max_v"]=90,
+["min_v"]=15,
+["order"]=6,
+["step"]=5,
+["value"]=angle or 45,
+},
+["FinalAltitude"]={
+["order"]=7,
+["value"]=FinalAltitude or 1000,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsMilitaryTurn(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="MILITARY_TURN",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+}
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsImmelmann(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="IMMELMAN",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+}
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsStraightFlight(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,FlightTime)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local maxflight=200
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local flighttime=FlightTime or 10
+if flighttime>200 then maxflight=flighttime end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="STRAIGHT_FLIGHT",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["FlightTime"]={
+["max_v"]=maxflight,
+["min_v"]=1,
+["order"]=6,
+["step"]=0.1,
+["value"]=flighttime or 10,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsClimb(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,Angle,FinalAltitude)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="CLIMB",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["Angle"]={
+["max_v"]=90,
+["min_v"]=15,
+["order"]=6,
+["step"]=5,
+["value"]=Angle or 45,
+},
+["FinalAltitude"]={
+["order"]=7,
+["value"]=FinalAltitude or 5000,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsSpiral(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,TurnAngle,Roll,Side,UpDown,Angle)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local updown=UpDown and 1 or 0
+local side=Side and 1 or 0
+local Task={
+["name"]="SPIRAL",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["SECTOR"]={
+["order"]=6,
+["value"]=TurnAngle or 360,
+},
+["ROLL"]={
+["order"]=7,
+["value"]=Roll or 60,
+},
+["SIDE"]={
+["order"]=8,
+["value"]=side or 0,
+},
+["UPDOWN"]={
+["order"]=9,
+["value"]=updown or 0,
+},
+["Angle"]={
+["max_v"]=90,
+["min_v"]=15,
+["order"]=10,
+["step"]=5,
+["value"]=Angle or 45,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsSplitS(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,FinalSpeed)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local maxflight=200
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local finalspeed=FinalSpeed or 500
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="SPLIT_S",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["FinalSpeed"]={
+["order"]=6,
+["value"]=finalspeed,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsAileronRoll(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,Side,RollRate,TurnAngle,FixAngle)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local maxflight=200
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="AILERON_ROLL",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["SIDE"]={
+["order"]=6,
+["value"]=Side or 0,
+},
+["RollRate"]={
+["max_v"]=450,
+["min_v"]=15,
+["order"]=7,
+["step"]=5,
+["value"]=RollRate or 90,
+},
+["SECTOR"]={
+["order"]=8,
+["value"]=TurnAngle or 360,
+},
+["FIXSECTOR"]={
+["max_v"]=180,
+["min_v"]=0,
+["order"]=9,
+["step"]=5,
+["value"]=FixAngle or 0,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsForcedTurn(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,TurnAngle,Side,FlightTime,MinSpeed)
+local maxrepeats=10
+local flighttime=FlightTime or 30
+local maxtime=200
+if flighttime>200 then maxtime=flighttime end
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="FORCED_TURN",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["SECTOR"]={
+["order"]=6,
+["value"]=TurnAngle or 360,
+},
+["SIDE"]={
+["order"]=7,
+["value"]=Side or 0,
+},
+["FlightTime"]={
+["max_v"]=maxtime or 200,
+["min_v"]=0,
+["order"]=8,
+["step"]=0.1,
+["value"]=flighttime or 30,
+},
+["MinSpeed"]={
+["max_v"]=3000,
+["min_v"]=30,
+["order"]=9,
+["step"]=10,
+["value"]=MinSpeed or 250,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
+function CONTROLLABLE:TaskAerobaticsBarrelRoll(TaskAerobatics,Repeats,InitAltitude,InitSpeed,UseSmoke,StartImmediately,Side,RollRate,TurnAngle)
+local maxrepeats=10
+if Repeats>maxrepeats then maxrepeats=Repeats end
+local usesmoke=UseSmoke and 1 or 0
+local startimmediately=StartImmediately and 1 or 0
+local Task={
+["name"]="BARREL_ROLL",
+["params"]={
+["RepeatQty"]={
+["max_v"]=maxrepeats,
+["min_v"]=1,
+["order"]=1,
+["value"]=Repeats or 1,
+},
+["InitAltitude"]={
+["order"]=2,
+["value"]=InitAltitude or 0,
+},
+["InitSpeed"]={
+["order"]=3,
+["value"]=InitSpeed or 0,
+},
+["UseSmoke"]={
+["order"]=4,
+["value"]=usesmoke,
+},
+["StartImmediatly"]={
+["order"]=5,
+["value"]=startimmediately,
+},
+["SIDE"]={
+["order"]=6,
+["value"]=Side or 0,
+},
+["RollRate"]={
+["max_v"]=450,
+["min_v"]=15,
+["order"]=7,
+["step"]=5,
+["value"]=RollRate or 90,
+},
+["SECTOR"]={
+["order"]=8,
+["value"]=TurnAngle or 360,
+},
+}
+}
+table.insert(TaskAerobatics.params["maneuversSequency"],Task)
+return TaskAerobatics
+end
 GROUP={
 ClassName="GROUP",
 }
@@ -29524,6 +30928,81 @@ self:E(self.lid..string.format("ERROR: Unknown liquid type %s",tostring(Type)))
 end
 return name
 end
+function STORAGE:AddAmount(Type,Amount)
+if type(Type)=="number"then
+self:AddLiquid(Type,Amount)
+else
+self:AddItem(Type,Amount)
+end
+return self
+end
+function STORAGE:RemoveAmount(Type,Amount)
+if type(Type)=="number"then
+self:RemoveLiquid(Type,Amount)
+else
+self:RemoveItem(Type,Amount)
+end
+return self
+end
+function STORAGE:SetAmount(Type,Amount)
+if type(Type)=="number"then
+self:SetLiquid(Type,Amount)
+else
+self:SetItem(Type,Amount)
+end
+return self
+end
+function STORAGE:GetAmount(Type)
+local N=0
+if type(Type)=="number"then
+N=self:GetLiquidAmount(Type)
+else
+N=self:GetItemAmount(Type)
+end
+return N
+end
+function STORAGE:IsUnlimited(Type)
+local N=self:GetAmount(Type)
+local unlimited=false
+if N>0 then
+self:RemoveAmount(Type,1)
+local n=self:GetAmount(Type)
+unlimited=n==N
+if not unlimited then
+self:AddAmount(Type,1)
+end
+self:I(self.lid..string.format("Type=%s: unlimited=%s (N=%d n=%d)",tostring(Type),tostring(unlimited),N,n))
+end
+return unlimited
+end
+function STORAGE:IsLimited(Type)
+local limited=not self:IsUnlimited(Type)
+return limited
+end
+function STORAGE:IsUnlimitedAircraft()
+local unlimited=self:IsUnlimited("A-10C")
+return unlimited
+end
+function STORAGE:IsUnlimitedLiquids()
+local unlimited=self:IsUnlimited(STORAGE.Liquid.DIESEL)
+return unlimited
+end
+function STORAGE:IsUnlimitedWeapons()
+local unlimited=self:IsUnlimited(ENUMS.Storage.weapons.bombs.Mk_82)
+return unlimited
+end
+function STORAGE:IsLimitedAircraft()
+local limited=self:IsLimited("A-10C")
+return limited
+end
+function STORAGE:IsLimitedLiquids()
+local limited=self:IsLimited(STORAGE.Liquid.DIESEL)
+return limited
+end
+function STORAGE:IsLimitedWeapons()
+local limited=self:IsLimited(ENUMS.Storage.weapons.bombs.Mk_82)
+return limited
+end
 function STORAGE:GetInventory(Item)
 local inventory=self.warehouse:getInventory(Item)
 return inventory.aircraft,inventory.liquids,inventory.weapon
@@ -39684,9 +41163,11 @@ MANTIS.SamDataCH={
 ["PGZ-09 CH"]={Range=4,Blindspot=0,Height=3,Type="Short",Radar="CH_PGZ09"},
 ["S350-9M100 CH"]={Range=15,Blindspot=1.5,Height=8,Type="Short",Radar="CH_S350_50P6_9M100"},
 ["S350-9M96D CH"]={Range=150,Blindspot=2.5,Height=30,Type="Long",Radar="CH_S350_50P6_9M96D"},
+["LAV-AD CH"]={Range=8,Blindspot=0.2,Height=4.8,Type="Short",Radar="CH_LAVAD"},
+["HQ-22 CH"]={Range=170,Blindspot=5,Height=27,Type="Long",Radar="CH_HQ22_LN"},
 }
 do
-function MANTIS:New(name,samprefix,ewrprefix,hq,coalition,dynamic,awacs,EmOnOff,Padding)
+function MANTIS:New(name,samprefix,ewrprefix,hq,coalition,dynamic,awacs,EmOnOff,Padding,Zones)
 self.SAM_Templates_Prefix=samprefix or"Red SAM"
 self.EWR_Templates_Prefix=ewrprefix or"Red EWR"
 self.HQ_Template_CC=hq or nil
@@ -39736,6 +41217,7 @@ self.maxshortrange=2
 self.maxclassic=6
 self.autoshorad=true
 self.ShoradGroupSet=SET_GROUP:New()
+self.FilterZones=Zones
 self.UseEmOnOff=true
 if EmOnOff==false then
 self.UseEmOnOff=false
@@ -39769,17 +41251,22 @@ if self.advAwacs then
 table.insert(self.ewr_templates,awacs)
 end
 self:T({self.ewr_templates})
+self.SAM_Group=SET_GROUP:New():FilterPrefixes(self.SAM_Templates_Prefix):FilterCoalitions(self.Coalition)
+self.EWR_Group=SET_GROUP:New():FilterPrefixes(self.ewr_templates):FilterCoalitions(self.Coalition)
+if self.FilterZones then
+self.SAM_Group:FilterZones(self.FilterZones)
+end
 if self.dynamic then
-self.SAM_Group=SET_GROUP:New():FilterPrefixes(self.SAM_Templates_Prefix):FilterCoalitions(self.Coalition):FilterStart()
-self.EWR_Group=SET_GROUP:New():FilterPrefixes(self.ewr_templates):FilterCoalitions(self.Coalition):FilterStart()
+self.SAM_Group:FilterStart()
+self.EWR_Group:FilterStart()
 else
-self.SAM_Group=SET_GROUP:New():FilterPrefixes(self.SAM_Templates_Prefix):FilterCoalitions(self.Coalition):FilterOnce()
-self.EWR_Group=SET_GROUP:New():FilterPrefixes(self.ewr_templates):FilterCoalitions(self.Coalition):FilterOnce()
+self.SAM_Group:FilterOnce()
+self.EWR_Group:FilterOnce()
 end
 if self.HQ_Template_CC then
 self.HQ_CC=GROUP:FindByName(self.HQ_Template_CC)
 end
-self.version="0.8.11"
+self.version="0.8.14"
 self:I(string.format("***** Starting MANTIS Version %s *****",self.version))
 self:SetStartState("Stopped")
 self:AddTransition("Stopped","Start","Running")
@@ -41644,7 +43131,7 @@ IRExitRange={filename="IR-ExitRange.ogg",duration=3.10},
 RANGE.Names={}
 RANGE.MenuF10={}
 RANGE.MenuF10Root=nil
-RANGE.version="2.7.0"
+RANGE.version="2.7.1"
 function RANGE:New(RangeName)
 local self=BASE:Inherit(self,FSM:New())
 self.rangename=RangeName or"Practice Range"
@@ -42359,6 +43846,7 @@ if _track and dPR<=self.BombtrackThreshold and _unit and _playername then
 local playerData=self.PlayerSettings[_playername]
 local attackHdg=_unit:GetHeading()
 local attackAlt=_unit:GetHeight()
+attackAlt=UTILS.MetersToFeet(attackAlt)
 local attackVel=_unit:GetVelocityKNOTS()
 self:T(self.lid..string.format("RANGE %s: Tracking %s - %s.",self.rangename,weapon:GetTypeName(),weapon:GetName()))
 weapon:SetFuncImpact(RANGE._OnImpact,self,playerData,attackHdg,attackAlt,attackVel)
@@ -63895,7 +65383,7 @@ RSBNChannel={filename="RSBNChannel.ogg",duration=1.14},
 Zulu={filename="Zulu.ogg",duration=0.62},
 }
 _ATIS={}
-ATIS.version="0.9.15"
+ATIS.version="0.9.16"
 function ATIS:New(AirbaseName,Frequency,Modulation)
 local self=BASE:Inherit(self,FSM:New())
 self.airbasename=AirbaseName
@@ -64173,7 +65661,8 @@ local coal=self.airbase and self.airbase:GetCoalition()or nil
 return coal
 end
 function ATIS:onafterStart(From,Event,To)
-self:I("Airbase category is "..self.airbase:GetAirbaseCategory())
+self:T({From,Event,To})
+self:T("Airbase category is "..self.airbase:GetAirbaseCategory())
 if self.airbase:GetAirbaseCategory()==Airbase.Category.SHIP then
 self:E(self.lid..string.format("ERROR: Cannot start ATIS for airbase %s! Only AIRDROMES are supported but NOT SHIPS.",self.airbasename))
 return
@@ -64206,6 +65695,7 @@ self:__Status(-2)
 self:__CheckQueue(-3)
 end
 function ATIS:onafterStatus(From,Event,To)
+self:T({From,Event,To})
 local fsmstate=self:GetState()
 local relayunitstatus="N/A"
 if self.relayunitname then
@@ -64222,10 +65712,12 @@ text=text..string.format(", Relay unit=%s (alive=%s)",tostring(self.relayunitnam
 end
 self:T(self.lid..text)
 if not self:Is("Stopped")then
-self:__Status(-60)
+self:__Status(60)
 end
 end
 function ATIS:onafterCheckQueue(From,Event,To)
+self:T({From,Event,To})
+if not self:Is("Stopped")then
 if self.useSRS then
 self:Broadcast()
 else
@@ -64236,11 +65728,11 @@ else
 self:T2(self.lid..string.format("Radio queue %d transmissions queued.",#self.radioqueue.queue))
 end
 end
-if not self:Is("Stopped")then
-self:__CheckQueue(-math.abs(self.dTQueueCheck))
+self:__CheckQueue(math.abs(self.dTQueueCheck))
 end
 end
 function ATIS:onafterBroadcast(From,Event,To)
+self:T({From,Event,To})
 local coord=self.airbase:GetCoordinate()
 local height=coord:GetLandHeight()
 local qfe=coord:GetPressure(height)
@@ -64794,8 +66286,9 @@ end
 alltext=alltext..";\n"..subtitle
 local _RUNACT
 if not self.ATISforFARPs then
+local subtitle
 if runwayLanding then
-local subtitle=string.format("Active runway %s",runwayLanding)
+subtitle=string.format("Active runway %s",runwayLanding)
 if rwyLandingLeft==true then
 subtitle=subtitle.." Left"
 elseif rwyLandingLeft==false then
@@ -65006,6 +66499,7 @@ self:UpdateMarker(_INFORMATION,_RUNACT,_WIND,_ALTIMETER,_TEMPERATURE)
 end
 end
 function ATIS:onafterReport(From,Event,To,Text)
+self:T({From,Event,To})
 self:T(self.lid..string.format("Report:\n%s",Text))
 if self.useSRS and self.msrs then
 local text=string.gsub(Text,"[\r\n]","")
@@ -65460,7 +66954,8 @@ return mission
 end
 function AUFTRAG:NewCAP(ZoneCAP,Altitude,Speed,Coordinate,Heading,Leg,TargetTypes)
 TargetTypes=UTILS.EnsureTable(TargetTypes,true)
-local mission=AUFTRAG:NewORBIT(Coordinate or ZoneCAP:GetCoordinate(),Altitude or 10000,Speed or 350,Heading,Leg)
+Altitude=Altitude or 10000
+local mission=AUFTRAG:NewORBIT(Coordinate or ZoneCAP:GetCoordinate(),Altitude,Speed or 350,Heading,Leg)
 mission.type=AUFTRAG.Type.CAP
 mission:_SetLogID()
 mission.engageZone=ZoneCAP
@@ -83804,6 +85299,20 @@ element.fuelrel=fuel
 end
 self:T(self.lid..string.format("Travelled ds=%.1f km dt=%.1f s ==> v=%.1f knots. Fuel left for %.1f min",self.traveldist/1000,dt,UTILS.MpsToKnots(v),TmaxFuel/60))
 end
+if false then
+for _,_element in pairs(self.elements)do
+local element=_element
+local unit=element.unit
+if unit and unit:IsAlive()then
+local vec3=unit:GetVec3()
+if vec3 and element.pos then
+local id=UTILS.GetMarkID()
+trigger.action.lineToAll(-1,id,vec3,element.pos,{1,1,1,0.5},1)
+end
+element.pos=vec3
+end
+end
+end
 if alive and self.group:IsAirborne(true)then
 local fuelmin=self:GetFuelMin()
 self:T2(self.lid..string.format("Fuel state=%d",fuelmin))
@@ -90548,18 +92057,20 @@ end
 end
 return self
 end
-function OPSGROUP:SelfDestruction(Delay,ExplosionPower)
+function OPSGROUP:SelfDestruction(Delay,ExplosionPower,ElementName)
 if Delay and Delay>0 then
-self:ScheduleOnce(Delay,OPSGROUP.SelfDestruction,self,0,ExplosionPower)
+self:ScheduleOnce(Delay,OPSGROUP.SelfDestruction,self,0,ExplosionPower,ElementName)
 else
 for i,_element in pairs(self.elements)do
 local element=_element
+if ElementName==nil or ElementName==element.name then
 local unit=element.unit
 if unit and unit:IsAlive()then
 unit:Explode(ExplosionPower or 100)
 end
 end
 end
+end
 return self
 end
 function OPSGROUP:SetSRS(PathToSRS,Gender,Culture,Voice,Port,PathToGoogleKey,Label,Volume)
@@ -92122,10 +93633,10 @@ end
 if self.isFlightgroup then
 if Mission.prohibitABExecute==true then
 self:SetProhibitAfterburner()
-self:I("Set prohibit AB")
+self:T(self.lid.."Set prohibit AB")
 elseif Mission.prohibitABExecute==false then
 self:SetAllowAfterburner()
-self:T2("Set allow AB")
+self:T2(self.lid.."Set allow AB")
 end
 end
 end
@@ -93041,19 +94552,31 @@ end
 end
 end
 for i=#Element.cargoBay,1,-1 do
-local cargo=Element.cargoBay[i]
-self:_DelCargobay(cargo.group)
-if cargo.group and not(cargo.group:IsDead()or cargo.group:IsStopped())then
-cargo.group:_RemoveMyCarrier()
-if cargo.reserved then
-cargo.group:_NewCargoStatus(OPSGROUP.CargoStatus.NOTCARGO)
-else
-for _,cargoelement in pairs(cargo.group.elements)do
+local mycargo=Element.cargoBay[i]
+if mycargo.group then
+self:_DelCargobay(mycargo.group)
+if mycargo.group and not(mycargo.group:IsDead()or mycargo.group:IsStopped())then
+mycargo.group:_RemoveMyCarrier()
+if mycargo.reserved then
+mycargo.group:_NewCargoStatus(OPSGROUP.CargoStatus.NOTCARGO)
+else
+for _,cargoelement in pairs(mycargo.group.elements)do
 self:T2(self.lid.."Cargo element dead "..cargoelement.name)
-cargo.group:ElementDead(cargoelement)
+mycargo.group:ElementDead(cargoelement)
 end
 end
 end
+else
+if self.cargoTZC then
+for _,_cargo in pairs(self.cargoTZC.Cargos)do
+local cargo=_cargo
+if cargo.uid==mycargo.cargoUID then
+cargo.storage.cargoLost=cargo.storage.cargoLost+mycargo.storageAmount
+end
+end
+end
+self:_DelCargobayElement(Element,mycargo)
+end
 end
 end
 function OPSGROUP:onafterRespawn(From,Event,To,Template)
@@ -93280,7 +94803,12 @@ for _,_element in pairs(self.elements)do
 local element=_element
 for _,_cargo in pairs(element.cargoBay)do
 local cargo=_cargo
+if cargo.group then
 text=text..string.format("\n- %s in carrier %s, reserved=%s",tostring(cargo.group:GetName()),tostring(element.name),tostring(cargo.reserved))
+else
+text=text..string.format("\n- storage %s=%d kg in carrier %s [UID=%s]",
+tostring(cargo.storageType),tostring(cargo.storageAmount*cargo.storageWeight),tostring(element.name),tostring(cargo.cargoUID))
+end
 end
 end
 if text==""then
@@ -93299,6 +94827,7 @@ local deployname=deployzone and deployzone:GetName()or"unknown"
 text=text..string.format("\n[%d] UID=%d Status=%s: %s --> %s",i,transport.uid,transport:GetState(),pickupname,deployname)
 for j,_cargo in pairs(transport:GetCargos())do
 local cargo=_cargo
+if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
 local state=cargo.opsgroup:GetState()
 local status=cargo.opsgroup.cargoStatus
 local name=cargo.opsgroup.groupname
@@ -93306,6 +94835,8 @@ local carriergroup,carrierelement,reserved=cargo.opsgroup:_GetMyCarrier()
 local carrierGroupname=carriergroup and carriergroup.groupname or"none"
 local carrierElementname=carrierelement and carrierelement.name or"none"
 text=text..string.format("\n  (%d) %s [%s]: %s, carrier=%s(%s), delivered=%s",j,name,state,status,carrierGroupname,carrierElementname,tostring(cargo.delivered))
+else
+end
 end
 end
 if text~=""then
@@ -93347,26 +94878,32 @@ self:T(self.lid..string.format("Picking up at %s [TZC UID=%d] for %s sec...",sel
 elseif self:IsLoading()then
 self.Tloading=self.Tloading or Time
 local tloading=Time-self.Tloading
-self:T(self.lid..string.format("Loading at %s [TZC UID=%d] for %s sec...",self.cargoTZC.PickupZone and self.cargoTZC.PickupZone:GetName()or"unknown",self.cargoTZC.uid,tloading))
+self:T(self.lid..string.format("Loading at %s [TZC UID=%d] for %.1f sec...",self.cargoTZC.PickupZone and self.cargoTZC.PickupZone:GetName()or"unknown",self.cargoTZC.uid,tloading))
 local boarding=false
 local gotcargo=false
 for _,_cargo in pairs(self.cargoTZC.Cargos)do
 local cargo=_cargo
-if cargo.opsgroup:IsBoarding(self.groupname)then
+if cargo.type==OPSTRANSPORT.CargoType.OPSTRANPORT then
+if cargo.opsgroup and cargo.opsgroup:IsBoarding(self.groupname)then
 boarding=true
 end
-if cargo.opsgroup:IsLoaded(self.groupname)then
+if cargo.opsgroup and cargo.opsgroup:IsLoaded(self.groupname)then
+gotcargo=true
+end
+else
+local mycargo=self:_GetMyCargoBayFromUID(cargo.uid)
+if mycargo and mycargo.storageAmount>0 then
 gotcargo=true
 end
 end
+end
 if gotcargo and self.cargoTransport:_CheckRequiredCargos(self.cargoTZC,self)and not boarding then
-self:T(self.lid.."Boarding finished ==> Loaded")
+self:T(self.lid.."Boarding/loading finished ==> Loaded")
+self.Tloading=nil
 self:LoadingDone()
 else
 self:Loading()
 end
-if not gotcargo and not boarding then
-end
 elseif self:IsTransporting()then
 self.Ttransporting=self.Ttransporting or Time
 local ttransporting=Time-self.Ttransporting
@@ -93378,11 +94915,19 @@ self:T(self.lid.."Unloading ==> Checking if all cargo was delivered")
 local delivered=true
 for _,_cargo in pairs(self.cargoTZC.Cargos)do
 local cargo=_cargo
+if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
 local carrierGroup=cargo.opsgroup:_GetMyCarrierGroup()
 if(carrierGroup and carrierGroup:GetName()==self:GetName())and not cargo.delivered then
 delivered=false
 break
 end
+else
+local mycargo=self:_GetMyCargoBayFromUID(cargo.uid)
+if mycargo and not cargo.delivered then
+delivered=false
+break
+end
+end
 end
 if delivered then
 self:T(self.lid.."Unloading finished ==> UnloadingDone")
@@ -93399,6 +94944,7 @@ local deployname=deployzone and deployzone:GetName()or"unknown"
 local text=string.format("Carrier [%s]: %s --> %s",self.carrierStatus,pickupname,deployname)
 for _,_cargo in pairs(self.cargoTransport:GetCargos(self.cargoTZC))do
 local cargo=_cargo
+if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
 local name=cargo.opsgroup:GetName()
 local gstatus=cargo.opsgroup:GetState()
 local cstatus=cargo.opsgroup.cargoStatus
@@ -93407,6 +94953,8 @@ local carriergroup,carrierelement,reserved=cargo.opsgroup:_GetMyCarrier()
 local carrierGroupname=carriergroup and carriergroup.groupname or"none"
 local carrierElementname=carrierelement and carrierelement.name or"none"
 text=text..string.format("\n- %s (%.1f kg) [%s]: %s, carrier=%s (%s), delivered=%s",name,weight,gstatus,cstatus,carrierElementname,carrierGroupname,tostring(cargo.delivered))
+else
+end
 end
 self:I(self.lid..text)
 end
@@ -93443,6 +94991,44 @@ self:AddWeightCargo(CarrierElement.name,weight)
 end
 return self
 end
+function OPSGROUP:_AddCargobayStorage(CarrierElement,CargoUID,StorageType,StorageAmount,StorageWeight)
+local MyCargo=self:_CreateMyCargo(CargoUID,nil,StorageType,StorageAmount,StorageWeight)
+self:_AddMyCargoBay(MyCargo,CarrierElement)
+end
+function OPSGROUP:_CreateMyCargo(CargoUID,OpsGroup,StorageType,StorageAmount,StorageWeight)
+local cargo={}
+cargo.cargoUID=CargoUID
+cargo.group=OpsGroup
+cargo.storageType=StorageType
+cargo.storageAmount=StorageAmount
+cargo.storageWeight=StorageWeight
+cargo.reserved=false
+return cargo
+end
+function OPSGROUP:_AddMyCargoBay(MyCargo,CarrierElement)
+table.insert(CarrierElement.cargoBay,MyCargo)
+if not MyCargo.reserved then
+local weight=0
+if MyCargo.group then
+weight=MyCargo.group:GetWeightTotal()
+else
+weight=MyCargo.storageAmount*MyCargo.storageWeight
+end
+self:AddWeightCargo(CarrierElement.name,weight)
+end
+end
+function OPSGROUP:_GetMyCargoBayFromUID(uid)
+for _,_element in pairs(self.elements)do
+local element=_element
+for i,_mycargo in pairs(element.cargoBay)do
+local mycargo=_mycargo
+if mycargo.cargoUID and mycargo.cargoUID==uid then
+return mycargo,element,i
+end
+end
+end
+return nil,nil,nil
+end
 function OPSGROUP:GetCargoGroups(CarrierName)
 local cargos={}
 for _,_element in pairs(self.elements)do
@@ -93473,6 +95059,31 @@ end
 end
 return nil,nil,nil
 end
+function OPSGROUP:_GetCargobayElement(Element,CargoUID)
+self:T3({Element=Element,CargoUID=CargoUID})
+for i,_mycargo in pairs(Element.cargoBay)do
+local mycargo=_mycargo
+if mycargo.cargoUID and mycargo.cargoUID==CargoUID then
+return mycargo
+end
+end
+return nil
+end
+function OPSGROUP:_DelCargobayElement(Element,MyCargo)
+for i,_mycargo in pairs(Element.cargoBay)do
+local mycargo=_mycargo
+if mycargo.cargoUID and MyCargo.cargoUID and mycargo.cargoUID==MyCargo.cargoUID then
+if MyCargo.group then
+self:RedWeightCargo(Element.name,MyCargo.group:GetWeightTotal())
+else
+self:RedWeightCargo(Element.name,MyCargo.storageAmount*MyCargo.storageWeight)
+end
+table.remove(Element.cargoBay,i)
+return true
+end
+end
+return false
+end
 function OPSGROUP:_DelCargobay(CargoGroup)
 if self.cargoBay[CargoGroup.groupname]then
 self.cargoBay[CargoGroup.groupname]=nil
@@ -93520,9 +95131,10 @@ function OPSGROUP:_CheckDelivered(CargoTransport)
 local done=true
 for _,_cargo in pairs(CargoTransport:GetCargos())do
 local cargo=_cargo
-if self:CanCargo(cargo.opsgroup)then
+if self:CanCargo(cargo)then
 if cargo.delivered then
-elseif cargo.opsgroup==nil or cargo.opsgroup:IsDead()or cargo.opsgroup:IsStopped()then
+elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup==nil then
+elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and(cargo.opsgroup:IsDead()or cargo.opsgroup:IsStopped())then
 else
 done=false
 end
@@ -93536,10 +95148,10 @@ local done=true
 if CargoTransport then
 for _,_cargo in pairs(CargoTransport:GetCargos())do
 local cargo=_cargo
-if self:CanCargo(cargo.opsgroup)then
+if self:CanCargo(cargo)then
 if cargo.delivered then
-elseif cargo.opsgroup==nil or cargo.opsgroup:IsDead()or cargo.opsgroup:IsStopped()then
-elseif cargo.opsgroup:IsLoaded(CargoTransport:_GetCarrierNames())then
+elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and(cargo.opsgroup==nil or cargo.opsgroup:IsDead()or cargo.opsgroup:IsStopped())then
+elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and(cargo.opsgroup:IsLoaded(CargoTransport:_GetCarrierNames()))then
 else
 done=false
 end
@@ -93643,8 +95255,11 @@ if(UnitName==nil or UnitName==element.name)and(element and element.status~=OPSGR
 for _,_cargo in pairs(element.cargoBay)do
 local cargo=_cargo
 if(not cargo.reserved)or(cargo.reserved==true and(IncludeReserved==true or IncludeReserved==nil))then
-local cargoweight=cargo.group:GetWeightTotal()
-gewicht=gewicht+cargoweight
+if cargo.group then
+gewicht=gewicht+cargo.group:GetWeightTotal()
+else
+gewicht=gewicht+cargo.storageAmount*cargo.storageWeight
+end
 end
 end
 end
@@ -93691,27 +95306,54 @@ function OPSGROUP:RedWeightCargo(UnitName,Weight)
 self:AddWeightCargo(UnitName,-Weight)
 return self
 end
-function OPSGROUP:CanCargo(CargoGroup)
-if CargoGroup then
-local weight=CargoGroup:GetWeightTotal()
+function OPSGROUP:_GetWeightStorage(Storage,Total,Reserved,Amount)
+local weight=Storage.cargoAmount
+if not Total then
+weight=weight-Storage.cargoLost-Storage.cargoLoaded-Storage.cargoDelivered
+end
+if Reserved then
+weight=weight-Storage.cargoReserved
+end
+if not Amount then
+weight=weight*Storage.cargoWeight
+end
+return weight
+end
+function OPSGROUP:CanCargo(Cargo)
+if Cargo then
+local weight=math.huge
+if Cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
+local weight=Cargo.opsgroup:GetWeightTotal()
 for _,_element in pairs(self.elements)do
 local element=_element
 if element and element.status~=OPSGROUP.ElementStatus.DEAD and element.weightMaxCargo>=weight then
 return true
 end
 end
+else
+weight=Cargo.storage.cargoWeight
+end
+local bay=0
+for _,_element in pairs(self.elements)do
+local element=_element
+if element and element.status~=OPSGROUP.ElementStatus.DEAD then
+bay=bay+element.weightMaxCargo
+end
+end
+if bay>=weight then
+return true
+end
 end
 return false
 end
-function OPSGROUP:FindCarrierForCargo(CargoGroup)
-local weight=CargoGroup:GetWeightTotal()
+function OPSGROUP:FindCarrierForCargo(Weight)
 for _,_element in pairs(self.elements)do
 local element=_element
 local free=self:GetFreeCargobay(element.name)
-if free>=weight then
+if free>=Weight then
 return element
 else
-self:T3(self.lid..string.format("%s: Weight %d>%d free cargo bay",element.name,weight,free))
+self:T3(self.lid..string.format("%s: Weight %d>%d free cargo bay",element.name,Weight,free))
 end
 end
 return nil
@@ -93848,42 +95490,97 @@ self:__Cruise(-2,nil,Formation)
 end
 end
 end
+function OPSGROUP:_SortCargo(Cargos)
+local function _sort(a,b)
+local cargoA=a
+local cargoB=b
+local weightA=0
+local weightB=0
+if cargoA.opsgroup then
+weightA=cargoA.opsgroup:GetWeightTotal()
+else
+weightA=self:_GetWeightStorage(cargoA.storage)
+end
+if cargoB.opsgroup then
+weightB=cargoB.opsgroup:GetWeightTotal()
+else
+weightB=self:_GetWeightStorage(cargoB.storage)
+end
+return weightA>weightB
+end
+table.sort(Cargos,_sort)
+return Cargos
+end
 function OPSGROUP:onafterLoading(From,Event,To)
 self:_NewCarrierStatus(OPSGROUP.CarrierStatus.LOADING)
-self.Tloading=timer.getAbsTime()
 local cargos={}
 for _,_cargo in pairs(self.cargoTZC.Cargos)do
 local cargo=_cargo
-local canCargo=self:CanCargo(cargo.opsgroup)
-local isCarrier=cargo.opsgroup:IsPickingup()or cargo.opsgroup:IsLoading()or cargo.opsgroup:IsTransporting()or cargo.opsgroup:IsUnloading()
-local isNotCargo=cargo.opsgroup:IsNotCargo(true)
-local isHolding=cargo.opsgroup:IsHolding()or cargo.opsgroup:IsLoaded()
-local inZone=cargo.opsgroup:IsInZone(self.cargoTZC.EmbarkZone)or cargo.opsgroup:IsInUtero()
-local isOnMission=cargo.opsgroup:IsOnMission()
+local canCargo=self:CanCargo(cargo)
+local isCarrier=false
+local isNotCargo=true
+local isHolding=cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and(cargo.opsgroup:IsHolding()or cargo.opsgroup:IsLoaded())or true
+local inZone=cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and(cargo.opsgroup:IsInZone(self.cargoTZC.EmbarkZone)or cargo.opsgroup:IsInUtero())or true
+local isOnMission=cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup:IsOnMission()or false
 if isOnMission then
 local mission=cargo.opsgroup:GetMissionCurrent()
 if mission and((mission.opstransport and mission.opstransport.uid==self.cargoTransport.uid)or mission.type==AUFTRAG.Type.NOTHING)then
 isOnMission=not isHolding
 end
 end
+local isAvail=true
+if cargo.type==OPSTRANSPORT.CargoType.STORAGE then
+local nAvail=cargo.storage.storageFrom:GetAmount(cargo.storage.cargoType)
+if nAvail>0 then
+isAvail=true
+else
+isAvail=false
+end
+else
+isCarrier=cargo.opsgroup:IsPickingup()or cargo.opsgroup:IsLoading()or cargo.opsgroup:IsTransporting()or cargo.opsgroup:IsUnloading()
+isNotCargo=cargo.opsgroup:IsNotCargo(true)
+end
+local isDead=cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup:IsDead()or false
 self:T(self.lid..string.format("Loading: canCargo=%s, isCarrier=%s, isNotCargo=%s, isHolding=%s, isOnMission=%s",
 tostring(canCargo),tostring(isCarrier),tostring(isNotCargo),tostring(isHolding),tostring(isOnMission)))
-if canCargo and inZone and isNotCargo and isHolding and(not(cargo.delivered or cargo.opsgroup:IsDead()or isCarrier or isOnMission))then
+if canCargo and inZone and isNotCargo and isHolding and isAvail and(not(cargo.delivered or isDead or isCarrier or isOnMission))then
 table.insert(cargos,cargo)
 end
 end
-local function _sort(a,b)
-local cargoA=a
-local cargoB=b
-return cargoA.opsgroup:GetWeightTotal()>cargoB.opsgroup:GetWeightTotal()
-end
-table.sort(cargos,_sort)
+self:_SortCargo(cargos)
 for _,_cargo in pairs(cargos)do
 local cargo=_cargo
-local carrier=self:FindCarrierForCargo(cargo.opsgroup)
+local weight=nil
+if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
+weight=cargo.opsgroup:GetWeightTotal()
+local carrier=self:FindCarrierForCargo(weight)
 if carrier then
 cargo.opsgroup:Board(self,carrier)
 end
+else
+weight=self:_GetWeightStorage(cargo.storage,false)
+local Amount=cargo.storage.storageFrom:GetAmount(cargo.storage.cargoType)
+local Weight=Amount*cargo.storage.cargoWeight
+weight=math.min(weight,Weight)
+self:T(self.lid..string.format("Loading storage weight=%d kg (warehouse has %d kg)!",weight,Weight))
+for _,_element in pairs(self.elements)do
+local element=_element
+local free=self:GetFreeCargobay(element.name)
+local w=math.min(weight,free)
+if w>=cargo.storage.cargoWeight then
+local amount=math.floor(w/cargo.storage.cargoWeight)
+cargo.storage.storageFrom:RemoveAmount(cargo.storage.cargoType,amount)
+cargo.storage.cargoLoaded=cargo.storage.cargoLoaded+amount
+self:_AddCargobayStorage(element,cargo.uid,cargo.storage.cargoType,amount,cargo.storage.cargoWeight)
+weight=weight-amount*cargo.storage.cargoWeight
+local text=string.format("Element %s: loaded amount=%d (weight=%d) ==> left=%d kg",element.name,amount,amount*cargo.storage.cargoWeight,weight)
+self:T(self.lid..text)
+if weight<=0 then
+break
+end
+end
+end
+end
 end
 end
 function OPSGROUP:_NewCargoStatus(Status)
@@ -93907,7 +95604,8 @@ function OPSGROUP:onafterLoad(From,Event,To,CargoGroup,Carrier)
 self:T(self.lid..string.format("Loading group %s",tostring(CargoGroup.groupname)))
 local carrier=Carrier or CargoGroup:_GetMyCarrierElement()
 if not carrier then
-carrier=self:FindCarrierForCargo(CargoGroup)
+local weight=CargoGroup:GetWeightTotal()
+carrier=self:FindCarrierForCargo(weight)
 end
 if carrier then
 CargoGroup:_NewCargoStatus(OPSGROUP.CargoStatus.LOADED)
@@ -94036,6 +95734,7 @@ self:T(self.lid.."Unloading..")
 local zone=self.cargoTZC.DisembarkZone or self.cargoTZC.DeployZone
 for _,_cargo in pairs(self.cargoTZC.Cargos)do
 local cargo=_cargo
+if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
 if cargo.opsgroup:IsLoaded(self.groupname)and not cargo.opsgroup:IsDead()then
 local carrier=nil
 local carrierGroup=nil
@@ -94095,6 +95794,31 @@ self:T(self.lid.."Cargo needs carrier but no carrier is avaiable (yet)!")
 end
 else
 end
+else
+if not cargo.delivered then
+for _,_element in pairs(self.elements)do
+local element=_element
+local mycargo=self:_GetCargobayElement(element,cargo.uid)
+if mycargo then
+cargo.storage.storageTo:AddAmount(mycargo.storageType,mycargo.storageAmount)
+cargo.storage.cargoDelivered=cargo.storage.cargoDelivered+mycargo.storageAmount
+cargo.storage.cargoLoaded=cargo.storage.cargoLoaded-mycargo.storageAmount
+self:_DelCargobayElement(element,mycargo)
+self:T2(self.lid..string.format("Cargo loaded=%d, delivered=%d, lost=%d",cargo.storage.cargoLoaded,cargo.storage.cargoDelivered,cargo.storage.cargoLost))
+end
+end
+local amountToDeliver=self:_GetWeightStorage(cargo.storage,false,false,true)
+local amountTotal=self:_GetWeightStorage(cargo.storage,true,false,true)
+local text=string.format("Amount delivered=%d, total=%d",amountToDeliver,amountTotal)
+self:T(self.lid..text)
+if amountToDeliver<=0 then
+cargo.delivered=true
+self.cargoTransport.Ndelivered=self.cargoTransport.Ndelivered+1
+local text=string.format("Ndelivered=%d delivered=%s",self.cargoTransport.Ndelivered,tostring(cargo.delivered))
+self:T(self.lid..text)
+end
+end
+end
 end
 end
 function OPSGROUP:onbeforeUnload(From,Event,To,OpsGroup,Coordinate,Heading)
@@ -96074,6 +97798,7 @@ assets={},
 legions={},
 statusLegion={},
 requestID={},
+cargocounter=0,
 }
 OPSTRANSPORT.Status={
 PLANNED="planned",
@@ -96086,8 +97811,12 @@ CANCELLED="cancelled",
 SUCCESS="success",
 FAILED="failed",
 }
+OPSTRANSPORT.CargoType={
+OPSGROUP="OPSGROUP",
+STORAGE="STORAGE",
+}
 _OPSTRANSPORTID=0
-OPSTRANSPORT.version="0.7.0"
+OPSTRANSPORT.version="0.8.0"
 function OPSTRANSPORT:New(CargoGroups,PickupZone,DeployZone)
 local self=BASE:Inherit(self,FSM:New())
 _OPSTRANSPORTID=_OPSTRANSPORTID+1
@@ -96174,6 +97903,14 @@ self:I(self.lid..text)
 end
 return self
 end
+function OPSTRANSPORT:AddCargoStorage(StorageFrom,StorageTo,CargoType,CargoAmount,CargoWeight,TransportZoneCombo)
+TransportZoneCombo=TransportZoneCombo or self.tzcDefault
+local cargo=self:_CreateCargoStorage(StorageFrom,StorageTo,CargoType,CargoAmount,CargoWeight,TransportZoneCombo)
+if cargo then
+self.Ncargo=self.Ncargo+1
+table.insert(TransportZoneCombo.Cargos,cargo)
+end
+end
 function OPSTRANSPORT:SetPickupZone(PickupZone,TransportZoneCombo)
 TransportZoneCombo=TransportZoneCombo or self.tzcDefault
 TransportZoneCombo.PickupZone=PickupZone
@@ -96376,36 +98113,71 @@ end
 return names
 end
 function OPSTRANSPORT:GetCargoOpsGroups(Delivered,Carrier,TransportZoneCombo)
-local cargos=self:GetCargos(TransportZoneCombo)
+local cargos=self:GetCargos(TransportZoneCombo,Carrier,Delivered)
 local opsgroups={}
 for _,_cargo in pairs(cargos)do
 local cargo=_cargo
-if Delivered==nil or cargo.delivered==Delivered then
+if cargo.type=="OPSGROUP"then
 if cargo.opsgroup and not(cargo.opsgroup:IsDead()or cargo.opsgroup:IsStopped())then
-if Carrier==nil or Carrier:CanCargo(cargo.opsgroup)then
 table.insert(opsgroups,cargo.opsgroup)
 end
 end
 end
+return opsgroups
+end
+function OPSTRANSPORT:GetCargoStorages(Delivered,Carrier,TransportZoneCombo)
+local cargos=self:GetCargos(TransportZoneCombo,Carrier,Delivered)
+local opsgroups={}
+for _,_cargo in pairs(cargos)do
+local cargo=_cargo
+if cargo.type=="STORAGE"then
+table.insert(opsgroups,cargo.storage)
+end
 end
 return opsgroups
 end
 function OPSTRANSPORT:GetCarriers()
 return self.carriers
 end
-function OPSTRANSPORT:GetCargos(TransportZoneCombo)
+function OPSTRANSPORT:GetCargos(TransportZoneCombo,Carrier,Delivered)
+local tczs=self.tzCombos
 if TransportZoneCombo then
-return TransportZoneCombo.Cargos
-else
+tczs={TransportZoneCombo}
+end
 local cargos={}
-for _,_tzc in pairs(self.tzCombos)do
-local tzc=_tzc
-for _,cargo in pairs(tzc.Cargos)do
+for _,_tcz in pairs(tczs)do
+local tcz=_tcz
+for _,_cargo in pairs(tcz.Cargos)do
+local cargo=_cargo
+if Delivered==nil or cargo.delivered==Delivered then
+if Carrier==nil or Carrier:CanCargo(cargo)then
 table.insert(cargos,cargo)
 end
 end
+end
+end
 return cargos
 end
+function OPSTRANSPORT:GetCargoTotalWeight(Cargo,IncludeReserved)
+local weight=0
+if Cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
+weight=Cargo.opsgroup:GetWeightTotal(nil,IncludeReserved)
+else
+if type(Cargo.storage.cargoType)=="number"then
+if IncludeReserved then
+return Cargo.storage.cargoAmount+Cargo.storage.cargoReserved
+else
+return Cargo.storage.cargoAmount
+end
+else
+if IncludeReserved then
+return Cargo.storage.cargoAmount*100
+else
+return(Cargo.storage.cargoAmount+Cargo.storage.cargoReserved)*100
+end
+end
+end
+return weight
 end
 function OPSTRANSPORT:SetTime(ClockStart,ClockStop)
 local Tnow=timer.getAbsTime()
@@ -96660,11 +98432,17 @@ if self.verbose>=3 then
 text=text..string.format("\nCargos:")
 for _,_cargo in pairs(self:GetCargos())do
 local cargo=_cargo
+if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
 local carrier=cargo.opsgroup:_GetMyCarrierElement()
 local name=carrier and carrier.name or"none"
 local cstate=carrier and carrier.status or"N/A"
 text=text..string.format("\n- %s: %s [%s], weight=%d kg, carrier=%s [%s], delivered=%s [UID=%s]",
 cargo.opsgroup:GetName(),cargo.opsgroup.cargoStatus:upper(),cargo.opsgroup:GetState(),cargo.opsgroup:GetWeightTotal(),name,cstate,tostring(cargo.delivered),tostring(cargo.opsgroup.cargoTransportUID))
+else
+local storage=cargo.storage
+text=text..string.format("\n- storage type=%s: amount: total=%d loaded=%d, lost=%d, delivered=%d, delivered=%s [UID=%s]",
+storage.cargoType,storage.cargoAmount,storage.cargoLoaded,storage.cargoLost,storage.cargoDelivered,tostring(cargo.delivered),tostring(cargo.uid))
+end
 end
 text=text..string.format("\nCarriers:")
 for _,_carrier in pairs(self.carriers)do
@@ -96782,11 +98560,11 @@ for _,_cargo in pairs(self:GetCargos())do
 local cargo=_cargo
 if cargo.delivered then
 dead=false
-elseif cargo.opsgroup==nil then
+elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup==nil then
 dead=false
-elseif cargo.opsgroup:IsDestroyed()then
-elseif cargo.opsgroup:IsDead()then
-elseif cargo.opsgroup:IsStopped()then
+elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup:IsDestroyed()then
+elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup:IsDead()then
+elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup:IsStopped()then
 dead=false
 else
 done=false
@@ -96879,7 +98657,10 @@ if cargo.opsgroup.groupname==opsgroup.groupname then
 return nil
 end
 end
+self.cargocounter=self.cargocounter+1
 local cargo={}
+cargo.uid=self.cargocounter
+cargo.type="OPSGROUP"
 cargo.opsgroup=opsgroup
 cargo.delivered=false
 cargo.status="Unknown"
@@ -96891,8 +98672,32 @@ self:_AddDisembarkCarriers(DisembarkCarriers,cargo.disembarkCarriers)
 end
 return cargo
 end
+function OPSTRANSPORT:_CreateCargoStorage(StorageFrom,StorageTo,CargoType,CargoAmount,CargoWeight,TransportZoneCombo)
+local storage={}
+storage.storageFrom=StorageFrom
+storage.storageTo=StorageTo
+storage.cargoType=CargoType
+storage.cargoAmount=CargoAmount
+storage.cargoDelivered=0
+storage.cargoLost=0
+storage.cargoReserved=0
+storage.cargoLoaded=0
+storage.cargoWeight=CargoWeight or 1
+self.cargocounter=self.cargocounter+1
+local cargo={}
+cargo.uid=self.cargocounter
+cargo.type="STORAGE"
+cargo.opsgroup=nil
+cargo.storage=storage
+cargo.delivered=false
+cargo.status="Unknown"
+cargo.tzcUID=TransportZoneCombo
+cargo.disembarkZone=nil
+cargo.disembarkCarriers=nil
+return cargo
+end
 function OPSTRANSPORT:_CountCargosInZone(Zone,Delivered,Carrier,TransportZoneCombo)
-local cargos=self:GetCargoOpsGroups(Delivered,Carrier,TransportZoneCombo)
+local cargos=self:GetCargos(TransportZoneCombo,Carrier,Delivered)
 local function iscarrier(_cargo)
 local cargo=_cargo
 local mycarrier=cargo:_GetMyCarrierGroup()
@@ -96923,13 +98728,19 @@ end
 local N=0
 for _,_cargo in pairs(cargos)do
 local cargo=_cargo
-local isNotCargo=cargo:IsNotCargo(true)
+local isNotCargo=true
+local isInZone=true
+local isInUtero=true
+if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
+local opsgroup=cargo.opsgroup
+isNotCargo=opsgroup:IsNotCargo(true)
 if not isNotCargo then
-isNotCargo=iscarrier(cargo)
+isNotCargo=iscarrier(opsgroup)
+end
+isInZone=opsgroup:IsInZone(Zone)
+isInUtero=opsgroup:IsInUtero()
+self:T(self.lid..string.format("Cargo=%s: notcargo=%s, iscarrier=%s inzone=%s, inutero=%s",opsgroup:GetName(),tostring(opsgroup:IsNotCargo(true)),tostring(iscarrier(opsgroup)),tostring(isInZone),tostring(isInUtero)))
 end
-local isInZone=cargo:IsInZone(Zone)
-local isInUtero=cargo:IsInUtero()
-self:T(self.lid..string.format("Cargo=%s: notcargo=%s, iscarrier=%s inzone=%s, inutero=%s",cargo:GetName(),tostring(cargo:IsNotCargo(true)),tostring(iscarrier(cargo)),tostring(isInZone),tostring(isInUtero)))
 if isNotCargo and(isInZone or isInUtero)then
 N=N+1
 end
@@ -100237,7 +102048,7 @@ PLAYERRECCE={
 ClassName="PLAYERRECCE",
 verbose=true,
 lid=nil,
-version="0.0.17",
+version="0.0.18",
 ViewZone={},
 ViewZoneVisual={},
 ViewZoneLaser={},
@@ -100746,6 +102557,7 @@ if self.ClientMenus[playername]then
 self.ClientMenus[playername]:Remove()
 self.ClientMenus[playername]=nil
 end
+self:_BuildMenus()
 return self
 end
 function PLAYERRECCE:_SwitchOnStation(client,group,playername)
@@ -100761,6 +102573,7 @@ if self.ClientMenus[playername]then
 self.ClientMenus[playername]:Remove()
 self.ClientMenus[playername]=nil
 end
+self:_BuildMenus(client)
 return self
 end
 function PLAYERRECCE:_SwitchSmoke(client,group,playername)
@@ -100776,6 +102589,7 @@ if self.ClientMenus[playername]then
 self.ClientMenus[playername]:Remove()
 self.ClientMenus[playername]=nil
 end
+self:_BuildMenus(client)
 return self
 end
 function PLAYERRECCE:_SwitchLasing(client,group,playername)
@@ -100791,6 +102605,7 @@ if self.ClientMenus[playername]then
 self.ClientMenus[playername]:Remove()
 self.ClientMenus[playername]=nil
 end
+self:_BuildMenus(client)
 return self
 end
 function PLAYERRECCE:_SwitchLasingDist(client,group,playername,mindist,maxdist)
@@ -100811,6 +102626,7 @@ if self.ClientMenus[playername]then
 self.ClientMenus[playername]:Remove()
 self.ClientMenus[playername]=nil
 end
+self:_BuildMenus(client)
 return self
 end
 function PLAYERRECCE:_WIP(client,group,playername)
@@ -100824,6 +102640,8 @@ local visualset=self:_GetTargetSet(client,false)
 cameraset:AddSet(visualset)
 if cameraset:CountAlive()>0 then
 self:__TargetsSmoked(-1,client,playername,cameraset)
+else
+return self
 end
 local highsmoke=self.SmokeColor.highsmoke
 local medsmoke=self.SmokeColor.medsmoke
@@ -100918,7 +102736,7 @@ local targetset,number=self:_GetTargetSet(client,true,true)
 if number>0 and self.AutoLase[playername]then
 local Settings=(client and _DATABASE:GetPlayerSettings(playername))or _SETTINGS
 local target=self:_GetHVTTarget(targetset)
-local ThreatLevel=target:GetThreatLevel()
+local ThreatLevel=target:GetThreatLevel()or 1
 local ThreatLevelText="high"
 if ThreatLevel>3 and ThreatLevel<8 then
 ThreatLevelText="medium"
@@ -100928,7 +102746,7 @@ end
 local ThreatGraph="["..string.rep("■",ThreatLevel)..string.rep("□",10-ThreatLevel).."]: "..ThreatLevel
 local report=REPORT:New("Lasing Report")
 report:Add(string.rep("-",15))
-report:Add("Target type: "..target:GetTypeName())
+report:Add("Target type: "..target:GetTypeName()or"unknown")
 report:Add("Threat Level: "..ThreatGraph.." ("..ThreatLevelText..")")
 if not self.ReferencePoint then
 report:Add("Location: "..client:GetCoordinate():ToStringBULLS(self.Coalition,Settings))
@@ -100938,14 +102756,14 @@ end
 report:Add("Laser Code: "..self.UnitLaserCodes[playername]or 1688)
 report:Add(string.rep("-",15))
 local text=report:Text()
-self:__TargetReport(-1,client,targetset,target,text)
+self:__TargetReport(1,client,targetset,target,text)
 else
 local report=REPORT:New("Lasing Report")
 report:Add(string.rep("-",15))
 report:Add("N O  T A R G E T S")
 report:Add(string.rep("-",15))
 local text=report:Text()
-self:__TargetReport(-1,client,nil,nil,text)
+self:__TargetReport(1,client,nil,nil,text)
 end
 return self
 end
@@ -100973,21 +102791,22 @@ report:Add("Location: "..client:GetCoordinate():ToStringFromRPShort(self.Referen
 end
 report:Add(string.rep("-",15))
 local text=report:Text()
-self:__TargetReport(-1,client,targetset,nil,text)
+self:__TargetReport(1,client,targetset,nil,text)
 else
 local report=REPORT:New("Target Report")
 report:Add(string.rep("-",15))
 report:Add("N O  T A R G E T S")
 report:Add(string.rep("-",15))
 local text=report:Text()
-self:__TargetReport(-1,client,nil,nil,text)
+self:__TargetReport(1,client,nil,nil,text)
 end
 return self
 end
-function PLAYERRECCE:_BuildMenus()
+function PLAYERRECCE:_BuildMenus(Client)
 self:T(self.lid.."_BuildMenus")
 local clients=self.PlayerSet
 local clientset=clients:GetSetObjects()
+if Client then clientset={Client}end
 for _,_client in pairs(clientset)do
 local client=_client
 if client and client:IsAlive()then
@@ -100995,7 +102814,7 @@ local playername=client:GetPlayerName()
 if not self.UnitLaserCodes[playername]then
 self:_SetClientLaserCode(nil,nil,playername,1688)
 end
-if not self.SmokeOwn[playername]then
+if self.SmokeOwn[playername]==nil then
 self.SmokeOwn[playername]=self.smokeownposition
 end
 local group=client:GetGroup()
@@ -101582,7 +103401,7 @@ MESSAGE:New(Text,45,self.Name or"FACA"):ToClient(Client)
 if self.AttackSet then
 for _,_client in pairs(self.AttackSet.Set)do
 local client=_client
-if client and client:IsAlive()then
+if client and client:IsAlive()and client~=Client then
 MESSAGE:New(Text,45,self.Name or"FACA"):ToClient(client)
 end
 end
@@ -113464,6 +115283,16 @@ self:T("MSRS execute VBS command="..runvbs)
 res=os.execute(runvbs)
 timer.scheduleFunction(os.remove,filename,timer.getTime()+1)
 timer.scheduleFunction(os.remove,filenvbs,timer.getTime()+1)
+elseif false then
+local filenvbs=os.getenv('TMP').."\\MSRS-"..STTS.uuid()..".vbs"
+local script=io.open(filenvbs,"w+")
+script:write(string.format('Set oShell = CreateObject ("Wscript.Shell")\n'))
+script:write(string.format('Dim strArgs\n'))
+script:write(string.format('strArgs = "cmd /c %s"\n',filename))
+script:write(string.format('oShell.Run strArgs, 0, false'))
+script:close()
+local runvbs=string.format('cscript.exe //Nologo //B "%s"',filenvbs)
+res=os.execute(runvbs)
 else
 self:T("MSRS execute command="..command)
 res=os.execute(command)