From 699760043f850dc43226a91648f582dc5b93de8d Mon Sep 17 00:00:00 2001 From: Quaggles <8382945+Quaggles@users.noreply.github.com> Date: Thu, 31 Oct 2024 02:03:06 +1000 Subject: [PATCH] 2.9.9.2280 --- _G/Pylons/BRU_55.lua | 2 +- _G/__DCS_VERSION__.lua | 2 +- _G/bombs/GBU_15_V_1_B.lua | 19 + _G/bombs/GBU_8_B.lua | 19 + _G/db/Countries/Abkhazia.lua | 2 + _G/db/Countries/Afghanistan.lua | 2 + _G/db/Countries/Algeria.lua | 2 + _G/db/Countries/Argentina.lua | 2 + _G/db/Countries/Australia.lua | 6 + _G/db/Countries/Austria.lua | 2 + _G/db/Countries/Bahrain.lua | 2 + _G/db/Countries/Belarus.lua | 2 + _G/db/Countries/Belgium.lua | 2 + _G/db/Countries/Bolivia.lua | 2 + _G/db/Countries/Brazil.lua | 6 + _G/db/Countries/Bulgaria.lua | 2 + _G/db/Countries/Canada.lua | 6 + _G/db/Countries/Chile.lua | 2 + _G/db/Countries/China.lua | 2 + .../Combined Joint Task Forces Blue.lua | 22 +- .../Combined Joint Task Forces Red.lua | 22 +- _G/db/Countries/Croatia.lua | 2 + _G/db/Countries/Cuba.lua | 2 + _G/db/Countries/Cyprus.lua | 2 + _G/db/Countries/Czech Republic.lua | 2 + _G/db/Countries/Denmark.lua | 2 + _G/db/Countries/Ecuador.lua | 2 + _G/db/Countries/Egypt.lua | 2 + _G/db/Countries/Ethiopia.lua | 2 + _G/db/Countries/Finland.lua | 2 + _G/db/Countries/France.lua | 2 + _G/db/Countries/GDR.lua | 2 + _G/db/Countries/Georgia.lua | 2 + _G/db/Countries/Germany.lua | 2 + _G/db/Countries/Ghana.lua | 2 + _G/db/Countries/Greece.lua | 2 + _G/db/Countries/Honduras.lua | 2 + _G/db/Countries/Hungary.lua | 2 + _G/db/Countries/India.lua | 2 + _G/db/Countries/Indonesia.lua | 2 + _G/db/Countries/Insurgents.lua | 2 + _G/db/Countries/Iran.lua | 2 + _G/db/Countries/Iraq.lua | 2 + _G/db/Countries/Israel.lua | 2 + _G/db/Countries/Italian Social Republic.lua | 2 + _G/db/Countries/Italy.lua | 2 + _G/db/Countries/Japan.lua | 2 + _G/db/Countries/Jordan.lua | 2 + _G/db/Countries/Kazakhstan.lua | 2 + _G/db/Countries/Kuwait.lua | 2 + _G/db/Countries/Lebanon.lua | 2 + _G/db/Countries/Libya.lua | 2 + _G/db/Countries/Malaysia.lua | 2 + _G/db/Countries/Mexico.lua | 2 + _G/db/Countries/Morocco.lua | 2 + _G/db/Countries/New Zealand.lua | 1288 +++++++++++++++++ _G/db/Countries/Nigeria.lua | 2 + _G/db/Countries/North Korea.lua | 2 + _G/db/Countries/Norway.lua | 2 + _G/db/Countries/Oman.lua | 2 + _G/db/Countries/Pakistan.lua | 2 + _G/db/Countries/Peru.lua | 2 + _G/db/Countries/Philippines.lua | 2 + _G/db/Countries/Poland.lua | 2 + _G/db/Countries/Portugal.lua | 2 + _G/db/Countries/Qatar.lua | 2 + _G/db/Countries/Romania.lua | 2 + _G/db/Countries/Russia.lua | 2 + _G/db/Countries/Saudi Arabia.lua | 2 + _G/db/Countries/Serbia.lua | 2 + _G/db/Countries/Slovakia.lua | 2 + _G/db/Countries/Slovenia.lua | 2 + _G/db/Countries/South Africa.lua | 2 + _G/db/Countries/South Korea.lua | 2 + _G/db/Countries/South Ossetia.lua | 2 + _G/db/Countries/Spain.lua | 2 + _G/db/Countries/Sudan.lua | 2 + _G/db/Countries/Sweden.lua | 2 + _G/db/Countries/Switzerland.lua | 2 + _G/db/Countries/Syria.lua | 2 + _G/db/Countries/Thailand.lua | 2 + _G/db/Countries/The Netherlands.lua | 2 + _G/db/Countries/Third Reich.lua | 2 + _G/db/Countries/Tunisia.lua | 2 + _G/db/Countries/Turkey.lua | 2 + _G/db/Countries/UK.lua | 2 + _G/db/Countries/USA.lua | 2 + _G/db/Countries/USAF Aggressors.lua | 22 +- _G/db/Countries/USSR.lua | 2 + _G/db/Countries/Ukraine.lua | 2 + _G/db/Countries/United Arab Emirates.lua | 2 + .../Countries/United Nations Peacekeepers.lua | 22 +- _G/db/Countries/Venezuela.lua | 2 + _G/db/Countries/Vietnam.lua | 2 + _G/db/Countries/Yemen.lua | 2 + _G/db/Countries/Yugoslavia.lua | 2 + _G/db/Pods/Pod/ALQ-167 (non-functional).lua | 4 - .../Sensor/ANAVQ-23 Pave Spike - Sensor.lua | 7 +- _G/db/Units/Cars/Car/Gepard.lua | 3 +- _G/db/Units/Cars/Car/L118_Unit.lua | 73 +- _G/db/Units/Cars/Car/LARC-V.lua | 24 +- _G/db/Units/Cars/Car/Leopard1A3.lua | 4 +- _G/db/Units/Cars/Car/NASAMS_LN_B.lua | 10 +- _G/db/Units/Cars/Car/NASAMS_LN_C.lua | 10 +- _G/db/Units/Cars/Car/SNR_75V.lua | 1 + _G/db/Units/Cars/Car/flak38.lua | 3 - _G/db/Units/GT_t/WS_t/L118/LN/1.lua | 19 + _G/db/Units/GT_t/WS_t/ship_Sea_Cat/LN/1.lua | 4 + _G/db/Units/GT_t/WS_t/ship_Sea_Dart/LN/1.lua | 3 +- _G/db/Units/Helicopters/Helicopter/AH-1W.lua | 9 + .../Helicopters/Helicopter/AH-64D_BLK_II.lua | 4 +- .../Helicopters/Helicopter/CH-47Fbl1.lua | 157 +- _G/db/Units/Helicopters/Helicopter/Ka-27.lua | 51 +- _G/db/Units/Helicopters/Helicopter/OH-58D.lua | 17 +- _G/db/Units/Helicopters/Helicopter/OH58D.lua | 344 +++-- _G/db/Units/Helicopters/Helicopter/SH-60B.lua | 17 +- _G/db/Units/Planes/Plane/AJS37.lua | 4 +- _G/db/Units/Planes/Plane/AV8BNA.lua | 6 +- _G/db/Units/Planes/Plane/B-52H.lua | 18 +- _G/db/Units/Planes/Plane/C-101CC.lua | 18 +- _G/db/Units/Planes/Plane/C-101EB.lua | 18 +- .../Units/Planes/Plane/Christen Eagle II.lua | 8 +- _G/db/Units/Planes/Plane/F-117A.lua | 90 +- _G/db/Units/Planes/Plane/F-14A-135-GR.lua | 594 +++++++- _G/db/Units/Planes/Plane/F-14B.lua | 594 +++++++- _G/db/Units/Planes/Plane/F-15ESE.lua | 12 +- _G/db/Units/Planes/Plane/F-16A MLU.lua | 55 +- _G/db/Units/Planes/Plane/F-16A.lua | 55 +- _G/db/Units/Planes/Plane/F-16C bl.50.lua | 55 +- _G/db/Units/Planes/Plane/F-16C bl.52d.lua | 55 +- _G/db/Units/Planes/Plane/F-16C_50.lua | 6 +- _G/db/Units/Planes/Plane/F-4E-45MC.lua | 39 +- _G/db/Units/Planes/Plane/FA-18C_hornet.lua | 156 +- _G/db/Units/Planes/Plane/H-6J.lua | 8 +- _G/db/Units/Planes/Plane/Hawk.lua | 4 +- _G/db/Units/Planes/Plane/J-11A.lua | 6 +- _G/db/Units/Planes/Plane/JF-17.lua | 8 +- _G/db/Units/Planes/Plane/KJ-2000.lua | 8 +- _G/db/Units/Planes/Plane/MB-339A.lua | 6 +- _G/db/Units/Planes/Plane/MB-339APAN.lua | 6 +- _G/db/Units/Planes/Plane/MQ-9 Reaper.lua | 56 +- _G/db/Units/Planes/Plane/MiG-23MLD.lua | 3 + _G/db/Units/Planes/Plane/MiG-25PD.lua | 27 +- _G/db/Units/Planes/Plane/MiG-25RBT.lua | 27 +- _G/db/Units/Planes/Plane/MiG-27K.lua | 51 +- _G/db/Units/Planes/Plane/Mirage 2000-5.lua | 59 +- _G/db/Units/Planes/Plane/Mirage-F1AD.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1AZ.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1B.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1BD.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1BE.lua | 7 +- _G/db/Units/Planes/Plane/Mirage-F1BQ.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1C-200.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1C.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1CE.lua | 7 +- _G/db/Units/Planes/Plane/Mirage-F1CG.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1CH.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1CJ.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1CK.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1CR.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1CT.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1CZ.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1DDA.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1ED.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1EDA.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1EE.lua | 7 +- _G/db/Units/Planes/Plane/Mirage-F1EH.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1EQ.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1JA.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1M-CE.lua | 2 +- _G/db/Units/Planes/Plane/Mirage-F1M-EE.lua | 2 +- _G/db/Units/Planes/Plane/S-3B Tanker.lua | 4 + _G/db/Units/Planes/Plane/S-3B.lua | 4 + _G/db/Units/Planes/Plane/Su-17M4.lua | 51 +- _G/db/Units/Planes/Plane/Su-30.lua | 42 +- _G/db/Units/Planes/Plane/Su-34.lua | 2 +- _G/db/Units/Planes/Plane/Tu-142.lua | 55 +- _G/db/Units/Planes/Plane/Tu-160.lua | 53 +- _G/db/Units/Planes/Plane/Tu-22M3.lua | 73 +- _G/db/Units/Planes/Plane/Tu-95MS.lua | 55 +- _G/db/Units/Ships/Ship/CastleClass_01.lua | 10 +- _G/db/Units/Ships/Ship/PERRY.lua | 13 +- .../Ships/Ship/USS_Arleigh_Burke_IIa.lua | 318 ++-- _G/db/Units/Ships/Ship/USS_Samuel_Chase.lua | 104 +- _G/db/Units/Ships/Ship/atconveyor.lua | 244 ++++ .../Units/Ships/Ship/leander-gun-achilles.lua | 6 +- .../Ships/Ship/leander-gun-andromeda.lua | 13 +- .../Units/Ships/Ship/leander-gun-ariadne.lua | 13 +- .../Units/Ships/Ship/leander-gun-condell.lua | 8 +- _G/db/Units/Ships/Ship/leander-gun-lynch.lua | 8 +- _G/launcher/DIS_C-701IR.lua | 2 +- _G/launcher/DIS_C-701T.lua | 2 +- _G/launcher/DIS_CM-400AKG.lua | 5 +- _G/launcher/DIS_DF4B_YJ12.lua | 2 +- _G/launcher/DIS_HJ-12.lua | 3 +- _G/launcher/DIS_YJ12.lua | 2 +- _G/launcher/{BRU-32 CBU-99}.lua | 214 +++ _G/launcher/{BRU3242_2CBU99 LS}.lua | 212 +++ _G/launcher/{BRU3242_2CBU99 RS}.lua | 212 +++ _G/launcher/{BRU42_2CBU99 LS}.lua | 214 +++ _G/launcher/{BRU42_2CBU99 RS}.lua | 214 +++ _G/launcher/{BRU55_2AGM-154A}.lua | 6 +- _G/launcher/{BRU55_2GBU-32}.lua | 380 +++++ _G/launcher/{F14-ALQ167-POD}.lua | 24 + _G/launcher/{F14-ALQ167}.lua | 25 +- _G/launcher/{GBU_15_V_1B}.lua | 17 + _G/launcher/{GBU_8_B}.lua | 17 + .../{HB_ALQ-131_ON_ADAPTER_IN_AERO7}.lua | 3 +- _G/launcher/{HB_F4EAGM-65A_LAU88_2x_Left}.lua | 2 +- .../{HB_F4EAGM-65A_LAU88_2x_Right}.lua | 2 +- _G/launcher/{HB_F4EAGM-65A_LAU88_3x_Left}.lua | 2 +- .../{HB_F4EAGM-65A_LAU88_3x_Right}.lua | 2 +- _G/launcher/{HB_F4EAGM-65B_LAU88_2x_Left}.lua | 2 +- .../{HB_F4EAGM-65B_LAU88_2x_Right}.lua | 2 +- _G/launcher/{HB_F4EAGM-65B_LAU88_3x_Left}.lua | 2 +- .../{HB_F4EAGM-65B_LAU88_3x_Right}.lua | 2 +- _G/launcher/{HB_F4EAGM-65D_LAU88_2x_Left}.lua | 2 +- .../{HB_F4EAGM-65D_LAU88_2x_Right}.lua | 2 +- _G/launcher/{HB_F4EAGM-65D_LAU88_3x_Left}.lua | 2 +- .../{HB_F4EAGM-65D_LAU88_3x_Right}.lua | 2 +- _G/launcher/{HB_F4E_AGM-65A_LAU117_SWA}.lua | 2 +- _G/launcher/{HB_F4E_AGM-65A_LAU117}.lua | 2 +- _G/launcher/{HB_F4E_AGM-65B_LAU117_SWA}.lua | 2 +- _G/launcher/{HB_F4E_AGM-65B_LAU117}.lua | 2 +- _G/launcher/{HB_F4E_AGM-65D_LAU117_SWA}.lua | 2 +- _G/launcher/{HB_F4E_AGM-65D_LAU117}.lua | 2 +- _G/launcher/{HB_F4E_AGM-65G_LAU117}.lua | 2 +- _G/launcher/{HB_F4E_AGM_12C}.lua | 31 - ...B_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}.lua | 5 +- _G/launcher/{HB_PAVE_SPIKE_FAST_TRACK}.lua | 4 +- .../{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}.lua | 3 +- _G/launcher/{HB_PAVE_SPIKE}.lua | 2 + _G/launcher/{LAU-7_AIM-9L_Left}.lua | 1 + _G/launcher/{LAU-7_AIM-9L_Right}.lua | 1 + _G/launcher/{LAU-7_AIM-9M_Left}.lua | 1 + _G/launcher/{LAU-7_AIM-9M_Right}.lua | 1 + _G/launcher/{LAU_34_AGM_45A_SWA}.lua | 2 + _G/launcher/{LAU_34_AGM_45A}.lua | 2 + _G/launcher/{MAK79_CBU99 1L}.lua | 212 +++ _G/launcher/{MAK79_CBU99 1R}.lua | 212 +++ _G/launcher/{MAK79_CBU99 2L}.lua | 216 +++ _G/launcher/{MAK79_CBU99 2R}.lua | 216 +++ _G/launcher/{PHXBRU3242_2CBU99 LS}.lua | 212 +++ _G/launcher/{PHXBRU3242_2CBU99 RS}.lua | 212 +++ _G/launcher/{SMOKE-GREEN-MB339}.lua | 6 +- _G/launcher/{SMOKE-RED-MB339}.lua | 6 +- _G/launcher/{SUU_23_POD}.lua | 6 +- _G/rockets/AGM_12C.lua | 149 -- _G/rockets/AGM_45A.lua | 40 +- _G/rockets/AGM_45B.lua | 1 + _G/rockets/AGM_78A.lua | 12 +- _G/rockets/AGM_78B.lua | 1 + _G/rockets/AGM_84H.lua | 7 +- _G/rockets/AGM_88.lua | 1 + _G/rockets/BK90_MJ1.lua | 2 +- _G/rockets/BK90_MJ1_MJ2.lua | 2 +- _G/rockets/BK90_MJ2.lua | 2 +- _G/rockets/CM-400AKG.lua | 14 +- _G/rockets/P_24R.lua | 3 +- _G/rockets/P_24T.lua | 3 +- _G/rockets/SA9M311.lua | 5 +- _G/rockets/SM_1.lua | 6 +- _G/rockets/SM_2.lua | 6 +- _G/rockets/SM_2ER.lua | 18 +- _G/rockets/SM_6.lua | 18 +- _G/warheads/Mk_84.lua | 2 +- .../aircraft_gunpods/{SUU_23_POD}.lua | 4 +- .../weapons/bombs/GBU_15_V_1_B.lua | 271 ++++ .../weapons/bombs/GBU_15_V_31_B.lua | 6 + _G/weapons_table/weapons/bombs/GBU_8_B.lua | 219 +++ _G/weapons_table/weapons/missiles/AGM_12C.lua | 314 ---- _G/weapons_table/weapons/missiles/AGM_45A.lua | 80 +- _G/weapons_table/weapons/missiles/AGM_45B.lua | 2 + _G/weapons_table/weapons/missiles/AGM_78A.lua | 24 +- _G/weapons_table/weapons/missiles/AGM_78B.lua | 2 + _G/weapons_table/weapons/missiles/AGM_84H.lua | 14 +- _G/weapons_table/weapons/missiles/AGM_84S.lua | 22 +- _G/weapons_table/weapons/missiles/AGM_88.lua | 24 +- .../weapons/missiles/BK90_MJ1.lua | 4 +- .../weapons/missiles/BK90_MJ1_MJ2.lua | 4 +- .../weapons/missiles/BK90_MJ2.lua | 4 +- 281 files changed, 7670 insertions(+), 2120 deletions(-) create mode 100644 _G/bombs/GBU_15_V_1_B.lua create mode 100644 _G/bombs/GBU_8_B.lua create mode 100644 _G/db/Countries/New Zealand.lua delete mode 100644 _G/db/Pods/Pod/ALQ-167 (non-functional).lua create mode 100644 _G/db/Units/GT_t/WS_t/L118/LN/1.lua create mode 100644 _G/db/Units/Ships/Ship/atconveyor.lua create mode 100644 _G/launcher/{BRU-32 CBU-99}.lua create mode 100644 _G/launcher/{BRU3242_2CBU99 LS}.lua create mode 100644 _G/launcher/{BRU3242_2CBU99 RS}.lua create mode 100644 _G/launcher/{BRU42_2CBU99 LS}.lua create mode 100644 _G/launcher/{BRU42_2CBU99 RS}.lua create mode 100644 _G/launcher/{BRU55_2GBU-32}.lua create mode 100644 _G/launcher/{F14-ALQ167-POD}.lua create mode 100644 _G/launcher/{GBU_15_V_1B}.lua create mode 100644 _G/launcher/{GBU_8_B}.lua delete mode 100644 _G/launcher/{HB_F4E_AGM_12C}.lua create mode 100644 _G/launcher/{MAK79_CBU99 1L}.lua create mode 100644 _G/launcher/{MAK79_CBU99 1R}.lua create mode 100644 _G/launcher/{MAK79_CBU99 2L}.lua create mode 100644 _G/launcher/{MAK79_CBU99 2R}.lua create mode 100644 _G/launcher/{PHXBRU3242_2CBU99 LS}.lua create mode 100644 _G/launcher/{PHXBRU3242_2CBU99 RS}.lua delete mode 100644 _G/rockets/AGM_12C.lua create mode 100644 _G/weapons_table/weapons/bombs/GBU_15_V_1_B.lua create mode 100644 _G/weapons_table/weapons/bombs/GBU_8_B.lua delete mode 100644 _G/weapons_table/weapons/missiles/AGM_12C.lua diff --git a/_G/Pylons/BRU_55.lua b/_G/Pylons/BRU_55.lua index a82163a4..43bfa031 100644 --- a/_G/Pylons/BRU_55.lua +++ b/_G/Pylons/BRU_55.lua @@ -1,5 +1,5 @@ _G["Pylons"]["BRU_55"] = { - DrawArgs = { { 3, 0.1 } }, + DrawArgs = { { 3, 0.2 } }, IsAdapter = true, ShapeName = "BRU_55", _unique_resource_name = "weapons.adapters.BRU_55", diff --git a/_G/__DCS_VERSION__.lua b/_G/__DCS_VERSION__.lua index 3b1e4bed..310a4b1b 100644 --- a/_G/__DCS_VERSION__.lua +++ b/_G/__DCS_VERSION__.lua @@ -1 +1 @@ -2.9.8.1214 \ No newline at end of file +2.9.9.2280 \ No newline at end of file diff --git a/_G/bombs/GBU_15_V_1_B.lua b/_G/bombs/GBU_15_V_1_B.lua new file mode 100644 index 00000000..5e83763b --- /dev/null +++ b/_G/bombs/GBU_15_V_1_B.lua @@ -0,0 +1,19 @@ +_G["bombs"]["#Index"] = { + Ag = -2, + Cx = 0.00461, + LaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 800, 1200, 5400, 8200, 10600, 12400, 14000, 15600, 17000, 200, 1200, 2000, 5800, 8400, 10800, 12800, 14400, 15800, 17400, 300, 1600, 3600, 6000, 8800, 11000, 13000, 14600, 16000, 17600, 400, 2000, 3800, 6400, 9000, 11200, 13200, 14800, 16400, 17800, 500, 2400, 4200, 6600, 9200, 11600, 13400, 15000, 16600, 18000, 600, 2600, 4400, 6800, 9400, 11800, 13800, 15400, 16800, 18400, 700, 2800, 4800, 7000, 9600, 12000, 14000, 15600, 17000, 18600, 800, 3200, 5000, 7200, 9800, 12200, 14200, 15800, 17400, 18800, 900, 3400, 5200, 7600, 10000, 12400, 14400, 16000, 17600, 19200, 1000, 3600, 5400, 7800, 10400, 12600, 14600, 16200, 17800, 19400, 2000, 5200, 8400, 11400, 13800, 15400, 16600, 17600, 18400, 19200, 3000, 6400, 10200, 13600, 16400, 18400, 20000, 21400, 22600, 23800, 4000, 7000, 11800, 15200, 18200, 20600, 22200, 23600, 25000, 25800, 5000, 8400, 12800, 16400, 19400, 21600, 23200, 24600, 25600, 26200, 6000, 9800, 13800, 17000, 20000, 22000, 23600, 24800, 25800, 27400, 7000, 11200, 14600, 17600, 20400, 22400, 24000, 25200, 26800, 28600, 8000, 12800, 15600, 18400, 21000, 22800, 24400, 26000, 27800, 29600, 9000, 14200, 16600, 19000, 21200, 23600, 25200, 26800, 28800, 30800, 10000, 15400, 17400, 19600, 21800, 24000, 25800, 27600, 29800, 32000 }, + MinLaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 850, 1000, 1150, 1300, 1500, 1800, 2050, 2350, 200, 850, 1050, 1250, 1450, 1600, 1800, 2350, 2850, 3300, 300, 1000, 1200, 1450, 1650, 1850, 2050, 2350, 3100, 3700, 400, 1100, 1350, 1600, 1800, 2000, 2200, 2550, 3200, 3850, 500, 1250, 1450, 1700, 1950, 2150, 2400, 2750, 3150, 4000, 600, 1350, 1550, 1800, 2050, 2300, 2500, 2900, 3350, 4050, 700, 1450, 1650, 1900, 2150, 2400, 2650, 3050, 3500, 4150, 800, 1550, 1700, 2000, 2250, 2500, 2750, 3200, 3650, 4150, 900, 1600, 1800, 2050, 2350, 2600, 2850, 3300, 3800, 4300, 1000, 1750, 1900, 2150, 2450, 2700, 2950, 3400, 3950, 4450, 2000, 2350, 3000, 3450, 3600, 3750, 3850, 4200, 4850, 5550, 3000, 2750, 3650, 4450, 5000, 5300, 5450, 5600, 5700, 6250, 4000, 3050, 4200, 5200, 6000, 6600, 6950, 7200, 7300, 7450, 5000, 3300, 4600, 5800, 6800, 7550, 8250, 8650, 8950, 9100, 6000, 3450, 4950, 6250, 7350, 8300, 9150, 9900, 10400, 10700, 7000, 3600, 5200, 6700, 7900, 9000, 10000, 10900, 11800, 12200, 8000, 3700, 5450, 7050, 8400, 9600, 10700, 11800, 12950, 13650, 9000, 3750, 5700, 7350, 8900, 10200, 11400, 12600, 13900, 15050, 10000, 3800, 5850, 7650, 9300, 10700, 12100, 13400, 14800, 16100 }, + Name = "Redacted", + VyHold = -100, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + display_name = "GBU-15(V)1/B", + display_name_short = "GBU-15(V)1/B", + hMax = 10000, + hMin = 100, + mass = 1123, + name = "GBU_15_V_1_B", + type = 3, + warhead = "_G/warheads/Mk_84.lua", + ws_type = { 4, 5, 36, "Redacted" } +} \ No newline at end of file diff --git a/_G/bombs/GBU_8_B.lua b/_G/bombs/GBU_8_B.lua new file mode 100644 index 00000000..386d829f --- /dev/null +++ b/_G/bombs/GBU_8_B.lua @@ -0,0 +1,19 @@ +_G["bombs"]["#Index"] = { + Ag = -1.5, + Cx = 0.00461, + LaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 850, 1850, 3900, 5650, 7000, 8150, 9200, 10250, 200, 900, 1150, 2250, 4400, 6100, 7400, 8550, 9550, 10600, 300, 1100, 1350, 2550, 4750, 6400, 7750, 8850, 9850, 10900, 400, 1250, 1550, 2800, 5050, 6700, 8000, 9100, 10150, 11200, 500, 1350, 1750, 3050, 5350, 7000, 8250, 9400, 10400, 11450, 600, 1500, 1900, 3300, 5600, 7250, 8500, 9600, 10600, 11650, 700, 1600, 2050, 3550, 5850, 7500, 8750, 9850, 10850, 11900, 800, 1700, 2200, 3800, 6100, 7750, 9000, 10100, 11100, 12150, 900, 1800, 2300, 4050, 6350, 7950, 9250, 10300, 11300, 12350, 1000, 1900, 2450, 4300, 6600, 8200, 9450, 10550, 11500, 12550, 2000, 3150, 4350, 7050, 9100, 10600, 11750, 12700, 13650, 14700, 3000, 4800, 7100, 9950, 11750, 13050, 14100, 15000, 15900, 16900, 4000, 6650, 10050, 12750, 14350, 15600, 16550, 17400, 18200, 19150, 5000, 8750, 13000, 15300, 16900, 18100, 19000, 20150, 21500, 22850, 6000, 11100, 15600, 17700, 19350, 20900, 22100, 23250, 24400, 25650, 7000, 13800, 17800, 19950, 21600, 22950, 24100, 25250, 26450, 27800, 8000, 16450, 19750, 21650, 23150, 24450, 25700, 26900, 28200, 29700, 9000, 18550, 21100, 22900, 24400, 25800, 27050, 28350, 29800, 31450, 10000, 19850, 22100, 23900, 25400, 26800, 28150, 29550, 31200, 33000 }, + MinLaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 800, 1000, 1150, 1300, 1500, 1600, 1800, 2000, 200, 900, 1100, 1300, 1500, 1700, 1900, 2000, 2200, 2450, 300, 1050, 1350, 1550, 1800, 1950, 2200, 2300, 2500, 2800, 400, 1200, 1500, 1750, 2000, 2200, 2450, 2550, 2800, 3100, 500, 1350, 1650, 1950, 2200, 2400, 2650, 2750, 3000, 3300, 600, 1450, 1800, 2100, 2350, 2600, 2800, 2950, 3200, 3550, 700, 1550, 1900, 2250, 2500, 2750, 3000, 3100, 3400, 3700, 800, 1650, 2000, 2350, 2650, 2900, 3150, 3250, 3550, 3900, 900, 1750, 2150, 2450, 2750, 3000, 3250, 3400, 3700, 4050, 1000, 1850, 2250, 2550, 2900, 3150, 3400, 3550, 3850, 4200, 2000, 2550, 3250, 3850, 4250, 4350, 4350, 4450, 4850, 5350, 3000, 3050, 3950, 4800, 5450, 6100, 6450, 6500, 6500, 6500, 4000, 3350, 4500, 5500, 6350, 7100, 7800, 8450, 8650, 8650, 5000, 3650, 4950, 6100, 7100, 8000, 8800, 9550, 10400, 10800, 6000, 3800, 5300, 6600, 7750, 8750, 9750, 10600, 11550, 12550, 7000, 4050, 5650, 7050, 8300, 9450, 10450, 11500, 12650, 13850, 8000, 4200, 5950, 7450, 8850, 10050, 11200, 12350, 13650, 15000, 9000, 4350, 6200, 7850, 9300, 10700, 11950, 13250, 14650, 16150, 10000, 4500, 6400, 8250, 9800, 11250, 12650, 14150, 15600, 17250 }, + Name = "Redacted", + VyHold = -50, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + display_name = "GBU-8/B", + display_name_short = "GBU-8/B", + hMax = 10000, + hMin = 100, + mass = 1027, + name = "GBU_8_B", + type = 3, + warhead = "_G/warheads/Mk_84.lua", + ws_type = { 4, 5, 36, "Redacted" } +} \ No newline at end of file diff --git a/_G/db/Countries/Abkhazia.lua b/_G/db/Countries/Abkhazia.lua index 59784234..a47a9ca0 100644 --- a/_G/db/Countries/Abkhazia.lua +++ b/_G/db/Countries/Abkhazia.lua @@ -1290,6 +1290,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Afghanistan.lua b/_G/db/Countries/Afghanistan.lua index c516e454..6179a2e7 100644 --- a/_G/db/Countries/Afghanistan.lua +++ b/_G/db/Countries/Afghanistan.lua @@ -1166,6 +1166,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Algeria.lua b/_G/db/Countries/Algeria.lua index 559cfe71..985f8afd 100644 --- a/_G/db/Countries/Algeria.lua +++ b/_G/db/Countries/Algeria.lua @@ -1598,6 +1598,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Argentina.lua b/_G/db/Countries/Argentina.lua index 8caf3aa6..8d4bd634 100644 --- a/_G/db/Countries/Argentina.lua +++ b/_G/db/Countries/Argentina.lua @@ -1168,6 +1168,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "santafe" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Australia.lua b/_G/db/Countries/Australia.lua index 6cc069ec..f38500e6 100644 --- a/_G/db/Countries/Australia.lua +++ b/_G/db/Countries/Australia.lua @@ -547,6 +547,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "HEMTT_C-RAM_Phalanx", in_service = 0, out_of_service = 40000 + }, { + Name = "soldier_wwii_br_01", + in_service = 0, + out_of_service = 40000 }, { Name = "TugHarlan_drivable" }, { @@ -1426,6 +1430,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "LST_Mk2" }, { diff --git a/_G/db/Countries/Austria.lua b/_G/db/Countries/Austria.lua index 3d25b135..c77c310a 100644 --- a/_G/db/Countries/Austria.lua +++ b/_G/db/Countries/Austria.lua @@ -1040,6 +1040,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Bahrain.lua b/_G/db/Countries/Bahrain.lua index aa2557e9..29f3f281 100644 --- a/_G/db/Countries/Bahrain.lua +++ b/_G/db/Countries/Bahrain.lua @@ -1094,6 +1094,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Belarus.lua b/_G/db/Countries/Belarus.lua index 78db9ff2..c3cf77cf 100644 --- a/_G/db/Countries/Belarus.lua +++ b/_G/db/Countries/Belarus.lua @@ -1446,6 +1446,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Belgium.lua b/_G/db/Countries/Belgium.lua index a39b4bf6..5a3aa6f6 100644 --- a/_G/db/Countries/Belgium.lua +++ b/_G/db/Countries/Belgium.lua @@ -1230,6 +1230,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "LST_Mk2" }, { diff --git a/_G/db/Countries/Bolivia.lua b/_G/db/Countries/Bolivia.lua index cf08eac8..3dd10fe6 100644 --- a/_G/db/Countries/Bolivia.lua +++ b/_G/db/Countries/Bolivia.lua @@ -1248,6 +1248,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Brazil.lua b/_G/db/Countries/Brazil.lua index bf9318b4..9fa59e23 100644 --- a/_G/db/Countries/Brazil.lua +++ b/_G/db/Countries/Brazil.lua @@ -937,6 +937,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "UH-60A", in_service = 0, out_of_service = 40000 + }, { + Name = "SH-60B", + in_service = 0, + out_of_service = 40000 }, { Name = "AH-64D_BLK_II" }, { @@ -1126,6 +1130,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Bulgaria.lua b/_G/db/Countries/Bulgaria.lua index e5ba1049..6987c8a3 100644 --- a/_G/db/Countries/Bulgaria.lua +++ b/_G/db/Countries/Bulgaria.lua @@ -1316,6 +1316,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC" }, { diff --git a/_G/db/Countries/Canada.lua b/_G/db/Countries/Canada.lua index cbc6f64e..8579016c 100644 --- a/_G/db/Countries/Canada.lua +++ b/_G/db/Countries/Canada.lua @@ -365,6 +365,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "FPS-117 Dome", in_service = 0, out_of_service = 40000 + }, { + Name = "soldier_wwii_br_01", + in_service = 0, + out_of_service = 40000 }, { Name = "TugHarlan_drivable" }, { @@ -1244,6 +1248,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "USS_Samuel_Chase" }, { diff --git a/_G/db/Countries/Chile.lua b/_G/db/Countries/Chile.lua index 3eeb88ab..a8fdcc2a 100644 --- a/_G/db/Countries/Chile.lua +++ b/_G/db/Countries/Chile.lua @@ -1212,6 +1212,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/China.lua b/_G/db/Countries/China.lua index bc6df98a..b3e77a8b 100644 --- a/_G/db/Countries/China.lua +++ b/_G/db/Countries/China.lua @@ -1394,6 +1394,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Combined Joint Task Forces Blue.lua b/_G/db/Countries/Combined Joint Task Forces Blue.lua index 0ede849a..9bafbdaa 100644 --- a/_G/db/Countries/Combined Joint Task Forces Blue.lua +++ b/_G/db/Countries/Combined Joint Task Forces Blue.lua @@ -1237,6 +1237,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Leclerc", in_service = 0, out_of_service = 40000 + }, { + Name = "soldier_wwii_br_01", + in_service = 0, + out_of_service = 40000 }, { Name = "Soldier M4 GRG", in_service = 0, @@ -1270,19 +1274,19 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "T155_Firtina", + Name = "M1126 Stryker ICV", in_service = 0, out_of_service = 40000 }, { - Name = "leopard-2A4_trs", + Name = "T155_Firtina", in_service = 0, out_of_service = 40000 }, { - Name = "Challenger2", + Name = "leopard-2A4_trs", in_service = 0, out_of_service = 40000 }, { - Name = "M1126 Stryker ICV", + Name = "Challenger2", in_service = 0, out_of_service = 40000 }, { @@ -1337,10 +1341,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "MCV-80", in_service = 0, out_of_service = 40000 - }, { - Name = "soldier_wwii_br_01", - in_service = 0, - out_of_service = 40000 } } }, Effects = { @@ -2537,6 +2537,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "H-6J", in_service = 0, out_of_service = 40000 + }, { + Name = "F-16C", + in_service = 0, + out_of_service = 40000 }, { Name = "Mirage-F1CZ", in_service = 0, @@ -2606,6 +2610,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC", in_service = 0, diff --git a/_G/db/Countries/Combined Joint Task Forces Red.lua b/_G/db/Countries/Combined Joint Task Forces Red.lua index 20a7a88b..b85092d1 100644 --- a/_G/db/Countries/Combined Joint Task Forces Red.lua +++ b/_G/db/Countries/Combined Joint Task Forces Red.lua @@ -1237,6 +1237,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Leclerc", in_service = 0, out_of_service = 40000 + }, { + Name = "soldier_wwii_br_01", + in_service = 0, + out_of_service = 40000 }, { Name = "Soldier M4 GRG", in_service = 0, @@ -1270,19 +1274,19 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "T155_Firtina", + Name = "M1126 Stryker ICV", in_service = 0, out_of_service = 40000 }, { - Name = "leopard-2A4_trs", + Name = "T155_Firtina", in_service = 0, out_of_service = 40000 }, { - Name = "Challenger2", + Name = "leopard-2A4_trs", in_service = 0, out_of_service = 40000 }, { - Name = "M1126 Stryker ICV", + Name = "Challenger2", in_service = 0, out_of_service = 40000 }, { @@ -1337,10 +1341,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "MCV-80", in_service = 0, out_of_service = 40000 - }, { - Name = "soldier_wwii_br_01", - in_service = 0, - out_of_service = 40000 } } }, Effects = { @@ -2537,6 +2537,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "H-6J", in_service = 0, out_of_service = 40000 + }, { + Name = "F-16C", + in_service = 0, + out_of_service = 40000 }, { Name = "Mirage-F1CZ", in_service = 0, @@ -2606,6 +2610,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC", in_service = 0, diff --git a/_G/db/Countries/Croatia.lua b/_G/db/Countries/Croatia.lua index 354a0297..5ee6107a 100644 --- a/_G/db/Countries/Croatia.lua +++ b/_G/db/Countries/Croatia.lua @@ -1048,6 +1048,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Cuba.lua b/_G/db/Countries/Cuba.lua index bf7e6ae0..5c009cf6 100644 --- a/_G/db/Countries/Cuba.lua +++ b/_G/db/Countries/Cuba.lua @@ -1276,6 +1276,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Cyprus.lua b/_G/db/Countries/Cyprus.lua index 0482a002..981b9a0b 100644 --- a/_G/db/Countries/Cyprus.lua +++ b/_G/db/Countries/Cyprus.lua @@ -1108,6 +1108,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Czech Republic.lua b/_G/db/Countries/Czech Republic.lua index 9c51100d..9e803086 100644 --- a/_G/db/Countries/Czech Republic.lua +++ b/_G/db/Countries/Czech Republic.lua @@ -1184,6 +1184,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "LST_Mk2" }, { diff --git a/_G/db/Countries/Denmark.lua b/_G/db/Countries/Denmark.lua index 82b18eb0..c9f57958 100644 --- a/_G/db/Countries/Denmark.lua +++ b/_G/db/Countries/Denmark.lua @@ -1182,6 +1182,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Ecuador.lua b/_G/db/Countries/Ecuador.lua index e9022632..8e8f8b05 100644 --- a/_G/db/Countries/Ecuador.lua +++ b/_G/db/Countries/Ecuador.lua @@ -1060,6 +1060,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Egypt.lua b/_G/db/Countries/Egypt.lua index 1d7e81fb..11733fc4 100644 --- a/_G/db/Countries/Egypt.lua +++ b/_G/db/Countries/Egypt.lua @@ -1406,6 +1406,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Ethiopia.lua b/_G/db/Countries/Ethiopia.lua index f44d40bb..2665caaf 100644 --- a/_G/db/Countries/Ethiopia.lua +++ b/_G/db/Countries/Ethiopia.lua @@ -1130,6 +1130,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Finland.lua b/_G/db/Countries/Finland.lua index c7eaa654..5dc38c70 100644 --- a/_G/db/Countries/Finland.lua +++ b/_G/db/Countries/Finland.lua @@ -1230,6 +1230,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC" }, { diff --git a/_G/db/Countries/France.lua b/_G/db/Countries/France.lua index e64c723f..2b98d273 100644 --- a/_G/db/Countries/France.lua +++ b/_G/db/Countries/France.lua @@ -1276,6 +1276,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "LST_Mk2" }, { diff --git a/_G/db/Countries/GDR.lua b/_G/db/Countries/GDR.lua index 7d77849a..3ef6b1b2 100644 --- a/_G/db/Countries/GDR.lua +++ b/_G/db/Countries/GDR.lua @@ -1302,6 +1302,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Georgia.lua b/_G/db/Countries/Georgia.lua index 3b36a854..0bbeda78 100644 --- a/_G/db/Countries/Georgia.lua +++ b/_G/db/Countries/Georgia.lua @@ -1436,6 +1436,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Germany.lua b/_G/db/Countries/Germany.lua index c0949d6d..ec3a9710 100644 --- a/_G/db/Countries/Germany.lua +++ b/_G/db/Countries/Germany.lua @@ -1596,6 +1596,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC" }, { diff --git a/_G/db/Countries/Ghana.lua b/_G/db/Countries/Ghana.lua index 034e0557..2c32a4a7 100644 --- a/_G/db/Countries/Ghana.lua +++ b/_G/db/Countries/Ghana.lua @@ -1048,6 +1048,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Greece.lua b/_G/db/Countries/Greece.lua index 7b38bd34..8ccf4595 100644 --- a/_G/db/Countries/Greece.lua +++ b/_G/db/Countries/Greece.lua @@ -1412,6 +1412,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Honduras.lua b/_G/db/Countries/Honduras.lua index 271f1550..33366837 100644 --- a/_G/db/Countries/Honduras.lua +++ b/_G/db/Countries/Honduras.lua @@ -1018,6 +1018,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Hungary.lua b/_G/db/Countries/Hungary.lua index 11cad71f..2acfa01e 100644 --- a/_G/db/Countries/Hungary.lua +++ b/_G/db/Countries/Hungary.lua @@ -1266,6 +1266,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC" }, { diff --git a/_G/db/Countries/India.lua b/_G/db/Countries/India.lua index 77942e2f..4127e55a 100644 --- a/_G/db/Countries/India.lua +++ b/_G/db/Countries/India.lua @@ -1218,6 +1218,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Indonesia.lua b/_G/db/Countries/Indonesia.lua index 4bd07d8a..aac35e7f 100644 --- a/_G/db/Countries/Indonesia.lua +++ b/_G/db/Countries/Indonesia.lua @@ -1222,6 +1222,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Insurgents.lua b/_G/db/Countries/Insurgents.lua index 401d9c9b..64f3d34e 100644 --- a/_G/db/Countries/Insurgents.lua +++ b/_G/db/Countries/Insurgents.lua @@ -1182,6 +1182,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Iran.lua b/_G/db/Countries/Iran.lua index 4692603f..010602e3 100644 --- a/_G/db/Countries/Iran.lua +++ b/_G/db/Countries/Iran.lua @@ -1318,6 +1318,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Iraq.lua b/_G/db/Countries/Iraq.lua index b351aa93..b9a3dc79 100644 --- a/_G/db/Countries/Iraq.lua +++ b/_G/db/Countries/Iraq.lua @@ -1268,6 +1268,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Israel.lua b/_G/db/Countries/Israel.lua index 684848d8..8f4e2364 100644 --- a/_G/db/Countries/Israel.lua +++ b/_G/db/Countries/Israel.lua @@ -1278,6 +1278,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Italian Social Republic.lua b/_G/db/Countries/Italian Social Republic.lua index 38715aef..a6c022a7 100644 --- a/_G/db/Countries/Italian Social Republic.lua +++ b/_G/db/Countries/Italian Social Republic.lua @@ -1026,6 +1026,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC" }, { diff --git a/_G/db/Countries/Italy.lua b/_G/db/Countries/Italy.lua index eb4f099e..7e81cc8b 100644 --- a/_G/db/Countries/Italy.lua +++ b/_G/db/Countries/Italy.lua @@ -1324,6 +1324,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Japan.lua b/_G/db/Countries/Japan.lua index f234220e..f68aafe1 100644 --- a/_G/db/Countries/Japan.lua +++ b/_G/db/Countries/Japan.lua @@ -1246,6 +1246,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC" }, { diff --git a/_G/db/Countries/Jordan.lua b/_G/db/Countries/Jordan.lua index dae75246..812567a6 100644 --- a/_G/db/Countries/Jordan.lua +++ b/_G/db/Countries/Jordan.lua @@ -1138,6 +1138,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Kazakhstan.lua b/_G/db/Countries/Kazakhstan.lua index d36bc0e7..53806492 100644 --- a/_G/db/Countries/Kazakhstan.lua +++ b/_G/db/Countries/Kazakhstan.lua @@ -1466,6 +1466,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Kuwait.lua b/_G/db/Countries/Kuwait.lua index 565b988b..36a06613 100644 --- a/_G/db/Countries/Kuwait.lua +++ b/_G/db/Countries/Kuwait.lua @@ -1132,6 +1132,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Lebanon.lua b/_G/db/Countries/Lebanon.lua index 44fcbda9..d7a3a106 100644 --- a/_G/db/Countries/Lebanon.lua +++ b/_G/db/Countries/Lebanon.lua @@ -1132,6 +1132,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Libya.lua b/_G/db/Countries/Libya.lua index 8ee746e3..07b97b77 100644 --- a/_G/db/Countries/Libya.lua +++ b/_G/db/Countries/Libya.lua @@ -1140,6 +1140,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "La_Combattante_II" } } diff --git a/_G/db/Countries/Malaysia.lua b/_G/db/Countries/Malaysia.lua index 47ac2d3f..9f8e176e 100644 --- a/_G/db/Countries/Malaysia.lua +++ b/_G/db/Countries/Malaysia.lua @@ -1066,6 +1066,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Mexico.lua b/_G/db/Countries/Mexico.lua index 17afdd5a..9e70c7b4 100644 --- a/_G/db/Countries/Mexico.lua +++ b/_G/db/Countries/Mexico.lua @@ -1048,6 +1048,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Morocco.lua b/_G/db/Countries/Morocco.lua index 5bf259b3..13bf2b66 100644 --- a/_G/db/Countries/Morocco.lua +++ b/_G/db/Countries/Morocco.lua @@ -1156,6 +1156,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/New Zealand.lua b/_G/db/Countries/New Zealand.lua new file mode 100644 index 00000000..e8e31626 --- /dev/null +++ b/_G/db/Countries/New Zealand.lua @@ -0,0 +1,1288 @@ +_G["db"]["Countries"]["#Index"] = { + Awards = { <1>{ + countryID = 92, + name = "New Zealand Distinguished Service Decoration", + nativeName = "New Zealand Distinguished Service Decoration", + picture = "New Zealand/awards/NZL05_Distinguished_Service_Decoration.png", + threshold = 800 + }, <2>{ + countryID = 92, + name = "New Zealand Bravery Medal", + nativeName = "New Zealand Bravery Medal", + picture = "New Zealand/awards/NZL02_Bravery_Medal.png", + threshold = 1600 + }, <3>{ + countryID = 92, + name = "New Zealand Gallantry Medal", + nativeName = "New Zealand Gallantry Medal", + picture = "New Zealand/awards/NZL03_Gallantry_Medal.png", + threshold = 2200 + }, <4>{ + countryID = 92, + name = "New Zealand Cross", + nativeName = "New Zealand Cross", + picture = "New Zealand/awards/NZL04_New_Zealand_Cross.png", + threshold = 2600 + }, <5>{ + countryID = 92, + name = "Victoria Cross for New Zealand", + nativeName = "Victoria Cross for New Zealand", + picture = "New Zealand/awards/NZL01_Victoria_Cross.png", + threshold = 3000 + } }, + InternationalName = "New Zealand", + Name = "New Zealand", + OldID = "New Zealand", + Ranks = { <6>{ + name = "Second lieutenant", + nativeName = "Pilot Officer", + pictureRect = { 0, 0, 64, 32 }, + stripes = "New Zealand/stripes.png", + threshold = 0 + }, <7>{ + name = "First lieutenant", + nativeName = "Flying Officer", + pictureRect = { 0, 32, 64, 32 }, + stripes = "New Zealand/stripes.png", + threshold = 15 + }, <8>{ + name = "Captain", + nativeName = "Flight Lieutenant", + pictureRect = { 0, 64, 64, 32 }, + stripes = "New Zealand/stripes.png", + threshold = 30 + }, <9>{ + name = "Major", + nativeName = "Squadron Leader", + pictureRect = { 0, 96, 64, 32 }, + stripes = "New Zealand/stripes.png", + threshold = 60 + }, <10>{ + name = "Lieutenant colonel", + nativeName = "Wing Commander", + pictureRect = { 0, 128, 64, 32 }, + stripes = "New Zealand/stripes.png", + threshold = 120 + }, <11>{ + name = "Colonel", + nativeName = "Group Captain", + pictureRect = { 0, 160, 64, 32 }, + stripes = "New Zealand/stripes.png", + threshold = 240 + } }, + ShortName = "NZL", + Troops = { <12>{ + name = "1 SQN RNZAF", + nativeName = "1 SQN RNZAF", + picture = "New Zealand/troops/1_SQN_RNZAF.png" + }, <13>{ + name = "2 SQN RNZAF", + nativeName = "2 SQN RNZAF", + picture = "New Zealand/troops/2_SQN_RNZAF.png" + }, <14>{ + name = "3 SQN RNZAF", + nativeName = "3 SQN RNZAF", + picture = "New Zealand/troops/3_SQN_RNZAF.png" + }, <15>{ + name = "5 SQN RNZAF", + nativeName = "5 SQN RNZAF", + picture = "New Zealand/troops/5_SQN_RNZAF.png" + }, <16>{ + name = "6 SQN RNZAF", + nativeName = "6 SQN RNZAF", + picture = "New Zealand/troops/6_SQN_RNZAF.png" + }, <17>{ + name = "14 SQN RNZAF", + nativeName = "14 SQN RNZAF", + picture = "New Zealand/troops/14_SQN_RNZAF.png" + }, <18>{ + name = "25 SQN RNZAF", + nativeName = "25 SQN RNZAF", + picture = "New Zealand/troops/25_SQN_RNZAF.png" + }, <19>{ + name = "40 SQN RNZAF", + nativeName = "40 SQN RNZAF", + picture = "New Zealand/troops/40_SQN_RNZAF.png" + }, <20>{ + name = "41 SQN RNZAF", + nativeName = "41 SQN RNZAF", + picture = "New Zealand/troops/41_SQN_RNZAF.png" + }, <21>{ + name = "42 SQN RNZAF", + nativeName = "42 SQN RNZAF", + picture = "New Zealand/troops/42_SQN_RNZAF.png" + }, <22>{ + name = "75 SQN RNZAF", + nativeName = "75 SQN RNZAF", + picture = "New Zealand/troops/75_SQN_RNZAF.png" + }, <23>{ + name = "Central Flying School RNZAF", + nativeName = "Central Flying School RNZAF", + picture = "New Zealand/troops/Central_Flying_School_RNZAF.png" + }, <24>{ + name = "Navigation and Air Electronics Training Squadron RNZAF", + nativeName = "Navigation and Air Electronics Training Squadron RNZAF", + picture = "New Zealand/troops/Navigation_and_Air_Electronics_Training_Squadron_RNZAF.png" + }, <25>{ + name = "RNZAF Boy Entrant School", + nativeName = "RNZAF Boy Entrant School", + picture = "New Zealand/troops/RNZAF_BOY_ENTRANT_SCHOOL.png" + } }, + Units = { + ADEquipments = { + ADEquipment = { { + Name = "Ski Ramp" + }, { + Name = "SA Ski Ramp" + } } + }, + Animals = { + Animal = { { + Name = "Cow" + } } + }, + Cargos = { + Cargo = { { + Name = "uh1h_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "ammo_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "barrels_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "m117_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "iso_container", + in_service = 0, + out_of_service = 40000 + }, { + Name = "iso_container_small", + in_service = 0, + out_of_service = 40000 + }, { + Name = "f_bar_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "container_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tetrapod_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "fueltank_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "oiltank_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "pipes_small_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "pipes_big_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "trunks_small_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "trunks_long_cargo", + in_service = 0, + out_of_service = 40000 + }, { + Name = "l118" + } } + }, + Cars = { + Car = { { + Name = "Bunker", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Sandbox", + in_service = 0, + out_of_service = 40000 + }, { + Name = "house1arm", + in_service = 0, + out_of_service = 40000 + }, { + Name = "house2arm", + in_service = 0, + out_of_service = 40000 + }, { + Name = "outpost_road", + in_service = 0, + out_of_service = 40000 + }, { + Name = "outpost_road_l", + in_service = 0, + out_of_service = 40000 + }, { + Name = "outpost_road_r", + in_service = 0, + out_of_service = 40000 + }, { + Name = "outpost", + in_service = 0, + out_of_service = 40000 + }, { + Name = "houseA_arm", + in_service = 0, + out_of_service = 40000 + }, { + Name = "TACAN_beacon", + in_service = 0, + out_of_service = 40000 + }, { + Name = "LAV-25", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Leopard1A3", + in_service = 0, + out_of_service = 40000 + }, { + Name = "rapier_fsa_launcher", + in_service = 0, + out_of_service = 40000 + }, { + Name = "rapier_fsa_optical_tracker_unit", + in_service = 0, + out_of_service = 40000 + }, { + Name = "rapier_fsa_blindfire_radar", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Land_Rover_101_FC", + in_service = 0, + out_of_service = 40000 + }, { + Name = "soldier_wwii_br_01", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FPS-117", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FPS-117 ECS", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FPS-117 Dome", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_KORD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_DSHK", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HL_ZU-23", + in_service = 0, + out_of_service = 40000 + }, { + Name = "tt_ZU-23", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M 818", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M978 HEMTT Tanker", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Soldier M4", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Soldier M249", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Soldier stinger", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Vulcan", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M-109", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M1126 Stryker ICV", + in_service = 0, + out_of_service = 40000 + }, { + Name = "2B11 mortar", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Hummer", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M1043 HMMWV Armament", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M1045 HMMWV TOW", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M-113", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M4_Sherman", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M4A4_Sherman_FF", + in_service = 0, + out_of_service = 40000 + }, { + Name = "bofors40", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Land_Rover_109_S3", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Daimler_AC", + in_service = 0, + out_of_service = 40000 + }, { + Name = "QF_37_AA", + in_service = 0, + out_of_service = 40000 + }, { + Name = "TugHarlan_drivable" + }, { + Name = "B600_drivable" + }, { + Name = "MJ-1_drivable" + }, { + Name = "P20_drivable" + }, { + Name = "r11_volvo_drivable" + }, { + Name = "Electric locomotive" + }, { + Name = "Locomotive" + }, { + Name = "Coach cargo" + }, { + Name = "Coach cargo open" + }, { + Name = "Coach a tank blue" + }, { + Name = "Coach a tank yellow" + }, { + Name = "Coach a passenger" + }, { + Name = "Coach a platform" + }, { + Name = "L118_Unit" + }, { + Name = "tacr2a" + }, { + Name = "LARC-V" + }, { + Name = "ES44AH" + }, { + Name = "Boxcartrinity" + }, { + Name = "Tankcartrinity" + }, { + Name = "Wellcarnsc" + }, { + Name = "DR_50Ton_Flat_Wagon" + }, { + Name = "DRG_Class_86" + }, { + Name = "German_covered_wagon_G10" + }, { + Name = "German_tank_wagon" + } } + }, + Effects = { + Effect = { { + Name = "big_smoke", + in_service = 0, + out_of_service = 40000 + } } + }, + Fortifications = { + Fortification = { { + Name = ".Command Center", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Hangar A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Tech hangar A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Farm A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Farm B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Garage A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Boiler-house A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Restaurant 1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Comms tower M", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Cafe", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Workshop A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Electric power box", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Supermarket A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Water tower A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "TV tower", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Shelter", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Repair workshop", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Railway station", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Railway crossing A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Railway crossing B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "WC", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small house 1A area", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small house 1A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small house 1B area", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small house 1B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small house 1C area", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small house 2C", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Shop", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Tech combine", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Chemical tank A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small werehouse 1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small werehouse 2", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small werehouse 3", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Small werehouse 4", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Garage B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Garage small A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Garage small B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Pump station", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Oil derrick", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Container red 1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Container red 2", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Container red 3", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Container white", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Container brown", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Barracks 2", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Military staff", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Hangar B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Fuel tank", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Shelter B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Oil platform", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure 1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure 2", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure 3", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure C", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure D", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure E", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure F", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Subsidiary structure G", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Landmine", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FARP Ammo Dump Coating", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FARP Tent", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FARP CP Blindage", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FARP Fuel Depot", + in_service = 0, + out_of_service = 40000 + }, { + Name = "GeneratorF", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Airshow_Cone", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Airshow_Crowd", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Red_Flag", + in_service = 0, + out_of_service = 40000 + }, { + Name = "White_Flag", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Black_Tyre", + in_service = 0, + out_of_service = 40000 + }, { + Name = "White_Tyre", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Black_Tyre_RF", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Black_Tyre_WF", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Windsock", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Beer Bomb" + }, { + Name = "AM32a-60_01" + }, { + Name = "AM32a-60_02" + }, { + Name = "APFC fuel" + }, { + Name = "B600" + }, { + Name = "Barrier A" + }, { + Name = "Barrier B" + }, { + Name = "Barrier C" + }, { + Name = "Barrier D" + }, { + Name = "BoomBarrier_open" + }, { + Name = "BoomBarrier_closed" + }, { + Name = "Building01_PBR" + }, { + Name = "Building02_PBR" + }, { + Name = "Building03_PBR" + }, { + Name = "Building04_PBR" + }, { + Name = "Building05_PBR" + }, { + Name = "Building06_PBR" + }, { + Name = "Building07_PBR" + }, { + Name = "Building08_PBR" + }, { + Name = "Cargo01" + }, { + Name = "Cargo02" + }, { + Name = "Cargo03" + }, { + Name = "Cargo04" + }, { + Name = "Cargo05" + }, { + Name = "Cargo06" + }, { + Name = "Camouflage01" + }, { + Name = "Camouflage02" + }, { + Name = "Camouflage03" + }, { + Name = "Camouflage04" + }, { + Name = "Camouflage05" + }, { + Name = "Camouflage06" + }, { + Name = "Camouflage07" + }, { + Name = "Cone01" + }, { + Name = "Cone02" + }, { + Name = "Container_10ft" + }, { + Name = "Container_20ft" + }, { + Name = "Container_40ft" + }, { + Name = "Container_watchtower" + }, { + Name = "Container_watchtower_lights" + }, { + Name = "Container_office" + }, { + Name = "Container_generator" + }, { + Name = "ElevatedPlatform_down" + }, { + Name = "ElevatedPlatform_up" + }, { + Name = "FireExtinguisher01" + }, { + Name = "FireExtinguisher02" + }, { + Name = "FireExtinguisher03" + }, { + Name = "HESCO_generator" + }, { + Name = "HESCO_post_1" + }, { + Name = "HESCO_wallperimeter_1" + }, { + Name = "HESCO_wallperimeter_2" + }, { + Name = "HESCO_wallperimeter_3" + }, { + Name = "HESCO_wallperimeter_4" + }, { + Name = "HESCO_wallperimeter_5" + }, { + Name = "HESCO_watchtower_1" + }, { + Name = "HESCO_watchtower_2" + }, { + Name = "HESCO_watchtower_3" + }, { + Name = "Jerrycan" + }, { + Name = "Ladder" + }, { + Name = "LHD_LHA" + }, { + Name = "M32-10C_01" + }, { + Name = "M32-10C_02" + }, { + Name = "M32-10C_03" + }, { + Name = "M32-10C_04" + }, { + Name = "MJ-1_01" + }, { + Name = "MJ-1_02" + }, { + Name = "NF-2_LightOn" + }, { + Name = "NF-2_LightOff01" + }, { + Name = "NF-2_LightOff02" + }, { + Name = "Oil Barrel" + }, { + Name = "Pile of Woods" + }, { + Name = "P20_01" + }, { + Name = "Revetment_x4" + }, { + Name = "Revetment_x8" + }, { + Name = "r11_volvo" + }, { + Name = "Sandbag_01" + }, { + Name = "Sandbag_02" + }, { + Name = "Sandbag_03" + }, { + Name = "Sandbag_04" + }, { + Name = "Sandbag_05" + }, { + Name = "Sandbag_06" + }, { + Name = "Sandbag_07" + }, { + Name = "Sandbag_08" + }, { + Name = "Sandbag_09" + }, { + Name = "Sandbag_10" + }, { + Name = "Sandbag_11" + }, { + Name = "Sandbag_12" + }, { + Name = "Sandbag_13" + }, { + Name = "Sandbag_15" + }, { + Name = "Sandbag_16" + }, { + Name = "Sandbag_17" + }, { + Name = "Shelter01" + }, { + Name = "Shelter02" + }, { + Name = "TugHarlan" + }, { + Name = "Tent05" + }, { + Name = "Tent04" + }, { + Name = "Tent03" + }, { + Name = "Tent02" + }, { + Name = "Tent01" + }, { + Name = "Toolbox01" + }, { + Name = "Toolbox02" + }, { + Name = "Twall_x1" + }, { + Name = "Twall_x6" + }, { + Name = "Twall_x6_3mts" + }, { + Name = "Orca" + }, { + Name = "WindTurbine" + }, { + Name = "WindTurbine_11" + }, { + Name = "billboard_motorized" + }, { + Name = "Stanley_LightHouse" + }, { + Name = "345 Excavator" + }, { + Name = "Tower Crane" + }, { + Name = "Small_LightHouse" + }, { + Name = "Nodding_Donkey_Pump" + }, { + Name = "offshore WindTurbine" + }, { + Name = "offshore WindTurbine2" + }, { + Name = "FarpHide_small" + }, { + Name = "FarpHide_Med" + }, { + Name = "FarpHide_Dsmall" + }, { + Name = "FarpHide_Dmed" + }, { + Name = "container_40ft" + }, { + Name = "container_20ft" + }, { + Name = "FlagPole" + }, { + Name = "ip_tower" + }, { + Name = "af_hq" + }, { + Name = "Concertina wire" + }, { + Name = "Haystack 1" + }, { + Name = "Haystack 2" + }, { + Name = "Haystack 3" + }, { + Name = "Haystack 4" + } } + }, + GrassAirfields = { + GrassAirfield = { { + Name = "GrassAirfield", + in_service = 0, + out_of_service = 40000 + } } + }, + Helicopters = { + Helicopter = { { + Name = "Ka-50", + in_service = 0, + out_of_service = 40000 + }, { + Name = "UH-1H", + in_service = 0, + out_of_service = 40000 + }, { + Name = "AH-64D_BLK_II" + }, { + Name = "CH-47Fbl1" + }, { + Name = "Ka-50_3" + }, { + Name = "Mi-24P" + }, { + Name = "OH58D" + }, { + Name = "SA342M" + }, { + Name = "SA342L" + }, { + Name = "SA342Mistral" + }, { + Name = "SA342Minigun" + } } + }, + Heliports = { + Heliport = { { + Name = "FARP", + in_service = 0, + out_of_service = 40000 + }, { + Name = "SINGLE_HELIPAD", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FARP_SINGLE_01" + }, { + Name = "Oil rig" + }, { + Name = "Gas platform" + }, { + Name = "Invisible FARP" + } } + }, + LTAvehicles = { + LTAvehicle = { { + Name = "m1_vla" + } } + }, + Personnel = { + Personnel = {} + }, + Planes = { + Plane = { { + Name = "A-10C", + in_service = 0, + out_of_service = 40000 + }, { + Name = "MosquitoFBMkVI", + in_service = 0, + out_of_service = 40000 + }, { + Name = "C-130", + in_service = 0, + out_of_service = 40000 + }, { + Name = "MB-339A", + in_service = 0, + out_of_service = 40000 + }, { + Name = "F-16C", + in_service = 0, + out_of_service = 40000 + }, { + Name = "F-16C_50", + in_service = 0, + out_of_service = 40000 + }, { + Name = "P-51D", + in_service = 0, + out_of_service = 40000 + }, { + Name = "C-47", + in_service = 0, + out_of_service = 40000 + }, { + Name = "FW-190A8" + }, { + Name = "Bf-109K-4" + }, { + Name = "SpitfireLFMkIX" + }, { + Name = "SpitfireLFMkIXCW" + }, { + Name = "P-47D-30" + }, { + Name = "P-47D-30bl1" + }, { + Name = "P-47D-40" + }, { + Name = "A-20G" + }, { + Name = "A-10A" + }, { + Name = "A-10C_2" + }, { + Name = "AJS37" + }, { + Name = "AV8BNA" + }, { + Name = "KC130" + }, { + Name = "KC135MPRS" + }, { + Name = "C-101EB" + }, { + Name = "C-101CC" + }, { + Name = "JF-17" + }, { + Name = "Falcon_Gyrocopter" + }, { + Name = "Christen Eagle II" + }, { + Name = "F-15ESE" + }, { + Name = "F-4E-45MC" + }, { + Name = "F-5E" + }, { + Name = "F-5E-3" + }, { + Name = "F-5E-3_FC" + }, { + Name = "F-86F Sabre" + }, { + Name = "F-86F_FC" + }, { + Name = "F/A-18A" + }, { + Name = "F/A-18C" + }, { + Name = "FA-18C_hornet" + }, { + Name = "Hawk" + }, { + Name = "I-16" + }, { + Name = "L-39C" + }, { + Name = "M-2000C" + }, { + Name = "MB-339APAN" + }, { + Name = "MiG-15bis" + }, { + Name = "MiG-15bis_FC" + }, { + Name = "MiG-19P" + }, { + Name = "MiG-21Bis" + }, { + Name = "Mirage-F1CE" + }, { + Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" + }, { + Name = "Yak-52" + }, { + Name = "Ju-88A4" + } } + }, + Ships = { + Ship = { { + Name = "speedboat", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HandyWind", + in_service = 0, + out_of_service = 40000 + }, { + Name = "PERRY", + in_service = 0, + out_of_service = 40000 + }, { + Name = "speedboat", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Seawise_Giant", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Higgins_boat", + in_service = 0, + out_of_service = 40000 + }, { + Name = "HarborTug" + }, { + Name = "Ship_Tilde_Supply" + }, { + Name = "ara_vdm" + }, { + Name = "atconveyor" + } } + }, + WWIIstructures = { + WWIIstructure = {} + }, + Warehouses = { + Warehouse = { { + Name = "Warehouse", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Tank", + in_service = 0, + out_of_service = 40000 + }, { + Name = ".Ammunition depot", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Tank 2", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Tank 3", + in_service = 0, + out_of_service = 40000 + } } + } + }, + WorldID = 92, + award_by_name = { + ["New Zealand Bravery Medal"] = , + ["New Zealand Cross"] =
, + ["New Zealand Distinguished Service Decoration"] =
, + ["New Zealand Gallantry Medal"] =
, + ["Victoria Cross for New Zealand"] =
+ }, + flag = "FUI/Common/Flags/New Zealand.png", + flag_small = "MissionEditor/data/images/flags/New Zealand.png", + rank_by_name = { + Captain =
, + Colonel =
, + ["First lieutenant"] =
, + ["Lieutenant colonel"] =
, + Major =
, + ["Second lieutenant"] =
+ }, + troop_by_name = { + ["1 SQN RNZAF"] =
, + ["14 SQN RNZAF"] =
, + ["2 SQN RNZAF"] =
, + ["25 SQN RNZAF"] =
, + ["3 SQN RNZAF"] =
, + ["40 SQN RNZAF"] =
, + ["41 SQN RNZAF"] =
, + ["42 SQN RNZAF"] =
, + ["5 SQN RNZAF"] =
, + ["6 SQN RNZAF"] =
, + ["75 SQN RNZAF"] =
, + ["Central Flying School RNZAF"] =
, + ["Navigation and Air Electronics Training Squadron RNZAF"] =
, + ["RNZAF Boy Entrant School"] =
+ } +} \ No newline at end of file diff --git a/_G/db/Countries/Nigeria.lua b/_G/db/Countries/Nigeria.lua index 846ce49c..53558dca 100644 --- a/_G/db/Countries/Nigeria.lua +++ b/_G/db/Countries/Nigeria.lua @@ -1098,6 +1098,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/North Korea.lua b/_G/db/Countries/North Korea.lua index 697d0e84..c53b138f 100644 --- a/_G/db/Countries/North Korea.lua +++ b/_G/db/Countries/North Korea.lua @@ -1112,6 +1112,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Norway.lua b/_G/db/Countries/Norway.lua index 42d64050..902a6100 100644 --- a/_G/db/Countries/Norway.lua +++ b/_G/db/Countries/Norway.lua @@ -1200,6 +1200,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Oman.lua b/_G/db/Countries/Oman.lua index 25debe74..9530aaec 100644 --- a/_G/db/Countries/Oman.lua +++ b/_G/db/Countries/Oman.lua @@ -1146,6 +1146,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Pakistan.lua b/_G/db/Countries/Pakistan.lua index 37c93afb..97db5828 100644 --- a/_G/db/Countries/Pakistan.lua +++ b/_G/db/Countries/Pakistan.lua @@ -1160,6 +1160,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Peru.lua b/_G/db/Countries/Peru.lua index 40ac0357..afc3b2dd 100644 --- a/_G/db/Countries/Peru.lua +++ b/_G/db/Countries/Peru.lua @@ -1144,6 +1144,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Philippines.lua b/_G/db/Countries/Philippines.lua index e55ef761..076504f4 100644 --- a/_G/db/Countries/Philippines.lua +++ b/_G/db/Countries/Philippines.lua @@ -1004,6 +1004,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Poland.lua b/_G/db/Countries/Poland.lua index 1f3999f2..17f773a7 100644 --- a/_G/db/Countries/Poland.lua +++ b/_G/db/Countries/Poland.lua @@ -1382,6 +1382,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "LST_Mk2" }, { diff --git a/_G/db/Countries/Portugal.lua b/_G/db/Countries/Portugal.lua index 9b9a4478..c9130965 100644 --- a/_G/db/Countries/Portugal.lua +++ b/_G/db/Countries/Portugal.lua @@ -1174,6 +1174,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Qatar.lua b/_G/db/Countries/Qatar.lua index ee596db9..29329e7d 100644 --- a/_G/db/Countries/Qatar.lua +++ b/_G/db/Countries/Qatar.lua @@ -1076,6 +1076,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Romania.lua b/_G/db/Countries/Romania.lua index be882c46..5512eeb2 100644 --- a/_G/db/Countries/Romania.lua +++ b/_G/db/Countries/Romania.lua @@ -1248,6 +1248,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC" }, { diff --git a/_G/db/Countries/Russia.lua b/_G/db/Countries/Russia.lua index cf8c7f4e..0678bfa7 100644 --- a/_G/db/Countries/Russia.lua +++ b/_G/db/Countries/Russia.lua @@ -1794,6 +1794,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Saudi Arabia.lua b/_G/db/Countries/Saudi Arabia.lua index b5d8bfb4..efe963a1 100644 --- a/_G/db/Countries/Saudi Arabia.lua +++ b/_G/db/Countries/Saudi Arabia.lua @@ -1198,6 +1198,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Serbia.lua b/_G/db/Countries/Serbia.lua index 1df34a20..ece058f9 100644 --- a/_G/db/Countries/Serbia.lua +++ b/_G/db/Countries/Serbia.lua @@ -1218,6 +1218,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Slovakia.lua b/_G/db/Countries/Slovakia.lua index 31621476..30057fa2 100644 --- a/_G/db/Countries/Slovakia.lua +++ b/_G/db/Countries/Slovakia.lua @@ -1164,6 +1164,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Slovenia.lua b/_G/db/Countries/Slovenia.lua index 34581cba..9361b0df 100644 --- a/_G/db/Countries/Slovenia.lua +++ b/_G/db/Countries/Slovenia.lua @@ -1182,6 +1182,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/South Africa.lua b/_G/db/Countries/South Africa.lua index f9fc5921..26790434 100644 --- a/_G/db/Countries/South Africa.lua +++ b/_G/db/Countries/South Africa.lua @@ -1204,6 +1204,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/South Korea.lua b/_G/db/Countries/South Korea.lua index 15ec7099..cec9ec03 100644 --- a/_G/db/Countries/South Korea.lua +++ b/_G/db/Countries/South Korea.lua @@ -1164,6 +1164,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/South Ossetia.lua b/_G/db/Countries/South Ossetia.lua index e989f6c1..38cae449 100644 --- a/_G/db/Countries/South Ossetia.lua +++ b/_G/db/Countries/South Ossetia.lua @@ -1200,6 +1200,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Spain.lua b/_G/db/Countries/Spain.lua index af759622..dd5ce0b3 100644 --- a/_G/db/Countries/Spain.lua +++ b/_G/db/Countries/Spain.lua @@ -1438,6 +1438,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Sudan.lua b/_G/db/Countries/Sudan.lua index fb0cf6c2..a587daca 100644 --- a/_G/db/Countries/Sudan.lua +++ b/_G/db/Countries/Sudan.lua @@ -1100,6 +1100,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Sweden.lua b/_G/db/Countries/Sweden.lua index f194b9f3..8bc88cfa 100644 --- a/_G/db/Countries/Sweden.lua +++ b/_G/db/Countries/Sweden.lua @@ -1056,6 +1056,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Switzerland.lua b/_G/db/Countries/Switzerland.lua index 369505bc..aac72eb7 100644 --- a/_G/db/Countries/Switzerland.lua +++ b/_G/db/Countries/Switzerland.lua @@ -1252,6 +1252,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Syria.lua b/_G/db/Countries/Syria.lua index 444a606a..9e110964 100644 --- a/_G/db/Countries/Syria.lua +++ b/_G/db/Countries/Syria.lua @@ -1310,6 +1310,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Thailand.lua b/_G/db/Countries/Thailand.lua index a7d20b5e..23ec68b1 100644 --- a/_G/db/Countries/Thailand.lua +++ b/_G/db/Countries/Thailand.lua @@ -1098,6 +1098,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/The Netherlands.lua b/_G/db/Countries/The Netherlands.lua index 42eeac6a..bd017cfa 100644 --- a/_G/db/Countries/The Netherlands.lua +++ b/_G/db/Countries/The Netherlands.lua @@ -1352,6 +1352,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "LST_Mk2" }, { diff --git a/_G/db/Countries/Third Reich.lua b/_G/db/Countries/Third Reich.lua index 5f9a17b2..1fb85e9d 100644 --- a/_G/db/Countries/Third Reich.lua +++ b/_G/db/Countries/Third Reich.lua @@ -1062,6 +1062,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC" }, { diff --git a/_G/db/Countries/Tunisia.lua b/_G/db/Countries/Tunisia.lua index 3f3097fc..73b6ddf4 100644 --- a/_G/db/Countries/Tunisia.lua +++ b/_G/db/Countries/Tunisia.lua @@ -1028,6 +1028,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Turkey.lua b/_G/db/Countries/Turkey.lua index 6af93cca..46da9c97 100644 --- a/_G/db/Countries/Turkey.lua +++ b/_G/db/Countries/Turkey.lua @@ -1278,6 +1278,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/UK.lua b/_G/db/Countries/UK.lua index f4779ddd..9a79dd3d 100644 --- a/_G/db/Countries/UK.lua +++ b/_G/db/Countries/UK.lua @@ -1324,6 +1324,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "USS_Samuel_Chase" }, { diff --git a/_G/db/Countries/USA.lua b/_G/db/Countries/USA.lua index 492585ce..a1c5ab4c 100644 --- a/_G/db/Countries/USA.lua +++ b/_G/db/Countries/USA.lua @@ -2706,6 +2706,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "santafe" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Forrestal" } } diff --git a/_G/db/Countries/USAF Aggressors.lua b/_G/db/Countries/USAF Aggressors.lua index aa02595f..4d743b22 100644 --- a/_G/db/Countries/USAF Aggressors.lua +++ b/_G/db/Countries/USAF Aggressors.lua @@ -2329,6 +2329,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Leclerc", in_service = 0, out_of_service = 40000 + }, { + Name = "soldier_wwii_br_01", + in_service = 0, + out_of_service = 40000 }, { Name = "Soldier M4 GRG", in_service = 0, @@ -2362,19 +2366,19 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "T155_Firtina", + Name = "M1126 Stryker ICV", in_service = 0, out_of_service = 40000 }, { - Name = "leopard-2A4_trs", + Name = "T155_Firtina", in_service = 0, out_of_service = 40000 }, { - Name = "Challenger2", + Name = "leopard-2A4_trs", in_service = 0, out_of_service = 40000 }, { - Name = "M1126 Stryker ICV", + Name = "Challenger2", in_service = 0, out_of_service = 40000 }, { @@ -2429,10 +2433,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "MCV-80", in_service = 0, out_of_service = 40000 - }, { - Name = "soldier_wwii_br_01", - in_service = 0, - out_of_service = 40000 } } }, Effects = { @@ -3627,6 +3627,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "H-6J", in_service = 0, out_of_service = 40000 + }, { + Name = "F-16C", + in_service = 0, + out_of_service = 40000 }, { Name = "Mirage-F1CZ", in_service = 0, @@ -3696,6 +3700,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC", in_service = 0, diff --git a/_G/db/Countries/USSR.lua b/_G/db/Countries/USSR.lua index 2b0b7abd..59849b00 100644 --- a/_G/db/Countries/USSR.lua +++ b/_G/db/Countries/USSR.lua @@ -1622,6 +1622,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "LST_Mk2" }, { diff --git a/_G/db/Countries/Ukraine.lua b/_G/db/Countries/Ukraine.lua index a0e516e5..7db06027 100644 --- a/_G/db/Countries/Ukraine.lua +++ b/_G/db/Countries/Ukraine.lua @@ -1704,6 +1704,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/United Arab Emirates.lua b/_G/db/Countries/United Arab Emirates.lua index f46aeed0..d602f7bd 100644 --- a/_G/db/Countries/United Arab Emirates.lua +++ b/_G/db/Countries/United Arab Emirates.lua @@ -1178,6 +1178,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/United Nations Peacekeepers.lua b/_G/db/Countries/United Nations Peacekeepers.lua index 38aa5567..b8c69fec 100644 --- a/_G/db/Countries/United Nations Peacekeepers.lua +++ b/_G/db/Countries/United Nations Peacekeepers.lua @@ -1237,6 +1237,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Leclerc", in_service = 0, out_of_service = 40000 + }, { + Name = "soldier_wwii_br_01", + in_service = 0, + out_of_service = 40000 }, { Name = "Soldier M4 GRG", in_service = 0, @@ -1270,19 +1274,19 @@ _G["db"]["Countries"]["#Index"] = { in_service = 0, out_of_service = 40000 }, { - Name = "T155_Firtina", + Name = "M1126 Stryker ICV", in_service = 0, out_of_service = 40000 }, { - Name = "leopard-2A4_trs", + Name = "T155_Firtina", in_service = 0, out_of_service = 40000 }, { - Name = "Challenger2", + Name = "leopard-2A4_trs", in_service = 0, out_of_service = 40000 }, { - Name = "M1126 Stryker ICV", + Name = "Challenger2", in_service = 0, out_of_service = 40000 }, { @@ -1337,10 +1341,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "MCV-80", in_service = 0, out_of_service = 40000 - }, { - Name = "soldier_wwii_br_01", - in_service = 0, - out_of_service = 40000 } } }, Effects = { @@ -2537,6 +2537,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "H-6J", in_service = 0, out_of_service = 40000 + }, { + Name = "F-16C", + in_service = 0, + out_of_service = 40000 }, { Name = "Mirage-F1CZ", in_service = 0, @@ -2606,6 +2610,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "Uboat_VIIC", in_service = 0, diff --git a/_G/db/Countries/Venezuela.lua b/_G/db/Countries/Venezuela.lua index 6da8a30a..5604df08 100644 --- a/_G/db/Countries/Venezuela.lua +++ b/_G/db/Countries/Venezuela.lua @@ -1146,6 +1146,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Vietnam.lua b/_G/db/Countries/Vietnam.lua index 6a313c37..aec8bc02 100644 --- a/_G/db/Countries/Vietnam.lua +++ b/_G/db/Countries/Vietnam.lua @@ -1210,6 +1210,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Yemen.lua b/_G/db/Countries/Yemen.lua index 3660e9c0..25c96d5a 100644 --- a/_G/db/Countries/Yemen.lua +++ b/_G/db/Countries/Yemen.lua @@ -1160,6 +1160,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" } } }, WWIIstructures = { diff --git a/_G/db/Countries/Yugoslavia.lua b/_G/db/Countries/Yugoslavia.lua index 4ad33739..2e14db3f 100644 --- a/_G/db/Countries/Yugoslavia.lua +++ b/_G/db/Countries/Yugoslavia.lua @@ -1112,6 +1112,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Ship_Tilde_Supply" }, { Name = "ara_vdm" + }, { + Name = "atconveyor" }, { Name = "LST_Mk2" }, { diff --git a/_G/db/Pods/Pod/ALQ-167 (non-functional).lua b/_G/db/Pods/Pod/ALQ-167 (non-functional).lua deleted file mode 100644 index 6f089db0..00000000 --- a/_G/db/Pods/Pod/ALQ-167 (non-functional).lua +++ /dev/null @@ -1,4 +0,0 @@ -_G["db"]["Pods"]["Pod"]["#Index"] = { - DisplayName = "ALQ-167 (non-functional)", - Name = "Redacted" -} \ No newline at end of file diff --git a/_G/db/Sensors/Sensor/ANAVQ-23 Pave Spike - Sensor.lua b/_G/db/Sensors/Sensor/ANAVQ-23 Pave Spike - Sensor.lua index 234182bc..7931c75c 100644 --- a/_G/db/Sensors/Sensor/ANAVQ-23 Pave Spike - Sensor.lua +++ b/_G/db/Sensors/Sensor/ANAVQ-23 Pave Spike - Sensor.lua @@ -2,17 +2,18 @@ _G["db"]["Sensors"]["Sensor"]["#Index"] = { DisplayName = "AN/AVQ-23 Pave Spike - Sensor", Name = "AN/AVQ-23 Pave Spike - Sensor", SensorType = 0, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", + _file = "./CoreMods/aircraft/F-4E/Entry/Sensors.lua", _origin = "F-4E AI by Heatblur Simulations", category = 0, + laserDesignator = true, laserRanger = true, - magnifications = { 3, 25, 90 }, + magnifications = { 8, 30 }, resolution = 0.07, scan_volume = { azimuth = { -150, 150 }, elevation = { -150, 45 } }, - type = 2, + type = 0, view_volume_max = { azimuth_sector = 18.4, elevation_sector = 24.1 diff --git a/_G/db/Units/Cars/Car/Gepard.lua b/_G/db/Units/Cars/Car/Gepard.lua index 50288348..d8697da7 100644 --- a/_G/db/Units/Cars/Car/Gepard.lua +++ b/_G/db/Units/Cars/Car/Gepard.lua @@ -77,7 +77,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 16, 105, "Redacted", "AA_flak", "Mobile AAA", "SAM SR", "SAM TR", "RADAR_BAND1_FOR_ARM", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "Armed Air Defence", "Rocket Attack Valid AirDefence", "AAA", "All", "Ground Units", "Vehicles", "Ground vehicles", "SAM related", "SAM elements" }, category = "Air Defence", chassis = { - armour_thickness = 0.04 + armour_thickness = 0.04, + gearRatios = {} }, driverViewPoint = { 2.3, 1.5, 0.62 }, enablePlayerCanDrive = true, diff --git a/_G/db/Units/Cars/Car/L118_Unit.lua b/_G/db/Units/Cars/Car/L118_Unit.lua index bdc16841..4c922302 100644 --- a/_G/db/Units/Cars/Car/L118_Unit.lua +++ b/_G/db/Units/Cars/Car/L118_Unit.lua @@ -3,81 +3,74 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { azimuth = {}, elevation = {} }, - DetectionRange = 500, + DetectionRange = 17500, DisplayName = "L118 Light Artillery Gun", - MaxSpeed = 10.8, + MaxSpeed = 3.6, Name = "L118 Light Artillery Gun", Rate = 5, ThreatRange = 17200, - WS = { - [12] = { + WS = { { LN = { { BR = { { - connector_name = "POINT_GUN" + connector_name = "POINT_GUN", + recoilArgument = 23, + recoilTime = 0.8 } }, PL = { { - ammo_capacity = 24, - portion_reload_time = 6, - shell_name = { "L23A1_APFSDS" }, - shot_delay = 3, - virtualStwID = 1 - }, { - ammo_capacity = 11, - automaticLoader = false, - portion_reload_time = 15, - shell_name = { "L23A1_APFSDS" }, - shot_delay = 10, - virtualStwID = 2 + shell_name = {} } }, - connectorFire = false, - reactionTime = 2, sensor = {} } }, - angles = { { 3.1415926535898, -3.1415926535898, -0.5235987755983, 0.5235987755983 } }, + angles = { { 3.1415926535898, -3.1415926535898, 0, 1.0471975511966 } }, center = "CENTER_TOWER", drawArgument1 = 0, drawArgument2 = 1 }, fire_on_march = false, - maxTargetDetectionRange = 10000 + maxTargetDetectionRange = 17500 }, Waypoint_Custom_Panel = true, - _file = "./CoreMods/tech/SouthAtlanticAssets/Entries/Vehicles/L118.lua", + _file = "./CoreMods/tech/SouthAtlanticAssets/Entries/Vehicles/L118_Unit.lua", _origin = "South_Atlantic_Assets", - animation_arguments = {}, + animation_arguments = { + alarm_state_sequence = { { 3, { { + endTime = 2, + endVal = 1, + startTime = -2, + startVal = 0 + } } }, { 50, { { + StartVal = 0, + endTime = 3, + endVal = 1, + startTime = 2 + } } }, + totalDuration = 3 + } + }, armour_scheme = { hull_azimuth = { {} }, hull_elevation = { {} }, turret_azimuth = { {} }, turret_elevation = { {} } }, - attribute = { 2, 17, 26, "Redacted", "Artillery", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "Indirect fire", "NonAndLightArmoredUnits", "LightArmoredUnits" }, + attribute = { 2, 8, 26, "Redacted", "Artillery", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "Indirect fire", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Artillery", chassis = { - X_gear_1 = 2.147, - X_gear_2 = -2.185, - Y_gear_1 = 0, - Y_gear_2 = 0, - Z_gear_1 = 1.092, - Z_gear_2 = 1.092, - armour_thickness = 0.011, - engine_power = 60, - gear_type = 1, length = 3, life = 3, mass = 2260, - max_acceleration = 0.925926, - max_road_velocity = 3, + max_road_velocity = 1, max_slope = 0.47, - max_vert_obstacle = 0.5, - min_turn_radius = 7, - r_max = 0.56, width = 1.78 }, enablePlayerCanDrive = false, mapclasskey = "P0091000006", sensor = { - height = 2 + height = 2, + max_alt_finding_target = 2000, + max_range_finding_target = 17500, + min_alt_finding_target = 0, + min_range_finding_target = 0 }, snd = { engine_pitch = { {}, {}, {} }, @@ -92,7 +85,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { visual = { fire_pos = {}, fire_size = 0.7, - fire_time = 900, + fire_time = 300, shape = "L118_Unit" } } \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/LARC-V.lua b/_G/db/Units/Cars/Car/LARC-V.lua index 7929ad51..4076e432 100644 --- a/_G/db/Units/Cars/Car/LARC-V.lua +++ b/_G/db/Units/Cars/Car/LARC-V.lua @@ -21,7 +21,29 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 10, 26, "Redacted", "APC", "Infantry carriers", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Unarmed", - chassis = {}, + chassis = { + X_gear_1 = 2.147, + X_gear_2 = -2.185, + Y_gear_1 = 0, + Y_gear_2 = 0, + Z_gear_1 = 1.092, + Z_gear_2 = 1.092, + armour_thickness = 0.011, + canSwim = true, + engine_power = 260, + gear_type = 1, + length = 7.65, + life = 3, + mass = 13600, + max_acceleration = 0.925926, + max_road_velocity = 14, + max_slope = 0.47, + max_vert_obstacle = 0.5, + min_turn_radius = 7, + r_max = 0.56, + waterline_level = 1.3, + width = 2.9 + }, enablePlayerCanDrive = false, mapclasskey = "P0091000004", snd = { diff --git a/_G/db/Units/Cars/Car/Leopard1A3.lua b/_G/db/Units/Cars/Car/Leopard1A3.lua index 95e96543..58b22930 100644 --- a/_G/db/Units/Cars/Car/Leopard1A3.lua +++ b/_G/db/Units/Cars/Car/Leopard1A3.lua @@ -100,7 +100,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { animation_arguments = {}, attribute = { 2, 17, 26, "Redacted", "Tanks", "Old Tanks", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + gearRatios = {} + }, crew_locale = "ENG", crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", diff --git a/_G/db/Units/Cars/Car/NASAMS_LN_B.lua b/_G/db/Units/Cars/Car/NASAMS_LN_B.lua index 2df05bae..877baeac 100644 --- a/_G/db/Units/Cars/Car/NASAMS_LN_B.lua +++ b/_G/db/Units/Cars/Car/NASAMS_LN_B.lua @@ -77,15 +77,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { _origin = "TechWeaponPack", animation_arguments = { alarm_state = -1, - alarm_state_sequence = { { 2, { { - endTime = 20, - startTime = 0 - }, { - endTime = 50, - endVal = 1, - startTime = 20, - startVal = 1 - } } }, { 3, { { + alarm_state_sequence = { { 3, { { endTime = 25, endVal = 0, startTime = 0, diff --git a/_G/db/Units/Cars/Car/NASAMS_LN_C.lua b/_G/db/Units/Cars/Car/NASAMS_LN_C.lua index da0e41f5..14a4c65b 100644 --- a/_G/db/Units/Cars/Car/NASAMS_LN_C.lua +++ b/_G/db/Units/Cars/Car/NASAMS_LN_C.lua @@ -78,15 +78,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { _origin = "TechWeaponPack", animation_arguments = { alarm_state = -1, - alarm_state_sequence = { { 2, { { - endTime = 20, - startTime = 0 - }, { - endTime = 50, - endVal = 1, - startTime = 20, - startVal = 1 - } } }, { 3, { { + alarm_state_sequence = { { 3, { { endTime = 25, endVal = 0, startTime = 0, diff --git a/_G/db/Units/Cars/Car/SNR_75V.lua b/_G/db/Units/Cars/Car/SNR_75V.lua index bc551cfb..7a568156 100644 --- a/_G/db/Units/Cars/Car/SNR_75V.lua +++ b/_G/db/Units/Cars/Car/SNR_75V.lua @@ -50,6 +50,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { beamWidth = 1.5707963267949, distanceMax = 100000, distanceMin = 1500, + frequencyRange = { 4910000000, 5090000000 }, maxShootingSpeed = 0, max_number_of_missiles_channels = 1, max_trg_alt = 25000, diff --git a/_G/db/Units/Cars/Car/flak38.lua b/_G/db/Units/Cars/Car/flak38.lua index 4dbd4b33..15efc600 100644 --- a/_G/db/Units/Cars/Car/flak38.lua +++ b/_G/db/Units/Cars/Car/flak38.lua @@ -117,9 +117,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { startTime = 10, startVal = 1 } } }, { 11, { { - endTime = 0, - startTime = 0 - }, { endTime = 10, leveling = true, startTime = 0 diff --git a/_G/db/Units/GT_t/WS_t/L118/LN/1.lua b/_G/db/Units/GT_t/WS_t/L118/LN/1.lua new file mode 100644 index 00000000..bae6eb00 --- /dev/null +++ b/_G/db/Units/GT_t/WS_t/L118/LN/1.lua @@ -0,0 +1,19 @@ +_G["db"]["Units"]["GT_t"]["WS_t"]["L118"]["LN"]["#Index"] = { + BR = { { + pos = { 8, 0, 0.1 } + } }, + PL = { { + ammo_capacity = 150, + reload_time = 600, + shell_name = { "UOF412_100HE" }, + shot_delay = 4 + } }, + automaticLoader = false, + distanceMax = 17500, + distanceMin = 500, + max_trg_alt = 2000, + reactionTime = 15, + reload_time = 4800, + sensor = {}, + type = 6 +} \ No newline at end of file diff --git a/_G/db/Units/GT_t/WS_t/ship_Sea_Cat/LN/1.lua b/_G/db/Units/GT_t/WS_t/ship_Sea_Cat/LN/1.lua index 8943f7ab..a4fb9b8b 100644 --- a/_G/db/Units/GT_t/WS_t/ship_Sea_Cat/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/ship_Sea_Cat/LN/1.lua @@ -5,8 +5,10 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["ship_Sea_Cat"]["LN"]["#Index"] = { PL = { { ammo_capacity = 32, reload_time = 1000000, + shot_delay = 300, type_ammunition = { 4, 4, 34, "Redacted" } } }, + barrels_reload_type = 2, beamWidth = 1.5707963267949, distanceMax = 5000, distanceMin = 500, @@ -14,6 +16,8 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["ship_Sea_Cat"]["LN"]["#Index"] = { max_number_of_missile_channels = 1, max_trg_alt = 5000, reactionTime = 3, + reloadAngleY = 0, + reloadAngleZ = 1.5707963267949, sensor = {}, show_external_missile = true, type = 4 diff --git a/_G/db/Units/GT_t/WS_t/ship_Sea_Dart/LN/1.lua b/_G/db/Units/GT_t/WS_t/ship_Sea_Dart/LN/1.lua index 5b03d92e..ad5a360d 100644 --- a/_G/db/Units/GT_t/WS_t/ship_Sea_Dart/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/ship_Sea_Dart/LN/1.lua @@ -4,7 +4,8 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["ship_Sea_Dart"]["LN"]["#Index"] = { } }, PL = { { ammo_capacity = 22, - reload_time = 5, + reload_time = 1000000, + shot_delay = 5, type_ammunition = { 4, 4, 34, "Redacted" } } }, beamWidth = 1.5707963267949, diff --git a/_G/db/Units/Helicopters/Helicopter/AH-1W.lua b/_G/db/Units/Helicopters/Helicopter/AH-1W.lua index 7452ff88..6e07f237 100644 --- a/_G/db/Units/Helicopters/Helicopter/AH-1W.lua +++ b/_G/db/Units/Helicopters/Helicopter/AH-1W.lua @@ -66,6 +66,9 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { critical_damage = 3, droppable = false }, + [54] = { + critical_damage = 3 + }, [55] = { args = { 159 }, critical_damage = 3, @@ -80,6 +83,12 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { args = { 81, 157 }, critical_damage = 12, deps_cells = { 55 } + }, + [64] = { + critical_damage = 3 + }, + [67] = { + critical_damage = 3 } }, DamageParts = { "AH-1W-WING-R", "AH-1W-WING-L", diff --git a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua index 7cbbd849..1b923240 100644 --- a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua +++ b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua @@ -1964,7 +1964,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { drop_canopy_name = 0, ejection_seat_name = 0, pilot_body_arg = 50, - pilot_name = 268, + pilot_name = 269, pos = { 1.68, 0.33, 0 }, role = "pilot", role_display_name = "Pilot" @@ -1975,7 +1975,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { drop_canopy_name = 0, ejection_seat_name = 0, pilot_body_arg = 472, - pilot_name = 268, + pilot_name = 269, pos = { 3.29, -0.168, 0 }, role = "copilot", role_display_name = "Copilot/Gunner" diff --git a/_G/db/Units/Helicopters/Helicopter/CH-47Fbl1.lua b/_G/db/Units/Helicopters/Helicopter/CH-47Fbl1.lua index 0bcfa4ac..d3d9087f 100644 --- a/_G/db/Units/Helicopters/Helicopter/CH-47Fbl1.lua +++ b/_G/db/Units/Helicopters/Helicopter/CH-47Fbl1.lua @@ -980,23 +980,17 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { min = 30, modulation = 1 }, { - max = 135.995, + max = 115.975, min = 108, modulation = 0 }, { - max = 155.995, - min = 136, - modulation = 2, - modulationDef = 1 - }, { - max = 173.975, - min = 156, - modulation = 1 + max = 151.975, + min = 116, + modulation = 0 }, { max = 399.975, min = 225, - modulation = 2, - modulationDef = 0 + modulation = 0 } } }, IR_emission_coeff = 0.1, @@ -2838,7 +2832,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } } }, moment_of_inertia = { 46000, 259000, 274000 }, - net_animation = { 28, 29, 30, 600, 620, 621, 622, 623, 624, 625, 626, 627, 395, 396, 397, 398, 39, 99, 533, 337, 399, 537, 506, 508, 509, 516, 518, 519, 459, 460, 500, 501, 502, 503, 510, 511, 512, 513, 530, 531, 532, 534, 535, 536 }, + net_animation = { 28, 29, 30, 600, 620, 621, 622, 623, 624, 625, 626, 627, 395, 396, 397, 398, 39, 99, 533, 337, 399, 537, 506, 508, 509, 516, 518, 519, 459, 460, 500, 501, 502, 503, 504, 505, 510, 511, 512, 513, 514, 515, 530, 531, 532, 534, 535, 536, 550, 551, 546, 547 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.003, nose_gear_amortizer_reversal_stroke = -0.15, @@ -2848,89 +2842,184 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { panelRadio = { { channels = { { default = 31.5, - modulation = "FM", name = "Channel 1" }, { default = 45.7, - modulation = "FM", name = "Channel 2" }, { default = 57, - modulation = "FM", name = "Channel 3" }, { default = 38, - modulation = "FM", name = "Channel 4" }, { default = 30, - modulation = "FM", name = "Channel 5" }, { default = 32, - modulation = "FM", name = "Channel 6" }, { default = 40, - modulation = "FM", name = "Channel 7" }, { default = 50, - modulation = "FM", name = "Channel 8" }, { default = 55.5, - modulation = "FM", name = "Channel 9" }, { default = 39.9, - modulation = "FM", name = "Channel 10" }, { default = 41.5, - modulation = "FM", name = "Channel 11" }, { default = 75.7, - modulation = "FM", name = "Channel 12" }, { default = 33, - modulation = "FM", name = "Channel 13" }, { default = 38, - modulation = "FM", name = "Channel 14" }, { default = 42, - modulation = "FM", name = "Channel 15" }, { default = 51.5, - modulation = "FM", name = "Channel 16" }, { default = 50, - modulation = "FM", name = "Channel 17" }, { default = 79, - modulation = "FM", name = "Channel 18" }, { default = 51.5, - modulation = "FM", name = "Channel 19" }, { default = 34.9, - modulation = "FM", name = "Channel 20" } }, name = "VHF FM: ARC-186", + range = { { + max = 87.975, + min = 30, + modulation = 1 + }, { + max = 115.975, + min = 108, + modulation = 0 + }, { + max = 151.975, + min = 116, + modulation = 0 + } } + }, { + channels = { { + connect = true, + default = 305, + name = "Channel 1" + }, { + default = 264, + name = "Channel 2" + }, { + default = 265, + name = "Channel 3" + }, { + default = 256, + name = "Channel 4" + }, { + default = 254, + name = "Channel 5" + }, { + default = 250, + name = "Channel 6" + }, { + default = 270, + name = "Channel 7" + }, { + default = 257, + name = "Channel 8" + }, { + default = 255, + name = "Channel 9" + }, { + default = 262, + name = "Channel 10" + }, { + default = 259, + name = "Channel 11" + }, { + default = 268, + name = "Channel 12" + }, { + default = 269, + name = "Channel 13" + }, { + default = 260, + name = "Channel 14" + }, { + default = 263, + name = "Channel 15" + }, { + default = 261, + name = "Channel 16" + }, { + default = 267, + name = "Channel 17" + }, { + default = 251, + name = "Channel 18" + }, { + default = 253, + name = "Channel 19" + }, { + default = 266, + name = "Channel 20" + } }, + name = "UHF AM: ARC-164", + range = { + max = 399.975, + min = 225 + } + }, { + channels = { { + default = 30, + name = "Channel 1" + }, { + default = 30.01, + name = "Channel 2" + }, { + default = 30.015, + name = "Channel 3" + }, { + default = 30.02, + name = "Channel 4" + }, { + default = 30.025, + name = "Channel 5" + }, { + default = 30.03, + name = "Channel 6" + }, { + default = 30.035, + name = "Channel 7" + }, { + default = 30.04, + name = "Channel 8" + }, { + default = 30.045, + name = "Channel 9" + }, { + default = 30.05, + name = "Channel 10" + } }, + name = "VHF FM: ARC-201D", range = { - max = 87.995, - min = 30 + max = 87.975, + min = 30, + modulation = 1 } } }, passivCounterm = { diff --git a/_G/db/Units/Helicopters/Helicopter/Ka-27.lua b/_G/db/Units/Helicopters/Helicopter/Ka-27.lua index 170a956f..c8800f56 100644 --- a/_G/db/Units/Helicopters/Helicopter/Ka-27.lua +++ b/_G/db/Units/Helicopters/Helicopter/Ka-27.lua @@ -2,34 +2,24 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { AmmoWeight = 0, CanopyGeometry = { -0.93969262078591, -0.95280922353749, -0.96592582628907, -0.049950211252315, 0.86602540378444 }, Categories = {}, - Damage = { { + Damage = { + [4] = { args = { 296 }, - critical_damage = 5 - }, { + critical_damage = 20 + }, + [5] = { args = { 297 }, - critical_damage = 5 - }, { - args = { 65 }, - critical_damage = 10 - }, { - args = { 147, 150, 298 }, - critical_damage = 20, - deps_cells = { 3 } - }, { - args = { 147, 149, 301, 302 }, - critical_damage = 20, - deps_cells = { 3 } + critical_damage = 20 }, - [0] = { - args = { 146 }, - critical_damage = 4 + [8] = { + critical_damage = 5 }, [9] = { - args = { 154, 299 }, + args = { 154 }, critical_damage = 5 }, [10] = { - args = { 153, 302, 303 }, + args = { 153 }, critical_damage = 5 }, [11] = { @@ -40,21 +30,34 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { args = { 161 }, critical_damage = 1 }, - [57] = { + [45] = { + args = { 235 }, + critical_damage = 3 + }, + [46] = { + args = { 233 }, + critical_damage = 3 + }, + [56] = { args = { 158 }, critical_damage = 5 }, + [57] = { + args = { 157 }, + critical_damage = 5 + }, [58] = { args = { 156 }, critical_damage = 5 }, [59] = { - args = { 148 }, critical_damage = 5 }, - [82] = { - args = { 152 }, + [63] = { critical_damage = 3 + }, + [82] = { + critical_damage = 20 } }, DamageParts = { diff --git a/_G/db/Units/Helicopters/Helicopter/OH-58D.lua b/_G/db/Units/Helicopters/Helicopter/OH-58D.lua index 24bf9902..106bf231 100644 --- a/_G/db/Units/Helicopters/Helicopter/OH-58D.lua +++ b/_G/db/Units/Helicopters/Helicopter/OH-58D.lua @@ -8,10 +8,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { args = { 146 }, critical_damage = 4 }, - [3] = { - args = { 146 }, - critical_damage = 10 - }, [9] = { args = { 154 }, critical_damage = 12 @@ -20,22 +16,13 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { args = { 153 }, critical_damage = 12 }, - [11] = { - args = { 161 }, - critical_damage = 2 - }, [12] = { args = { 161 }, - critical_damage = 2, - deps_cells = { 11 } - }, - [55] = { - critical_damage = 3 + critical_damage = 2 }, [56] = { args = { 81 }, - critical_damage = 8, - deps_cells = { 55 } + critical_damage = 8 }, [82] = { args = { 152 }, diff --git a/_G/db/Units/Helicopters/Helicopter/OH58D.lua b/_G/db/Units/Helicopters/Helicopter/OH58D.lua index ad406e54..0c639c59 100644 --- a/_G/db/Units/Helicopters/Helicopter/OH58D.lua +++ b/_G/db/Units/Helicopters/Helicopter/OH58D.lua @@ -35,6 +35,14 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { id = "PDU", label = "Install Pilot Display Unit", weightWhenOn = 5 + }, { + arg = 0, + boolean_inverted = false, + control = "checkbox", + defValue = true, + id = "AllowHidePDU", + label = "Allow Hiding Pilot Display Unit", + playerOnly = true }, { arg = 1001, boolean_inverted = false, @@ -110,7 +118,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, [0] = { args = { 170 }, - critical_damage = 10 + critical_damage = 2 }, [8] = { args = { -1 }, @@ -123,7 +131,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { skin = "Aluminum", spar = "Truss" }, - critical_damage = 4, + critical_damage = 2, droppable = false }, [10] = { @@ -133,7 +141,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { skin = "Aluminum", spar = "Truss" }, - critical_damage = 4, + critical_damage = 2, droppable = false }, [11] = { @@ -146,7 +154,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { durability = 0.53, skin = "Aluminum" }, - critical_damage = 4 + critical_damage = 2 }, [14] = { args = { 151 }, @@ -154,7 +162,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { durability = 0.53, skin = "Aluminum" }, - critical_damage = 4 + critical_damage = 2 }, [15] = { args = { 50 }, @@ -182,11 +190,11 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, [33] = { args = { 147, 50 }, - critical_damage = 4 + critical_damage = 2 }, [34] = { args = { 148, 50 }, - critical_damage = 4 + critical_damage = 2 }, [35] = { args = { -1 }, @@ -275,13 +283,129 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { skin = "Aluminum", spar = "Truss" }, - critical_damage = 8, + critical_damage = 4, droppable = false }, [100] = { args = { -1 }, critical_damage = 2 }, + [103] = { + args = { -1 }, + critical_damage = 1 + }, + [104] = { + args = { -1 }, + critical_damage = 1 + }, + [105] = { + args = { -1 }, + critical_damage = 1 + }, + [106] = { + args = { -1 }, + critical_damage = 1 + }, + [107] = { + args = { -1 }, + critical_damage = 1 + }, + [108] = { + args = { -1 }, + critical_damage = 1 + }, + [109] = { + args = { -1 }, + critical_damage = 1 + }, + [110] = { + args = { -1 }, + critical_damage = 1 + }, + [111] = { + args = { -1 }, + critical_damage = 1 + }, + [112] = { + args = { -1 }, + critical_damage = 1 + }, + [113] = { + args = { -1 }, + critical_damage = 1 + }, + [114] = { + args = { -1 }, + critical_damage = 1 + }, + [115] = { + args = { -1 }, + critical_damage = 1 + }, + [116] = { + args = { -1 }, + critical_damage = 1 + }, + [117] = { + args = { -1 }, + critical_damage = 1 + }, + [118] = { + args = { -1 }, + critical_damage = 1 + }, + [119] = { + args = { -1 }, + critical_damage = 1 + }, + [120] = { + args = { -1 }, + critical_damage = 1 + }, + [121] = { + args = { -1 }, + critical_damage = 1 + }, + [122] = { + args = { -1 }, + critical_damage = 1 + }, + [123] = { + args = { -1 }, + critical_damage = 1 + }, + [124] = { + args = { -1 }, + critical_damage = 1 + }, + [125] = { + args = { -1 }, + critical_damage = 1 + }, + [126] = { + args = { -1 }, + critical_damage = 1 + }, + [127] = { + args = { -1 }, + critical_damage = 1 + }, + [128] = { + args = { -1 }, + critical_damage = 1 + }, + [129] = { + args = { -1 }, + critical_damage = 1 + }, + [130] = { + args = { -1 }, + critical_damage = 1 + }, + [131] = { + args = { -1 }, + critical_damage = 1 + }, [137] = { args = { -1 }, critical_damage = 1 @@ -364,6 +488,14 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { CYCLIC_L = 139, CYCLIC_R = 140, DC_GEN = 141, + ENGINE_1 = 103, + ENGINE_2 = 104, + ENGINE_3 = 105, + ENGINE_4 = 106, + ENGINE_5 = 107, + ENGINE_6 = 108, + ENGINE_7 = 109, + ENGINE_8 = 110, ENGINE_ECU = 142, ENGINE_L = 11, ENG_OIL = 143, @@ -398,9 +530,30 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { TAIL = 55, TAIL_BOTTOM = 58, TAIL_TOP = 100, + WING_L_00 = 111, + WING_L_01 = 112, + WING_L_02 = 113, + WING_L_03 = 114, + WING_L_04 = 115, + WING_L_05 = 116, + WING_L_06 = 117, + WING_L_07 = 118, + WING_L_08 = 119, + WING_L_09 = 120, + WING_L_10 = 121, + WING_L_11 = 122, WING_L_IN = 35, WING_L_OUT = 23, WING_L_PART_IN = 33, + WING_R_00 = 123, + WING_R_01 = 124, + WING_R_02 = 125, + WING_R_03 = 126, + WING_R_04 = 127, + WING_R_05 = 128, + WING_R_06 = 129, + WING_R_07 = 130, + WING_R_08 = 131, WING_R_IN = 36, WING_R_OUT = 24, WING_R_PART_IN = 34, @@ -1612,6 +1765,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } }, crew_members = { { can_be_playable = true, + canopy_arg = 35, drop_canopy_name = 0, ejection_added_speed = { 0, 0, 5 }, ejection_order = 1, @@ -1621,6 +1775,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { role_display_name = "Pilot" }, { can_be_playable = true, + canopy_arg = 421, drop_canopy_name = 0, ejection_added_speed = { 0, 0, -5 }, ejection_order = 2, @@ -1634,6 +1789,9 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { crew_stations = "HumanOrchestra", date_of_introduction = 1983, detection_range_max = 0, + encyclopediaAnimation = { + args = {} + }, engine_data = { SFC_k = { 0, -0.0003171, 0.512 }, power_RPM_k = { -0.08639, 0.24277, 0.84175 }, @@ -1744,7 +1902,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { typename = "collection" }, main_gear_pos = { -0.277, -0.89, 0.957 }, - mapclasskey = "P0091000026", + mapclasskey = "P0091000096", mechanimations = { Door0 = { { Flags = { "Reversible" }, @@ -1768,90 +1926,90 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DuplicateOf = "Door0" } }, - net_animation = { 11, 12, 15, 17, 34, 35, 38, 46, 60, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 880, 881, 882, 910, 911, 912, 913, 914, 930, 931, 2000 }, + net_animation = { 11, 12, 15, 17, 34, 35, 38, 46, 60, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 836, 880, 881, 882, 910, 911, 912, 913, 914, 930, 931, 2000 }, nose_gear_pos = { 1.161, -0.88, 0.957 }, panelRadio = { { channels = { { connect = true, default = 260, modulation = "AM", - name = "Channel 1" + name = "Channel M" }, { default = 225, modulation = "AM", - name = "Channel 2" + name = "Channel 1" }, { default = 230, modulation = "AM", - name = "Channel 3" + name = "Channel 2" }, { default = 240, modulation = "AM", - name = "Channel 4" + name = "Channel 3" }, { default = 250, modulation = "AM", - name = "Channel 5" + name = "Channel 4" }, { default = 260, modulation = "AM", - name = "Channel 6" + name = "Channel 5" }, { default = 270, modulation = "AM", - name = "Channel 7" + name = "Channel 6" }, { default = 280, modulation = "AM", - name = "Channel 8" + name = "Channel 7" }, { default = 290, modulation = "AM", - name = "Channel 9" + name = "Channel 8" }, { default = 300, modulation = "AM", - name = "Channel 10" + name = "Channel 9" }, { default = 310, modulation = "AM", - name = "Channel 11" + name = "Channel 10" }, { default = 320, modulation = "AM", - name = "Channel 12" + name = "Channel 11" }, { default = 330, modulation = "AM", - name = "Channel 13" + name = "Channel 12" }, { default = 340, modulation = "AM", - name = "Channel 14" + name = "Channel 13" }, { default = 350, modulation = "AM", - name = "Channel 15" + name = "Channel 14" }, { default = 360, modulation = "AM", - name = "Channel 16" + name = "Channel 15" }, { default = 370, modulation = "AM", - name = "Channel 17" + name = "Channel 16" }, { default = 380, modulation = "AM", - name = "Channel 18" + name = "Channel 17" }, { default = 390, modulation = "AM", - name = "Channel 19" + name = "Channel 18" }, { default = 395, modulation = "AM", - name = "Channel 20" + name = "Channel 19" } }, name = "UHF AM", range = { @@ -1862,83 +2020,83 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { channels = { { default = 131, modulation = "AM", - name = "Channel 1" + name = "Channel M" }, { default = 116, modulation = "AM", - name = "Channel 2" + name = "Channel 1" }, { default = 118, modulation = "AM", - name = "Channel 3" + name = "Channel 2" }, { default = 120, modulation = "AM", - name = "Channel 4" + name = "Channel 3" }, { default = 122, modulation = "AM", - name = "Channel 5" + name = "Channel 4" }, { default = 124, modulation = "AM", - name = "Channel 6" + name = "Channel 5" }, { default = 126, modulation = "AM", - name = "Channel 7" + name = "Channel 6" }, { default = 128, modulation = "AM", - name = "Channel 8" + name = "Channel 7" }, { default = 130, modulation = "AM", - name = "Channel 9" + name = "Channel 8" }, { default = 132, modulation = "AM", - name = "Channel 10" + name = "Channel 9" }, { default = 134, modulation = "AM", - name = "Channel 11" + name = "Channel 10" }, { default = 136, modulation = "AM", - name = "Channel 12" + name = "Channel 11" }, { default = 138, modulation = "AM", - name = "Channel 13" + name = "Channel 12" }, { default = 140, modulation = "AM", - name = "Channel 14" + name = "Channel 13" }, { default = 142, modulation = "AM", - name = "Channel 15" + name = "Channel 14" }, { default = 144, modulation = "AM", - name = "Channel 16" + name = "Channel 15" }, { default = 146, modulation = "AM", - name = "Channel 17" + name = "Channel 16" }, { default = 148, modulation = "AM", - name = "Channel 18" + name = "Channel 17" }, { default = 150, modulation = "AM", - name = "Channel 19" + name = "Channel 18" }, { default = 151, modulation = "AM", - name = "Channel 20" + name = "Channel 19" } }, name = "VHF AM", range = { @@ -1949,87 +2107,87 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { channels = { { default = 30, modulation = "FM", - name = "Channel 1" + name = "Channel C" }, { default = 40.4, modulation = "FM", - name = "Channel 2" + name = "Channel M" }, { default = 30, modulation = "FM", - name = "Channel 3" + name = "Channel 1" }, { default = 32, modulation = "FM", - name = "Channel 4" + name = "Channel 2" }, { default = 36, modulation = "FM", - name = "Channel 5" + name = "Channel 3" }, { default = 38, modulation = "FM", - name = "Channel 6" + name = "Channel 4" }, { default = 42, modulation = "FM", - name = "Channel 7" + name = "Channel 5" }, { default = 44, modulation = "FM", - name = "Channel 8" + name = "Channel 6" }, { default = 48, modulation = "FM", - name = "Channel 9" + name = "Channel 7" }, { default = 50, modulation = "FM", - name = "Channel 10" + name = "Channel 8" }, { default = 54, modulation = "FM", - name = "Channel 11" + name = "Channel 9" }, { default = 56, modulation = "FM", - name = "Channel 12" + name = "Channel 10" }, { default = 60, modulation = "FM", - name = "Channel 13" + name = "Channel 11" }, { default = 62, modulation = "FM", - name = "Channel 14" + name = "Channel 12" }, { default = 66, modulation = "FM", - name = "Channel 15" + name = "Channel 13" }, { default = 68, modulation = "FM", - name = "Channel 16" + name = "Channel 14" }, { default = 72, modulation = "FM", - name = "Channel 17" + name = "Channel 15" }, { default = 74, modulation = "FM", - name = "Channel 18" + name = "Channel 16" }, { default = 78, modulation = "FM", - name = "Channel 19" + name = "Channel 17" }, { default = 80, modulation = "FM", - name = "Channel 20" + name = "Channel 18" }, { default = 84, modulation = "FM", - name = "Channel 21" + name = "Channel 19" } }, name = "VHF FM1", range = { @@ -2040,87 +2198,87 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { channels = { { default = 30, modulation = "FM", - name = "Channel 1" + name = "Channel C" }, { default = 40.4, modulation = "FM", - name = "Channel 2" + name = "Channel M" }, { default = 30, modulation = "FM", - name = "Channel 3" + name = "Channel 1" }, { default = 32, modulation = "FM", - name = "Channel 4" + name = "Channel 2" }, { default = 36, modulation = "FM", - name = "Channel 5" + name = "Channel 3" }, { default = 38, modulation = "FM", - name = "Channel 6" + name = "Channel 4" }, { default = 42, modulation = "FM", - name = "Channel 7" + name = "Channel 5" }, { default = 44, modulation = "FM", - name = "Channel 8" + name = "Channel 6" }, { default = 48, modulation = "FM", - name = "Channel 9" + name = "Channel 7" }, { default = 50, modulation = "FM", - name = "Channel 10" + name = "Channel 8" }, { default = 54, modulation = "FM", - name = "Channel 11" + name = "Channel 9" }, { default = 56, modulation = "FM", - name = "Channel 12" + name = "Channel 10" }, { default = 60, modulation = "FM", - name = "Channel 13" + name = "Channel 11" }, { default = 62, modulation = "FM", - name = "Channel 14" + name = "Channel 12" }, { default = 66, modulation = "FM", - name = "Channel 15" + name = "Channel 13" }, { default = 68, modulation = "FM", - name = "Channel 16" + name = "Channel 14" }, { default = 72, modulation = "FM", - name = "Channel 17" + name = "Channel 15" }, { default = 74, modulation = "FM", - name = "Channel 18" + name = "Channel 16" }, { default = 78, modulation = "FM", - name = "Channel 19" + name = "Channel 17" }, { default = 80, modulation = "FM", - name = "Channel 20" + name = "Channel 18" }, { default = 84, modulation = "FM", - name = "Channel 21" + name = "Channel 19" } }, name = "VHF FM2", range = { @@ -2171,7 +2329,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { file = "OH58D", fire = { 300, 2 }, index = "Redacted", - life = 18, + life = 10, name = "OH58D", positioning = "BYNORMAL", vis = 3 diff --git a/_G/db/Units/Helicopters/Helicopter/SH-60B.lua b/_G/db/Units/Helicopters/Helicopter/SH-60B.lua index 450852c1..7d93c6e8 100644 --- a/_G/db/Units/Helicopters/Helicopter/SH-60B.lua +++ b/_G/db/Units/Helicopters/Helicopter/SH-60B.lua @@ -7,10 +7,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { args = { 146 }, critical_damage = 4 }, - [3] = { - args = { 146 }, - critical_damage = 10 - }, [9] = { args = { 154 }, critical_damage = 12 @@ -19,22 +15,13 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { args = { 153 }, critical_damage = 12 }, - [11] = { - args = { 161 }, - critical_damage = 2 - }, [12] = { args = { 161 }, - critical_damage = 2, - deps_cells = { 11 } - }, - [55] = { - critical_damage = 3 + critical_damage = 2 }, [56] = { args = { 81 }, - critical_damage = 8, - deps_cells = { 55 } + critical_damage = 8 }, [82] = { args = { 152 }, diff --git a/_G/db/Units/Planes/Plane/AJS37.lua b/_G/db/Units/Planes/Plane/AJS37.lua index 528d9758..d7d34d81 100644 --- a/_G/db/Units/Planes/Plane/AJS37.lua +++ b/_G/db/Units/Planes/Plane/AJS37.lua @@ -1677,8 +1677,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, crew_members = { { canopy_pos = { 4.7, 0, 0 }, - drop_canopy_name = 270, - ejection_seat_name = 269, + drop_canopy_name = 271, + ejection_seat_name = 270, pos = { 4.8, 0.6, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/AV8BNA.lua b/_G/db/Units/Planes/Plane/AV8BNA.lua index 8e0c6364..d1794576 100644 --- a/_G/db/Units/Planes/Plane/AV8BNA.lua +++ b/_G/db/Units/Planes/Plane/AV8BNA.lua @@ -5512,11 +5512,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, crew_members = { { bailout_arg = -1, - drop_canopy_name = 272, + drop_canopy_name = 273, drop_parachute_name = "AV8BNA_Parachute", - ejection_seat_name = 271, + ejection_seat_name = 272, g_suit = 2, - pilot_name = 273, + pilot_name = 274, pos = { 3.43, 0.703, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/B-52H.lua b/_G/db/Units/Planes/Plane/B-52H.lua index 8898f668..f968430a 100644 --- a/_G/db/Units/Planes/Plane/B-52H.lua +++ b/_G/db/Units/Planes/Plane/B-52H.lua @@ -659,7 +659,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { diameter = 1.523, elevation = 0, - engine_number = 1, + engine_number = 2, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, pos = { -1.82, -1.05, -17.66 }, @@ -667,7 +667,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { diameter = 1.523, elevation = 0, - engine_number = 2, + engine_number = 3, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, pos = { 4.05, -0.76, -11.12 }, @@ -675,7 +675,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { diameter = 1.523, elevation = 0, - engine_number = 2, + engine_number = 4, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, pos = { 4.05, -0.78, -9.73 }, @@ -683,7 +683,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { diameter = 1.523, elevation = 0, - engine_number = 3, + engine_number = 5, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, pos = { 4.05, -0.78, 9.73 }, @@ -691,7 +691,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { diameter = 1.523, elevation = 0, - engine_number = 3, + engine_number = 6, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, pos = { 4.05, -0.76, 11.12 }, @@ -699,7 +699,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { diameter = 1.523, elevation = 0, - engine_number = 4, + engine_number = 7, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, pos = { -1.82, -1.05, 17.66 }, @@ -707,7 +707,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { diameter = 1.523, elevation = 0, - engine_number = 4, + engine_number = 8, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, pos = { -1.82, -1.02, 19 }, @@ -948,7 +948,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { main_gear_amortizer_direct_stroke = 0, main_gear_amortizer_normal_weight_stroke = -0.3577, main_gear_amortizer_reversal_stroke = -0.477, - main_gear_pos = { -6.296, -3.849, 1.24 }, + main_gear_pos = { -6.296, -3.8, 1.24 }, main_gear_wheel_diameter = 1.39, mapclasskey = "P0091000027", mechanimations = { @@ -1027,7 +1027,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.3577, nose_gear_amortizer_reversal_stroke = -0.477, - nose_gear_pos = { 9.051, -3.849, 1.24 }, + nose_gear_pos = { 9.051, -3.8, 1.24 }, nose_gear_wheel_diameter = 1.39, passivCounterm = { CMDS_Edit = false, diff --git a/_G/db/Units/Planes/Plane/C-101CC.lua b/_G/db/Units/Planes/Plane/C-101CC.lua index 18b09d2f..8be380bc 100644 --- a/_G/db/Units/Planes/Plane/C-101CC.lua +++ b/_G/db/Units/Planes/Plane/C-101CC.lua @@ -1304,7 +1304,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { V_take_off = 53, Vy_max = 10, Waypoint_Custom_Panel = true, - WingSpan = 14, + WingSpan = 10.6, WorldID = 270, _file = "./CoreMods/aircraft/C-101/C-101CC.lua", _origin = "C-101 Aviojet by AvioDev", @@ -1322,16 +1322,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.677, 2.677, 0 }, - drop_canopy_name = 275, + drop_canopy_name = 276, drop_parachute_name = "C-101_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, ejection_play_arg = 149, - ejection_seat_name = 274, + ejection_seat_name = 275, ejection_through_canopy = true, g_suit = 0.8, pilot_body_arg = 50, - pilot_name = 276, + pilot_name = 277, pos = { 3.233, 0.066, 0, 5 }, role = "pilot", role_display_name = "Pilot" @@ -1343,16 +1343,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 421, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 1.01, 0.786, 0 }, - drop_canopy_name = 278, + drop_canopy_name = 279, drop_parachute_name = "C-101_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, ejection_play_arg = 473, - ejection_seat_name = 277, + ejection_seat_name = 278, ejection_through_canopy = true, g_suit = 0.8, pilot_body_arg = 472, - pilot_name = 279, + pilot_name = 280, pos = { 1.681, 0.339, 0, 5 }, role = "instructor", role_display_name = "Instructor" @@ -1915,12 +1915,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { positioning = "BYNORMAL" } }, swapped_names = true, - tand_gear_max = 0.577, tanker_type = 0, thrust_sum_ab = 2100, thrust_sum_max = 2100, type = "C-101CC", + wheel_steering_angle_max = 1.3089969389957, wing_area = 20, - wing_span = 14, + wing_span = 10.6, wing_tip_pos = { -0.77, -0.049, 5.294 } } \ No newline at end of file diff --git a/_G/db/Units/Planes/Plane/C-101EB.lua b/_G/db/Units/Planes/Plane/C-101EB.lua index a5da391a..bc8abb8d 100644 --- a/_G/db/Units/Planes/Plane/C-101EB.lua +++ b/_G/db/Units/Planes/Plane/C-101EB.lua @@ -757,7 +757,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { V_take_off = 53, Vy_max = 10, Waypoint_Custom_Panel = true, - WingSpan = 14, + WingSpan = 10.6, WorldID = 269, _file = "./CoreMods/aircraft/C-101/C-101.lua", _origin = "C-101 Aviojet by AvioDev", @@ -775,16 +775,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.677, 2.677, 0 }, - drop_canopy_name = 275, + drop_canopy_name = 276, drop_parachute_name = "C-101_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, ejection_play_arg = 149, - ejection_seat_name = 274, + ejection_seat_name = 275, ejection_through_canopy = true, g_suit = 0.8, pilot_body_arg = 50, - pilot_name = 276, + pilot_name = 277, pos = { 3.233, 0.066, 0, 5 }, role = "pilot", role_display_name = "Pilot" @@ -796,16 +796,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 421, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 1.01, 0.786, 0 }, - drop_canopy_name = 278, + drop_canopy_name = 279, drop_parachute_name = "C-101_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, ejection_play_arg = 473, - ejection_seat_name = 277, + ejection_seat_name = 278, ejection_through_canopy = true, g_suit = 0.8, pilot_body_arg = 472, - pilot_name = 279, + pilot_name = 280, pos = { 1.681, 0.339, 0, 5 }, role = "instructor", role_display_name = "Instructor" @@ -1363,12 +1363,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { positioning = "BYNORMAL" } }, swapped_names = true, - tand_gear_max = 0.577, tanker_type = 0, thrust_sum_ab = 1588, thrust_sum_max = 1588, type = "C-101EB", + wheel_steering_angle_max = 1.3089969389957, wing_area = 20, - wing_span = 14, + wing_span = 10.6, wing_tip_pos = { -0.77, -0.049, 5.294 } } \ No newline at end of file diff --git a/_G/db/Units/Planes/Plane/Christen Eagle II.lua b/_G/db/Units/Planes/Plane/Christen Eagle II.lua index 7fa03784..2aaf2a1a 100644 --- a/_G/db/Units/Planes/Plane/Christen Eagle II.lua +++ b/_G/db/Units/Planes/Plane/Christen Eagle II.lua @@ -470,13 +470,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_arg = 38, canopy_ejection_dir = { 0, 2, 2 }, canopy_pos = { 1.61, 1.18, 0 }, - drop_canopy_name = 288, + drop_canopy_name = 289, drop_parachute_name = "CE2_Pilot_01_Parachute", ejection_added_speed = { -1, 3, -3 }, ejection_order = 2, ejection_seat_name = 0, pilot_body_arg = 50, - pilot_name = 289, + pilot_name = 290, pos = { -1, -0.08, 0 }, role = "instructor", role_display_name = "Instructor Pilot" @@ -485,13 +485,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_arg = 38, canopy_ejection_dir = { 0, 2, 2 }, canopy_pos = { 1.61, 1.18, 0 }, - drop_canopy_name = 288, + drop_canopy_name = 289, drop_parachute_name = "CE2_Pilot_02_Parachute", ejection_added_speed = { -1, 3, -3 }, ejection_order = 1, ejection_seat_name = 0, pilot_body_arg = 472, - pilot_name = 290, + pilot_name = 291, pos = { -0.37, -0.1, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/F-117A.lua b/_G/db/Units/Planes/Plane/F-117A.lua index 03d7db2d..4c326176 100644 --- a/_G/db/Units/Planes/Plane/F-117A.lua +++ b/_G/db/Units/Planes/Plane/F-117A.lua @@ -5,100 +5,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CanopyGeometry = { -0.17364817766693, -0.40821789367673, -0.64278760968654, 0.11161889704895, 0.86602540378444 }, Categories = {}, Damage = { - [0] = { - args = { 82 }, - critical_damage = 5 - }, [3] = { - args = { 65 }, - critical_damage = 10 - }, - [8] = { - critical_damage = 10 - }, - [11] = { - critical_damage = 3 - }, - [12] = { critical_damage = 3 }, - [15] = { - critical_damage = 10 - }, - [16] = { + [10] = { critical_damage = 10 }, - [17] = { - critical_damage = 3 - }, - [18] = { + [11] = { critical_damage = 3 - }, - [25] = { - args = { 53 }, - critical_damage = 5 - }, - [26] = { - args = { 54 }, - critical_damage = 5 - }, - [35] = { - args = { 67 }, - critical_damage = 10, - deps_cells = { 25, 37 } - }, - [36] = { - args = { 68 }, - critical_damage = 10, - deps_cells = { 26, 38 } - }, - [37] = { - args = { 55 }, - critical_damage = 4 - }, - [38] = { - args = { 56 }, - critical_damage = 4 - }, - [43] = { - args = { 61 }, - critical_damage = 4, - deps_cells = { 53 } - }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } - }, - [47] = { - args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } - }, - [48] = { - args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 - }, - [53] = { - args = { 57 }, - critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 15 } }, DamageParts = { "F-117-OBLOMOK-WING-R", "F-117-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/F-14A-135-GR.lua b/_G/db/Units/Planes/Plane/F-14A-135-GR.lua index 012fc7bf..2c6e34b7 100644 --- a/_G/db/Units/Planes/Plane/F-14A-135-GR.lua +++ b/_G/db/Units/Planes/Plane/F-14A-135-GR.lua @@ -2207,6 +2207,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "{PHXBRU3242_2*MK20 LS}", connector = "WEP_PhoenixWingPylon_L" + }, { + CLSID = "{PHXBRU3242_2*CBU99 LS}", + connector = "WEP_PhoenixWingPylon_L" }, { CLSID = "{PHXBRU3242_MK83 LS}", connector = "WEP_PhoenixWingPylon_L" @@ -2523,6 +2526,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -2535,6 +2541,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -2662,6 +2671,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -2674,6 +2686,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -2801,6 +2816,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -2813,6 +2831,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -2997,6 +3018,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -3009,6 +3033,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -3496,6 +3523,48 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 7 } } + }, { + CLSID = "{BRU-32 CBU-99}", + arg = 601, + arg_value = 0.5, + connector = "WEP_BRU-34_F_L", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 7 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 7 + } } }, { CLSID = "{BRU3242_ADM141}", arg = 601, @@ -4300,6 +4369,84 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 7 } } + }, { + CLSID = "{MAK79_CBU99 2L}", + arg = 601, + arg_value = 0, + connector = "MAK-79_Root_F_L", + forbidden = { { + loadout = { "{AIM_54A_Mk47}" }, + station = 5 + }, { + loadout = { "{AIM_54A_Mk60}" }, + station = 5 + }, { + loadout = { "{AIM_54C_Mk47}" }, + station = 5 + }, { + loadout = { "{AIM_54C_Mk60}" }, + station = 5 + }, { + loadout = { "{BRU-32 GBU-12}" }, + station = 5 + }, { + loadout = { "{BRU-32 GBU-16}" }, + station = 5 + }, { + loadout = { "{MAK79_MK81 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_MK82 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_BDU45 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_BDU45B 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_MK82AIR 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_MK82SE 3L}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 7 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 7 + } } } }, Number = 4, Order = 4, @@ -4358,6 +4505,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "" }, station = 4 @@ -4449,6 +4599,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "" }, station = 4 @@ -4540,6 +4693,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "" }, station = 4 @@ -4631,6 +4787,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "" }, station = 4 @@ -4737,6 +4896,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -4749,6 +4911,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -4831,6 +4996,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -4843,6 +5011,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -4925,6 +5096,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -4937,6 +5111,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -5032,6 +5209,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -5044,6 +5224,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -5120,6 +5303,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -5132,6 +5318,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -5345,6 +5534,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5375,6 +5567,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5421,6 +5616,33 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 6 } } + }, { + CLSID = "{BRU-32 CBU-99}", + arg = 603, + arg_value = 0.5, + connector = "WEP_BRU-34_R_L", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 6 + } } }, { CLSID = "{BRU3242_ADM141}", arg = 603, @@ -5558,6 +5780,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5591,6 +5816,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5624,6 +5852,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5657,6 +5888,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5720,6 +5954,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5753,6 +5990,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5829,6 +6069,33 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 6 } } + }, { + CLSID = "{MAK79_CBU99 1L}", + arg = 603, + arg_value = 0, + connector = "MAK-79_Root_R_L", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 6 + } } } }, Number = 5, Order = 5, @@ -5871,9 +6138,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU3242_2*LAU10 R}" }, station = 4 - }, { - loadout = { "{BRU-32 MK-82}" }, - station = 4 }, { loadout = { "{BRU-32 MK-82AIR}" }, station = 4 @@ -5914,16 +6178,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{MAK79_MK83 3L}" }, station = 4 }, { - loadout = { "{BRU-32 MK-83}" }, - station = 4 - }, { - loadout = { "{BRU-32 GBU-12}" }, - station = 4 - }, { - loadout = { "{BRU-32 GBU-16}" }, + loadout = { "{BRU-32 MK-20}" }, station = 4 }, { - loadout = { "{BRU-32 MK-20}" }, + loadout = { "{BRU-32 CBU-99}" }, station = 4 }, { loadout = { "{BRU3242_ADM141}" }, @@ -5937,6 +6195,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -5955,9 +6216,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU3242_2*LAU10 R}" }, station = 7 - }, { - loadout = { "{BRU-32 MK-82}" }, - station = 7 }, { loadout = { "{BRU-32 MK-82AIR}" }, station = 7 @@ -5998,16 +6256,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{MAK79_MK83 3L}" }, station = 7 }, { - loadout = { "{BRU-32 MK-83}" }, - station = 7 - }, { - loadout = { "{BRU-32 GBU-12}" }, - station = 7 - }, { - loadout = { "{BRU-32 GBU-16}" }, + loadout = { "{BRU-32 MK-20}" }, station = 7 }, { - loadout = { "{BRU-32 MK-20}" }, + loadout = { "{BRU-32 CBU-99}" }, station = 7 }, { loadout = { "{BRU3242_ADM141}" }, @@ -6021,6 +6273,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 7 }, { loadout = { "{BRU-32 GBU-24}" }, station = 7 @@ -6113,6 +6368,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-84}" }, station = 7 @@ -6204,6 +6462,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-84}" }, station = 7 @@ -6295,6 +6556,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-84}" }, station = 7 @@ -6386,6 +6650,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-84}" }, station = 7 @@ -6468,6 +6735,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -6480,6 +6750,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -6552,6 +6825,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 5 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 5 }, { loadout = { "{BRU3242_ADM141}" }, station = 5 @@ -6561,6 +6837,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1L}" }, station = 5 + }, { + loadout = { "{MAK79_CBU99 1L}" }, + station = 5 }, { loadout = { "" }, station = 5 @@ -6621,6 +6900,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -6633,6 +6915,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -6745,6 +7030,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -6757,6 +7045,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -6829,6 +7120,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 5 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 5 }, { loadout = { "{BRU3242_ADM141}" }, station = 5 @@ -6838,6 +7132,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1L}" }, station = 5 + }, { + loadout = { "{MAK79_CBU99 1L}" }, + station = 5 }, { loadout = { "" }, station = 5 @@ -6898,6 +7195,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -6910,6 +7210,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -7022,6 +7325,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -7034,6 +7340,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -7106,6 +7415,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 5 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 5 }, { loadout = { "{BRU3242_ADM141}" }, station = 5 @@ -7115,6 +7427,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1L}" }, station = 5 + }, { + loadout = { "{MAK79_CBU99 1L}" }, + station = 5 }, { loadout = { "" }, station = 5 @@ -7175,6 +7490,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -7187,6 +7505,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -7307,6 +7628,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -7319,6 +7643,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -7391,6 +7718,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 5 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 5 }, { loadout = { "{BRU3242_ADM141}" }, station = 5 @@ -7400,6 +7730,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1L}" }, station = 5 + }, { + loadout = { "{MAK79_CBU99 1L}" }, + station = 5 }, { loadout = { "" }, station = 5 @@ -7460,6 +7793,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -7472,6 +7808,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -7706,6 +8045,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{BRU-32 GBU-16}", @@ -7736,6 +8078,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{BRU-32 MK-20}", @@ -7761,6 +8106,30 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 5 } } + }, { + CLSID = "{BRU-32 CBU-99}", + arg = 604, + arg_value = 0.5, + connector = "WEP_BRU-34_R_R", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 5 + }, { + loadout = { "" }, + station = 5 + } } }, { CLSID = "{BRU3242_ADM141}", arg = 604, @@ -7898,6 +8267,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_MK82 3R}", @@ -7931,6 +8303,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_BDU45 3R}", @@ -7964,6 +8339,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_BDU45B 3R}", @@ -7997,6 +8375,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_BDU33 3R}", @@ -8060,6 +8441,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_MK82SE 3R}", @@ -8093,6 +8477,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_MK83 1R}", @@ -8142,6 +8529,30 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 5 } } + }, { + CLSID = "{MAK79_CBU99 1R}", + arg = 604, + arg_value = 0, + connector = "MAK-79_Root_R_R", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 5 + }, { + loadout = { "" }, + station = 5 + } } } }, Number = 6, Order = 6, @@ -8411,6 +8822,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -8423,6 +8837,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -8553,6 +8970,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -8565,6 +8985,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -8695,6 +9118,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -8707,6 +9133,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -8894,6 +9323,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -8906,6 +9338,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -9003,8 +9438,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "{F14-ALQ167}", arg = 602, - arg_value = 0, - connector = "WEP_Phoenix_FrontPallette_R", + arg_value = 0.5, + connector = "WEP_BRU-34_F_R", forbidden = { { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -9417,6 +9852,48 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 4 } } + }, { + CLSID = "{BRU-32 CBU-99}", + arg = 602, + arg_value = 0.5, + connector = "WEP_BRU-34_F_R", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 4 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 4 + } } }, { CLSID = "{BRU3242_ADM141}", arg = 602, @@ -10152,6 +10629,69 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 4 } } + }, { + CLSID = "{MAK79_CBU99 2R}", + arg = 602, + arg_value = 0, + connector = "MAK-79_Root_F_R", + forbidden = { { + loadout = { "{AIM_54A_Mk47}" }, + station = 6 + }, { + loadout = { "{AIM_54A_Mk60}" }, + station = 6 + }, { + loadout = { "{AIM_54C_Mk47}" }, + station = 6 + }, { + loadout = { "{AIM_54C_Mk60}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{BRU-32 GBU-24}" }, + station = 6 + }, { + loadout = { "{BRU-32 GBU-12}" }, + station = 6 + }, { + loadout = { "{BRU-32 GBU-16}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 4 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 4 + } } } }, Number = 7, Order = 7, @@ -10466,6 +11006,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "{PHXBRU3242_2*MK20 RS}", connector = "WEP_PhoenixWingPylon_R" + }, { + CLSID = "{PHXBRU3242_2*CBU99 RS}", + connector = "WEP_PhoenixWingPylon_R" }, { CLSID = "{PHXBRU3242_MK83 RS}", connector = "WEP_PhoenixWingPylon_R" @@ -10887,6 +11430,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { dir = { -1, 0, 0 }, pos = { -0.47967, 0.2638, 3.4626 } + }, { + dir = { 0, -1, 0 }, + pos = { 2.749, -0.662, -0.52 } } }, crew_members = { { can_be_playable = true, diff --git a/_G/db/Units/Planes/Plane/F-14B.lua b/_G/db/Units/Planes/Plane/F-14B.lua index de22d919..d0dd7b97 100644 --- a/_G/db/Units/Planes/Plane/F-14B.lua +++ b/_G/db/Units/Planes/Plane/F-14B.lua @@ -2207,6 +2207,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "{PHXBRU3242_2*MK20 LS}", connector = "WEP_PhoenixWingPylon_L" + }, { + CLSID = "{PHXBRU3242_2*CBU99 LS}", + connector = "WEP_PhoenixWingPylon_L" }, { CLSID = "{PHXBRU3242_MK83 LS}", connector = "WEP_PhoenixWingPylon_L" @@ -2523,6 +2526,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -2535,6 +2541,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -2662,6 +2671,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -2674,6 +2686,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -2801,6 +2816,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -2813,6 +2831,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -2997,6 +3018,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -3009,6 +3033,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -3496,6 +3523,48 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 7 } } + }, { + CLSID = "{BRU-32 CBU-99}", + arg = 601, + arg_value = 0.5, + connector = "WEP_BRU-34_F_L", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 7 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 7 + } } }, { CLSID = "{BRU3242_ADM141}", arg = 601, @@ -4300,6 +4369,84 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 7 } } + }, { + CLSID = "{MAK79_CBU99 2L}", + arg = 601, + arg_value = 0, + connector = "MAK-79_Root_F_L", + forbidden = { { + loadout = { "{AIM_54A_Mk47}" }, + station = 5 + }, { + loadout = { "{AIM_54A_Mk60}" }, + station = 5 + }, { + loadout = { "{AIM_54C_Mk47}" }, + station = 5 + }, { + loadout = { "{AIM_54C_Mk60}" }, + station = 5 + }, { + loadout = { "{BRU-32 GBU-12}" }, + station = 5 + }, { + loadout = { "{BRU-32 GBU-16}" }, + station = 5 + }, { + loadout = { "{MAK79_MK81 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_MK82 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_BDU45 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_BDU45B 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_MK82AIR 3L}" }, + station = 5 + }, { + loadout = { "{MAK79_MK82SE 3L}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 7 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 7 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 7 + } } } }, Number = 4, Order = 4, @@ -4358,6 +4505,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "" }, station = 4 @@ -4449,6 +4599,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "" }, station = 4 @@ -4540,6 +4693,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "" }, station = 4 @@ -4631,6 +4787,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "" }, station = 4 @@ -4737,6 +4896,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -4749,6 +4911,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -4831,6 +4996,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -4843,6 +5011,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -4925,6 +5096,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -4937,6 +5111,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -5032,6 +5209,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -5044,6 +5224,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -5120,6 +5303,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1R}" }, station = 6 + }, { + loadout = { "{MAK79_CBU99 1R}" }, + station = 6 }, { loadout = { "{BRU-32 MK-83}" }, station = 6 @@ -5132,6 +5318,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 6 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 6 }, { loadout = { "{BRU3242_ADM141}" }, station = 6 @@ -5345,6 +5534,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5375,6 +5567,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5421,6 +5616,33 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 6 } } + }, { + CLSID = "{BRU-32 CBU-99}", + arg = 603, + arg_value = 0.5, + connector = "WEP_BRU-34_R_L", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 6 + } } }, { CLSID = "{BRU3242_ADM141}", arg = 603, @@ -5558,6 +5780,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5591,6 +5816,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5624,6 +5852,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5657,6 +5888,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5720,6 +5954,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5753,6 +5990,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -5829,6 +6069,33 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 6 } } + }, { + CLSID = "{MAK79_CBU99 1L}", + arg = 603, + arg_value = 0, + connector = "MAK-79_Root_R_L", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 6 + } } } }, Number = 5, Order = 5, @@ -5871,9 +6138,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU3242_2*LAU10 R}" }, station = 4 - }, { - loadout = { "{BRU-32 MK-82}" }, - station = 4 }, { loadout = { "{BRU-32 MK-82AIR}" }, station = 4 @@ -5914,16 +6178,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{MAK79_MK83 3L}" }, station = 4 }, { - loadout = { "{BRU-32 MK-83}" }, - station = 4 - }, { - loadout = { "{BRU-32 GBU-12}" }, - station = 4 - }, { - loadout = { "{BRU-32 GBU-16}" }, + loadout = { "{BRU-32 MK-20}" }, station = 4 }, { - loadout = { "{BRU-32 MK-20}" }, + loadout = { "{BRU-32 CBU-99}" }, station = 4 }, { loadout = { "{BRU3242_ADM141}" }, @@ -5937,6 +6195,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -5955,9 +6216,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU3242_2*LAU10 R}" }, station = 7 - }, { - loadout = { "{BRU-32 MK-82}" }, - station = 7 }, { loadout = { "{BRU-32 MK-82AIR}" }, station = 7 @@ -5998,16 +6256,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{MAK79_MK83 3L}" }, station = 7 }, { - loadout = { "{BRU-32 MK-83}" }, - station = 7 - }, { - loadout = { "{BRU-32 GBU-12}" }, - station = 7 - }, { - loadout = { "{BRU-32 GBU-16}" }, + loadout = { "{BRU-32 MK-20}" }, station = 7 }, { - loadout = { "{BRU-32 MK-20}" }, + loadout = { "{BRU-32 CBU-99}" }, station = 7 }, { loadout = { "{BRU3242_ADM141}" }, @@ -6021,6 +6273,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 7 }, { loadout = { "{BRU-32 GBU-24}" }, station = 7 @@ -6113,6 +6368,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-84}" }, station = 7 @@ -6204,6 +6462,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-84}" }, station = 7 @@ -6295,6 +6556,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-84}" }, station = 7 @@ -6386,6 +6650,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-84}" }, station = 7 @@ -6468,6 +6735,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -6480,6 +6750,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -6552,6 +6825,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 5 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 5 }, { loadout = { "{BRU3242_ADM141}" }, station = 5 @@ -6561,6 +6837,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1L}" }, station = 5 + }, { + loadout = { "{MAK79_CBU99 1L}" }, + station = 5 }, { loadout = { "" }, station = 5 @@ -6621,6 +6900,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -6633,6 +6915,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -6745,6 +7030,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -6757,6 +7045,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -6829,6 +7120,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 5 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 5 }, { loadout = { "{BRU3242_ADM141}" }, station = 5 @@ -6838,6 +7132,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1L}" }, station = 5 + }, { + loadout = { "{MAK79_CBU99 1L}" }, + station = 5 }, { loadout = { "" }, station = 5 @@ -6898,6 +7195,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -6910,6 +7210,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -7022,6 +7325,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -7034,6 +7340,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -7106,6 +7415,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 5 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 5 }, { loadout = { "{BRU3242_ADM141}" }, station = 5 @@ -7115,6 +7427,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1L}" }, station = 5 + }, { + loadout = { "{MAK79_CBU99 1L}" }, + station = 5 }, { loadout = { "" }, station = 5 @@ -7175,6 +7490,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -7187,6 +7505,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -7307,6 +7628,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -7319,6 +7643,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -7391,6 +7718,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 5 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 5 }, { loadout = { "{BRU3242_ADM141}" }, station = 5 @@ -7400,6 +7730,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 1L}" }, station = 5 + }, { + loadout = { "{MAK79_CBU99 1L}" }, + station = 5 }, { loadout = { "" }, station = 5 @@ -7460,6 +7793,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 }, { loadout = { "{BRU-32 MK-83}" }, station = 7 @@ -7472,6 +7808,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 7 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 7 }, { loadout = { "{BRU3242_ADM141}" }, station = 7 @@ -7706,6 +8045,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{BRU-32 GBU-16}", @@ -7736,6 +8078,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{BRU-32 MK-20}", @@ -7761,6 +8106,30 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 5 } } + }, { + CLSID = "{BRU-32 CBU-99}", + arg = 604, + arg_value = 0.5, + connector = "WEP_BRU-34_R_R", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 5 + }, { + loadout = { "" }, + station = 5 + } } }, { CLSID = "{BRU3242_ADM141}", arg = 604, @@ -7898,6 +8267,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_MK82 3R}", @@ -7931,6 +8303,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_BDU45 3R}", @@ -7964,6 +8339,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_BDU45B 3R}", @@ -7997,6 +8375,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_BDU33 3R}", @@ -8060,6 +8441,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_MK82SE 3R}", @@ -8093,6 +8477,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2R}" }, station = 7 + }, { + loadout = { "{MAK79_CBU99 2R}" }, + station = 7 } } }, { CLSID = "{MAK79_MK83 1R}", @@ -8142,6 +8529,30 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 5 } } + }, { + CLSID = "{MAK79_CBU99 1R}", + arg = 604, + arg_value = 0, + connector = "MAK-79_Root_R_R", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 5 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 5 + }, { + loadout = { "" }, + station = 5 + } } } }, Number = 6, Order = 6, @@ -8411,6 +8822,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -8423,6 +8837,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -8553,6 +8970,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -8565,6 +8985,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -8695,6 +9118,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -8707,6 +9133,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -8894,6 +9323,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{BRU-32 MK-20}" }, station = 4 + }, { + loadout = { "{BRU-32 CBU-99}" }, + station = 4 }, { loadout = { "{BRU3242_ADM141}" }, station = 4 @@ -8906,6 +9338,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { loadout = { "{MAK79_MK20 2L}" }, station = 4 + }, { + loadout = { "{MAK79_CBU99 2L}" }, + station = 4 }, { loadout = { "{BRU-32 GBU-24}" }, station = 4 @@ -9003,8 +9438,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "{F14-ALQ167}", arg = 602, - arg_value = 0, - connector = "WEP_Phoenix_FrontPallette_R", + arg_value = 0.5, + connector = "WEP_BRU-34_F_R", forbidden = { { loadout = { "{BELLY AIM-7E}" }, station = 6 @@ -9417,6 +9852,48 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 4 } } + }, { + CLSID = "{BRU-32 CBU-99}", + arg = 602, + arg_value = 0.5, + connector = "WEP_BRU-34_F_R", + forbidden = { { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 4 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 4 + } } }, { CLSID = "{BRU3242_ADM141}", arg = 602, @@ -10152,6 +10629,69 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "" }, station = 4 } } + }, { + CLSID = "{MAK79_CBU99 2R}", + arg = 602, + arg_value = 0, + connector = "MAK-79_Root_F_R", + forbidden = { { + loadout = { "{AIM_54A_Mk47}" }, + station = 6 + }, { + loadout = { "{AIM_54A_Mk60}" }, + station = 6 + }, { + loadout = { "{AIM_54C_Mk47}" }, + station = 6 + }, { + loadout = { "{AIM_54C_Mk60}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 6 + }, { + loadout = { "{BRU-32 GBU-24}" }, + station = 6 + }, { + loadout = { "{BRU-32 GBU-12}" }, + station = 6 + }, { + loadout = { "{BRU-32 GBU-16}" }, + station = 6 + }, { + loadout = { "{BELLY AIM-7E}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7F}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7M}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7MH}" }, + station = 4 + }, { + loadout = { "{BELLY AIM-7P}" }, + station = 4 + }, { + loadout = { "{F14-TARPS}" }, + station = 6 + }, { + loadout = { "" }, + station = 4 + } } } }, Number = 7, Order = 7, @@ -10466,6 +11006,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "{PHXBRU3242_2*MK20 RS}", connector = "WEP_PhoenixWingPylon_R" + }, { + CLSID = "{PHXBRU3242_2*CBU99 RS}", + connector = "WEP_PhoenixWingPylon_R" }, { CLSID = "{PHXBRU3242_MK83 RS}", connector = "WEP_PhoenixWingPylon_R" @@ -10887,6 +11430,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { dir = { -1, 0, 0 }, pos = { -0.47967, 0.2638, 3.4626 } + }, { + dir = { 0, -1, 0 }, + pos = { 2.749, -0.662, -0.52 } } }, crew_members = { { can_be_playable = true, diff --git a/_G/db/Units/Planes/Plane/F-15ESE.lua b/_G/db/Units/Planes/Plane/F-15ESE.lua index e9147684..bba6c884 100644 --- a/_G/db/Units/Planes/Plane/F-15ESE.lua +++ b/_G/db/Units/Planes/Plane/F-15ESE.lua @@ -2949,14 +2949,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { can_be_playable = true, canopy_arg = 38, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 292, + drop_canopy_name = 293, drop_parachute_name = "F-15E_Pilot_Parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, - ejection_seat_name = 291, + ejection_seat_name = 292, g_suit = 2, pilot_body_arg = 50, - pilot_name = 293, + pilot_name = 294, pos = { 6.512, -0.369, 0 }, role = "pilot", role_display_name = "Pilot" @@ -2965,14 +2965,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { can_be_playable = true, canopy_arg = 38, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 292, + drop_canopy_name = 293, drop_parachute_name = "F-15E_Pilot_Parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, - ejection_seat_name = 294, + ejection_seat_name = 295, g_suit = 2, pilot_body_arg = 472, - pilot_name = 295, + pilot_name = 296, pos = { 5.112, -0.369, 0 }, role = "instructor", role_display_name = "WSO" diff --git a/_G/db/Units/Planes/Plane/F-16A MLU.lua b/_G/db/Units/Planes/Plane/F-16A MLU.lua index 980a1685..023abc99 100644 --- a/_G/db/Units/Planes/Plane/F-16A MLU.lua +++ b/_G/db/Units/Planes/Plane/F-16A MLU.lua @@ -43,15 +43,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [3] = { args = { 65 }, - critical_damage = 10 + critical_damage = 5 }, [8] = { critical_damage = 3 }, - [11] = { - critical_damage = 3 + [10] = { + critical_damage = 10 }, - [12] = { + [11] = { critical_damage = 3 }, [15] = { @@ -60,29 +60,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 5 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, - [25] = { - args = { 53 }, - critical_damage = 3 - }, - [26] = { - args = { 54 }, - critical_damage = 3 - }, [35] = { args = { 67 }, - critical_damage = 5, - deps_cells = { 25, 37 } + critical_damage = 5 }, [36] = { args = { 68 }, - critical_damage = 5, - deps_cells = { 26, 38 } + critical_damage = 5 }, [37] = { args = { 55 }, @@ -97,40 +81,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2, deps_cells = { 53 } }, - [44] = { - args = { 62 }, - critical_damage = 2, - deps_cells = { 54 } - }, [47] = { args = { 63 }, - critical_damage = 3, - deps_cells = { 51 } + critical_damage = 3 }, [48] = { args = { 64 }, - critical_damage = 3, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 3 }, [53] = { args = { 57 }, critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 10 } }, DamageParts = { "F-16-OBLOMOK-WING-R", "F-16-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/F-16A.lua b/_G/db/Units/Planes/Plane/F-16A.lua index ee57ac26..f5a41389 100644 --- a/_G/db/Units/Planes/Plane/F-16A.lua +++ b/_G/db/Units/Planes/Plane/F-16A.lua @@ -14,15 +14,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [3] = { args = { 65 }, - critical_damage = 10 + critical_damage = 5 }, [8] = { critical_damage = 3 }, - [11] = { - critical_damage = 3 + [10] = { + critical_damage = 10 }, - [12] = { + [11] = { critical_damage = 3 }, [15] = { @@ -31,29 +31,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 5 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, - [25] = { - args = { 53 }, - critical_damage = 3 - }, - [26] = { - args = { 54 }, - critical_damage = 3 - }, [35] = { args = { 67 }, - critical_damage = 5, - deps_cells = { 25, 37 } + critical_damage = 5 }, [36] = { args = { 68 }, - critical_damage = 5, - deps_cells = { 26, 38 } + critical_damage = 5 }, [37] = { args = { 55 }, @@ -68,40 +52,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2, deps_cells = { 53 } }, - [44] = { - args = { 62 }, - critical_damage = 2, - deps_cells = { 54 } - }, [47] = { args = { 63 }, - critical_damage = 3, - deps_cells = { 51 } + critical_damage = 3 }, [48] = { args = { 64 }, - critical_damage = 3, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 3 }, [53] = { args = { 57 }, critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 10 } }, DamageParts = { "F-16-OBLOMOK-WING-R", "F-16-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/F-16C bl.50.lua b/_G/db/Units/Planes/Plane/F-16C bl.50.lua index 1606c35b..0d5dddba 100644 --- a/_G/db/Units/Planes/Plane/F-16C bl.50.lua +++ b/_G/db/Units/Planes/Plane/F-16C bl.50.lua @@ -43,15 +43,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [3] = { args = { 65 }, - critical_damage = 10 + critical_damage = 5 }, [8] = { critical_damage = 3 }, - [11] = { - critical_damage = 3 + [10] = { + critical_damage = 10 }, - [12] = { + [11] = { critical_damage = 3 }, [15] = { @@ -60,29 +60,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 5 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, - [25] = { - args = { 53 }, - critical_damage = 3 - }, - [26] = { - args = { 54 }, - critical_damage = 3 - }, [35] = { args = { 67 }, - critical_damage = 5, - deps_cells = { 25, 37 } + critical_damage = 5 }, [36] = { args = { 68 }, - critical_damage = 5, - deps_cells = { 26, 38 } + critical_damage = 5 }, [37] = { args = { 55 }, @@ -97,40 +81,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2, deps_cells = { 53 } }, - [44] = { - args = { 62 }, - critical_damage = 2, - deps_cells = { 54 } - }, [47] = { args = { 63 }, - critical_damage = 3, - deps_cells = { 51 } + critical_damage = 3 }, [48] = { args = { 64 }, - critical_damage = 3, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 3 }, [53] = { args = { 57 }, critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 10 } }, DamageParts = { "F-16-OBLOMOK-WING-R", "F-16-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/F-16C bl.52d.lua b/_G/db/Units/Planes/Plane/F-16C bl.52d.lua index b2c32883..3bdbacd7 100644 --- a/_G/db/Units/Planes/Plane/F-16C bl.52d.lua +++ b/_G/db/Units/Planes/Plane/F-16C bl.52d.lua @@ -43,15 +43,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [3] = { args = { 65 }, - critical_damage = 10 + critical_damage = 5 }, [8] = { critical_damage = 3 }, - [11] = { - critical_damage = 3 + [10] = { + critical_damage = 10 }, - [12] = { + [11] = { critical_damage = 3 }, [15] = { @@ -60,29 +60,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 5 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, - [25] = { - args = { 53 }, - critical_damage = 3 - }, - [26] = { - args = { 54 }, - critical_damage = 3 - }, [35] = { args = { 67 }, - critical_damage = 5, - deps_cells = { 25, 37 } + critical_damage = 5 }, [36] = { args = { 68 }, - critical_damage = 5, - deps_cells = { 26, 38 } + critical_damage = 5 }, [37] = { args = { 55 }, @@ -97,40 +81,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2, deps_cells = { 53 } }, - [44] = { - args = { 62 }, - critical_damage = 2, - deps_cells = { 54 } - }, [47] = { args = { 63 }, - critical_damage = 3, - deps_cells = { 51 } + critical_damage = 3 }, [48] = { args = { 64 }, - critical_damage = 3, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 3 }, [53] = { args = { 57 }, critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 10 } }, DamageParts = { "F-16-OBLOMOK-WING-R", "F-16-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/F-16C_50.lua b/_G/db/Units/Planes/Plane/F-16C_50.lua index 7d86bbaa..3a49aaff 100644 --- a/_G/db/Units/Planes/Plane/F-16C_50.lua +++ b/_G/db/Units/Planes/Plane/F-16C_50.lua @@ -2158,10 +2158,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { country_of_origin = "USA", crew_members = { { canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 297, - ejection_seat_name = 296, + drop_canopy_name = 298, + ejection_seat_name = 297, g_suit = 1.02, - pilot_name = 298, + pilot_name = 268, pos = { 3.32, 0.27, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/F-4E-45MC.lua b/_G/db/Units/Planes/Plane/F-4E-45MC.lua index 1048d839..66da2b6c 100644 --- a/_G/db/Units/Planes/Plane/F-4E-45MC.lua +++ b/_G/db/Units/Planes/Plane/F-4E-45MC.lua @@ -1531,7 +1531,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, ejector_dir = { 0, 0, 0 }, ejector_pos = { 0, 0, 0 }, - ejector_pos_connector = "Gun_point", + ejector_pos_connector = "pnt_shell", elevation_initial = 0, gun = { barrels_count = 1, @@ -1616,12 +1616,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { rotation_freq = 7, round_mass = 0.349, s = 0, + scale_smoke = 1, scale_tracer = 0, silent_self_destruction = false, - smoke_tail_life_time = -1, + smoke_opacity = 0.1, + smoke_tail_life_time = 0.2, subcalibre = false, - tracer_off = -100, - tracer_on = 0, + tracer_off = -1, + tracer_on = -1, type_name = "shell", user_name = "M56A3 20mm HEI", v0 = 1011.936, @@ -1684,12 +1686,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { rotation_freq = 7, round_mass = 0.349, s = 0, + scale_smoke = 1, scale_tracer = 0, silent_self_destruction = false, - smoke_tail_life_time = -1, + smoke_opacity = 0.1, + smoke_tail_life_time = 0.2, subcalibre = false, - tracer_off = -100, - tracer_on = 0, + tracer_off = -1, + tracer_on = -1, type_name = "shell", user_name = "M53 20mm API", v0 = 1030.224, @@ -1753,12 +1757,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { rotation_freq = 7, round_mass = 0.349, s = 0, + scale_smoke = 1, scale_tracer = 0, silent_self_destruction = false, - smoke_tail_life_time = -1, + smoke_opacity = 0.1, + smoke_tail_life_time = 0.2, subcalibre = false, - tracer_off = -100, - tracer_on = 0, + tracer_off = -1, + tracer_on = -1, type_name = "shell", user_name = "M55A2 20mm TP", v0 = 1030.224, @@ -1821,12 +1827,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { rotation_freq = 7, round_mass = 0.349, s = 0, + scale_smoke = 1, scale_tracer = 1, silent_self_destruction = false, - smoke_tail_life_time = -1, + smoke_opacity = 0.1, + smoke_tail_life_time = 1.5, subcalibre = false, - tracer_off = 6, - tracer_on = 0, + tracer_off = 6.1, + tracer_on = 0.01, type_name = "shell", user_name = "20mm tracer", v0 = 1030.224, @@ -33035,7 +33043,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, Sensors = { - OPTIC = "Shkval", RADAR = "HB_ANAPQ_120", RWR = "Abstract RWR" }, @@ -33439,6 +33446,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { has_speedbrake = true, height = 5, is_tanker = false, + laserEquipment = { + laserDesignator = true, + laserRangefinder = true + }, length = 19.2, lights_data = { lights = { { diff --git a/_G/db/Units/Planes/Plane/FA-18C_hornet.lua b/_G/db/Units/Planes/Plane/FA-18C_hornet.lua index 64e3577e..e9b357a8 100644 --- a/_G/db/Units/Planes/Plane/FA-18C_hornet.lua +++ b/_G/db/Units/Planes/Plane/FA-18C_hornet.lua @@ -1808,47 +1808,51 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Cx_gain_empty = 0.477, Cx_gain_item = 0.357 }, <67>{ + CLSID = "{BRU55_2*GBU-32}", + Cx_gain_empty = 0.477, + Cx_gain_item = 0.357 + }, <68>{ CLSID = "{C40A1E3A-DD05-40D9-85A4-217729E37FAE}", Cx_gain = 1.175 - }, <68>{ + }, <69>{ CLSID = "{BDU_45LG}", Cx_gain = 0.996 - }, <69>{ + }, <70>{ CLSID = "{BRU33_2X_BDU_45LG}", Cx_gain_empty = 0.373, Cx_gain_item = 1.178 - }, <70>{ + }, <71>{ CLSID = "{AGM_84D}", Cx_gain = 0.355, Type = 1 - }, <71>{ + }, <72>{ CLSID = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", Cx_gain = 0.519, Type = 1 - }, <72>{ + }, <73>{ CLSID = "{AGM_84H}", Cx_gain = 0.467, Type = 1 - }, <73>{ + }, <74>{ CLSID = "{AWW-13}", Cx_gain = 0.784, arg_value = 0.1 - }, <74>{ + }, <75>{ CLSID = "{BRU_42A_x3_ADM_141A}", Cx_gain_empty = 0.338, Cx_gain_item = 0.237, Type = 1 - }, <75>{ + }, <76>{ CLSID = "{BRU_42A_x2_ADM_141A}", Cx_gain_empty = 0.338, Cx_gain_item = 0.237, Type = 1 - }, <76>{ + }, <77>{ CLSID = "{BRU_42A_x1_ADM_141A}", Cx_gain_empty = 0.338, Cx_gain_item = 0.237, Type = 1 - }, <77>{ + }, <78>{ CLSID = "", add_mass = -140.6, arg_value = 1 @@ -1889,225 +1893,229 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mass = 140.6, use_full_connector_position = true }, { - Launchers = { <78>{ + Launchers = { <79>{ CLSID = "{LAU-115 - AIM-7M}", Cx_gain_empty = 0.7435, Cx_gain_item = 0.734 - }, <79>{ + }, <80>{ CLSID = "{LAU-115 - AIM-7F}", Cx_gain_empty = 0.7435, Cx_gain_item = 0.734 - }, <80>{ + }, <81>{ CLSID = "{LAU-115 - AIM-7H}", Cx_gain_empty = 0.7435, Cx_gain_item = 0.734 - }, <81>{ + }, <82>{ CLSID = "{LAU-115 - AIM-7P}", Cx_gain_empty = 0.7435, Cx_gain_item = 0.734 - }, <82>{ + }, <83>{ CLSID = "LAU-115_2*LAU-127_AIM-120B", Cx_gain_empty = 0.786, Cx_gain_item = 0.543 - }, <83>{ + }, <84>{ CLSID = "LAU-115_2*LAU-127_AIM-120C", Cx_gain_empty = 0.786, Cx_gain_item = 0.543 - }, <84>{ + }, <85>{ CLSID = "{F16A4DE0-116C-4A71-97F0-2CF85B0313EC}", Cx_gain_empty = 0.794, Cx_gain_item = 1.593 - }, <85>{ + }, <86>{ CLSID = "LAU_117_AGM_65F", Cx_gain_empty = 0.794, Cx_gain_item = 1.593 - }, <86>{ + }, <87>{ CLSID = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", Cx_gain_empty = 1.987, Cx_gain_item = 0.621 - }, <87>{ + }, <88>{ CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", Cx_gain = 1.24 - }, <88>{ + }, <89>{ CLSID = "{Mk82SNAKEYE}", Cx_gain = 1.773 - }, <89>{ + }, <90>{ CLSID = "{Mk_82Y}", Cx_gain = 0.943 - }, <90>{ + }, <91>{ CLSID = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", Cx_gain = 1.466 - }, <91>{ + }, <92>{ CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", Cx_gain = 1.296 - }, <92>{ + }, <93>{ CLSID = "{BDU_45}", Cx_gain = 0.944 - }, <93>{ + }, <94>{ CLSID = "{BDU_45B}", Cx_gain = 0.566 - }, <94>{ + }, <95>{ CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", Cx_gain = 1.951 - }, <95>{ + }, <96>{ CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", Cx_gain = 0.996 - }, <96>{ + }, <97>{ CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", Cx_gain = 1.53 - }, <97>{ + }, <98>{ CLSID = "{CBU_99}", Cx_gain = 1.201 - }, <98>{ + }, <99>{ CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", Cx_gain = 1.871 - }, <99>{ + }, <100>{ CLSID = "{BRU33_2X_MK-82}", Cx_gain_empty = 0.335, Cx_gain_item = 1.653 - }, <100>{ + }, <101>{ CLSID = "{BRU33_2X_MK-82_Snakeye}", Cx_gain_empty = 0.328, Cx_gain_item = 2.128 - }, <101>{ + }, <102>{ CLSID = "{BRU33_2X_MK-82Y}", Cx_gain_empty = 0.379, Cx_gain_item = 1.132 - }, <102>{ + }, <103>{ CLSID = "{BRU33_2X_MK-83}", Cx_gain_empty = 0.339, Cx_gain_item = 1.76 - }, <103>{ + }, <104>{ CLSID = "{BRU33_2X_BDU-45}", Cx_gain_empty = 0.379, Cx_gain_item = 1.132 - }, <104>{ + }, <105>{ CLSID = "{BRU33_2X_BDU-45B}", Cx_gain_empty = 0.398, Cx_gain_item = 0.755 - }, <105>{ + }, <106>{ CLSID = "{BRU33_2X_GBU-12}", Cx_gain_empty = 0.373, Cx_gain_item = 1.178 - }, <106>{ + }, <107>{ CLSID = "{BRU33_2X_CBU-99}", Cx_gain_empty = 0.325, Cx_gain_item = 1.44 - }, <107>{ + }, <108>{ CLSID = "{BRU33_2X_ROCKEYE}", Cx_gain_empty = 0.341, Cx_gain_item = 1.496 - }, <108>{ + }, <109>{ CLSID = "{BRU33_LAU68}", Cx_gain = 0.406 - }, <109>{ + }, <110>{ CLSID = "{BRU33_2*LAU68}", Cx_gain = 0.443 - }, <110>{ + }, <111>{ CLSID = "{BRU33_LAU68_MK5}", Cx_gain = 0.406 - }, <111>{ + }, <112>{ CLSID = "{BRU33_2*LAU68_MK5}", Cx_gain = 0.443 - }, <112>{ + }, <113>{ CLSID = "{BRU33_LAU10}", Cx_gain = 0.589 - }, <113>{ + }, <114>{ CLSID = "{BRU33_2*LAU10}", Cx_gain = 0.699 - }, <114>{ + }, <115>{ CLSID = "{BRU33_LAU61}", Cx_gain = 0.692 - }, <115>{ + }, <116>{ CLSID = "{BRU33_2*LAU61}", Cx_gain = 0.846 - }, <116>{ + }, <117>{ CLSID = "{BRU41_6X_BDU-33}", Cx_gain_empty = 6.024, Cx_gain_item = 3.636 - }, <117>{ + }, <118>{ CLSID = "{AGM-154A}", Cx_gain = 0.277, Type = 1 - }, <118>{ + }, <119>{ CLSID = "{9BCC2A2B-5708-4860-B1F1-053A18442067}", Cx_gain = 0.277, Type = 1 - }, <119>{ + }, <120>{ CLSID = "{BRU55_2*AGM-154A}", Cx_gain_empty = 0.371, Cx_gain_item = 0.277, Type = 1 - }, <120>{ + }, <121>{ CLSID = "{BRU55_2*AGM-154C}", Cx_gain_empty = 0.371, Cx_gain_item = 0.277, Type = 1 - }, <121>{ + }, <122>{ CLSID = "{GBU-31}", Cx_gain = 0.188 - }, <122>{ + }, <123>{ CLSID = "{GBU-31V3B}", Cx_gain = 0.292 - }, <123>{ + }, <124>{ CLSID = "{GBU_31_V_2B}", Cx_gain = 0.188 - }, <124>{ + }, <125>{ CLSID = "{GBU_31_V_4B}", Cx_gain = 0.188 - }, <125>{ - CLSID = "{GBU_32_V_2B}" }, <126>{ + CLSID = "{GBU_32_V_2B}" + }, <127>{ CLSID = "{GBU-24}", Cx_gain = 2.073 - }, <127>{ + }, <128>{ CLSID = "{GBU-38}", Cx_gain = 0.268 - }, <128>{ + }, <129>{ CLSID = "{BRU55_2*GBU-38}", Cx_gain_empty = 0.477, Cx_gain_item = 0.357 - }, <129>{ + }, <130>{ + CLSID = "{BRU55_2*GBU-32}", + Cx_gain_empty = 0.477, + Cx_gain_item = 0.357 + }, <131>{ CLSID = "{BDU_45LG}", Cx_gain = 0.996 - }, <130>{ + }, <132>{ CLSID = "{BRU33_2X_BDU_45LG}", Cx_gain_empty = 0.373, Cx_gain_item = 1.178 - }, <131>{ + }, <133>{ CLSID = "{AGM_84D}", Cx_gain = 0.355, Type = 1 - }, <132>{ + }, <134>{ CLSID = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", Cx_gain = 0.519, Type = 1 - }, <133>{ + }, <135>{ CLSID = "{AGM_84H}", Cx_gain = 0.467, Type = 1 - }, <134>{ + }, <136>{ CLSID = "{AWW-13}", Cx_gain = 0.784, arg_value = 0.1 - }, <135>{ + }, <137>{ CLSID = "{FPU_8A_FUEL_TANK}" - }, <136>{ + }, <138>{ CLSID = "{BRU_42A_x3_ADM_141A}", Cx_gain_empty = 0.338, Cx_gain_item = 0.237, Type = 1 - }, <137>{ + }, <139>{ CLSID = "{BRU_42A_x2_ADM_141A}", Cx_gain_empty = 0.338, Cx_gain_item = 0.237, Type = 1 - }, <138>{ + }, <140>{ CLSID = "{BRU_42A_x1_ADM_141A}", Cx_gain_empty = 0.338, Cx_gain_item = 0.237, Type = 1 - }, <139>{ + }, <141>{ CLSID = "", add_mass = -140.6, arg_value = 1 @@ -2299,7 +2307,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mass = 29.5, use_full_connector_position = true }, { - Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { CLSID = "{LAU-115 - AIM-120B_R}", Cx_gain_empty = 0.786, Cx_gain_item = 0.543 @@ -2320,7 +2328,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mass = 140.6, use_full_connector_position = true }, { - Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { CLSID = "LAU-115_LAU-127_AIM-9X_R", Cx_gain_empty = 0.786, Cx_gain_item = 1.576 diff --git a/_G/db/Units/Planes/Plane/H-6J.lua b/_G/db/Units/Planes/Plane/H-6J.lua index a5aad1b6..956d58a8 100644 --- a/_G/db/Units/Planes/Plane/H-6J.lua +++ b/_G/db/Units/Planes/Plane/H-6J.lua @@ -547,7 +547,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.225, bank_angle_max = 45, bomb_bay_movement = 2, - brakeshute_name = 287, + brakeshute_name = 288, chaff_flare_dispenser = { { dir = { 0, -1, 1 }, pos = { -11.2, -0.8, 0.5 } @@ -565,21 +565,21 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { crew_members = { { canopy_arg = 38, drop_canopy_name = 0, - pilot_name = 282, + pilot_name = 283, pos = { 13.5, 0.55, -0.5 }, role = "pilot", role_display_name = "Pilot in command" }, { canopy_arg = 38, drop_canopy_name = 0, - pilot_name = 282, + pilot_name = 283, pos = { 13.5, 0.55, 0.5 }, role = "copilot", role_display_name = "Copilot" }, { canopy_arg = 38, drop_canopy_name = 0, - pilot_name = 282, + pilot_name = 283, pos = { 12.5, 0.55, 0.5 }, role = "flight_officer", role_display_name = "Flight officer" diff --git a/_G/db/Units/Planes/Plane/Hawk.lua b/_G/db/Units/Planes/Plane/Hawk.lua index 017fbb7c..03de68a7 100644 --- a/_G/db/Units/Planes/Plane/Hawk.lua +++ b/_G/db/Units/Planes/Plane/Hawk.lua @@ -511,7 +511,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 313, ejection_added_speed = { 0, 0, 5 }, ejection_order = 1, - ejection_seat_name = 269, + ejection_seat_name = 270, pos = { 4, 1, 0 }, role = "pilot", role_display_name = "Pilot" @@ -522,7 +522,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 313, ejection_added_speed = { 0, 0, -5 }, ejection_order = 2, - ejection_seat_name = 269, + ejection_seat_name = 270, pilot_body_arg = 529, pos = { 4, 1, 0 }, role = "instructor", diff --git a/_G/db/Units/Planes/Plane/J-11A.lua b/_G/db/Units/Planes/Plane/J-11A.lua index 18bca373..7945b291 100644 --- a/_G/db/Units/Planes/Plane/J-11A.lua +++ b/_G/db/Units/Planes/Plane/J-11A.lua @@ -1363,9 +1363,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { crew_members = { { can_be_playable = true, canopy_arg = 38, - drop_canopy_name = 281, - ejection_seat_name = 280, - pilot_name = 282, + drop_canopy_name = 282, + ejection_seat_name = 281, + pilot_name = 283, pos = { 7.916, 0.986, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/JF-17.lua b/_G/db/Units/Planes/Plane/JF-17.lua index 61146527..6a108f16 100644 --- a/_G/db/Units/Planes/Plane/JF-17.lua +++ b/_G/db/Units/Planes/Plane/JF-17.lua @@ -3516,7 +3516,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { attribute = { 1, 1, 1, "Redacted", "Multirole fighters", "Refuelable", "Datalink", "Link16", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes", "Battle airplanes" }, average_fuel_consumption = 0.065, bank_angle_max = 90, - brakeshute_name = 286, + brakeshute_name = 287, chaff_flare_dispenser = { { dir = { 0, -1, 0.1 }, pos = { -3.703, -0.302, 0.639 } @@ -3534,13 +3534,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { crew_members = { { bailout_arg = -1, canopy_pos = { 4.282, 0.62, 0 }, - drop_canopy_name = 284, + drop_canopy_name = 285, drop_parachute_name = "JF-17_parachute", ejection_play_arg = 993, - ejection_seat_name = 283, + ejection_seat_name = 284, ejection_through_canopy = true, g_suit = 5, - pilot_name = 285, + pilot_name = 286, pos = { 4.45, 0.18, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/KJ-2000.lua b/_G/db/Units/Planes/Plane/KJ-2000.lua index a7e161a7..87f20637 100644 --- a/_G/db/Units/Planes/Plane/KJ-2000.lua +++ b/_G/db/Units/Planes/Plane/KJ-2000.lua @@ -315,28 +315,28 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { crew_members = { { drop_canopy_name = 0, ejection_seat_name = 0, - pilot_name = 282, + pilot_name = 283, pos = { 7.916, 0.986, 0 }, role = "pilot", role_display_name = "Pilot in command" }, { drop_canopy_name = 0, ejection_seat_name = 0, - pilot_name = 282, + pilot_name = 283, pos = { 3.949, 1.01, 0 }, role = "copilot", role_display_name = "Copilot" }, { drop_canopy_name = 0, ejection_seat_name = 0, - pilot_name = 282, + pilot_name = 283, pos = { 3.949, 1.01, 0 }, role = "flight_officer", role_display_name = "Flight officer" }, { drop_canopy_name = 0, ejection_seat_name = 0, - pilot_name = 282, + pilot_name = 283, pos = { 3.949, 1.01, 0 }, role = "flight_officer", role_display_name = "Flight officer" diff --git a/_G/db/Units/Planes/Plane/MB-339A.lua b/_G/db/Units/Planes/Plane/MB-339A.lua index 7dfc27c6..04e26136 100644 --- a/_G/db/Units/Planes/Plane/MB-339A.lua +++ b/_G/db/Units/Planes/Plane/MB-339A.lua @@ -1978,7 +1978,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 276, + pilot_name = 277, pos = { 2.25, 0.25, 0 }, role = "pilot", role_display_name = "Pilot" @@ -1996,7 +1996,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, - pilot_name = 279, + pilot_name = 280, pos = { 0.75, 0.5, 0 }, role = "instructor", role_display_name = "Instructor" @@ -2167,7 +2167,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "Bailout" } } } }, - net_animation = { 38, 190, 191, 192, 203, 202, 201, 208, 200, 477, 525, 526, 527, 39, 99, 337, 399, 480, 525, 560, 757, 1004, 1200, 1201, 447, 954, 1998, 1999, 1990, 1050, 1472, 509, 515, 1994, 1993, 1049, 1099 }, + net_animation = { 38, 190, 191, 192, 203, 202, 201, 208, 200, 477, 525, 526, 527, 39, 99, 337, 399, 480, 525, 560, 757, 1004, 1200, 1201, 447, 954, 1998, 1999, 1050, 1472, 509, 515, 1994, 1993, 1049, 1099 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.04, nose_gear_amortizer_reversal_stroke = -0.174, diff --git a/_G/db/Units/Planes/Plane/MB-339APAN.lua b/_G/db/Units/Planes/Plane/MB-339APAN.lua index a69837f6..0c64b60a 100644 --- a/_G/db/Units/Planes/Plane/MB-339APAN.lua +++ b/_G/db/Units/Planes/Plane/MB-339APAN.lua @@ -1225,7 +1225,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 276, + pilot_name = 277, pos = { 2.25, 0.25, 0 }, role = "pilot", role_display_name = "Pilot" @@ -1243,7 +1243,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, - pilot_name = 279, + pilot_name = 280, pos = { 0.75, 0.5, 0 }, role = "instructor", role_display_name = "Instructor" @@ -1410,7 +1410,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "Bailout" } } } }, - net_animation = { 38, 190, 191, 192, 203, 202, 201, 208, 200, 477, 525, 526, 527, 39, 99, 337, 399, 480, 525, 560, 757, 1004, 1200, 1201, 447, 954, 1998, 1999, 1990, 1050, 1472, 509, 515, 1994, 1993, 1049, 1099 }, + net_animation = { 38, 190, 191, 192, 203, 202, 201, 208, 200, 477, 525, 526, 527, 39, 99, 337, 399, 480, 525, 560, 757, 1004, 1200, 1201, 447, 954, 1998, 1999, 1050, 1472, 509, 515, 1994, 1993, 1049, 1099 }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.04, nose_gear_amortizer_reversal_stroke = -0.174, diff --git a/_G/db/Units/Planes/Plane/MQ-9 Reaper.lua b/_G/db/Units/Planes/Plane/MQ-9 Reaper.lua index 619d7117..330421b6 100644 --- a/_G/db/Units/Planes/Plane/MQ-9 Reaper.lua +++ b/_G/db/Units/Planes/Plane/MQ-9 Reaper.lua @@ -260,10 +260,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "AGM114x2_OH_58", arg_value = 0.5, connector = "Pylon1_m272" - }, { - CLSID = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}", - arg_value = 0.5, - connector = "Pylon1_m299" } }, Number = 1, Order = 1, @@ -333,10 +329,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "AGM114x2_OH_58", arg_value = 0.5, connector = "Pylon4_m272" - }, { - CLSID = "{88D18A5E-99C8-4B04-B40B-1C02F2018B6E}", - arg_value = 0.5, - connector = "Pylon4_m299" } }, Number = 4, Order = 4, @@ -463,20 +455,58 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, length = 11, lights_data = { - lights = { + lights = { { + lights = { { + lights = { { + argument = 193, + connector = "BANO_3", + pos_correction = { 0, 0.2, 0 }, + proto = <2>{ + angle_max = 3.1415926535898, + angle_min = 0.5235987755983, + color = { 0.92, 0.92, 1, 0.20784609690827 }, + controller = "Strobe", + period = 1, + range = 48 + }, + typename = "Strobe" + }, { + argument = 194, + connector = "BANO_4", + pos_correction = { 0, -0.2, 0 }, + proto =
, + typename = "Strobe" + } }, + typename = "Collection" + } }, + typename = "collection" + }, [3] = { lights = { { argument = 190, color = { 0.99, 0.11, 0.3 }, connector = "BANO_1", - pos_correction = { 0, 0, -0.2 }, - typename = "omnilight" + pos_correction = { 0.147, 0.147, 0 }, + typename = "Omni" }, { argument = 191, color = { 0, 0.894, 0.6 }, connector = "BANO_2", - pos_correction = { 0, 0, 0.2 }, - typename = "omnilight" + pos_correction = { 0.147, -0.147, 0 }, + typename = "Omni" + } }, + typename = "collection" + }, + [4] = { + lights = { { + lights = { { + argument = 195, + typename = "Argument" + }, { + argument = 196, + typename = "Argument" + } }, + typename = "Collection" } }, typename = "collection" } diff --git a/_G/db/Units/Planes/Plane/MiG-23MLD.lua b/_G/db/Units/Planes/Plane/MiG-23MLD.lua index 1ceb4695..ffcb5687 100644 --- a/_G/db/Units/Planes/Plane/MiG-23MLD.lua +++ b/_G/db/Units/Planes/Plane/MiG-23MLD.lua @@ -16,6 +16,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 65 }, critical_damage = 10 }, + [8] = { + critical_damage = 10 + }, [10] = { critical_damage = 20 }, diff --git a/_G/db/Units/Planes/Plane/MiG-25PD.lua b/_G/db/Units/Planes/Plane/MiG-25PD.lua index a825c329..f11c75a1 100644 --- a/_G/db/Units/Planes/Plane/MiG-25PD.lua +++ b/_G/db/Units/Planes/Plane/MiG-25PD.lua @@ -19,6 +19,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [8] = { critical_damage = 10 }, + [10] = { + critical_damage = 20 + }, [11] = { critical_damage = 3 }, @@ -31,12 +34,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 10 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, [25] = { args = { 53 }, critical_damage = 5 @@ -75,21 +72,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 5 }, [53] = { args = { 57 }, @@ -98,10 +85,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [54] = { args = { 58 }, critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 15 } }, DamageParts = { "MIG-25-OBLOMOK-WING-R", "MIG-25-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/MiG-25RBT.lua b/_G/db/Units/Planes/Plane/MiG-25RBT.lua index a8a9e5ef..5a26b8dd 100644 --- a/_G/db/Units/Planes/Plane/MiG-25RBT.lua +++ b/_G/db/Units/Planes/Plane/MiG-25RBT.lua @@ -16,6 +16,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [8] = { critical_damage = 10 }, + [10] = { + critical_damage = 20 + }, [11] = { critical_damage = 3 }, @@ -28,12 +31,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 10 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, [25] = { args = { 53 }, critical_damage = 5 @@ -72,21 +69,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 5 }, [53] = { args = { 57 }, @@ -95,10 +82,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [54] = { args = { 58 }, critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 15 } }, DamageParts = { "MIG-25-OBLOMOK-WING-R", "MIG-25-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/MiG-27K.lua b/_G/db/Units/Planes/Plane/MiG-27K.lua index c27ddc04..5eefaf2d 100644 --- a/_G/db/Units/Planes/Plane/MiG-27K.lua +++ b/_G/db/Units/Planes/Plane/MiG-27K.lua @@ -19,10 +19,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [8] = { critical_damage = 10 }, - [11] = { - critical_damage = 3 + [10] = { + critical_damage = 20 }, - [12] = { + [11] = { critical_damage = 3 }, [15] = { @@ -31,29 +31,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 10 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, - [25] = { - args = { 53 }, - critical_damage = 5 - }, - [26] = { - args = { 54 }, - critical_damage = 5 - }, [35] = { args = { 67 }, critical_damage = 10, - deps_cells = { 25, 37 } + deps_cells = { 37 } }, [36] = { args = { 68 }, critical_damage = 10, - deps_cells = { 26, 38 } + deps_cells = { 38 } }, [37] = { args = { 55 }, @@ -68,40 +54,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 4, deps_cells = { 53 } }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } - }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 5 }, [53] = { args = { 57 }, critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 15 } }, DamageParts = { "MIG-27-OBLOMOK-WING-R", "MIG-27-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/Mirage 2000-5.lua b/_G/db/Units/Planes/Plane/Mirage 2000-5.lua index 11ff80ea..e100568e 100644 --- a/_G/db/Units/Planes/Plane/Mirage 2000-5.lua +++ b/_G/db/Units/Planes/Plane/Mirage 2000-5.lua @@ -16,34 +16,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 65 }, critical_damage = 10 }, - [8] = { - critical_damage = 10 + [10] = { + critical_damage = 20 }, [11] = { critical_damage = 3 }, - [12] = { - critical_damage = 3 - }, - [15] = { - critical_damage = 10 - }, - [16] = { - critical_damage = 10 - }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, [25] = { - args = { 53 }, - critical_damage = 5 + critical_damage = 3 }, [26] = { - args = { 54 }, - critical_damage = 5 + critical_damage = 3 }, [35] = { args = { 67 }, @@ -63,45 +46,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 56 }, critical_damage = 4 }, - [43] = { - args = { 61 }, - critical_damage = 4, - deps_cells = { 53 } - }, [44] = { - args = { 62 }, + args = { 61 }, critical_damage = 4, deps_cells = { 54 } }, - [47] = { - args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } - }, - [48] = { - args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 - }, - [53] = { - args = { 57 }, - critical_damage = 2 - }, [54] = { - args = { 58 }, critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 15 } }, DamageParts = { "M2000-OBLOMOK-WING-R", "M2000-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1AD.lua b/_G/db/Units/Planes/Plane/Mirage-F1AD.lua index b4261151..8421d80d 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1AD.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1AD.lua @@ -2589,11 +2589,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1AD", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1AZ.lua b/_G/db/Units/Planes/Plane/Mirage-F1AZ.lua index c8d07a80..ec8e745e 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1AZ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1AZ.lua @@ -2581,11 +2581,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1AZ", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1B.lua b/_G/db/Units/Planes/Plane/Mirage-F1B.lua index 3fca58f4..42be57ca 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1B.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1B.lua @@ -2753,11 +2753,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1B", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BD.lua b/_G/db/Units/Planes/Plane/Mirage-F1BD.lua index 00c0a8b6..ab36910c 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BD.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BD.lua @@ -2740,11 +2740,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1BD", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BE.lua b/_G/db/Units/Planes/Plane/Mirage-F1BE.lua index 0504fd55..c74dc8f7 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BE.lua @@ -1549,11 +1549,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { axle_angle = 0, damage_element = 83, damage_omega = 30, - damper_coeff = 300, drag_factor = 0, influence_of_pos_z_to_V_l_z = false, mass = 83, - moment_limit = 0, noise_k = 0.4, self_attitude = false, track_width = 0.2, @@ -1568,8 +1566,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { wheel_radius = 0.17, wheel_roll_friction_factor = 0.02, wheel_side_friction_factor = 0.65, - wheel_static_friction_factor = 0.9, - yaw_limit = 0.78539816339745 + wheel_static_friction_factor = 0.9 }, { allowable_hard_contact_length = 0.2, amortizer_back_damper_force_factor = 5000, @@ -3448,11 +3445,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1BE", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua b/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua index 597b9389..cec37984 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua @@ -2740,11 +2740,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1BQ", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua b/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua index 476a5435..b151c8ad 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua @@ -2811,11 +2811,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1C-200", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1C.lua b/_G/db/Units/Planes/Plane/Mirage-F1C.lua index acecd254..86ea7f09 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1C.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1C.lua @@ -2773,11 +2773,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1C", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CE.lua b/_G/db/Units/Planes/Plane/Mirage-F1CE.lua index 020a77a1..6eb6cd1f 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CE.lua @@ -1670,11 +1670,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { axle_angle = 0, damage_element = 83, damage_omega = 30, - damper_coeff = 300, drag_factor = 0, influence_of_pos_z_to_V_l_z = false, mass = 83, - moment_limit = 0, noise_k = 0.4, self_attitude = false, track_width = 0.2, @@ -1689,8 +1687,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { wheel_radius = 0.17, wheel_roll_friction_factor = 0.02, wheel_side_friction_factor = 0.65, - wheel_static_friction_factor = 0.9, - yaw_limit = 0.78539816339745 + wheel_static_friction_factor = 0.9 }, { allowable_hard_contact_length = 0.2, amortizer_back_damper_force_factor = 5000, @@ -3349,11 +3346,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1CE", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CG.lua b/_G/db/Units/Planes/Plane/Mirage-F1CG.lua index 4f4d5387..32a0c2e4 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CG.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CG.lua @@ -2804,11 +2804,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1CG", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CH.lua b/_G/db/Units/Planes/Plane/Mirage-F1CH.lua index 87da67de..1d174ec8 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CH.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CH.lua @@ -2776,11 +2776,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1CH", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua b/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua index 8f319acc..df6e2b52 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua @@ -2776,11 +2776,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1CJ", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CK.lua b/_G/db/Units/Planes/Plane/Mirage-F1CK.lua index 2134445e..cf99601a 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CK.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CK.lua @@ -2776,11 +2776,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1CK", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CR.lua b/_G/db/Units/Planes/Plane/Mirage-F1CR.lua index 1de6b953..6854be84 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CR.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CR.lua @@ -2635,11 +2635,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1CR", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CT.lua b/_G/db/Units/Planes/Plane/Mirage-F1CT.lua index 3287e872..1ee68453 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CT.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CT.lua @@ -2681,11 +2681,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1CT", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua b/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua index a147cddb..a917e5c0 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua @@ -2776,11 +2776,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1CZ", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua b/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua index cb7f4ade..c79f2451 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua @@ -2694,11 +2694,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1DDA", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1ED.lua b/_G/db/Units/Planes/Plane/Mirage-F1ED.lua index 0c31adbb..74fe5ed4 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1ED.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1ED.lua @@ -2759,11 +2759,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1ED", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua b/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua index 4da86a6f..73caaa4d 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua @@ -2713,11 +2713,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1EDA", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EE.lua b/_G/db/Units/Planes/Plane/Mirage-F1EE.lua index 258ce49f..1d43805c 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EE.lua @@ -1705,11 +1705,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { axle_angle = 0, damage_element = 83, damage_omega = 30, - damper_coeff = 300, drag_factor = 0, influence_of_pos_z_to_V_l_z = false, mass = 83, - moment_limit = 0, noise_k = 0.4, self_attitude = false, track_width = 0.2, @@ -1724,8 +1722,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { wheel_radius = 0.17, wheel_roll_friction_factor = 0.02, wheel_side_friction_factor = 0.65, - wheel_static_friction_factor = 0.9, - yaw_limit = 0.78539816339745 + wheel_static_friction_factor = 0.9 }, { allowable_hard_contact_length = 0.2, amortizer_back_damper_force_factor = 5000, @@ -3435,11 +3432,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1EE", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EH.lua b/_G/db/Units/Planes/Plane/Mirage-F1EH.lua index 72f6cb1f..2471ec89 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EH.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EH.lua @@ -2811,11 +2811,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1EH", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua b/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua index ef91a153..bb6ebd19 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua @@ -2794,11 +2794,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1EQ", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1JA.lua b/_G/db/Units/Planes/Plane/Mirage-F1JA.lua index 2b21a817..aaa79661 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1JA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1JA.lua @@ -2578,11 +2578,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1JA", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua b/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua index 90aab8c0..253737f5 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua @@ -2937,11 +2937,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 0, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1M-CE", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua b/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua index 73c0c445..b3ec85b5 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua @@ -2988,11 +2988,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, stores_number = 9, swapped_names = true, - tand_gear_max = 2.1445, tanker_type = 2, thrust_sum_ab = 6969, thrust_sum_max = 4867, type = "Mirage-F1M-EE", + wheel_steering_angle_max = 0.78539816339745, wing_area = 25, wing_span = 8.4, wing_tip_pos = { -3.5, -0.04, 4.22 }, diff --git a/_G/db/Units/Planes/Plane/S-3B Tanker.lua b/_G/db/Units/Planes/Plane/S-3B Tanker.lua index e7413f47..bd2eb48f 100644 --- a/_G/db/Units/Planes/Plane/S-3B Tanker.lua +++ b/_G/db/Units/Planes/Plane/S-3B Tanker.lua @@ -492,6 +492,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { bailout_arg = 118, drop_canopy_name = 0, ejection_seat_name = 58, + pilot_name = 268, pos = { 3.27, 0.748, -0.521 }, role = "pilot", role_display_name = "Pilot in command" @@ -500,6 +501,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 0, ejection_seat_name = 58, pilot_body_arg = 472, + pilot_name = 268, pos = { 3.27, 0.748, 0.521 }, role = "copilot", role_display_name = "Copilot" @@ -508,6 +510,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 0, ejection_seat_name = 58, pilot_body_arg = 487, + pilot_name = 268, pos = { 1.271, 0.748, -0.521 }, role = "flight_officer", role_display_name = "Tactical coordinator" @@ -516,6 +519,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 0, ejection_seat_name = 58, pilot_body_arg = 488, + pilot_name = 268, pos = { 1.271, 0.748, 0.521 }, role = "flight_officer", role_display_name = "Sensor operator" diff --git a/_G/db/Units/Planes/Plane/S-3B.lua b/_G/db/Units/Planes/Plane/S-3B.lua index 91654152..e1d006f6 100644 --- a/_G/db/Units/Planes/Plane/S-3B.lua +++ b/_G/db/Units/Planes/Plane/S-3B.lua @@ -576,6 +576,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { bailout_arg = 118, drop_canopy_name = 0, ejection_seat_name = 58, + pilot_name = 268, pos = { 3.27, 0.748, -0.521 }, role = "pilot", role_display_name = "Pilot in command" @@ -584,6 +585,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 0, ejection_seat_name = 58, pilot_body_arg = 472, + pilot_name = 268, pos = { 3.27, 0.748, 0.521 }, role = "copilot", role_display_name = "Copilot" @@ -592,6 +594,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 0, ejection_seat_name = 58, pilot_body_arg = 487, + pilot_name = 268, pos = { 1.271, 0.748, -0.521 }, role = "flight_officer", role_display_name = "Tactical coordinator" @@ -600,6 +603,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 0, ejection_seat_name = 58, pilot_body_arg = 488, + pilot_name = 268, pos = { 1.271, 0.748, 0.521 }, role = "flight_officer", role_display_name = "Sensor operator" diff --git a/_G/db/Units/Planes/Plane/Su-17M4.lua b/_G/db/Units/Planes/Plane/Su-17M4.lua index 5006d996..4ee40e09 100644 --- a/_G/db/Units/Planes/Plane/Su-17M4.lua +++ b/_G/db/Units/Planes/Plane/Su-17M4.lua @@ -16,10 +16,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [8] = { critical_damage = 10 }, - [11] = { - critical_damage = 3 + [10] = { + critical_damage = 20 }, - [12] = { + [11] = { critical_damage = 3 }, [15] = { @@ -28,29 +28,23 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 10 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, [25] = { args = { 53 }, - critical_damage = 5 + critical_damage = 3 }, [26] = { args = { 54 }, - critical_damage = 5 + critical_damage = 3 }, [35] = { args = { 67 }, - critical_damage = 10, - deps_cells = { 25, 37 } + critical_damage = 7, + deps_cells = { 37 } }, [36] = { args = { 68 }, - critical_damage = 10, - deps_cells = { 26, 38 } + critical_damage = 7, + deps_cells = { 38 } }, [37] = { args = { 55 }, @@ -65,40 +59,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 4, deps_cells = { 53 } }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } - }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 5 }, [53] = { args = { 57 }, critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 15 } }, DamageParts = { "SU-17-OBLOMOK-WING-R", "SU-17-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/Su-30.lua b/_G/db/Units/Planes/Plane/Su-30.lua index 27fc1d13..60e1f05e 100644 --- a/_G/db/Units/Planes/Plane/Su-30.lua +++ b/_G/db/Units/Planes/Plane/Su-30.lua @@ -19,6 +19,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [8] = { critical_damage = 10 }, + [10] = { + critical_damage = 20 + }, [11] = { critical_damage = 3 }, @@ -31,29 +34,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [16] = { critical_damage = 10 }, - [17] = { - critical_damage = 3 - }, - [18] = { - critical_damage = 3 - }, - [25] = { - args = { 53 }, - critical_damage = 5 - }, - [26] = { - args = { 54 }, - critical_damage = 5 - }, [35] = { args = { 67 }, critical_damage = 10, - deps_cells = { 25, 37 } + deps_cells = { 37 } }, [36] = { args = { 68 }, critical_damage = 10, - deps_cells = { 26, 38 } + deps_cells = { 38 } }, [37] = { args = { 55 }, @@ -69,39 +58,24 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { deps_cells = { 53 } }, [44] = { - args = { 62 }, + args = { 61 }, critical_damage = 4, deps_cells = { 54 } }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 5 }, [53] = { args = { 57 }, critical_damage = 2 }, [54] = { - args = { 58 }, critical_damage = 2 - }, - [55] = { - args = { 81 }, - critical_damage = 15 } }, DamageParts = { "SU-30-OBLOMOK-WING-R", "SU-30-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/Su-34.lua b/_G/db/Units/Planes/Plane/Su-34.lua index e650b7c7..d314bf6b 100644 --- a/_G/db/Units/Planes/Plane/Su-34.lua +++ b/_G/db/Units/Planes/Plane/Su-34.lua @@ -1498,7 +1498,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -6.889, -0.257, 1.193 }, smokiness_level = 0.1 } }, - fires_pos = { { -1.594, -0.064, 0 }, { -1.073, 0.319, 2.304 }, { -1.187, 0.338, -3.678 }, { -0.82, 0.265, 2.774 }, { -0.82, 0.265, -2.774 }, { -0.82, 0.255, 4.274 }, { -0.82, 0.255, -4.274 }, { -5.889, -0.257, 1.193 }, { -5.889, -0.257, -1.193 }, { -1.257, 0.283, 3.05 }, { -1.257, 0.283, -3.05 } }, + fires_pos = { { -1.594, -0.064, 0 }, { -1.073, 0.319, 2.904 }, { -1.187, 0.338, -2.978 }, { -0.82, 0.265, 2.774 }, { -0.82, 0.265, -2.774 }, { -0.82, 0.255, 4.274 }, { -0.82, 0.255, -4.274 }, { -5.889, -0.257, 1.193 }, { -5.889, -0.257, -1.193 }, { -1.257, 0.283, 3.05 }, { -1.257, 0.283, -3.05 } }, flaps_maneuver = 1, has_afteburner = true, has_speedbrake = false, diff --git a/_G/db/Units/Planes/Plane/Tu-142.lua b/_G/db/Units/Planes/Plane/Tu-142.lua index 7bc5f876..3dc185fe 100644 --- a/_G/db/Units/Planes/Plane/Tu-142.lua +++ b/_G/db/Units/Planes/Plane/Tu-142.lua @@ -16,6 +16,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [8] = { critical_damage = 10 }, + [10] = { + critical_damage = 15 + }, [11] = { critical_damage = 3 }, @@ -34,67 +37,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [18] = { critical_damage = 3 }, - [25] = { - args = { 53 }, - critical_damage = 5 - }, - [26] = { - args = { 54 }, - critical_damage = 5 - }, [35] = { args = { 67 }, - critical_damage = 20, - deps_cells = { 25, 37, 11, 17 } + critical_damage = 10 }, [36] = { args = { 68 }, - critical_damage = 20, - deps_cells = { 26, 38, 12, 18 } - }, - [37] = { - args = { 55 }, - critical_damage = 4 - }, - [38] = { - args = { 56 }, - critical_damage = 4 + critical_damage = 10 }, [43] = { args = { 61 }, - critical_damage = 4, - deps_cells = { 53 } - }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } + critical_damage = 4 }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 - }, - [53] = { - args = { 57 }, - critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 + critical_damage = 5 }, [55] = { args = { 81 }, diff --git a/_G/db/Units/Planes/Plane/Tu-160.lua b/_G/db/Units/Planes/Plane/Tu-160.lua index c23f242c..dbb8032d 100644 --- a/_G/db/Units/Planes/Plane/Tu-160.lua +++ b/_G/db/Units/Planes/Plane/Tu-160.lua @@ -16,8 +16,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 65 }, critical_damage = 10 }, - [8] = { - critical_damage = 10 + [10] = { + critical_damage = 15 }, [11] = { critical_damage = 3 @@ -25,12 +25,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [12] = { critical_damage = 3 }, - [15] = { - critical_damage = 10 - }, - [16] = { - critical_damage = 10 - }, [17] = { critical_damage = 3 }, @@ -47,13 +41,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [35] = { args = { 67 }, - critical_damage = 20, - deps_cells = { 25, 37, 11, 17 } + critical_damage = 10, + deps_cells = { 25, 37 } }, [36] = { args = { 68 }, - critical_damage = 20, - deps_cells = { 26, 38, 12, 18 } + critical_damage = 10, + deps_cells = { 26, 38 } }, [37] = { args = { 55 }, @@ -63,41 +57,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 56 }, critical_damage = 4 }, - [43] = { - args = { 61 }, + [41] = { + args = -1, critical_damage = 4, - deps_cells = { 53 } + deps_cells = { 43 } }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } + [43] = { + args = { 61 }, + critical_damage = 4 }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 - }, - [53] = { - args = { 57 }, - critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 + critical_damage = 5 }, [55] = { args = { 81 }, diff --git a/_G/db/Units/Planes/Plane/Tu-22M3.lua b/_G/db/Units/Planes/Plane/Tu-22M3.lua index 1d0a3192..10272b50 100644 --- a/_G/db/Units/Planes/Plane/Tu-22M3.lua +++ b/_G/db/Units/Planes/Plane/Tu-22M3.lua @@ -7,20 +7,27 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Countermeasures = { ECM = "Lutik SPS-151" }, - Damage = { { - args = { 150 }, - critical_damage = 5 - }, { - args = { 147 }, + Damage = { + [0] = { + args = { 146 }, critical_damage = 5 - }, { + }, + [3] = { args = { 65 }, critical_damage = 10 }, - [0] = { - args = { 146 }, + [4] = { + args = { 150 }, + critical_damage = 5 + }, + [5] = { + args = { 147 }, critical_damage = 5 }, + [6] = { + args = { 148 }, + critical_damage = 3 + }, [9] = { args = { 154 }, critical_damage = 3 @@ -37,6 +44,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 161 }, critical_damage = 3 }, + [13] = { + critical_damage = 5 + }, + [14] = { + critical_damage = 5 + }, [15] = { args = { 267 }, critical_damage = 6 @@ -48,12 +61,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [23] = { args = { 223 }, critical_damage = 3, - deps_cells = { 27, 31, 37, 138 } + deps_cells = { 27, 31, 37, 137 } }, [24] = { args = { 213 }, critical_damage = 3, - deps_cells = { 28, 32, 38, 139 } + deps_cells = { 28, 32, 38, 138 } }, [27] = { args = { 221 }, @@ -87,6 +100,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 217 }, critical_damage = 6 }, + [43] = { + critical_damage = 5, + deps_cells = { 53 } + }, [47] = { args = { 235 }, critical_damage = 7 @@ -99,54 +116,56 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 247 }, critical_damage = 3 }, + [56] = { + critical_damage = 5 + }, + [57] = { + critical_damage = 5 + }, [58] = { args = { 297 }, critical_damage = 5 }, - [59] = { - args = { 148 }, - critical_damage = 3 - }, [82] = { args = { 152 }, critical_damage = 4 }, [137] = { - args = { 244 }, - critical_damage = 4 - }, - [138] = { args = { 228 }, critical_damage = 6 }, - [139] = { + [138] = { args = { 218 }, critical_damage = 6 }, cell_indices = { + CABIN_BOTTOM = 6, + CABIN_LEFT_SIDE = 4, + CABIN_RIGHT_SIDE = 5, COCKPIT = 3, ENGINE_L = 11, ENGINE_R = 12, - FIN_TOP = 137, - ["FLAP_L_ CENTER"] = 138, + ["FLAP_L_ CENTER"] = 137, FLAP_L_IN = 37, FLAP_L_OUT = 31, - ["FLAP_R_ CENTER"] = 139, + ["FLAP_R_ CENTER"] = 138, FLAP_R_IN = 38, FLAP_R_OUT = 32, FUSELAGE_BOTTOM = 82, FUSELAGE_LEFT_SIDE = 9, FUSELAGE_RIGHT_SIDE = 10, - LEFT_GEAR_BOX = 15, - NOSE_BOTTOM = 59, + GEAR_L = 15, + GEAR_R = 16, + KEEL = 43, + MTG_L_BOTTOM = 13, + MTG_R_BOTTOM = 14, NOSE_CENTER = 0, - NOSE_LEFT_SIDE = 1, - NOSE_RIGHT_SIDE = 2, - RIGHT_GEAR_BOX = 16, RUDDER = 53, STABILIZER_L_IN = 47, STABILIZER_R_IN = 48, TAIL_BOTTOM = 58, + TAIL_LEFT_SIDE = 56, + TAIL_RIGHT_SIDE = 57, WING_L_IN = 35, WING_L_OUT = 23, WING_L_PART_CENTER = 27, diff --git a/_G/db/Units/Planes/Plane/Tu-95MS.lua b/_G/db/Units/Planes/Plane/Tu-95MS.lua index bbad8901..791b5407 100644 --- a/_G/db/Units/Planes/Plane/Tu-95MS.lua +++ b/_G/db/Units/Planes/Plane/Tu-95MS.lua @@ -19,6 +19,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [8] = { critical_damage = 10 }, + [10] = { + critical_damage = 15 + }, [11] = { critical_damage = 3 }, @@ -37,67 +40,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [18] = { critical_damage = 3 }, - [25] = { - args = { 53 }, - critical_damage = 5 - }, - [26] = { - args = { 54 }, - critical_damage = 5 - }, [35] = { args = { 67 }, - critical_damage = 20, - deps_cells = { 25, 37, 11, 17 } + critical_damage = 10 }, [36] = { args = { 68 }, - critical_damage = 20, - deps_cells = { 26, 38, 12, 18 } - }, - [37] = { - args = { 55 }, - critical_damage = 4 - }, - [38] = { - args = { 56 }, - critical_damage = 4 + critical_damage = 10 }, [43] = { args = { 61 }, - critical_damage = 4, - deps_cells = { 53 } - }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } + critical_damage = 4 }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 - }, - [53] = { - args = { 57 }, - critical_damage = 2 - }, - [54] = { - args = { 58 }, - critical_damage = 2 + critical_damage = 5 }, [55] = { args = { 81 }, diff --git a/_G/db/Units/Ships/Ship/CastleClass_01.lua b/_G/db/Units/Ships/Ship/CastleClass_01.lua index 7f541643..a40be559 100644 --- a/_G/db/Units/Ships/Ship/CastleClass_01.lua +++ b/_G/db/Units/Ships/Ship/CastleClass_01.lua @@ -8,16 +8,16 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { DeckLevel = 4.7, DetectionRange = 25000, DisplayName = "Castle Class", - Gamma_max = 0.35, + Gamma_max = 1.35, Height = 30, Helicopter_Num_ = 2, Landing_Point = { -29, 3.15, 0 }, Length = 74, MaxSpeed = 48.15, Name = "Castle Class", - Om = 0.05, + Om = 0.8, Plane_Num_ = 0, - R_min = 247, + R_min = 208.4, Rate = 1460, Sensors = { OPTIC = { "long-range naval optics" } @@ -107,9 +107,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { enablePlayerCanDrive = false, exhaust = { { pos = { -7.08, 14.38, -0.11 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.5 }, { pos = { -7.08, 13.76, -0.81 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.5 } }, life = 1200, @@ -121,7 +123,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { race_velocity = 9, shipLength = 74.1, snd = {}, - speedup = 0.365728, + speedup = 0.0814062, swapped_names = true, tags = { "Corvette and Patrol" }, type = "CastleClass_01", diff --git a/_G/db/Units/Ships/Ship/PERRY.lua b/_G/db/Units/Ships/Ship/PERRY.lua index 4b8f775f..7eceac91 100644 --- a/_G/db/Units/Ships/Ship/PERRY.lua +++ b/_G/db/Units/Ships/Ship/PERRY.lua @@ -341,15 +341,22 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { } }, PL = { { ammo_capacity = 24, + name_ammunition = "(SM-1) RIM-66B", + reload_time = 1000000, shot_delay = 12, - type_ammunition = {} + type_ammunition = "weapons.missiles.SM_1" } }, barrels_reload_type = 1, depends_on_unit = { { { "self", 8 } }, { { "self", 9 } } }, + distanceMax = 100000, + distanceMin = 4000, + launch_delay = 2, min_launch_angle = 0.34906585039887, - reactionTime = 10, + reactionTime = 1, + reflection_limit = 0.05, sensor = {}, - show_external_missile = true + show_external_missile = true, + type = 4 }, { BR = { { connector_name = "POINT_PU" diff --git a/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua b/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua index 58981b99..500d4d90 100644 --- a/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua +++ b/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua @@ -375,7 +375,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { pos = {} }, { LN = { { - BR = { { + BR = <1>{ { connector_name = "POINT_MK_41_01", recoilArgument = 177, recoilT0 = -2, @@ -433,670 +433,732 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { recoilTime = 2 }, { connector_name = "POINT_MK_41_09", - recoilArgument = 185, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_10", - recoilArgument = 186, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_11", - recoilArgument = 187, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_12", - recoilArgument = 188, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_13", - recoilArgument = 189, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_14", - recoilArgument = 190, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_15", - recoilArgument = 191, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_16", - recoilArgument = 192, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 - } }, - PL = { { - ammo_capacity = 16, - type_ammunition = {} - } }, - max_number_of_missiles_channels = 16, - sensor = {} - } }, - angles = { {} }, - area = "Nose_Col_Top", - center = "POINT_MK_41_08" - }, { - LN = { { - BR = { { + }, { connector_name = "POINT_MK_41_17", - recoilArgument = 193, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_18", - recoilArgument = 194, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_19", - recoilArgument = 195, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_20", - recoilArgument = 196, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_21", - recoilArgument = 197, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_22", - recoilArgument = 198, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_23", - recoilArgument = 199, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_24", - recoilArgument = 200, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_25", - recoilArgument = 201, + recoilArgument = 181, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_26", - recoilArgument = 202, + recoilArgument = 182, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_27", - recoilArgument = 203, + recoilArgument = 183, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_28", - recoilArgument = 204, + recoilArgument = 184, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_29", - recoilArgument = 205, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_30", - recoilArgument = 206, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_31", - recoilArgument = 207, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_32", - recoilArgument = 208, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 } }, PL = { { - ammo_capacity = 16, - type_ammunition = {} + ammo_capacity = 12, + name_ammunition = "BGM_109B", + reload_time = 1000000, + shot_delay = 1, + type_ammunition = "weapons.missiles.BGM_109B", + virtualStwID = 1 } }, - depends_on_unit = <1>{ { { "self", 6 } }, { { "self", 7 } }, { { "self", 8 } }, { { "self", 9 } }, { { "self", 10 } }, { { "self", 11 } }, { { "self", 12 } }, { { "self", 13 } }, { { "self", 14 } } }, - sensor = {} + barrels_reload_type = 3, + external_tracking_awacs = true, + launch_delay = 2, + max_number_of_missiles_channels = 16, + reactionTime = 2, + sensor = {}, + type = 8 + }, { + BR =
, + PL = { { + ammo_capacity = 10, + name_ammunition = "SM 2MR RIM 66M", + reload_time = 1000000, + type_ammunition = "weapons.missiles.SM_2", + virtualStwID = 1 + } }, + barrels_reload_type = 3, + depends_on_unit = <2>{ { { "self", 6 } }, { { "self", 7 } }, { { "self", 8 } }, { { "self", 9 } }, { { "self", 10 } }, { { "self", 11 } }, { { "self", 12 } }, { { "self", 13 } }, { { "self", 14 } } }, + distanceMax = 100000, + distanceMin = 4000, + launch_delay = 2, + reactionTime = 1, + reflection_limit = 0.05, + sensor = {}, + type = 4 + }, { + BR =
, + PL = { { + ammo_capacity = 10, + name_ammunition = "SM 2ER RIM 156", + reload_time = 1000000, + type_ammunition = "weapons.missiles.SM_2ER", + virtualStwID = 1 + } }, + barrels_reload_type = 3, + depends_on_unit =
, + launch_delay = 2, + reactionTime = 1, + reflection_limit = 0.05, + sensor = {}, + type = 4 } }, angles = { {} }, area = "Nose_Col_Top", - center = "POINT_MK_41_24" + center = "POINT_MK_41_08", + sharesBarrelsBetweenLaunchers = true }, { LN = { { - BR = { { + BR = <3>{ { connector_name = "POINT_MK_41_33", - recoilArgument = 209, + recoilArgument = 180, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_34", - recoilArgument = 210, + recoilArgument = 180, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_35", - recoilArgument = 211, + recoilArgument = 181, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_36", - recoilArgument = 212, + recoilArgument = 182, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_37", - recoilArgument = 213, + recoilArgument = 183, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_38", - recoilArgument = 214, + recoilArgument = 184, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_39", - recoilArgument = 215, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_40", - recoilArgument = 216, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_41", - recoilArgument = 217, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_42", - recoilArgument = 218, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_43", - recoilArgument = 219, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_44", - recoilArgument = 220, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_45", - recoilArgument = 221, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_46", - recoilArgument = 222, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_47", - recoilArgument = 223, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_48", - recoilArgument = 224, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 - } }, - PL = { { - ammo_capacity = 16, - type_ammunition = {} - } }, - max_number_of_missiles_channels = 16, - sensor = {} - } }, - angles = { {} }, - area = "Bort_Col_Top", - center = "POINT_MK_41_40" - }, { - LN = { { - BR = { { + }, { connector_name = "POINT_MK_41_49", - recoilArgument = 225, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_50", - recoilArgument = 226, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_51", - recoilArgument = 227, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_52", - recoilArgument = 228, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_53", - recoilArgument = 229, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_54", - recoilArgument = 230, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_55", - recoilArgument = 231, + recoilArgument = 181, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_56", - recoilArgument = 232, + recoilArgument = 182, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_57", - recoilArgument = 233, + recoilArgument = 183, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_58", - recoilArgument = 234, + recoilArgument = 184, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_59", - recoilArgument = 235, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_60", - recoilArgument = 236, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_61", - recoilArgument = 237, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_62", - recoilArgument = 238, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_63", - recoilArgument = 239, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_64", - recoilArgument = 240, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_65", - recoilArgument = 241, + recoilArgument = 181, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_66", - recoilArgument = 242, + recoilArgument = 182, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_67", - recoilArgument = 243, + recoilArgument = 183, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_68", - recoilArgument = 244, + recoilArgument = 184, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_69", - recoilArgument = 245, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_70", - recoilArgument = 246, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_71", - recoilArgument = 247, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_72", - recoilArgument = 248, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_73", - recoilArgument = 249, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_74", - recoilArgument = 250, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_75", - recoilArgument = 251, + recoilArgument = 181, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_76", - recoilArgument = 252, + recoilArgument = 182, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_77", - recoilArgument = 253, + recoilArgument = 183, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_78", - recoilArgument = 254, + recoilArgument = 184, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_79", - recoilArgument = 255, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_80", - recoilArgument = 256, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_81", - recoilArgument = 257, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_82", - recoilArgument = 258, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_83", - recoilArgument = 259, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_84", - recoilArgument = 260, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_85", - recoilArgument = 261, + recoilArgument = 181, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_86", - recoilArgument = 262, + recoilArgument = 182, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_87", - recoilArgument = 263, + recoilArgument = 183, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_88", - recoilArgument = 264, + recoilArgument = 184, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_89", - recoilArgument = 265, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_90", - recoilArgument = 266, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_91", - recoilArgument = 267, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_92", - recoilArgument = 268, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_93", - recoilArgument = 269, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_94", - recoilArgument = 270, + recoilArgument = 177, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_95", - recoilArgument = 271, + recoilArgument = 181, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 }, { connector_name = "POINT_MK_41_96", - recoilArgument = 272, + recoilArgument = 182, recoilT0 = -2, recoilT1 = -1, recoilT2 = 1, recoilTime = 2 } }, PL = { { - ammo_capacity = 48, - type_ammunition = {} + ammo_capacity = 10, + name_ammunition = "BGM_109B", + reload_time = 1000000, + shot_delay = 1, + type_ammunition = "weapons.missiles.BGM_109B", + virtualStwID = 2 } }, - depends_on_unit =
, - sensor = {} + barrels_reload_type = 3, + external_tracking_awacs = true, + launch_delay = 2, + max_number_of_missiles_channels = 16, + reactionTime = 2, + sensor = {}, + type = 8 + }, { + BR =
, + PL = { { + ammo_capacity = 27, + name_ammunition = "SM 2MR RIM 66M", + reload_time = 1000000, + type_ammunition = "weapons.missiles.SM_2", + virtualStwID = 2 + } }, + barrels_reload_type = 3, + depends_on_unit =
, + distanceMax = 100000, + distanceMin = 4000, + launch_delay = 2, + reactionTime = 1, + reflection_limit = 0.05, + sensor = {}, + type = 4 + }, { + BR =
, + PL = { { + ammo_capacity = 27, + name_ammunition = "SM 2ER RIM 156", + reload_time = 1000000, + type_ammunition = "weapons.missiles.SM_2ER", + virtualStwID = 2 + } }, + barrels_reload_type = 3, + depends_on_unit =
, + launch_delay = 2, + reactionTime = 1, + reflection_limit = 0.05, + sensor = {}, + type = 4 } }, angles = { {} }, area = "Bort_Col_Top", - center = "POINT_MK_41_56" + center = "POINT_MK_41_40", + sharesBarrelsBetweenLaunchers = true }, maxTargetDetectionRange = 450000, radar_type = 102, diff --git a/_G/db/Units/Ships/Ship/USS_Samuel_Chase.lua b/_G/db/Units/Ships/Ship/USS_Samuel_Chase.lua index 32f27ceb..1355f86f 100644 --- a/_G/db/Units/Ships/Ship/USS_Samuel_Chase.lua +++ b/_G/db/Units/Ships/Ship/USS_Samuel_Chase.lua @@ -123,15 +123,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 123, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { -1.221730476396, -1.3962634015955, 0, 1.4835298641952 }, { -1.3962634015955, 2.8448866807508, -0.069813170079773, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_12", - cockpit = { "IronSight/IronSight", { -1.2, 0.1, 0 }, - open = true - }, drawArgument1 = 25, drawArgument2 = 26, pidY = {}, @@ -168,15 +164,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 124, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { -2.9670597283904, 1.3962634015955, -0.069813170079773, 1.4835298641952 }, { 1.3962634015955, 1.221730476396, 0, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_13", - cockpit = { "IronSight/IronSight", { -1.2, 0.1, 0 }, - open = true - }, drawArgument1 = 27, drawArgument2 = 28, pidY = {}, @@ -213,15 +205,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 128, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 0, -3.1415926535898, -0.017453292519943, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_05", - cockpit = { "IronSight/IronSight", { -1.2, 0.1, 0 }, - open = true - }, drawArgument1 = 35, drawArgument2 = 36, pidY = {}, @@ -258,16 +246,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 129, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 0, -0.78539816339745, -0.017453292519943, 1.4835298641952 }, { -2.0943951023932, -3.1415926535898, -0.017453292519943, 1.4835298641952 } }, angles_mech = { { 0, -3.1415926535898, -0.017453292519943, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_06", - cockpit = { "IronSight/IronSight", { -1.2, 0.1, 0 }, - open = true - }, drawArgument1 = 37, drawArgument2 = 38, pidY = {}, @@ -304,15 +288,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 130, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 3.1415926535898, 0, -0.017453292519943, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_09", - cockpit = { "IronSight/IronSight", { -1.2, 0.1, 0 }, - open = true - }, drawArgument1 = 39, drawArgument2 = 40, pidY = {}, @@ -349,16 +329,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 131, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 0.78539816339745, 0, -0.017453292519943, 1.4835298641952 }, { 3.1415926535898, 2.0943951023932, -0.017453292519943, 1.4835298641952 } }, angles_mech = { { 3.1415926535898, 0, -0.017453292519943, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_08", - cockpit = { "IronSight/IronSight", { -1.2, 0.1, 0 }, - open = true - }, drawArgument1 = 41, drawArgument2 = 42, pidY = {}, @@ -395,15 +371,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 132, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 2.0943951023932, 0.26179938779915, -0.17453292519943, 1.4835298641952 }, { 0.26179938779915, 0, 0.069813170079773, 1.4835298641952 } }, area = "RUBKA_L", center = "CENTER_TOWER_10", - cockpit = { "IronSight/IronSight", { -1.2, 0.1, 0 }, - open = true - }, drawArgument1 = 43, drawArgument2 = 44, pidY = {}, @@ -440,15 +412,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 133, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 3.1415926535898, 1.221730476396, -0.17453292519943, 1.4835298641952 } }, area = "RUBKA_L", center = "CENTER_TOWER_11", - cockpit = { "IronSight/IronSight", { -1.2, 0.1, 0 }, - open = true - }, drawArgument1 = 45, drawArgument2 = 46, pidY = {}, @@ -475,15 +443,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 125, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { -2.0245819323134, 2.146754979953, -0.17453292519943, 1.3962634015955 } }, area = "KORMA_TOP", center = "CENTER_TOWER_14", - cockpit = { "IronSight/IronSight", { -2, 0.1, -0.1 }, - open = true - }, drawArgument1 = 29, drawArgument2 = 30, pidY = {}, @@ -510,15 +474,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 126, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { -2.146754979953, 2.0245819323134, -0.17453292519943, 1.3962634015955 } }, area = "KORMA_TOP", center = "CENTER_TOWER_15", - cockpit = { "IronSight/IronSight", { -2, 0.1, -0.1 }, - open = true - }, drawArgument1 = 31, drawArgument2 = 32, pidY = {}, @@ -545,15 +505,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = 127, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 0.56862827029975, -0.56862827029975, -0.22689280275926, 1.3962634015955 } }, area = "NOSE_TOP", center = "CENTER_TOWER_04", - cockpit = { "IronSight/IronSight", { -2, 0.1, -0.1 }, - open = true - }, drawArgument1 = 33, drawArgument2 = 34, pidY = {}, @@ -573,15 +529,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { PL = { { shell_name = {} } }, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 2.0943951023932, -2.0943951023932, -0.17453292519943, 1.4835298641952 } }, area = "NOSE_TOP", center = "CENTER_TOWER_03", - cockpit = { "IronSight/IronSight", { -2.5, 0.1, -1.1 }, - open = true - }, drawArgument1 = 15, drawArgument2 = 16, pidY = {}, @@ -598,16 +550,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { PL = { { shell_name = {} } }, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 2.0071286397935, 1.221730476396, 0.29670597283904, 1.4835298641952 }, { 1.221730476396, 0.57595865315813, 0, 1.4835298641952 }, { 0.57595865315813, -2.8274333882308, -0.15707963267949, 1.4835298641952 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.15707963267949, 1.4835298641952 } }, area = "NOSE_TOP", center = "CENTER_TOWER_01", - cockpit = { "IronSight/IronSight", { -2.2, 0.3, 0 }, - open = true - }, drawArgument1 = 17, drawArgument2 = 18, omegaY = 0.34906585039887, @@ -636,16 +584,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { PL = { { shell_name = {} } }, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { 2.8274333882308, -0.57595865315813, -0.15707963267949, 1.4835298641952 }, { -0.57595865315813, -1.221730476396, 0, 1.4835298641952 }, { -1.221730476396, -2.0071286397935, 0.29670597283904, 1.4835298641952 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.15707963267949, 1.4835298641952 } }, area = "NOSE_TOP", center = "CENTER_TOWER_02", - cockpit = { "IronSight/IronSight", { -2.2, 0.3, 0 }, - open = true - }, drawArgument1 = 19, drawArgument2 = 20, omegaY = 0.34906585039887, @@ -664,16 +608,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { PL = { { shell_name = {} } }, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { -0.17453292519943, 2.6005405854716, -0.061086523819802, 1.4835298641952 }, { 2.6005405854716, 1.7715091907742, 0.1221730476396, 1.4835298641952 }, { 1.7715091907742, 0.80285145591739, 0.87266462599716, 1.4835298641952 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.15707963267949, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_16", - cockpit = { "IronSight/IronSight", { -2.2, 0.3, 0 }, - open = true - }, drawArgument1 = 21, drawArgument2 = 22, omegaY = 0.34906585039887, @@ -692,16 +632,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { PL = { { shell_name = {} } }, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { -0.80285145591739, -1.7715091907742, 0.87266462599716, 1.4835298641952 }, { -1.7715091907742, -2.6005405854716, 0.1221730476396, 1.4835298641952 }, { -2.6005405854716, 0.17453292519943, -0.061086523819802, 1.4835298641952 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.15707963267949, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_17", - cockpit = { "IronSight/IronSight", { -2.2, 0.3, 0 }, - open = true - }, drawArgument1 = 23, drawArgument2 = 24, omegaY = 0.34906585039887, @@ -720,16 +656,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { PL = { { shell_name = {} } }, - sensor = {}, - sightMasterMode = 1 + sensor = {} } }, angles = { { -0.69813170079773, 0.69813170079773, -0.05235987755983, 1.4835298641952 } }, angles_mech = { { 3.1415926535898, -3.1415926535898, -0.15707963267949, 1.4835298641952 } }, area = "KORMA_TOP", center = "CENTER_TOWER_18", - cockpit = { "IronSight/IronSight", { -2.2, 0.3, 0 }, - open = true - }, drawArgument1 = 13, drawArgument2 = 14, omegaY = 0.17453292519943, @@ -764,7 +696,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { draft = 8.5, economy_distance = 8334000, economy_velocity = 6, - enablePlayerCanDrive = true, + enablePlayerCanDrive = false, encyclopediaAnimation = { args = { [13] = 1, diff --git a/_G/db/Units/Ships/Ship/atconveyor.lua b/_G/db/Units/Ships/Ship/atconveyor.lua new file mode 100644 index 00000000..8eceb198 --- /dev/null +++ b/_G/db/Units/Ships/Ship/atconveyor.lua @@ -0,0 +1,244 @@ +_G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { + Categories = { { + name = "AircraftCarrier" + }, { + name = "Armed Ship" + } }, + DM = { { + area_arg = 70, + area_fire = { + pos = { 64, 0, 3 }, + size = 0.5 + }, + area_life = 50, + area_name = "DMG-HULL-FWD" + }, { + area_arg = 71, + area_fire = { + pos = { 13.7, 0, 3 }, + size = 0.5 + }, + area_life = 50, + area_name = "DMG-HULL-MID" + }, { + area_arg = 72, + area_fire = { + pos = { -76, 0, 3 }, + size = 0.5 + }, + area_life = 50, + area_name = "DMG-HULL-AFT" + }, { + area_arg = 73, + area_fire = { + pos = { 62, 0, 6.2 }, + size = 0.5 + }, + area_life = 70, + area_name = "PALUBA-DMG-FWD" + }, { + area_arg = 73, + area_fire = { + pos = { 81.2, 0, 6.2 }, + size = 0.2 + }, + area_life = 10, + area_name = "DMG-DECK-SHIELD" + }, { + area_arg = 74, + area_fire = { + pos = { -13.6, 0, 8.2 }, + size = 0.5 + }, + area_life = 70, + area_name = "PALUBA-DMG-MID" + }, { + area_arg = 75, + area_fire = { + pos = { -88, 0, 8.2 }, + size = 0.5 + }, + area_life = 70, + area_name = "PALUBA-DMG-AFT" + }, { + area_arg = 76, + area_fire = { + pos = { -53.7, 0, 14 }, + size = 0.5 + }, + area_life = 70, + area_name = "DMG-SS-BASE" + }, { + area_arg = 77, + area_fire = { + pos = { -48, 0, 25 }, + size = 0.5 + }, + area_life = 70, + area_name = "DMG-SS-UPPER" + }, { + area_arg = 78, + area_fire = { + pos = { 56, 0, 28 }, + size = 0.2 + }, + area_life = 20, + area_name = "DMG-SS-FUNNEL" + }, { + area_arg = 79, + area_fire = { + pos = { -104, 0, 2.6 }, + size = 0.5 + }, + area_life = 70, + area_name = "DMG-RAMP" + }, { + area_arg = 82, + area_fire = { + pos = { 0.3, -12.8, 17 }, + size = 0.1 + }, + area_life = 15, + area_name = "COL-CONT-PORT" + }, { + area_arg = 81, + area_fire = { + pos = { 0.3, 12.8, 17 }, + size = 0.1 + }, + area_life = 15, + area_name = "COL-CONT-STBD" + }, { + area_arg = 82, + area_fire = { + pos = { -30, 0, 4 }, + size = 1.2 + }, + area_life = 150, + area_name = "atconv_Destroyed" + } }, + DeckLevel = 12.28, + DetectionRange = 100000, + DisplayName = "SS Atlantic Conveyor", + Draft = 9.6, + Gamma_max = 0.35, + Height = 50.65, + HelicopterSpawnTerminal = { { + Points = { { { 59.444, 12.28, 0 }, 0 } }, + TerminalIdx = 1 + }, { + Points = { { { -86.8, 14.18, 0 }, 0 } }, + TerminalIdx = 2 + }, + TerminalNumber = 2 + }, + Helicopter_Num_ = 1, + Landing_Point = { 59.072, 12.28, 0 }, + Length = 211.316, + MaxSpeed = 42.588, + Name = "SS Atlantic Conveyor", + Om = 0.05, + Plane_Num_ = 6, + RCS = 700000, + R_min = 665.8, + Rate = 5500, + RunWays = { { { 59.072, 12.28, 0 }, 0, 5, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 59.072, 12.28, 0 }, 0, 2, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, + RunwaysNumber = 2 + }, + Sensors = { + OPTIC = { "long-range naval optics", "long-range naval LLTV", "long-range naval FLIR" }, + RADAR = { "Osa 9A33 ln", "rezki search radar", "carrier search radar" } + }, + Singleton = "yes", + TACAN = false, + Tail_Width = 10.07, + TaxiForTORoutes = { { + Points = { { { 7.791, 12.28, -5.732 }, 1 }, { { 34.954, 12.28, -1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + RunwayIdx = 1 + }, { + Points = { { { 8, 12.28, 6.436 }, 1 }, { { 34.954, 12.28, 1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + RunwayIdx = 1 + }, { + Points = { { { -15.371, 12.28, -5.933 }, 1 }, { { 34.954, 12.28, -1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + RunwayIdx = 1 + }, { + Points = { { { -15.161, 12.28, 6.838 }, 2 }, { { 34.954, 12.28, 1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + RunwayIdx = 1 + }, { + Points = { { { -29.479, 12.28, -5.933 }, 2 }, { { 34.954, 12.28, -1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + RunwayIdx = 1 + }, { + Points = { { { -29.479, 12.28, 6.938 }, 2 }, { { 34.954, 12.28, 1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + RunwayIdx = 1 + }, + RoutesForTONumber = 6 + }, + TaxiRoutes = { { { { 40.5, 12.28, 0 }, -1 }, { { 39, 12.28, 0 }, -1 }, { { 34.954, 12.28, 0 }, -2 }, { { 11.5, 12.28, 0 }, -2 }, { { 5, 12.28, 1 }, -2 }, { { -29.479, 12.28, 6.93 }, -2, 120 } }, { { { 40.5, 12.28, 0 }, -1 }, { { 39, 12.28, 0 }, -1 }, { { 34.954, 12.28, 0 }, -2 }, { { 11.5, 12.28, 0 }, -2 }, { { 5, 12.28, -1 }, -2 }, { { -29.479, 12.28, -6.53 }, -2, 120 } }, { { { 40.5, 12.28, 0 }, -1 }, { { 39, 12.28, 0 }, -1 }, { { 34.954, 12.28, 0 }, -2 }, { { 5, 12.28, 1 }, -2 }, { { -7.791, 12.28, 6.83 }, -2, 120 } }, { { { 40.5, 12.28, 0 }, -1 }, { { 39, 12.28, 0 }, -1 }, { { 34.954, 12.28, 0 }, -2 }, { { 5, 12.28, -1 }, -2 }, { { -7.791, 12.28, -5.93 }, -1, 120 } }, { { { 40.5, 12.28, 0 }, -1 }, { { 39, 12.28, 0 }, -1 }, { { 35, 12.28, 0 }, -2 }, { { 31, 12.28, 3 }, -2 }, { { 18, 12.28, 5.93 }, -1, 120 } }, { { { 40.5, 12.28, 0 }, -1 }, { { 39, 12.28, 0 }, -1 }, { { 35, 12.28, 0 }, -2 }, { { 31, 12.28, -3 }, -2 }, { { 18, 12.28, -4.93 }, -1, 120 } }, + RoutesNumber = 6 + }, + ThreatRange = 74000, + WS = { + maxTargetDetectionRange = 450000, + radar_type = 102 + }, + Waypoint_Custom_Panel = true, + Width = 28.306, + X_nose = 105.265, + X_tail = -106.051, + _file = "./CoreMods/tech/SouthAtlanticAssets/Entries/Navy/atconveyor.lua", + _origin = "South_Atlantic_Assets", + airFindDist = 100000, + airWeaponDist = 74000, + animation_arguments = { + arresting_wires = {}, + blast_fences = {}, + luna_lights = 69, + nav_lights = 88, + radar1_rotation = 3, + radar2_rotation = 2, + water_propeller = 8 + }, + armour_scheme = { + hull_azimuth = { {} }, + hull_elevation = { {} }, + turret_azimuth = { {} }, + turret_elevation = { {} } + }, + attribute = { 3, 12, 12, "Redacted", "Aircraft Carriers", "DetectionByAWACS", "Straight_in_approach_type", "AircraftCarrier", "Armed Ship", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, + carrierIlluminationStates = { { { 69, 0, 1 }, { 149, 0, 0.2 }, { 150, 0, 0 }, { 307, 0, 0 }, { 791, 0, 1 }, { 792, 0, 1 }, { 793, 0, 0 }, { 797, 0, 1 }, { 798, 0, 1 } }, { { 69, 0, 1 }, { 149, 0, 0.4 }, { 150, 0, 1 }, { 307, 0, 0.4 }, { 791, 0, 0 }, { 792, 0, 0 }, { 793, 0, 1 }, { 797, 0, 1 }, { 798, 0, 1 } }, { { 69, 0, 0 }, { 149, 0, 0.6 }, { 150, 0, 1 }, { 307, 0, 0.7 }, { 791, 0, 0 }, { 792, 0, 0 }, { 793, 0, 1 }, { 797, 0, 1 }, { 798, 0, 0 } } }, + chassis = {}, + distFindObstacles = 250, + economy_distance = 13000, + economy_velocity = 9.26, + enablePlayerCanDrive = false, + exhaust = { { + pos = { -54.286, 45.7, 0 }, + size = 0.9 + } }, + life = 7200, + mapclasskey = "P0091000065", + mass = 20000000, + max_velocity = 11.83, + numParking = 7, + race_distance = 2778000, + race_velocity = 9, + radar1_period = 6, + radar2_period = 7, + sensor = { + max_alt_finding_target = 30000, + max_range_finding_target = 50000, + min_alt_finding_target = 0, + min_range_finding_target = 0, + pos = { -14.113, 16.2, 0 } + }, + shipLength = 211.316, + snd = {}, + speedup = 0.16, + swapped_names = true, + tags = { "Carrier" }, + type = "atconveyor", + visual = { + shape = "atconveyor", + shape_dstr = "" + } +} \ No newline at end of file diff --git a/_G/db/Units/Ships/Ship/leander-gun-achilles.lua b/_G/db/Units/Ships/Ship/leander-gun-achilles.lua index 79ad8e97..11fb5eb2 100644 --- a/_G/db/Units/Ships/Ship/leander-gun-achilles.lua +++ b/_G/db/Units/Ships/Ship/leander-gun-achilles.lua @@ -185,14 +185,14 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { DeckLevel = 4.511, DetectionRange = 180000, DisplayName = "HMS Achilles (F12)", - Gamma_max = 0.35, + Gamma_max = 1.35, Height = 29.5, Helicopter_Num_ = 1, Landing_Point = { -33.57, 4.511, 0 }, Length = 113.64, MaxSpeed = 51.84, Name = "HMS Achilles (F12)", - Om = 0.05, + Om = 0.8, R_min = 208.4, Rate = 4000, Sensors = { @@ -363,9 +363,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { enablePlayerCanDrive = false, exhaust = { { pos = { -3.435, 15.04, 0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 }, { pos = { -3.435, 15.04, -0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 } }, life = 1000, diff --git a/_G/db/Units/Ships/Ship/leander-gun-andromeda.lua b/_G/db/Units/Ships/Ship/leander-gun-andromeda.lua index 4e853c51..10e285e5 100644 --- a/_G/db/Units/Ships/Ship/leander-gun-andromeda.lua +++ b/_G/db/Units/Ships/Ship/leander-gun-andromeda.lua @@ -185,14 +185,14 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { DeckLevel = 4.511, DetectionRange = 180000, DisplayName = "HMS Andromeda (F57)", - Gamma_max = 0.35, + Gamma_max = 1.35, Height = 29.5, Helicopter_Num_ = 1, Landing_Point = { -33.57, 4.511, 0 }, Length = 113.64, MaxSpeed = 51.84, Name = "HMS Andromeda (F57)", - Om = 0.05, + Om = 0.8, R_min = 208.4, Rate = 4000, Sensors = { @@ -319,12 +319,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { } }, sensor = {} } }, - angles = { { 3.1415926535898, 0.34906585039887, 0, 1.5707963267949 }, { 0.34906585039887, -0.34906585039887, 1.221730476396, 1.5707963267949 }, { -0.34906585039887, -3.1415926535898, 0, 1.5707963267949 } }, + angles = { { -0.69813170079773, -1.5707963267949, 0.78539816339745, 1.553343034275 }, { -1.5707963267949, 1.0995574287564, 0, 1.553343034275 }, { 1.0995574287564, -0.69813170079773, 1.3962634015955, 1.553343034275 } }, + angles_mech = { { 3.1415926535898, -3.1415926535898, 0, 1.553343034275 } }, area = "DMG-SS-AFT-SEACAT-HANGAR", center = "CENTER_TOWER_04", drawArgument1 = 44, drawArgument2 = 54, - reference_angle_Z = 1.5707963267949 + reference_angle_Z = 1.553343034275 }, maxTargetDetectionRange = 25000, radar_type = 109, @@ -355,16 +356,18 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, attribute = { 3, 12, 14, "Redacted", "Frigates", "RADAR_BAND1_FOR_ARM", "DetectionByAWACS", "Armed Ship", "HelicopterCarrier", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, chassis = {}, - distFindObstacles = 250, + distFindObstacles = 1000, draft = 7, economy_distance = 4200000, economy_velocity = 7.2, enablePlayerCanDrive = false, exhaust = { { pos = { -3.435, 15.04, 0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 }, { pos = { -3.435, 15.04, -0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 } }, life = 1000, diff --git a/_G/db/Units/Ships/Ship/leander-gun-ariadne.lua b/_G/db/Units/Ships/Ship/leander-gun-ariadne.lua index 1de03fdf..c51f0d7c 100644 --- a/_G/db/Units/Ships/Ship/leander-gun-ariadne.lua +++ b/_G/db/Units/Ships/Ship/leander-gun-ariadne.lua @@ -185,14 +185,14 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { DeckLevel = 4.511, DetectionRange = 150000, DisplayName = "HMS Ariadne (F72)", - Gamma_max = 0.35, + Gamma_max = 1.35, Height = 29.5, Helicopter_Num_ = 1, Landing_Point = { -33.57, 4.511, 0 }, Length = 113.64, MaxSpeed = 51.84, Name = "HMS Ariadne (F72)", - Om = 0.05, + Om = 0.8, R_min = 208.4, Rate = 4000, Sensors = { @@ -319,12 +319,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { } }, sensor = {} } }, - angles = { { 3.1415926535898, 0.34906585039887, 0, 1.5707963267949 }, { 0.34906585039887, -0.34906585039887, 1.221730476396, 1.5707963267949 }, { -0.34906585039887, -3.1415926535898, 0, 1.5707963267949 } }, + angles = { { -0.69813170079773, -1.5707963267949, 0.78539816339745, 1.553343034275 }, { -1.5707963267949, 1.0995574287564, 0, 1.553343034275 }, { 1.0995574287564, -0.69813170079773, 1.3962634015955, 1.553343034275 } }, + angles_mech = { { 3.1415926535898, -3.1415926535898, 0, 1.553343034275 } }, area = "DMG-SS-AFT-SEACAT-HANGAR", center = "CENTER_TOWER_04", drawArgument1 = 44, drawArgument2 = 54, - reference_angle_Z = 1.5707963267949 + reference_angle_Z = 1.553343034275 }, maxTargetDetectionRange = 25000, radar_type = 109, @@ -355,16 +356,18 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, attribute = { 3, 12, 14, "Redacted", "Frigates", "RADAR_BAND1_FOR_ARM", "DetectionByAWACS", "Armed Ship", "HelicopterCarrier", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, chassis = {}, - distFindObstacles = 250, + distFindObstacles = 1000, draft = 7, economy_distance = 4200000, economy_velocity = 7.2, enablePlayerCanDrive = false, exhaust = { { pos = { -3.435, 15.04, 0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 }, { pos = { -3.435, 15.04, -0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 } }, life = 1000, diff --git a/_G/db/Units/Ships/Ship/leander-gun-condell.lua b/_G/db/Units/Ships/Ship/leander-gun-condell.lua index 9f400698..c941c59d 100644 --- a/_G/db/Units/Ships/Ship/leander-gun-condell.lua +++ b/_G/db/Units/Ships/Ship/leander-gun-condell.lua @@ -185,14 +185,14 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { DeckLevel = 4.511, DetectionRange = 150000, DisplayName = "CNS Almirante Condell (PFG-06)", - Gamma_max = 0.35, + Gamma_max = 1.35, Height = 29.5, Helicopter_Num_ = 1, Landing_Point = { -45.1, 4.511, 0 }, Length = 113.64, MaxSpeed = 51.84, Name = "CNS Almirante Condell (PFG-06)", - Om = 0.05, + Om = 0.8, R_min = 208.4, Rate = 4000, Sensors = { @@ -429,16 +429,18 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, attribute = { 3, 12, 14, "Redacted", "Frigates", "RADAR_BAND1_FOR_ARM", "DetectionByAWACS", "Armed Ship", "HelicopterCarrier", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, chassis = {}, - distFindObstacles = 250, + distFindObstacles = 1000, draft = 7, economy_distance = 4200000, economy_velocity = 7.2, enablePlayerCanDrive = false, exhaust = { { pos = { -3.435, 15.04, 0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 }, { pos = { -3.435, 15.04, -0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 } }, life = 1000, diff --git a/_G/db/Units/Ships/Ship/leander-gun-lynch.lua b/_G/db/Units/Ships/Ship/leander-gun-lynch.lua index 8fd41d6e..c7a71731 100644 --- a/_G/db/Units/Ships/Ship/leander-gun-lynch.lua +++ b/_G/db/Units/Ships/Ship/leander-gun-lynch.lua @@ -185,14 +185,14 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { DeckLevel = 4.511, DetectionRange = 180000, DisplayName = "CNS Almirante Lynch (PFG-07)", - Gamma_max = 0.35, + Gamma_max = 1.35, Height = 29.5, Helicopter_Num_ = 1, Landing_Point = { -45.1, 4.511, 0 }, Length = 113.64, MaxSpeed = 51.84, Name = "CNS Almirante Lynch (PFG-07)", - Om = 0.05, + Om = 0.8, R_min = 208.4, Rate = 4000, Sensors = { @@ -429,16 +429,18 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, attribute = { 3, 12, 14, "Redacted", "Frigates", "RADAR_BAND1_FOR_ARM", "DetectionByAWACS", "Armed Ship", "HelicopterCarrier", "Naval", "All", "Ships", "Armed ships", "Armed Air Defence", "HeavyArmoredUnits", "Heavy armed ships" }, chassis = {}, - distFindObstacles = 250, + distFindObstacles = 1000, draft = 7, economy_distance = 4200000, economy_velocity = 7.2, enablePlayerCanDrive = false, exhaust = { { pos = { -3.435, 15.04, 0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 }, { pos = { -3.435, 15.04, -0.5 }, + preset = "Bazar/ParticleEffects/effects/SmokeShip.lua", size = 0.2 } }, life = 1000, diff --git a/_G/launcher/DIS_C-701IR.lua b/_G/launcher/DIS_C-701IR.lua index a2c5107c..3f9701dd 100644 --- a/_G/launcher/DIS_C-701IR.lua +++ b/_G/launcher/DIS_C-701IR.lua @@ -12,5 +12,5 @@ _G["launcher"]["DIS_C-701IR"] = { attribute = "weapons.missiles.C-701IR", category = 2, displayName = "C-701IR", - ejectVelocity = 2 + ejectVelocity = 0 } \ No newline at end of file diff --git a/_G/launcher/DIS_C-701T.lua b/_G/launcher/DIS_C-701T.lua index df595e85..3a36b404 100644 --- a/_G/launcher/DIS_C-701T.lua +++ b/_G/launcher/DIS_C-701T.lua @@ -12,5 +12,5 @@ _G["launcher"]["DIS_C-701T"] = { attribute = "weapons.missiles.C_701T", category = 2, displayName = "C-701T", - ejectVelocity = 2 + ejectVelocity = 0 } \ No newline at end of file diff --git a/_G/launcher/DIS_CM-400AKG.lua b/_G/launcher/DIS_CM-400AKG.lua index b9c6d65b..d8e15095 100644 --- a/_G/launcher/DIS_CM-400AKG.lua +++ b/_G/launcher/DIS_CM-400AKG.lua @@ -1,7 +1,7 @@ _G["launcher"]["DIS_CM-400AKG"] = { CLSID = "DIS_CM-400AKG", Count = 1, - Cx_pil = 0.0023, + Cx_pil = 0.0016, Elements = { { Position = { 0, 0, 0 }, ShapeName = "cm400akg" @@ -13,5 +13,6 @@ _G["launcher"]["DIS_CM-400AKG"] = { attribute = "weapons.missiles.CM-400AKG", category = 2, displayName = "CM-400AKG", - ejectImpulse = 140 + ejectDirection = { 0, -1, 0 }, + ejectVelocity = 4 } \ No newline at end of file diff --git a/_G/launcher/DIS_DF4B_YJ12.lua b/_G/launcher/DIS_DF4B_YJ12.lua index 3dc7884b..c2e2df78 100644 --- a/_G/launcher/DIS_DF4B_YJ12.lua +++ b/_G/launcher/DIS_DF4B_YJ12.lua @@ -16,5 +16,5 @@ _G["launcher"]["DIS_DF4B_YJ12"] = { displayName = "YJ-12", ejectVelocity = 2, name = "DIS_DF4B_YJ12", - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + wsTypeOfWeapon = "weapons.missiles.YJ-12" } \ No newline at end of file diff --git a/_G/launcher/DIS_HJ-12.lua b/_G/launcher/DIS_HJ-12.lua index 4e2cc414..ad808cf3 100644 --- a/_G/launcher/DIS_HJ-12.lua +++ b/_G/launcher/DIS_HJ-12.lua @@ -14,8 +14,7 @@ _G["launcher"]["DIS_HJ-12"] = { attribute = { 4, 5, 32, "Redacted" }, category = 2, displayName = "HJ-12", - ejectDirection = { 0, -1, 0 }, - ejectVelocity = 2, + ejectVelocity = 0, name = "DIS_HJ-12", wsTypeOfWeapon = "weapons.missiles.HJ-12" } \ No newline at end of file diff --git a/_G/launcher/DIS_YJ12.lua b/_G/launcher/DIS_YJ12.lua index 9f1785e2..d9037d99 100644 --- a/_G/launcher/DIS_YJ12.lua +++ b/_G/launcher/DIS_YJ12.lua @@ -10,7 +10,7 @@ _G["launcher"]["DIS_YJ12"] = { Weight = 1750, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_yj12.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - attribute = { 4, 4, 8, "Redacted" }, + attribute = "weapons.missiles.YJ-12", category = 2, displayName = "YJ-12", ejectVelocity = 2 diff --git a/_G/launcher/{BRU-32 CBU-99}.lua b/_G/launcher/{BRU-32 CBU-99}.lua new file mode 100644 index 00000000..baac4075 --- /dev/null +++ b/_G/launcher/{BRU-32 CBU-99}.lua @@ -0,0 +1,214 @@ +_G["launcher"]["{BRU-32 CBU-99}"] = { + CLSID = "{BRU-32 CBU-99}", + Count = 1, + Cx_item = 0.000413, + Cx_pil = 2e-05, + Elements = { { + IsAdapter = true, + ShapeName = "HB_F14_EXT_BRU34" + }, { + DrawArgs = { { 19, 0 }, { 56, 0 }, { 57, 0.12 } }, + ShapeName = "CBU_99", + connector_name = "WEP_BRU-34_MK82" + } }, + Picture = "Mk20.png", + Weight = 279.38, + Weight_Empty = 57.38, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "CBU-99", + name = "{BRU-32 CBU-99}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{BRU3242_2CBU99 LS}.lua b/_G/launcher/{BRU3242_2CBU99 LS}.lua new file mode 100644 index 00000000..e657420f --- /dev/null +++ b/_G/launcher/{BRU3242_2CBU99 LS}.lua @@ -0,0 +1,212 @@ +_G["launcher"]["{BRU3242_2*CBU99 LS}"] = { + CLSID = "{BRU3242_2*CBU99 LS}", + Count = 2, + Cx_pil = 0.001346, + Elements = { { + IsAdapter = true, + ShapeName = "HB_F14_EXT_BRU34" + }, { + connector_name = "WEP_BRU-34_BRU-42", + payload_CLSID = "{BRU42_2*CBU99 LS}" + } }, + JettisonSubmunitionOnly = true, + Picture = "Mk20.png", + Weight = 629.38, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "2 CBU-99", + name = "{BRU3242_2*CBU99 LS}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{BRU3242_2CBU99 RS}.lua b/_G/launcher/{BRU3242_2CBU99 RS}.lua new file mode 100644 index 00000000..5027694c --- /dev/null +++ b/_G/launcher/{BRU3242_2CBU99 RS}.lua @@ -0,0 +1,212 @@ +_G["launcher"]["{BRU3242_2*CBU99 RS}"] = { + CLSID = "{BRU3242_2*CBU99 RS}", + Count = 2, + Cx_pil = 0.001346, + Elements = { { + IsAdapter = true, + ShapeName = "HB_F14_EXT_BRU34" + }, { + connector_name = "WEP_BRU-34_BRU-42", + payload_CLSID = "{BRU42_2*CBU99 RS}" + } }, + JettisonSubmunitionOnly = true, + Picture = "Mk20.png", + Weight = 629.38, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "2 CBU-99", + name = "{BRU3242_2*CBU99 RS}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{BRU42_2CBU99 LS}.lua b/_G/launcher/{BRU42_2CBU99 LS}.lua new file mode 100644 index 00000000..ae9e615c --- /dev/null +++ b/_G/launcher/{BRU42_2CBU99 LS}.lua @@ -0,0 +1,214 @@ +_G["launcher"]["{BRU42_2*CBU99 LS}"] = { + CLSID = "{BRU42_2*CBU99 LS}", + Count = 2, + Cx_pil = 0.001326, + Elements = { { + IsAdapter = true, + ShapeName = "HB_F14_EXT_BRU42" + }, { + ShapeName = "CBU_99", + connector_name = "BRU-42_LEFT" + }, { + ShapeName = "CBU_99", + connector_name = "BRU-42_LOWER" + } }, + Picture = "Mk20.png", + Weight = 572, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "2 CBU-99", + name = "{BRU42_2*CBU99 LS}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{BRU42_2CBU99 RS}.lua b/_G/launcher/{BRU42_2CBU99 RS}.lua new file mode 100644 index 00000000..38d9dad1 --- /dev/null +++ b/_G/launcher/{BRU42_2CBU99 RS}.lua @@ -0,0 +1,214 @@ +_G["launcher"]["{BRU42_2*CBU99 RS}"] = { + CLSID = "{BRU42_2*CBU99 RS}", + Count = 2, + Cx_pil = 0.001326, + Elements = { { + IsAdapter = true, + ShapeName = "HB_F14_EXT_BRU42" + }, { + ShapeName = "CBU_99", + connector_name = "BRU-42_RIGHT" + }, { + ShapeName = "CBU_99", + connector_name = "BRU-42_LOWER" + } }, + Picture = "Mk20.png", + Weight = 572, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "2 CBU-99", + name = "{BRU42_2*CBU99 RS}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{BRU55_2AGM-154A}.lua b/_G/launcher/{BRU55_2AGM-154A}.lua index 8f36d5f7..7a8ffdc0 100644 --- a/_G/launcher/{BRU55_2AGM-154A}.lua +++ b/_G/launcher/{BRU55_2AGM-154A}.lua @@ -2,7 +2,11 @@ _G["launcher"]["{BRU55_2*AGM-154A}"] = { CLSID = "{BRU55_2*AGM-154A}", Count = 2, Cx_pil = 0.00604140625, - Elements = { "_G/Pylons/BRU_55.lua", { + Elements = { { + DrawArgs = { { 3, 0.1 } }, + IsAdapter = true, + ShapeName = "BRU_55" + }, { connector_name = "Point02", payload_CLSID = "{AGM-154A}" }, { diff --git a/_G/launcher/{BRU55_2GBU-32}.lua b/_G/launcher/{BRU55_2GBU-32}.lua new file mode 100644 index 00000000..3d2dafee --- /dev/null +++ b/_G/launcher/{BRU55_2GBU-32}.lua @@ -0,0 +1,380 @@ +_G["launcher"]["{BRU55_2*GBU-32}"] = { + CLSID = "{BRU55_2*GBU-32}", + Count = 2, + Cx_pil = 0.00314140625, + Elements = { "_G/Pylons/BRU_55.lua", { + ShapeName = "GBU-32", + connector_name = "Point02" + }, { + ShapeName = "GBU-32", + connector_name = "Point01" + } }, + Picture = "GBU32.png", + Weight = 1025, + _file = "./CoreMods/aircraft/AircraftWeaponPack/JDAM.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "BRU-55 with 2 x GBU-32(V)2/B - JDAM, 1000lb GPS Guided Bomb", + name = "{BRU55_2*GBU-32}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "EMPTY_NOSE", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "DSU-33", + id = "DSU33", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.3 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nProvides a firing signal to the bomb's fuze upon detecting an altitude of 20 ft (ca. 6 m) AGL" + } + }, { + dispName = "Plugged", + id = "EMPTY_NOSE", + secondaryParams = {} + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + bNot = true, + id = "NFP_fuze_type_nose", + value = "DSU33" + }, "and", { + bNot = true, + id = "NFP_fuze_type_nose", + value = "M904E4" + } }, + baseDim = "", + control = "comboList", + defValue = 0.5, + id = "NFP_VIS_DrawArgNo_56", + label = "Plug", + stringIndex = 1, + values = { { + dispName = "Long Conical", + id = 0.1 + }, { + dispName = "Short Conical", + id = 0.4 + }, { + dispName = "MXU-735", + id = 0.5 + } }, + wCtrl = 110, + xCtrl = 650, + xLbl = 580 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "DSU33" + } }, + baseDim = "ft", + control = "spinbox", + defValue = 6.096, + dimension = "ft", + id = "function_altitude_ctrl_DSU33", + label = "Airburst Altitude", + max = 1000000000000, + min = 0, + nLocDim = "ft", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + baseDim = "", + control = "comboList", + defValue = "FMU139CB_LD", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "FMU-139", + id = "FMU139CB_LD", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_55", + val = 0.1 + }, + tooltip = "Electronic, impact" + } + }, { + dispName = "FMU-143", + id = "FMU143", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_55", + val = 0.1 + }, + tooltip = "Electronic, impact" + } + }, { + dispName = "FMU-152", + id = "FMU152AB_LD", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_55", + val = 0.1 + }, + tooltip = "Electronic, impact\nFuze parameters are adjustable in-flight" + } + }, { + dispName = "Plugged", + id = "EMPTY_TAIL", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_55", + val = 0.1 + } + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = "FMU143" + } }, + baseDim = "s", + control = "comboList", + defValue = 5.5, + dimension = "s", + id = "arm_delay_ctrl_FMU143", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 4, + values = { { + dispName = 5.5, + id = 5.5, + units = "s" + }, { + dispName = 12, + id = 12, + units = "s" + }, { + dispName = 21, + id = 21, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = "FMU152AB_LD" + } }, + baseDim = "s", + control = "comboList", + defValue = 4, + dimension = "s", + id = "arm_delay_ctrl_FMU152AB_LD", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 4, + values = { { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 5, + id = 5, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 7, + id = 7, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + }, { + dispName = 14, + id = 14, + units = "s" + }, { + dispName = 21, + id = 21, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = "FMU139CB_LD" + } }, + baseDim = "s", + control = "comboList", + defValue = 4, + dimension = "s", + id = "arm_delay_ctrl_FMU139CB_LD", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 4, + values = { { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 7, + id = 7, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + }, { + dispName = 14, + id = 14, + units = "s" + }, { + dispName = 20, + id = 20, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = "FMU143" + } }, + baseDim = "s", + control = "comboList", + defValue = 0.03, + dimension = "ms", + id = "function_delay_ctrl_FMU143", + label = "Function Delay", + nLocDim = "ms", + stringIndex = 4, + values = { { + dispName = 0.03, + id = 0.03, + units = "s" + }, { + dispName = 0.06, + id = 0.06, + units = "s" + }, { + dispName = 0.12, + id = 0.12, + units = "s" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = "FMU139CB_LD" + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_FMU139CB_LD", + label = "Function Delay", + nLocDim = "s", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.06, + id = 0.06, + units = "s" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = "FMU152AB_LD" + } }, + baseDim = "", + control = "comboList", + defValue = 0, + dimension = "", + id = "function_delay_ctrl_FMU152AB_LD", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = "0 s", + id = 0 + }, { + dispName = "5 ms", + id = 0.005 + }, { + dispName = "25 ms", + id = 0.025 + }, { + dispName = "60 ms", + id = 0.06 + }, { + dispName = "0.18 s", + id = 0.18 + }, { + dispName = "0.25 h", + id = 900 + }, { + dispName = "4 h", + id = 14400 + }, { + dispName = "24 h", + id = 86400 + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + id = "NFP_VIS_DrawArgNo_57", + label = "Appearance", + stringIndex = 5, + values = { { + dispName = "USN", + id = 1 + } }, + wCtrl = 80, + xCtrl = 200, + xLbl = 10 + } }, + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{F14-ALQ167-POD}.lua b/_G/launcher/{F14-ALQ167-POD}.lua new file mode 100644 index 00000000..c0ee985c --- /dev/null +++ b/_G/launcher/{F14-ALQ167-POD}.lua @@ -0,0 +1,24 @@ +_G["launcher"]["{F14-ALQ167-POD}"] = { + CLSID = "{F14-ALQ167-POD}", + Cx_pil = 4e-05, + Elements = { { + ShapeName = "HB_F14_EXT_AN_APQ-167" + } }, + Picture = "ALQ167.png", + Weight = 107, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + _unique_resource_name = "weapons.containers.HB_F14_EXT_AN_APQ-167", + attribute = { 4, 15, 45, "Redacted" }, + category = 6, + displayName = "ALQ-167 pod", + name = "HB_F14_EXT_AN_APQ-167", + shape_table_data = { { + file = "HB_F14_EXT_AN_APQ-167", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "HB_F14_EXT_AN_APQ-167", + username = "ALQ167" + } } +} \ No newline at end of file diff --git a/_G/launcher/{F14-ALQ167}.lua b/_G/launcher/{F14-ALQ167}.lua index b75af65a..67bed621 100644 --- a/_G/launcher/{F14-ALQ167}.lua +++ b/_G/launcher/{F14-ALQ167}.lua @@ -1,25 +1,24 @@ _G["launcher"]["{F14-ALQ167}"] = { CLSID = "{F14-ALQ167}", + Count = 1, Cx_pil = 4e-05, Elements = { { + IsAdapter = true, Position = { 0, 0, 0 }, - ShapeName = "HB_F14_EXT_AN_APQ-167" + ShapeName = "HB_F14_EXT_BRU34" + }, { + ShapeName = "HB_F14_EXT_AN_APQ-167", + connector_name = "WEP_BRU-34_MK82", + payload_CLSID = "{F14-ALQ167-POD}" } }, Picture = "ALQ167.png", - Weight = 107, + Weight = 164.38, _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", _origin = "F-14B AI by Heatblur Simulations", - _unique_resource_name = "weapons.containers.HB_F14_EXT_AN_APQ-167", - attribute = { 4, 15, 44, "Redacted" }, + _unique_resource_name = "weapons.containers.HB_F14_EXT_BRU34", + attribute = { 4, 7, 32, "Redacted" }, category = 6, displayName = "ALQ-167 (non-functional)", - name = "HB_F14_EXT_AN_APQ-167", - shape_table_data = { { - file = "HB_F14_EXT_AN_APQ-167", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "HB_F14_EXT_AN_APQ-167", - username = "ALQ167" - } } + name = "HB_F14_EXT_BRU34", + wsTypeOfWeapon = { 4, 15, 45, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{GBU_15_V_1B}.lua b/_G/launcher/{GBU_15_V_1B}.lua new file mode 100644 index 00000000..5a59a66d --- /dev/null +++ b/_G/launcher/{GBU_15_V_1B}.lua @@ -0,0 +1,17 @@ +_G["launcher"]["{GBU_15_V_1B}"] = { + CLSID = "{GBU_15_V_1B}", + Count = 1, + Cx_pil = 0.00461, + Elements = { { + ShapeName = "HB_F4E_GBU15V1" + } }, + Picture = "Picto_GBU15.png", + Weight = 1123, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 36, "Redacted" }, + category = 1, + displayName = "GBU-15(V)1/B - 2000lb TV (EO) Guided Bomb", + ejectPitchRate = 0, + ejectVelocity = 2 +} \ No newline at end of file diff --git a/_G/launcher/{GBU_8_B}.lua b/_G/launcher/{GBU_8_B}.lua new file mode 100644 index 00000000..7ad436fb --- /dev/null +++ b/_G/launcher/{GBU_8_B}.lua @@ -0,0 +1,17 @@ +_G["launcher"]["{GBU_8_B}"] = { + CLSID = "{GBU_8_B}", + Count = 1, + Cx_pil = 0.00461, + Elements = { { + ShapeName = "HB_F-4E_EXT_GBU8" + } }, + Picture = "Picto_GBU8.png", + Weight = 1027, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 36, "Redacted" }, + category = 1, + displayName = "GBU-8/B HOBOS - 2000 lb TV Guided Bomb", + ejectPitchRate = 0, + ejectVelocity = 2 +} \ No newline at end of file diff --git a/_G/launcher/{HB_ALQ-131_ON_ADAPTER_IN_AERO7}.lua b/_G/launcher/{HB_ALQ-131_ON_ADAPTER_IN_AERO7}.lua index 5df4c80d..bbe98d83 100644 --- a/_G/launcher/{HB_ALQ-131_ON_ADAPTER_IN_AERO7}.lua +++ b/_G/launcher/{HB_ALQ-131_ON_ADAPTER_IN_AERO7}.lua @@ -15,7 +15,8 @@ _G["launcher"]["{HB_ALQ-131_ON_ADAPTER_IN_AERO7}"] = { Weight = 330.9, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + adapter_type = { 4, 15, 47, "" }, + attribute = { 4, 6, 32, "Redacted" }, category = 6, displayName = "ALQ-131 - ECM Pod Rack", name = "HB_ORD_Missile_Well_Adapter", diff --git a/_G/launcher/{HB_F4EAGM-65A_LAU88_2x_Left}.lua b/_G/launcher/{HB_F4EAGM-65A_LAU88_2x_Left}.lua index 74954db3..f80a364b 100644 --- a/_G/launcher/{HB_F4EAGM-65A_LAU88_2x_Left}.lua +++ b/_G/launcher/{HB_F4EAGM-65A_LAU88_2x_Left}.lua @@ -21,7 +21,7 @@ _G["launcher"]["{HB_F4EAGM-65A_LAU88_2x_Left}"] = { Weight = 632, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "2x AGM-65A - Maverick A (TV Guided) (LAU-88)", name = "{HB_F4EAGM-65A_LAU88_2x_Left}", diff --git a/_G/launcher/{HB_F4EAGM-65A_LAU88_2x_Right}.lua b/_G/launcher/{HB_F4EAGM-65A_LAU88_2x_Right}.lua index 7c55f983..e3e2515a 100644 --- a/_G/launcher/{HB_F4EAGM-65A_LAU88_2x_Right}.lua +++ b/_G/launcher/{HB_F4EAGM-65A_LAU88_2x_Right}.lua @@ -21,7 +21,7 @@ _G["launcher"]["{HB_F4EAGM-65A_LAU88_2x_Right}"] = { Weight = 632, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "2x AGM-65A - Maverick A (TV Guided) (LAU-88)", name = "{HB_F4EAGM-65A_LAU88_2x_Right}", diff --git a/_G/launcher/{HB_F4EAGM-65A_LAU88_3x_Left}.lua b/_G/launcher/{HB_F4EAGM-65A_LAU88_3x_Left}.lua index ad5c0d49..7a982c78 100644 --- a/_G/launcher/{HB_F4EAGM-65A_LAU88_3x_Left}.lua +++ b/_G/launcher/{HB_F4EAGM-65A_LAU88_3x_Left}.lua @@ -26,7 +26,7 @@ _G["launcher"]["{HB_F4EAGM-65A_LAU88_3x_Left}"] = { Weight = 842.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "3x AGM-65A - Maverick A (TV Guided) (LAU-88)", name = "{HB_F4EAGM-65A_LAU88_3x_Left}", diff --git a/_G/launcher/{HB_F4EAGM-65A_LAU88_3x_Right}.lua b/_G/launcher/{HB_F4EAGM-65A_LAU88_3x_Right}.lua index 80ae55e5..9511f512 100644 --- a/_G/launcher/{HB_F4EAGM-65A_LAU88_3x_Right}.lua +++ b/_G/launcher/{HB_F4EAGM-65A_LAU88_3x_Right}.lua @@ -22,7 +22,7 @@ _G["launcher"]["{HB_F4EAGM-65A_LAU88_3x_Right}"] = { Weight = 842.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "3x AGM-65A - Maverick A (TV Guided) (LAU-88)", name = "{HB_F4EAGM-65A_LAU88_3x_Right}", diff --git a/_G/launcher/{HB_F4EAGM-65B_LAU88_2x_Left}.lua b/_G/launcher/{HB_F4EAGM-65B_LAU88_2x_Left}.lua index f2e8e566..b544e161 100644 --- a/_G/launcher/{HB_F4EAGM-65B_LAU88_2x_Left}.lua +++ b/_G/launcher/{HB_F4EAGM-65B_LAU88_2x_Left}.lua @@ -21,7 +21,7 @@ _G["launcher"]["{HB_F4EAGM-65B_LAU88_2x_Left}"] = { Weight = 632, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "2x AGM-65B - Maverick B (TV Guided) (LAU-88)", name = "{HB_F4EAGM-65B_LAU88_2x_Left}", diff --git a/_G/launcher/{HB_F4EAGM-65B_LAU88_2x_Right}.lua b/_G/launcher/{HB_F4EAGM-65B_LAU88_2x_Right}.lua index 37f96454..4e0fbf24 100644 --- a/_G/launcher/{HB_F4EAGM-65B_LAU88_2x_Right}.lua +++ b/_G/launcher/{HB_F4EAGM-65B_LAU88_2x_Right}.lua @@ -21,7 +21,7 @@ _G["launcher"]["{HB_F4EAGM-65B_LAU88_2x_Right}"] = { Weight = 632, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "2x AGM-65B - Maverick B (TV Guided) (LAU-88)", name = "{HB_F4EAGM-65B_LAU88_2x_Right}", diff --git a/_G/launcher/{HB_F4EAGM-65B_LAU88_3x_Left}.lua b/_G/launcher/{HB_F4EAGM-65B_LAU88_3x_Left}.lua index acf30f38..048e0cc8 100644 --- a/_G/launcher/{HB_F4EAGM-65B_LAU88_3x_Left}.lua +++ b/_G/launcher/{HB_F4EAGM-65B_LAU88_3x_Left}.lua @@ -26,7 +26,7 @@ _G["launcher"]["{HB_F4EAGM-65B_LAU88_3x_Left}"] = { Weight = 842.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "3x AGM-65B - Maverick B (TV Guided) (LAU-88)", name = "{HB_F4EAGM-65B_LAU88_3x_Left}", diff --git a/_G/launcher/{HB_F4EAGM-65B_LAU88_3x_Right}.lua b/_G/launcher/{HB_F4EAGM-65B_LAU88_3x_Right}.lua index aabf21ef..9792e5d9 100644 --- a/_G/launcher/{HB_F4EAGM-65B_LAU88_3x_Right}.lua +++ b/_G/launcher/{HB_F4EAGM-65B_LAU88_3x_Right}.lua @@ -26,7 +26,7 @@ _G["launcher"]["{HB_F4EAGM-65B_LAU88_3x_Right}"] = { Weight = 842.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "3x AGM-65B - Maverick B (TV Guided) (LAU-88)", name = "{HB_F4EAGM-65B_LAU88_3x_Right}", diff --git a/_G/launcher/{HB_F4EAGM-65D_LAU88_2x_Left}.lua b/_G/launcher/{HB_F4EAGM-65D_LAU88_2x_Left}.lua index 87fbd812..6a2f652e 100644 --- a/_G/launcher/{HB_F4EAGM-65D_LAU88_2x_Left}.lua +++ b/_G/launcher/{HB_F4EAGM-65D_LAU88_2x_Left}.lua @@ -21,7 +21,7 @@ _G["launcher"]["{HB_F4EAGM-65D_LAU88_2x_Left}"] = { Weight = 632, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "2x AGM-65D - Maverick D (IIR ASM) (LAU-88)", name = "{HB_F4EAGM-65D_LAU88_2x_Left}", diff --git a/_G/launcher/{HB_F4EAGM-65D_LAU88_2x_Right}.lua b/_G/launcher/{HB_F4EAGM-65D_LAU88_2x_Right}.lua index f888ea54..c5ac9c27 100644 --- a/_G/launcher/{HB_F4EAGM-65D_LAU88_2x_Right}.lua +++ b/_G/launcher/{HB_F4EAGM-65D_LAU88_2x_Right}.lua @@ -21,7 +21,7 @@ _G["launcher"]["{HB_F4EAGM-65D_LAU88_2x_Right}"] = { Weight = 632, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "2x AGM-65D - Maverick D (IIR ASM) (LAU-88)", name = "{HB_F4EAGM-65D_LAU88_2x_Right}", diff --git a/_G/launcher/{HB_F4EAGM-65D_LAU88_3x_Left}.lua b/_G/launcher/{HB_F4EAGM-65D_LAU88_3x_Left}.lua index 9e29a1a3..023f59cf 100644 --- a/_G/launcher/{HB_F4EAGM-65D_LAU88_3x_Left}.lua +++ b/_G/launcher/{HB_F4EAGM-65D_LAU88_3x_Left}.lua @@ -26,7 +26,7 @@ _G["launcher"]["{HB_F4EAGM-65D_LAU88_3x_Left}"] = { Weight = 842.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "3x AGM-65D - Maverick D (IIR ASM) (LAU-88)", name = "{HB_F4EAGM-65D_LAU88_3x_Left}", diff --git a/_G/launcher/{HB_F4EAGM-65D_LAU88_3x_Right}.lua b/_G/launcher/{HB_F4EAGM-65D_LAU88_3x_Right}.lua index 81091e6f..dac4382f 100644 --- a/_G/launcher/{HB_F4EAGM-65D_LAU88_3x_Right}.lua +++ b/_G/launcher/{HB_F4EAGM-65D_LAU88_3x_Right}.lua @@ -26,7 +26,7 @@ _G["launcher"]["{HB_F4EAGM-65D_LAU88_3x_Right}"] = { Weight = 842.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "3x AGM-65D - Maverick D (IIR ASM) (LAU-88)", name = "{HB_F4EAGM-65D_LAU88_3x_Right}", diff --git a/_G/launcher/{HB_F4E_AGM-65A_LAU117_SWA}.lua b/_G/launcher/{HB_F4E_AGM-65A_LAU117_SWA}.lua index 71eac188..ea75c061 100644 --- a/_G/launcher/{HB_F4E_AGM-65A_LAU117_SWA}.lua +++ b/_G/launcher/{HB_F4E_AGM-65A_LAU117_SWA}.lua @@ -13,7 +13,7 @@ _G["launcher"]["{HB_F4E_AGM-65A_LAU117_SWA}"] = { Weight = 269.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "(Special Weapons Adapter) AGM-65A - Maverick A (TV Guided) (LAU-117)(Special Weapons Adapter) ", name = "{HB_F4E_AGM-65A_LAU117_SWA}", diff --git a/_G/launcher/{HB_F4E_AGM-65A_LAU117}.lua b/_G/launcher/{HB_F4E_AGM-65A_LAU117}.lua index 96ae7f24..18347ab3 100644 --- a/_G/launcher/{HB_F4E_AGM-65A_LAU117}.lua +++ b/_G/launcher/{HB_F4E_AGM-65A_LAU117}.lua @@ -10,7 +10,7 @@ _G["launcher"]["{HB_F4E_AGM-65A_LAU117}"] = { Weight = 269.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "AGM-65A - Maverick A (TV Guided) (LAU-117)", name = "{HB_F4E_AGM-65A_LAU117}", diff --git a/_G/launcher/{HB_F4E_AGM-65B_LAU117_SWA}.lua b/_G/launcher/{HB_F4E_AGM-65B_LAU117_SWA}.lua index eeee15e9..e3f12518 100644 --- a/_G/launcher/{HB_F4E_AGM-65B_LAU117_SWA}.lua +++ b/_G/launcher/{HB_F4E_AGM-65B_LAU117_SWA}.lua @@ -13,7 +13,7 @@ _G["launcher"]["{HB_F4E_AGM-65B_LAU117_SWA}"] = { Weight = 269.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "(Special Weapons Adapter) AGM-65B - Maverick B (TV Guided) (LAU-117)(Special Weapons Adapter) ", name = "{HB_F4E_AGM-65B_LAU117_SWA}", diff --git a/_G/launcher/{HB_F4E_AGM-65B_LAU117}.lua b/_G/launcher/{HB_F4E_AGM-65B_LAU117}.lua index c9214341..bd51744d 100644 --- a/_G/launcher/{HB_F4E_AGM-65B_LAU117}.lua +++ b/_G/launcher/{HB_F4E_AGM-65B_LAU117}.lua @@ -13,7 +13,7 @@ _G["launcher"]["{HB_F4E_AGM-65B_LAU117}"] = { Weight = 269.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "AGM-65B - Maverick B (TV Guided) (LAU-117)", name = "{HB_F4E_AGM-65B_LAU117}", diff --git a/_G/launcher/{HB_F4E_AGM-65D_LAU117_SWA}.lua b/_G/launcher/{HB_F4E_AGM-65D_LAU117_SWA}.lua index 19500771..cc8a40bd 100644 --- a/_G/launcher/{HB_F4E_AGM-65D_LAU117_SWA}.lua +++ b/_G/launcher/{HB_F4E_AGM-65D_LAU117_SWA}.lua @@ -13,7 +13,7 @@ _G["launcher"]["{HB_F4E_AGM-65D_LAU117_SWA}"] = { Weight = 269.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "(Special Weapons Adapter) AGM-65D - Maverick D (IIR ASM) (LAU-117)(Special Weapons Adapter) ", name = "{HB_F4E_AGM-65D_LAU117_SWA}", diff --git a/_G/launcher/{HB_F4E_AGM-65D_LAU117}.lua b/_G/launcher/{HB_F4E_AGM-65D_LAU117}.lua index dd5f2d92..abc1b91c 100644 --- a/_G/launcher/{HB_F4E_AGM-65D_LAU117}.lua +++ b/_G/launcher/{HB_F4E_AGM-65D_LAU117}.lua @@ -13,7 +13,7 @@ _G["launcher"]["{HB_F4E_AGM-65D_LAU117}"] = { Weight = 269.5, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "AGM-65D - Maverick D (IIR ASM) (LAU-117)", name = "{HB_F4E_AGM-65D_LAU117}", diff --git a/_G/launcher/{HB_F4E_AGM-65G_LAU117}.lua b/_G/launcher/{HB_F4E_AGM-65G_LAU117}.lua index e85d75c9..635ec5d1 100644 --- a/_G/launcher/{HB_F4E_AGM-65G_LAU117}.lua +++ b/_G/launcher/{HB_F4E_AGM-65G_LAU117}.lua @@ -13,7 +13,7 @@ _G["launcher"]["{HB_F4E_AGM-65G_LAU117}"] = { Weight = 360, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "AGM-65G - Maverick G (IIR ASM - Lg Whd) (LAU-117)", name = "{HB_F4E_AGM-65G_LAU117}", diff --git a/_G/launcher/{HB_F4E_AGM_12C}.lua b/_G/launcher/{HB_F4E_AGM_12C}.lua deleted file mode 100644 index 8bb19435..00000000 --- a/_G/launcher/{HB_F4E_AGM_12C}.lua +++ /dev/null @@ -1,31 +0,0 @@ -_G["launcher"]["{HB_F4E_AGM_12C}"] = { - CLSID = "{HB_F4E_AGM_12C}", - Count = 1, - Cx_pil = 0.0009765625, - Elements = { { - IsAdapter = true, - Position = { 0, 0, 0 }, - ShapeName = "HB_F-4E_LAU-34" - }, { - Position = { 0, 0, 0 }, - ShapeName = "HB_F-4E_EXT_AGM12C", - connector_name = "AGM45_ATTACH" - } }, - JettisonSubmunitionOnly = true, - Picture = "Picto_AGM12.png", - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, - category = 2, - displayName = "AGM-12C Bullpup - MCLOS missile", - name = "{HB_F4E_AGM_12C}", - shape_table_data = { { - file = "HB_F-4E_LAU-34", - fire = { 0, 1 }, - index = "Redacted", - life = 1, - name = "HB_F-4E_LAU-34", - username = "HB_F-4E_LAU-34" - } }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } -} \ No newline at end of file diff --git a/_G/launcher/{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}.lua b/_G/launcher/{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}.lua index 04e1e53b..43d9b8f0 100644 --- a/_G/launcher/{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}.lua +++ b/_G/launcher/{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}.lua @@ -11,11 +11,12 @@ _G["launcher"]["{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"] = { connector_name = "PNT_AIM7_4B", payload_CLSID = "{HB_PAVE_SPIKE_FAST_TRACK}" } }, - Picture = "Picto_PaveSpike_FAST_TRACK.png", + Picture = "Picto_PaveSpike.png", Weight = 217.9, _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 7, 32, "Redacted" }, + adapter_type = { 4, 15, 47, "" }, + attribute = { 4, 6, 32, "Redacted" }, category = 6, displayName = "AN/AVQ-23 Pave Spike (Fast/Smart Track) - Targeting Pod Rack", name = "HB_ORD_Missile_Well_Adapter", diff --git a/_G/launcher/{HB_PAVE_SPIKE_FAST_TRACK}.lua b/_G/launcher/{HB_PAVE_SPIKE_FAST_TRACK}.lua index 65f737e0..bde6976d 100644 --- a/_G/launcher/{HB_PAVE_SPIKE_FAST_TRACK}.lua +++ b/_G/launcher/{HB_PAVE_SPIKE_FAST_TRACK}.lua @@ -4,7 +4,7 @@ _G["launcher"]["{HB_PAVE_SPIKE_FAST_TRACK}"] = { Elements = { { ShapeName = "HB_ORD_Pave_Spike_Fast" } }, - Picture = "Picto_PaveSpike_FAST_TRACK.png", + Picture = "Picto_PaveSpike.png", Sensors = { OPTIC = { "AN/AVQ-23 Pave Spike - Sensor" } }, @@ -15,6 +15,8 @@ _G["launcher"]["{HB_PAVE_SPIKE_FAST_TRACK}"] = { attribute = { 4, 15, 44, "Redacted" }, category = 6, displayName = "AN/AVQ-23 Pave Spike (Fast/Smart Track) - Targeting Pod", + laserDesignator = true, + laserRanger = true, name = "HB_ORD_Pave_Spike_Fast", shape_table_data = { { file = "", diff --git a/_G/launcher/{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}.lua b/_G/launcher/{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}.lua index c42fb894..3a3baeef 100644 --- a/_G/launcher/{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}.lua +++ b/_G/launcher/{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}.lua @@ -12,7 +12,8 @@ _G["launcher"]["{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}"] = { _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", _unique_resource_name = "weapons.containers.HB_ORD_Missile_Well_Adapter", - attribute = { 4, 7, 32, "Redacted" }, + adapter_type = { 4, 15, 47, "" }, + attribute = { 4, 6, 32, "Redacted" }, category = 6, displayName = "AN/AVQ-23 Pave Spike - Targeting Pod Rack", name = "HB_ORD_Missile_Well_Adapter", diff --git a/_G/launcher/{HB_PAVE_SPIKE}.lua b/_G/launcher/{HB_PAVE_SPIKE}.lua index a10c6ffa..c1a6f035 100644 --- a/_G/launcher/{HB_PAVE_SPIKE}.lua +++ b/_G/launcher/{HB_PAVE_SPIKE}.lua @@ -15,6 +15,8 @@ _G["launcher"]["{HB_PAVE_SPIKE}"] = { attribute = { 4, 15, 44, "Redacted" }, category = 6, displayName = "AN/AVQ-23 Pave Spike - Targeting Pod", + laserDesignator = true, + laserRanger = true, name = "HB_ORD_Pave_Spike", shape_table_data = { { file = "", diff --git a/_G/launcher/{LAU-7_AIM-9L_Left}.lua b/_G/launcher/{LAU-7_AIM-9L_Left}.lua index 163f3681..c129fdc8 100644 --- a/_G/launcher/{LAU-7_AIM-9L_Left}.lua +++ b/_G/launcher/{LAU-7_AIM-9L_Left}.lua @@ -20,5 +20,6 @@ _G["launcher"]["{LAU-7_AIM-9L_Left}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 4, displayName = "2x AIM-9L", + name = "{LAU-7_AIM-9L_Left}", wsTypeOfWeapon = "weapons.missiles.AIM-9L" } \ No newline at end of file diff --git a/_G/launcher/{LAU-7_AIM-9L_Right}.lua b/_G/launcher/{LAU-7_AIM-9L_Right}.lua index aae99968..c5a1bf0b 100644 --- a/_G/launcher/{LAU-7_AIM-9L_Right}.lua +++ b/_G/launcher/{LAU-7_AIM-9L_Right}.lua @@ -20,5 +20,6 @@ _G["launcher"]["{LAU-7_AIM-9L_Right}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 4, displayName = "2x AIM-9L", + name = "{LAU-7_AIM-9L_Right}", wsTypeOfWeapon = "weapons.missiles.AIM-9L" } \ No newline at end of file diff --git a/_G/launcher/{LAU-7_AIM-9M_Left}.lua b/_G/launcher/{LAU-7_AIM-9M_Left}.lua index 67fdc7c2..0b346f0e 100644 --- a/_G/launcher/{LAU-7_AIM-9M_Left}.lua +++ b/_G/launcher/{LAU-7_AIM-9M_Left}.lua @@ -17,5 +17,6 @@ _G["launcher"]["{LAU-7_AIM-9M_Left}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 4, displayName = "2x AIM-9M", + name = "{LAU-7_AIM-9M_Left}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{LAU-7_AIM-9M_Right}.lua b/_G/launcher/{LAU-7_AIM-9M_Right}.lua index 81f299e7..db7d8c33 100644 --- a/_G/launcher/{LAU-7_AIM-9M_Right}.lua +++ b/_G/launcher/{LAU-7_AIM-9M_Right}.lua @@ -20,5 +20,6 @@ _G["launcher"]["{LAU-7_AIM-9M_Right}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 4, displayName = "2x AIM-9M", + name = "{LAU-7_AIM-9M_Right}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{LAU_34_AGM_45A_SWA}.lua b/_G/launcher/{LAU_34_AGM_45A_SWA}.lua index c26ce6de..8dd87aa2 100644 --- a/_G/launcher/{LAU_34_AGM_45A_SWA}.lua +++ b/_G/launcher/{LAU_34_AGM_45A_SWA}.lua @@ -16,6 +16,8 @@ _G["launcher"]["{LAU_34_AGM_45A_SWA}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "(Special Weapons Adapter) AGM-45A Shrike ARM (LAU-34)", + ejectPitchRate = 0, + ejectVelocity = 0, name = "{LAU_34_AGM_45A_SWA}", settings = { { baseDim = "", diff --git a/_G/launcher/{LAU_34_AGM_45A}.lua b/_G/launcher/{LAU_34_AGM_45A}.lua index 33371879..7cce548b 100644 --- a/_G/launcher/{LAU_34_AGM_45A}.lua +++ b/_G/launcher/{LAU_34_AGM_45A}.lua @@ -20,6 +20,8 @@ _G["launcher"]["{LAU_34_AGM_45A}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "AGM-45A Shrike ARM (LAU-34)", + ejectPitchRate = 0, + ejectVelocity = 0, name = "{LAU_34_AGM_45A}", settings = { { baseDim = "", diff --git a/_G/launcher/{MAK79_CBU99 1L}.lua b/_G/launcher/{MAK79_CBU99 1L}.lua new file mode 100644 index 00000000..f4749691 --- /dev/null +++ b/_G/launcher/{MAK79_CBU99 1L}.lua @@ -0,0 +1,212 @@ +_G["launcher"]["{MAK79_CBU99 1L}"] = { + CLSID = "{MAK79_CBU99 1L}", + Count = 1, + Cx_pil = 0.000423, + Elements = { { + IsAdapter = true, + ShapeName = "MAK-79_VAR_2" + }, { + connector_name = "R_L", + payload_CLSID = "{CBU_99}", + use_full_connector_position = true + } }, + Picture = "Mk20.png", + Weight = 232, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "MAK79 CBU-99", + name = "{MAK79_CBU99 1L}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{MAK79_CBU99 1R}.lua b/_G/launcher/{MAK79_CBU99 1R}.lua new file mode 100644 index 00000000..ba1eafe8 --- /dev/null +++ b/_G/launcher/{MAK79_CBU99 1R}.lua @@ -0,0 +1,212 @@ +_G["launcher"]["{MAK79_CBU99 1R}"] = { + CLSID = "{MAK79_CBU99 1R}", + Count = 1, + Cx_pil = 0.000423, + Elements = { { + IsAdapter = true, + ShapeName = "MAK-79_VAR_2" + }, { + connector_name = "R_R", + payload_CLSID = "{CBU_99}", + use_full_connector_position = true + } }, + Picture = "Mk20.png", + Weight = 232, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "MAK79 CBU-99", + name = "{MAK79_CBU99 1R}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{MAK79_CBU99 2L}.lua b/_G/launcher/{MAK79_CBU99 2L}.lua new file mode 100644 index 00000000..77107f5a --- /dev/null +++ b/_G/launcher/{MAK79_CBU99 2L}.lua @@ -0,0 +1,216 @@ +_G["launcher"]["{MAK79_CBU99 2L}"] = { + CLSID = "{MAK79_CBU99 2L}", + Count = 2, + Cx_pil = 0.000836, + Elements = { { + IsAdapter = true, + ShapeName = "MAK-79_VAR_4" + }, { + connector_name = "F_L", + payload_CLSID = "{CBU_99}", + use_full_connector_position = true + }, { + connector_name = "R_L", + payload_CLSID = "{CBU_99}", + use_full_connector_position = true + } }, + Picture = "Mk20.png", + Weight = 464, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "MAK79 2 CBU-99", + name = "{MAK79_CBU99 2L}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{MAK79_CBU99 2R}.lua b/_G/launcher/{MAK79_CBU99 2R}.lua new file mode 100644 index 00000000..c17c9c95 --- /dev/null +++ b/_G/launcher/{MAK79_CBU99 2R}.lua @@ -0,0 +1,216 @@ +_G["launcher"]["{MAK79_CBU99 2R}"] = { + CLSID = "{MAK79_CBU99 2R}", + Count = 2, + Cx_pil = 0.000836, + Elements = { { + IsAdapter = true, + ShapeName = "MAK-79_VAR_4" + }, { + connector_name = "F_R", + payload_CLSID = "{CBU_99}", + use_full_connector_position = true + }, { + connector_name = "R_R", + payload_CLSID = "{CBU_99}", + use_full_connector_position = true + } }, + Picture = "Mk20.png", + Weight = 464, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "MAK79 2 CBU-99", + name = "{MAK79_CBU99 2R}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{PHXBRU3242_2CBU99 LS}.lua b/_G/launcher/{PHXBRU3242_2CBU99 LS}.lua new file mode 100644 index 00000000..e29afb07 --- /dev/null +++ b/_G/launcher/{PHXBRU3242_2CBU99 LS}.lua @@ -0,0 +1,212 @@ +_G["launcher"]["{PHXBRU3242_2*CBU99 LS}"] = { + CLSID = "{PHXBRU3242_2*CBU99 LS}", + Count = 2, + Cx_pil = 0.001446, + Elements = { { + IsAdapter = true, + ShapeName = "HB_F14_EXT_SHOULDER_PHX_L" + }, { + connector_name = "WEP_Phoenix_Connector", + payload_CLSID = "{BRU3242_2*CBU99 LS}" + } }, + JettisonSubmunitionOnly = true, + Picture = "Mk20.png", + Weight = 629.38, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "2 CBU-99", + name = "{PHXBRU3242_2*CBU99 LS}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{PHXBRU3242_2CBU99 RS}.lua b/_G/launcher/{PHXBRU3242_2CBU99 RS}.lua new file mode 100644 index 00000000..fd260449 --- /dev/null +++ b/_G/launcher/{PHXBRU3242_2CBU99 RS}.lua @@ -0,0 +1,212 @@ +_G["launcher"]["{PHXBRU3242_2*CBU99 RS}"] = { + CLSID = "{PHXBRU3242_2*CBU99 RS}", + Count = 2, + Cx_pil = 0.001446, + Elements = { { + IsAdapter = true, + ShapeName = "HB_F14_EXT_SHOULDER_PHX_L" + }, { + connector_name = "WEP_Phoenix_Connector", + payload_CLSID = "{BRU3242_2*CBU99 RS}" + } }, + JettisonSubmunitionOnly = true, + Picture = "Mk20.png", + Weight = 629.38, + _file = "./CoreMods/aircraft/F14/Entry/Weapons.lua", + _origin = "F-14B AI by Heatblur Simulations", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "2 CBU-99", + name = "{PHXBRU3242_2*CBU99 RS}", + settings = { { + baseDim = "", + control = "comboList", + defValue = "Mk339Mod1", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", + stringIndex = 1, + values = { { + dispName = "Mk 339 Mod 1", + id = "Mk339Mod1", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0 + }, + tooltip = "Mechanical, time\nArmed by vane rotation\nHas two pre-flight adjustable function delays, either of which can be selected in flight" + } + }, { + dispName = "FMU-140", + id = "FMU140", + secondaryParams = { + addDef = { + ID = "NFP_VIS_DrawArgNo_56", + val = 0.5 + }, + tooltip = "Electronic, proximity\nDoppler radar altimeter\nArmed by dynamic air pressure\nHas an optional Arm and Fire time-based function that leads to airburst 1.22 s after release" + } + } }, + wCtrl = 360, + xCtrl = 200 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.1, + dimension = "s", + id = "arm_delay_ctrl_Mk339Mod1", + label = "Arm Delay", + max = 1000000000000, + min = 0, + nLocDim = "s", + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "s", + control = "comboList", + defValue = 1.2, + dimension = "s", + id = "arm_delay_ctrl_FMU140", + label = "Arm Delay", + nLocDim = "s", + stringIndex = 2, + values = { { + dispName = 1.2, + id = 1.2, + units = "s" + }, { + dispName = 4, + id = 4, + units = "s" + }, { + dispName = 6, + id = 6, + units = "s" + }, { + dispName = 8, + id = 8, + units = "s" + }, { + dispName = 10, + id = 10, + units = "s" + } }, + wCtrl = 60, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "FMU140" + } }, + baseDim = "ft", + control = "comboList", + defValue = 1500, + dimension = "ft", + id = "function_altitude_ctrl_FMU140", + label = "Airburst Altitude", + nLocDim = "ft", + stringIndex = 2, + values = { { + dispName = 300, + id = 300, + units = "ft" + }, { + dispName = 500, + id = 500, + units = "ft" + }, { + dispName = 700, + id = 700, + units = "ft" + }, { + dispName = 900, + id = 900, + units = "ft" + }, { + dispName = 1200, + id = 1200, + units = "ft" + }, { + dispName = 1500, + id = 1500, + units = "ft" + }, { + dispName = 1800, + id = 1800, + units = "ft" + }, { + dispName = 2200, + id = 2200, + units = "ft" + }, { + dispName = 2600, + id = 2600, + units = "ft" + }, { + dispName = 3000, + id = 3000, + units = "ft" + } }, + wCtrl = 60, + xCtrl = 500, + xLbl = 310 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 1.2, + dimension = "s", + id = "function_delay_ctrl_00_Mk339Mod1", + label = "Function Delay PRI", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 200, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = "Mk339Mod1" + } }, + baseDim = "s", + control = "spinbox", + defValue = 4, + dimension = "s", + id = "function_delay_ctrl_01_Mk339Mod1", + label = "Function Delay OPT", + max = 100, + min = 1.2, + nLocDim = "s", + readOnly = false, + step = 0.1, + stringIndex = 3, + tooltip = "Lower Limit: 1.2 s\nUpper Limit: 100 s\nIncrement: 0.1 s", + wCtrl = 60, + wDim = 30, + xCtrl = 500, + xLbl = 300 + } }, + wsTypeOfWeapon = "weapons.bombs.CBU_99" +} \ No newline at end of file diff --git a/_G/launcher/{SMOKE-GREEN-MB339}.lua b/_G/launcher/{SMOKE-GREEN-MB339}.lua index 5714ad3e..839a9b13 100644 --- a/_G/launcher/{SMOKE-GREEN-MB339}.lua +++ b/_G/launcher/{SMOKE-GREEN-MB339}.lua @@ -13,11 +13,11 @@ _G["launcher"]["{SMOKE-GREEN-MB339}"] = { PictureBlendColor = "0x228b22ff", Smoke = { alpha = 220, - b = 60, + b = 5, dx = -1.455, dy = -0.062, - g = 165, - r = 13 + g = 118, + r = 61 }, Weight = 1, _file = "./CoreMods/aircraft/MB-339/Weapons/TanksAndSmokes.lua", diff --git a/_G/launcher/{SMOKE-RED-MB339}.lua b/_G/launcher/{SMOKE-RED-MB339}.lua index 0af3650e..59cd7a9f 100644 --- a/_G/launcher/{SMOKE-RED-MB339}.lua +++ b/_G/launcher/{SMOKE-RED-MB339}.lua @@ -13,11 +13,11 @@ _G["launcher"]["{SMOKE-RED-MB339}"] = { PictureBlendColor = "0xc81e1eff", Smoke = { alpha = 220, - b = 14, + b = 20, dx = -1.455, dy = -0.062, - g = 14, - r = 255 + g = 20, + r = 213 }, Weight = 1, _file = "./CoreMods/aircraft/MB-339/Weapons/TanksAndSmokes.lua", diff --git a/_G/launcher/{SUU_23_POD}.lua b/_G/launcher/{SUU_23_POD}.lua index 701637c4..8faa3fa0 100644 --- a/_G/launcher/{SUU_23_POD}.lua +++ b/_G/launcher/{SUU_23_POD}.lua @@ -37,7 +37,7 @@ _G["launcher"]["{SUU_23_POD}"] = { } }, ejector_dir = { 0, 0, 0 }, ejector_pos = { 0, 0, 0 }, - ejector_pos_connector = "Gun_point", + ejector_pos_connector = "pnt_shell_pod", elevation_initial = 0, gun = { barrels_count = 1, @@ -59,7 +59,7 @@ _G["launcher"]["{SUU_23_POD}"] = { short_name = "M-61A1", smoke_dir = { 0, -1, -0.2 }, supply = { - count = 639, + count = 1234, get_mass = , get_mass_ = , mixes = { { 1, 1, 1, 1, 4 }, { 2, 2, 2, 2, 4 }, { 1, 2, 1, 2, 4 }, { 3, 3, 3, 3, 4 } }, @@ -354,5 +354,5 @@ _G["launcher"]["{SUU_23_POD}"] = { name = "HB_ORD_SUU-23", username = "SUU-23" } }, - wsTypeOfWeapon = { 4, 6, 6, "" } + wsTypeOfWeapon = { 4, 6, 10, "" } } \ No newline at end of file diff --git a/_G/rockets/AGM_12C.lua b/_G/rockets/AGM_12C.lua deleted file mode 100644 index 746e431d..00000000 --- a/_G/rockets/AGM_12C.lua +++ /dev/null @@ -1,149 +0,0 @@ -_G["rockets"]["#Index"] = { - Cx_pil = 4, - D_max = 13000, - D_min = 1500, - Damage = 113, - Diam = 305, - Escort = 1, - Fi_excort = 0.4, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.1, - H_max = 10000, - H_min = -1, - H_min_t = 0, - Head_Form = 1, - Head_Type = 7, - KillDistance = 0, - LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7000, 8000, 0, 0, 10000, 10500, 11000, 12000, 200, 0, 0, 7000, 0, 0, 12000, 0, 0, 0, 0, 300, 5000, 6000, 7000, 8500, 10500, 11500, 12500, 11000, 12000, 12500, 400, 5500, 6500, 7500, 8500, 10500, 12500, 12500, 11000, 12000, 12500, 500, 5500, 6500, 7500, 9000, 10500, 12500, 14500, 15500, 15000, 12500, 600, 5500, 6500, 7500, 9000, 11000, 13000, 13000, 15000, 16500, 17000, 700, 6000, 6500, 7500, 9500, 11000, 13000, 15500, 15500, 17500, 18500, 800, 6000, 6500, 7500, 9500, 11500, 13500, 15000, 15500, 18000, 18500, 900, 6000, 6500, 8500, 9500, 11500, 13000, 15000, 16000, 18000, 18500, 1000, 6000, 6500, 8000, 10000, 11500, 13500, 15000, 17000, 17500, 19000, 2000, 9500, 10500, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 3000, 9500, 10500, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 4000, 10000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 5000, 10000, 11000, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 20500, 6000, 10000, 11500, 12500, 14000, 15000, 16500, 17500, 18500, 19500, 21000, 7000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 8000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 9000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 10000, 9500, 11000, 12500, 14000, 15500, 16500, 17500, 18000, 20000, 21000 }, - Life_Time = 30, - M = 263, - Mach_max = 1.8, - MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 500, 500, 500, 750, 500, 0, 0, 0, 200, 2050, 2300, 500, 500, 550, 750, 500, 500, 500, 500, 300, 2000, 500, 500, 500, 500, 750, 500, 500, 500, 500, 400, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 600, 500, 500, 500, 500, 500, 650, 500, 500, 500, 500, 700, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 800, 500, 500, 500, 500, 550, 800, 500, 500, 500, 500, 900, 500, 500, 500, 500, 600, 850, 500, 500, 500, 500, 1000, 500, 500, 500, 500, 600, 800, 500, 500, 500, 500, 2000, 500, 600, 600, 600, 500, 700, 500, 500, 500, 500, 3000, 700, 550, 800, 950, 1200, 500, 750, 650, 500, 500, 4000, 800, 700, 700, 850, 850, 900, 800, 700, 650, 550, 5000, 1000, 800, 900, 1000, 1400, 1100, 900, 800, 700, 700, 6000, 1000, 1000, 1500, 1000, 1500, 1500, 1000, 1000, 1000, 1000, 7000, 2000, 1500, 2000, 2500, 1500, 2000, 1500, 1500, 1000, 1500, 8000, 2500, 2500, 1500, 3500, 1500, 1500, 2500, 1500, 1500, 1500, 9000, 3000, 3000, 3000, 2500, 1500, 2000, 2000, 2500, 1500, 1000, 10000, 3500, 3000, 3500, 4500, 3500, 1500, 2500, 3000, 2500, 2000 }, - Name = "Redacted", - Nr_max = 1.2, - OmViz_max = 99.9, - Range_max = 13000, - Reflection = 0.03, - X_back = -0.922, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - autopilot = { - Kd = 0.07, - Ki = 0.01, - Kp = 0.07, - delay = 2, - fins_discreet = 0.08, - fins_limit = 1, - max_ctrl_angle = 6.24, - no_ctrl_center_ang = 2e-05, - op_time = 30, - self_destruct_command_timer = 3, - self_destruct_maneuver = 1, - self_destruct_maneuver_cmd_y = 0.3, - self_destruct_maneuver_cmd_z = 0.6, - self_destruct_no_signal_lim = 0.5, - self_destruct_start_timer = 18 - }, - booster = { - custom_smoke_dissipation_factor = 1, - effect_type = 0, - fuel_mass = 41.88, - impulse = 230, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1, 0, 0 } }, - smoke_color = { 0.8, 0.8, 0.8 }, - smoke_transparency = 0.01, - tail_width = 0.18, - work_time = 2.5 - }, - category = 2, - class_name = "wAmmunitionVikhr", - display_name = "AGM-12C", - display_name_short = "AGM-12C", - fm = { - A = 0.36, - I = 265.38909287667, - I_x = 10, - L = 3.4798, - Ma = 2, - Ma_x = 3, - Mw = 5, - Mw_x = 1.5, - Mx0Ma = { -0.25, -0.11 }, - Sw = 0.465, - caliber = 0.3048, - cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.01, - ideal_fins = true, - mass = 263, - maxAoa = 0.23, - wind_sigma = 0, - wind_time = 0 - }, - fuze = { - default_arm_delays = { 2 }, - default_function_altitude = 0 - }, - model = "HB_F-4E_EXT_AGM12C", - name = "AGM_12C", - scheme = "AGM-12", - shape_table_data = { { - file = "HB_F-4E_EXT_AGM12C", - index = "Redacted", - name = "HB_F-4E_EXT_AGM12C", - username = "AGM-12C" - } }, - sigma = { 4, 4, 4 }, - spiral_nav = { - def_cone_max_dist = 22000, - def_cone_near_rad = 10000, - def_cone_near_rad_st = 0, - def_cone_time_stab_rad = 0, - gb_angle = 0.0036, - gb_max_retW = 0.4, - gb_min_dist = 3200, - gb_ret_Kp = 1.1, - gb_use_time = 5.3, - t_cone_near_rad = 10000 - }, - t_acc = 2.5, - t_b = 0, - t_marsh = 0, - user_name = "AGM-12C", - v_mid = 300, - v_min = 170, - warhead = { - caliber = 207, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, - default_fuze_delay = 0, - expl_mass = 45.2, - mass = 45.2, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 9.04 - }, - warhead_air = {}, - wcs = { - activation_delay = 0.75, - base_pulse_length = 0.05, - command_deflection = 0.2, - input_delay = 0.1, - lead_pulse_deadzone = 0.001, - lead_pulse_sensitivity = 0.5, - lifetime = 30, - memory_pulse_sensitivity = 1, - reference_offset = -0.87266462599716, - sustain_pulse_gain_per_cycle = 0.1, - sustain_pulse_sensitity = 1, - sustain_pulse_sentitivity_exponent = 0.2 - }, - wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, - ws_type =
-} \ No newline at end of file diff --git a/_G/rockets/AGM_45A.lua b/_G/rockets/AGM_45A.lua index 4345ab22..9b12c6b9 100644 --- a/_G/rockets/AGM_45A.lua +++ b/_G/rockets/AGM_45A.lua @@ -15,16 +15,19 @@ _G["rockets"]["#Index"] = { Head_Form = 1, Head_Type = 3, KillDistance = 10, - LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 5000, 3500, 4500, 4500, 4500, 5000, 7000, 8000, 5500, 7500, 700, 5000, 4000, 5000, 5000, 5000, 8500, 7000, 6000, 5500, 7500, 800, 4500, 4500, 6000, 5000, 5500, 8500, 7000, 6000, 5500, 6500, 900, 5500, 5000, 6000, 5000, 5500, 8500, 7000, 7500, 7500, 9500, 1000, 5500, 5000, 7500, 6500, 5500, 8500, 7500, 8500, 7500, 10000, 2000, 6500, 6500, 7500, 8500, 9000, 9500, 9500, 9000, 9500, 10500, 3000, 7000, 8500, 8000, 9000, 10000, 9000, 10500, 9500, 12000, 11500, 4000, 8500, 8500, 8500, 10500, 10500, 10500, 10000, 12000, 12000, 12500, 5000, 9500, 9500, 9500, 11000, 11500, 11000, 11000, 13000, 13000, 13000, 6000, 10000, 10000, 10000, 11000, 12000, 12000, 12000, 13500, 14500, 13500, 7000, 12500, 13500, 11000, 12000, 11500, 13500, 12500, 14000, 16000, 16000, 8000, 12000, 12500, 13500, 12500, 13000, 14000, 15000, 14000, 15000, 16000, 9000, 15500, 14500, 14500, 15500, 13500, 14000, 15000, 16000, 15500, 16000, 10000, 17000, 15500, 15500, 17500, 15500, 18000, 19000, 20500, 17000, 18000, 11000, 16000, 18500, 18000, 19000, 19000, 19500, 17500, 19500, 19000, 17500, 12000, 20000, 18000, 21000, 21500, 19000, 19500, 17500, 19000, 20500, 23000, 13000, 20500, 22000, 19500, 20000, 21000, 21000, 21000, 22000, 22000, 21000, 14000, 19500, 23500, 20500, 24000, 22000, 21500, 22500, 21500, 25000, 26000, 15000, 25000, 23500, 26000, 20500, 24500, 25000, 24500, 27500, 27000, 26000 }, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 5283, 4033, 4308, 4558, 4765, 5016, 4764, 6098, 4947, 5459, 700, 4571, 4092, 4367, 7138, 5256, 5353, 6443, 5672, 6021, 6071, 800, 5781, 5817, 4918, 5567, 6725, 7577, 5391, 6732, 7491, 7419, 900, 4847, 4940, 5821, 6647, 7269, 6532, 5943, 6742, 8942, 6918, 1000, 5911, 5622, 7181, 6349, 5878, 7666, 8238, 6808, 8505, 7655, 2000, 7166, 6832, 8152, 8476, 8512, 8711, 9425, 9463, 9879, 9992, 3000, 8919, 8382, 9394, 9626, 9695, 9777, 9850, 10114, 10699, 11520, 4000, 10660, 9874, 10567, 10936, 11062, 10872, 10995, 13029, 12446, 13501, 5000, 11313, 11756, 11881, 11499, 11736, 13273, 12729, 12664, 13065, 14249, 6000, 11923, 12385, 12732, 13444, 14251, 13760, 13404, 15224, 14974, 15201, 7000, 12909, 13401, 14309, 13993, 14986, 15068, 15502, 15272, 16767, 15607, 8000, 14670, 15268, 15498, 16506, 15867, 16032, 16641, 17277, 18096, 17861, 9000, 16323, 17458, 17284, 17556, 17462, 18148, 17463, 17763, 18115, 19153, 10000, 18410, 17939, 18837, 18897, 19124, 19710, 19794, 19407, 19184, 19849, 11000, 20300, 18886, 20128, 19133, 21129, 20597, 20838, 21493, 21866, 22766, 12000, 21414, 21318, 20241, 21061, 22052, 23042, 22657, 23361, 23062, 23520, 13000, 21219, 22213, 22917, 22995, 24093, 23738, 23602, 24603, 24601, 24439, 14000, 23694, 25204, 23738, 24751, 24728, 25456, 25393, 26383, 26180, 26213, 15000, 25310, 26762, 26563, 26865, 27317, 26410, 28481, 28045, 28301, 27492 }, Life_Time = 300, + LoftData2 = { 3254.0855407279, 0, 0, 0, 0, 2.105036331619, 0, 0, 0, 0, 16.165277772877, 0, 0, 0, 0, 457.73945734647, 0, 0, 0, 0, -8.5097096820393e-05, 0, 0, 0, 0, -0.019419928685535, 0, 0, 0, 0, -1.8267994361067, 0, 0, 0, 0, -0.001015031044631, 0, 0, 0, 0, -0.06533623660628, 0, 0, 0, 0, -0.42005961246243, 0, 0, 0, 0, 2.0913595334776e-09, 0, 0, 0, 0, 9.6311096991665e-06, 0, 0, 0, 0, -0.068933304527203, 0, 0, 0, 0, 1.3811786130703e-07, 0, 0, 0, 0, 3.4035217209411e-06, 0, 0, 0, 0, 2.2993622679303e-06, 0, 0, 0, 0, 0.00062192836641152, 0, 0, 0, 0, 0.0005478427394223, 0, 0, 0, 0, 0.0057813025206964, 0, 0, 0, 0, 0.00014426388702246, 0, 0, 0, 0 }, + LoftStartData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 13821, 15075, 16421, 17877, 19461, 21201, 23111, 25217, 27531, 30082, 200, 13978, 15233, 16583, 18045, 19635, 21383, 23305, 25425, 27756, 30330, 300, 14132, 15388, 16743, 18210, 19808, 21565, 23500, 25633, 27984, 30581, 400, 14286, 15546, 16904, 18377, 19982, 21749, 23696, 25845, 28213, 30834, 500, 14437, 15699, 17062, 18542, 20156, 21933, 23892, 26058, 28445, 31090, 600, 14586, 15853, 17221, 18707, 20330, 22118, 24090, 26271, 28679, 31350, 700, 14735, 16004, 17379, 18873, 20503, 22302, 24289, 26487, 28916, 31613, 800, 14881, 16157, 17535, 19037, 20679, 22488, 24489, 26705, 29155, 31881, 900, 15027, 16308, 17692, 19201, 20853, 22674, 24691, 26925, 29397, 32150, 1000, 15173, 16456, 17849, 19366, 21028, 22861, 24894, 27147, 29642, 32424, 2000, 16580, 17933, 19411, 21032, 22818, 24803, 27019, 29496, 32272, 35425, 3000, 17958, 19411, 21009, 22773, 24727, 26917, 29386, 32180, 35372, 39024, 4000, 19357, 20942, 22698, 24650, 26829, 29304, 32136, 35355, 39078, 43398, 5000, 20818, 22575, 24537, 26738, 29240, 32094, 35374, 39154, 43513, 48528, 6000, 22385, 24367, 26620, 29154, 32047, 35380, 39203, 43580, 48588, 54308, 7000, 24138, 26420, 29013, 31958, 35322, 39170, 43548, 48528, 54211, 60674, 8000, 26136, 28775, 31765, 35159, 39009, 43369, 48309, 53926, 60303, 67492, 9000, 28400, 31422, 34837, 38677, 43005, 47891, 53424, 59684, 66726, 74611, 10000, 30903, 34314, 38136, 42423, 47245, 52686, 58812, 65689, 73336, 81838, 11000, 33600, 37387, 41618, 46358, 51675, 57626, 64275, 71669, 79858, 88911, 12000, 36336, 40490, 45128, 50316, 56089, 62512, 69628, 77511, 86194, 95725, 13000, 39073, 43590, 48632, 54230, 60428, 67268, 74823, 83149, 92259, 102230, 14000, 41785, 46663, 52070, 58049, 64622, 71848, 79804, 88522, 98027, 108346, 15000, 44463, 49663, 55408, 61727, 68639, 76224, 84541, 93609, 103437, 114027 }, M = 180, Mach_max = 2, - MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 3350, 3400, 3400, 3500, 3550, 3600, 3750, 3800, 3900, 4050, 700, 3440, 3490, 3540, 3590, 3640, 3740, 3840, 3940, 4040, 4140, 800, 3580, 3580, 3630, 3680, 3780, 3830, 3930, 4080, 4130, 4280, 900, 3670, 3720, 3720, 3820, 3870, 3920, 4020, 4170, 4270, 4370, 1000, 3760, 3810, 3810, 3910, 3960, 4010, 4160, 4260, 4360, 4510, 2000, 4060, 4210, 4260, 4410, 4560, 4660, 4860, 5010, 5160, 5310, 3000, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4000, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 5000, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 6000, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 7000, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 8000, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 9000, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 10000, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 11000, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 12000, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 13000, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 14000, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 15000, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660 }, Name = "Redacted", Nr_max = 3, OmViz_max = 99.9, Range_max = 30000, Reflection = 0.08, + RmaxData2 = { 1789.3142537829, 0, 0, 0, 0, 2.5344868796669, 0, 0, 0, 0, 21.991036575543, 0, 0, 0, 0, 418.89023300334, 0, 0, 0, 0, -7.4684382731926e-05, 0, 0, 0, 0, -0.036899164333987, 0, 0, 0, 0, 2.4562467569475, 0, 0, 0, 0, -0.0015765534435511, 0, 0, 0, 0, -0.049094603967603, 0, 0, 0, 0, -0.25377644032906, 0, 0, 0, 0, 1.390249769639e-09, 0, 0, 0, 0, 2.847567037942e-05, 0, 0, 0, 0, -0.11981907752464, 0, 0, 0, 0, 1.454119124379e-07, 0, 0, 0, 0, 2.6484307909412e-06, 0, 0, 0, 0, 2.5860549565231e-06, 0, 0, 0, 0, 0.00041718867092244, 0, 0, 0, 0, 0.00028564401965639, 0, 0, 0, 0, 0.0069359986309123, 0, 0, 0, 0, 0.00014091907596761, 0, 0, 0, 0 }, + RminData2 = { 4380.2729539491, 0, 0, 0, 0, 0.85275817318368, 0, 0, 0, 0, 14.201232905361, 0, 0, 0, 0, 419.27315859641, 0, 0, 0, 0, 1.5880078161574e-05, 0, 0, 0, 0, -0.017470759427042, 0, 0, 0, 0, -1.4159818087263, 0, 0, 0, 0, -0.00105303053093, 0, 0, 0, 0, -0.046429113103535, 0, 0, 0, 0, -0.49919642820388, 0, 0, 0, 0, -2.8179394453381e-10, 0, 0, 0, 0, 8.5412414089595e-06, 0, 0, 0, 0, -0.09531615785463, 0, 0, 0, 0, 1.3773800902924e-07, 0, 0, 0, 0, 2.3754564502556e-06, 0, 0, 0, 0, 2.2267632968711e-06, 0, 0, 0, 0, 0.00065236003288354, 0, 0, 0, 0, 0.00058130954724224, 0, 0, 0, 0, 0.0072094680714585, 0, 0, 0, 0, 0.00015187509430858, 0, 0, 0, 0 }, SeekerGen = 1, X_back = 0, Y_back = 0, @@ -34,8 +37,9 @@ _G["rockets"]["#Index"] = { ap = { EAS_Cp = { 0.30033732, 0.94117171, 17.82526047, -0.02109645, -0.03571429, 0.35952381, -1.15797619, 1.20857143 }, deadzone = 0, - deflection = 0.087266462599716 + deflection = 0.1221730476396 }, + ballistic_loft = true, boost = { boost_factor = 0, boost_time = 0, @@ -59,8 +63,8 @@ _G["rockets"]["#Index"] = { display_name = "AGM-45A Shrike ARM", display_name_short = "AGM-45A", fm = { - A1trim = { -0.05, -0.05 }, - A2trim = { -0.05, -0.05 }, + A1trim = { 0, 0 }, + A2trim = { 0, 0 }, Cx0 = { 0.2822, 0.2822, 0.2822, 0.2822, 0.2905, 0.913, 1.0541, 1.0209, 0.9877, 0.9296, 0.8715, 0.83, 0.7885, 0.7553, 0.7221, 0.6972, 0.6723, 0.6474, 0.6308, 0.6142, 0.5976 }, CxB = { 0.0913, 0.0913, 0.0913, 0.0913, 0.0913, 0.1494, 0.1577, 0.1411, 0.1328, 0.1162, 0.1079, 0.0996, 0.0996, 0.0913, 0.0913, 0.083, 0.0747, 0.0747, 0.0664, 0.0664, 0.0581 }, Cya = { 0.9234, 0.9234, 0.9234, 0.9234, 0.9234, 1.1502, 1.1826, 1.1259, 1.0692, 0.9315, 0.8586, 0.81, 0.7614, 0.7209, 0.6723, 0.6318, 0.5913, 0.5589, 0.5265, 0.4941, 0.4617 }, @@ -74,14 +78,14 @@ _G["rockets"]["#Index"] = { Mx0 = 0.03, Mxd = 17.19, Mxw = -44.5, - Mya = { -0.2, -0.2 }, - Myw = { -1, -1 }, - Mza = { -0.2, -0.2 }, - Mzw = { -1, -1 }, + Mya = { -0.35, -0.35 }, + Myw = { -1.5, -1.5 }, + Mza = { -0.35, -0.35 }, + Mzw = { -1.5, -1.5 }, S = 0.0324, caliber = 0.2, - delta_max = 0.087266462599716, - draw_fins_conv = { 0, 0.166, 0.166 }, + delta_max = 0.1221730476396, + draw_fins_conv = { 0, 0.233, 0.233 }, fins_part_val = 0, fins_stall = 0, mass = 180, @@ -97,11 +101,14 @@ _G["rockets"]["#Index"] = { fuze = { default_arm_delays = { 3 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, gyro = { init_roll = 0.78539816339745 }, + loft = 1, + loft_factor = 3, manualWeaponFlag = 1, march = { boost_factor = 0, @@ -121,15 +128,16 @@ _G["rockets"]["#Index"] = { model = "HB_F-4E_EXT_AGM45", name = "AGM_45A", radio_seeker = { - FOV = 0.78539816339745, + FOV = 1.3962634015955, aim_y_offset = 0, - blind_ctrl_dist = 100, - blind_rad_val = 10, + blind_ctrl_dist = 360, + blind_rad_val = 1, calc_aim_dist = 500000, - err_correct_time = 2.8, - err_val = 0.01, + err_correct_time = 2, + err_val = 0.003, filter_by_frequency = true, keep_aim_time = 0.1, + max_random_boresight_error = 0.017, min_sens_rad_val = 2.5e-06, op_time = 150, pos_memory_time = 0.1, diff --git a/_G/rockets/AGM_45B.lua b/_G/rockets/AGM_45B.lua index 8531f37e..bc3c09eb 100644 --- a/_G/rockets/AGM_45B.lua +++ b/_G/rockets/AGM_45B.lua @@ -97,6 +97,7 @@ _G["rockets"]["#Index"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, gyro = { diff --git a/_G/rockets/AGM_78A.lua b/_G/rockets/AGM_78A.lua index 7155027a..a0f44282 100644 --- a/_G/rockets/AGM_78A.lua +++ b/_G/rockets/AGM_78A.lua @@ -90,6 +90,7 @@ _G["rockets"]["#Index"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, manualWeaponFlag = 1, @@ -111,15 +112,16 @@ _G["rockets"]["#Index"] = { model = "rim-66", name = "AGM_78A", radio_seeker = { - FOV = 0.78539816339745, + FOV = 1.3962634015955, aim_y_offset = 0, - blind_ctrl_dist = 100, - blind_rad_val = 10, + blind_ctrl_dist = 360, + blind_rad_val = 1, calc_aim_dist = 500000, - err_correct_time = 2.8, - err_val = 0.01, + err_correct_time = 2, + err_val = 0.003, filter_by_frequency = true, keep_aim_time = 0.1, + max_random_boresight_error = 0.017, min_sens_rad_val = 2.5e-06, op_time = 150, pos_memory_time = 0.1, diff --git a/_G/rockets/AGM_78B.lua b/_G/rockets/AGM_78B.lua index 3a26b50b..3e126b9d 100644 --- a/_G/rockets/AGM_78B.lua +++ b/_G/rockets/AGM_78B.lua @@ -90,6 +90,7 @@ _G["rockets"]["#Index"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, manualWeaponFlag = 1, diff --git a/_G/rockets/AGM_84H.lua b/_G/rockets/AGM_84H.lua index 98ccfae2..e8037f0c 100644 --- a/_G/rockets/AGM_84H.lua +++ b/_G/rockets/AGM_84H.lua @@ -52,9 +52,10 @@ _G["rockets"]["#Index"] = { default_cruise_height = 50, obj_sensor = 0, seeker_activation_dist = 20000, - stab_aim_diff = 0.1, + stab_aim_diff = 0.2, + stab_vert_diff = 50, turn_before_point_reach = 1, - turn_hor_N = 0.5, + turn_hor_N = 1.6, turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 450, use_horiz_dist = 1 @@ -73,7 +74,7 @@ _G["rockets"]["#Index"] = { Kii_ver = 0.2, Kp_eng = 265, Kp_hor_err = 350, - Kp_hor_err_croll = 0.06, + Kp_hor_err_croll = 0.064, Kp_ver = 8.2, Kp_ver_st1 = 0.009, Kp_ver_st2 = 0.00018, diff --git a/_G/rockets/AGM_88.lua b/_G/rockets/AGM_88.lua index 3ad904fa..59cb741c 100644 --- a/_G/rockets/AGM_88.lua +++ b/_G/rockets/AGM_88.lua @@ -33,6 +33,7 @@ _G["rockets"]["#Index"] = { RmaxData2 = { 12551.77877, 3373.335016, 430.4872205, 404.3822822, -180.8380295, 7.342056481, 1.109316639, -0.185139678, 0.117346701, -0.102390588, 29.57307282, -2.899005481, -3.184679794, -5.253380469, 3.06759546, 104.1758284, 89.69308404, 3.122667444, -9.362807769, 6.416694814, -0.000374418, -0.000108516, 2.13488e-05, 6.6133e-08, 8.44796e-06, -0.042370248, 0.027145972, 0.013755326, 0.015550084, -0.006860182, 1.969768925, -1.390675448, -1.13291136, 0.509527424, 0.093374346, 0.00222461, -0.001429414, 4.54508e-05, -0.000257136, 0.000160615, -0.005324852, -0.030352916, -0.002061228, 0.002665022, 0.000634274, 0.362877619, -0.158267158, -0.056635178, 0.029416359, -0.02499115, 7.639e-09, 7.03e-09, -9.89e-10, -2.16e-10, 5.5e-11, 2.57428e-05, -2.34529e-05, -1.64626e-05, -1.44077e-05, 4.13798e-06, -0.031709952, 0.016088595, 0.018652888, -0.004167551, -0.006099827, -4.4672e-08, 1.36414e-07, 4.055e-09, 1.3285e-08, -1.4632e-08, 5.60064e-07, 1.44334e-06, 2.7538e-08, -1.34738e-07, 6.048e-09, -1.9274e-08, 9.15652e-07, -1.72765e-07, 2.58766e-07, 4.9348e-08, 0.000207515, 7.03103e-05, -5.02458e-05, 3.05772e-05, 2.53581e-05, -0.000515743, 0.000161334, 2.30926e-05, -2.88179e-05, -4.18133e-05, -0.00404117, 0.002442476, 0.001455294, -0.001011017, -0.000102109, -3.00613e-05, 4.68966e-05, 4.73358e-06, -2.54188e-06, -1.70262e-06 }, RminData = { 2721.355743, -707.191763, 1388.401303, -691.4667775, 260.4030961, -3.752996863, 19.22398386, -11.83090298, 6.539409336, -3.750308422, 1.367224202, -0.357388729, -0.100076085, -0.023616464, -0.083060945, 0.10221075, -0.063836291, -0.012172098, -0.036372371, -0.002613897, 1.12458e-05, 6.80647e-05, 3.90272e-05, -5.12121e-05, 1.21233e-05, -0.00112998, 0.000194742, 0.000420277, 0.001182319, 0.000134003, -9.00964e-05, 3.40036e-05, 2.68921e-05, 3.64381e-05, 4.72301e-06, 2.938e-09, -6.768e-09, -1.777e-09, 3.416e-09, -3.02e-10, 3.40244e-06, 8.58114e-07, -3.13963e-06, -1.45638e-06, -4.31177e-07, -9.0179e-08, 7.217e-08, 6.875e-08, -3.3372e-08, -1.7254e-08 }, RminData2 = { 3002.868564, 0, 0, 0, 0, 0.208064818, 0, 0, 0, 0, 3.731256199, 0, 0, 0, 0, -10.70686954, 0, 0, 0, 0, 4.06911e-05, 0, 0, 0, 0, 3.46991e-05, 0, 0, 0, 0, -0.997598869, 0, 0, 0, 0, 0.000370904, 0, 0, 0, 0, -0.001763321, 0, 0, 0, 0, -0.022631277, 0, 0, 0, 0, -9.2e-10, 0, 0, 0, 0, 3.2049e-06, 0, 0, 0, 0, 0.028333266, 0, 0, 0, 0, 1.27e-10, 0, 0, 0, 0, 3.4707e-08, 0, 0, 0, 0, -2.83063e-07, 0, 0, 0, 0, 3.21442e-06, 0, 0, 0, 0, 0.000116631, 0, 0, 0, 0, 0.001973947, 0, 0, 0, 0, 1.02477e-05, 0, 0, 0, 0 }, + SeekerGen = 3, X_back = -1.506, Y_back = -0.126, Z_back = 0, diff --git a/_G/rockets/BK90_MJ1.lua b/_G/rockets/BK90_MJ1.lua index c8adac19..4046896d 100644 --- a/_G/rockets/BK90_MJ1.lua +++ b/_G/rockets/BK90_MJ1.lua @@ -16,7 +16,7 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95, diff --git a/_G/rockets/BK90_MJ1_MJ2.lua b/_G/rockets/BK90_MJ1_MJ2.lua index 3337099a..9e8ce9b3 100644 --- a/_G/rockets/BK90_MJ1_MJ2.lua +++ b/_G/rockets/BK90_MJ1_MJ2.lua @@ -16,7 +16,7 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95, diff --git a/_G/rockets/BK90_MJ2.lua b/_G/rockets/BK90_MJ2.lua index eb69bd5f..246a8129 100644 --- a/_G/rockets/BK90_MJ2.lua +++ b/_G/rockets/BK90_MJ2.lua @@ -16,7 +16,7 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95, diff --git a/_G/rockets/CM-400AKG.lua b/_G/rockets/CM-400AKG.lua index 4138d9f2..7c4376f5 100644 --- a/_G/rockets/CM-400AKG.lua +++ b/_G/rockets/CM-400AKG.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 8, - D_max = 250000, - D_min = 100000, + D_max = 240000, + D_min = 160000, Damage = 1200, Diam = 400, Escort = 1, @@ -9,7 +9,7 @@ _G["rockets"]["#Index"] = { Fi_rak = 3.14152, Fi_search = 99.9, Fi_start = 0.3, - H_max = 55000, + H_max = 125000, H_min = -1, H_min_t = 0, Head_Form = 1, @@ -17,11 +17,11 @@ _G["rockets"]["#Index"] = { KillDistance = 10, Life_Time = 1800, M = 910, - Mach_max = 5.5, + Mach_max = 4.5, Name = "Redacted", Nr_max = 6, OmViz_max = 99.9, - Range_max = 250000, + Range_max = 220000, Reflection = 0.12, X_back = -2.26, Y_back = 0, @@ -44,11 +44,11 @@ _G["rockets"]["#Index"] = { username = "CM-400AKG" } }, sigma = { 5, 5, 5 }, - t_acc = 60, + t_acc = 30, t_b = 2, t_marsh = 0, user_name = "CM-400AKG", - v_mid = 1500, + v_mid = 1000, v_min = 85, warhead = <1>{ caliber = 400, diff --git a/_G/rockets/P_24R.lua b/_G/rockets/P_24R.lua index 489f6523..bf5a8881 100644 --- a/_G/rockets/P_24R.lua +++ b/_G/rockets/P_24R.lua @@ -41,5 +41,6 @@ _G["rockets"]["#Index"] = { v_mid = 500, v_min = 140, warhead = "_G/warheads/P_24R.lua", - ws_type = { 4, 4, 7, "Redacted" } + ws_type = { 4, 4, 7, "Redacted" }, + x_wing_anim = -1 } \ No newline at end of file diff --git a/_G/rockets/P_24T.lua b/_G/rockets/P_24T.lua index 85d8f01f..8d0e0a76 100644 --- a/_G/rockets/P_24T.lua +++ b/_G/rockets/P_24T.lua @@ -43,5 +43,6 @@ _G["rockets"]["#Index"] = { v_mid = 500, v_min = 140, warhead = "_G/warheads/P_24T.lua", - ws_type = { 4, 4, 7, "Redacted" } + ws_type = { 4, 4, 7, "Redacted" }, + x_wing_anim = -1 } \ No newline at end of file diff --git a/_G/rockets/SA9M311.lua b/_G/rockets/SA9M311.lua index 43610829..7d7ff4a4 100644 --- a/_G/rockets/SA9M311.lua +++ b/_G/rockets/SA9M311.lua @@ -18,10 +18,11 @@ _G["rockets"]["#Index"] = { Life_Time = 30, M = 42, Mach_max = 2.82, - ModelData = { 58, 0.06, 0.1, 0.1, 0.02, 0.06, 1.2, 1.2, 0.8, 0.8, 1.2, 0.4, 0, -1, -1, 2.6, 0, 0, 0, 1000000000, 0, 0, 9.03, 0, 0, 0, 0, 0, 0, 11700, 0, 0, 0, 0, 30, 60, 0, 0.5, 1000000000, 1000000000, 0, 30, 30, 1.19, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + ModelData = { 58, 0.06, 0.1, 0.1, 0.02, 0.06, 1.2, 1.2, 0.8, 0.8, 1.2, 0.4, 0, -1, -1, 2.6, 0, 0, 0, 1000000000, 0, 0, 9.03, 0, 0, 0, 0, 0, 0, 11700, 0, 0, 0, 0, 30, 60, 0, 0.2, 0, 0, 0.15, 30, 30, 1.19, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, Name = "Redacted", Nr_max = 18, OmViz_max = 99.9, + PN_gain = 1, Range_max = 8000, Reflection = 0.03, SeekerGen = 3, @@ -35,6 +36,8 @@ _G["rockets"]["#Index"] = { display_name_short = "9M311", effect_max_length = 10000, exhaust = { 0.7, 0.7, 0.7, 0.5 }, + loft = 1, + loft_factor = 1, name = "SA9M311", sigma = { 10, 10, 10 }, t_acc = 2, diff --git a/_G/rockets/SM_1.lua b/_G/rockets/SM_1.lua index 40a4c5ec..ea98625c 100644 --- a/_G/rockets/SM_1.lua +++ b/_G/rockets/SM_1.lua @@ -18,7 +18,7 @@ _G["rockets"]["#Index"] = { Life_Time = 200, M = 630, Mach_max = 3, - ModelData = { 58, 0.092, 0.408, 0.808, 0.01, -2.336, 0.12, 0.1, 9.5, 6.8, 1.2, 0.3, 0, 0, 0, 4, 10, 0, 0, 1000000000, 0, 0, 37.5, 13.5, 0, 0, 0, 0, 0, 82771.88, 30460.05, 0, 0, 0, 1000000000, 200, 0, 0.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + ModelData = { 58, 0.092, 0.408, 0.808, 0.01, -2.336, 0.12, 0.1, 38, 27, 1.2, 0.3, 0, 0, 0, 4, 10, 0, 0, 1000000000, 0, 0, 37.5, 13.5, 0, 0, 0, 0, 0, 82771.88, 30460.05, 0, 0, 0, 1000000000, 80, 0, 1.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 24.6, -32.2, -3.2, 53000, 21000, 65000, 30000, 46000, 14000, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", Nr_max = 25, OmViz_max = 99.9, @@ -26,7 +26,7 @@ _G["rockets"]["#Index"] = { Range_max = 51000, Reflection = 0.15, SeekerGen = 2, - X_back = -1.507, + X_back = -2.5, Y_back = 0, Z_back = 0, _unique_resource_name = "weapons.missiles.SM_1", @@ -36,7 +36,7 @@ _G["rockets"]["#Index"] = { exhaust = { 1, 1, 1, 1 }, name = "SM_1", nozzle_exit_area = 0.024, - sigma = { 50, 50, 50 }, + sigma = { 30, 30, 30 }, supersonic_A_coef_skew = 0.01, t_acc = 4, t_b = 0, diff --git a/_G/rockets/SM_2.lua b/_G/rockets/SM_2.lua index ff78376c..a5354a35 100644 --- a/_G/rockets/SM_2.lua +++ b/_G/rockets/SM_2.lua @@ -18,7 +18,7 @@ _G["rockets"]["#Index"] = { Life_Time = 200, M = 708, Mach_max = 4, - ModelData = { 58, 0.092, 0.408, 0.808, 0.01, -2.336, 0.12, 0.1, 9.5, 6.8, 1.2, 0.35, 0, 0, 0, 4, 12, 0, 0, 1000000000, 0, 0, 40, 16.67, 0, 0, 0, 0, 0, 96138, 40875, 0, 0, 0, 1000000000, 200, 0, 0.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + ModelData = { 58, 0.092, 0.408, 0.808, 0.01, -2.336, 0.12, 0.1, 38, 27, 1.2, 0.35, 0, 0, 0, 4, 12, 0, 0, 1000000000, 0, 0, 40, 16.67, 0, 0, 0, 0, 0, 96138, 40875, 0, 0, 0, 1000000000, 120, 0, 1.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 22.6, -20.2, -2.96, 66000, 34000, 83000, 37000, 46900, 17800, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", Nr_max = 25, OmViz_max = 99.9, @@ -26,7 +26,7 @@ _G["rockets"]["#Index"] = { Range_max = 74000, Reflection = 0.15, SeekerGen = 3, - X_back = -1.507, + X_back = -2.5, Y_back = 0, Z_back = 0, _unique_resource_name = "weapons.missiles.SM_2", @@ -36,7 +36,7 @@ _G["rockets"]["#Index"] = { exhaust = { 1, 1, 1, 1 }, name = "SM_2", nozzle_exit_area = 0.025, - sigma = { 50, 50, 50 }, + sigma = { 30, 30, 30 }, supersonic_A_coef_skew = 0.01, t_acc = 4, t_b = 0, diff --git a/_G/rockets/SM_2ER.lua b/_G/rockets/SM_2ER.lua index d68f6897..13cbe191 100644 --- a/_G/rockets/SM_2ER.lua +++ b/_G/rockets/SM_2ER.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 5, - D_max = 150000, - D_min = 6500, + D_max = 180000, + D_min = 10000, Damage = 245, Diam = 343, Escort = 3, @@ -18,25 +18,29 @@ _G["rockets"]["#Index"] = { Life_Time = 200, M = 1463, Mach_max = 5, - ModelData = { 58, 0.092, 0.408, 0.808, 0.01, -2.336, 0.12, 0.1, 9.5, 6.8, 1.2, 0.35, 0, 0, 6, 4, 12, 0, 0, 1000000000, 0, 118.67, 40, 16.67, 0, 0, 0, 0, 151420.9, 96138, 40875, 0, 0, 0, 1000000000, 200, 0, 0.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + ModelData = { 58, 0.092, 0.408, 0.808, 0.01, -2.336, 0.12, 0.1, 38, 27, 1.2, 0.35, 0, 0, 6, 4, 12, 0, 0, 1000000000, 0, 118.67, 40, 16.67, 0, 0, 0, 0, 151420.9, 96138, 40875, 0, 0, 0, 1000000000, 200, 0, 1.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 22.6, -50.2, -2.96, 150000, 50000, 180000, 87000, 84000, 38000, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", Nr_max = 25, OmViz_max = 99.9, PN_gain = 4, - Range_max = 153000, + Range_max = 180000, Reflection = 0.15, SeekerGen = 3, - X_back = -1.507, + X_back = -2.6, + X_back_acc = -4.3, Y_back = 0, + Y_back_acc = 0, Z_back = 0, + Z_back_acc = 0, _unique_resource_name = "weapons.missiles.SM_2ER", ccm_k0 = 0.5, display_name = "SM-2ER", display_name_short = "SM-2ER", - exhaust = { 1, 1, 1, 1 }, + exhaust1 = <1>{ 1, 1, 1, 1 }, + exhaust2 =
, name = "SM_2ER", nozzle_exit_area = 0.025, - sigma = { 50, 50, 50 }, + sigma = { 20, 20, 20 }, supersonic_A_coef_skew = 0.01, t_acc = 4, t_b = 6, diff --git a/_G/rockets/SM_6.lua b/_G/rockets/SM_6.lua index 00aab0ea..e4522260 100644 --- a/_G/rockets/SM_6.lua +++ b/_G/rockets/SM_6.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 5, - D_max = 150000, - D_min = 6500, + D_max = 180000, + D_min = 10000, Damage = 245, Diam = 343, Escort = 3, @@ -18,25 +18,29 @@ _G["rockets"]["#Index"] = { Life_Time = 200, M = 1497, Mach_max = 5, - ModelData = { 58, 0.092, 0.408, 0.808, 0.01, -2.336, 0.12, 0.1, 9.5, 6.8, 1.2, 0.35, 0, 0, 6, 4, 12, 0, 0, 1000000000, 0, 118.67, 40, 16.67, 0, 0, 0, 0, 151420.9, 96138, 40875, 0, 0, 0, 1000000000, 200, 0, 0.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + ModelData = { 58, 0.092, 0.408, 0.808, 0.01, -2.336, 0.12, 0.1, 38, 27, 1.2, 0.35, 0, 0, 6, 4, 12, 0, 0, 1000000000, 0, 118.67, 40, 16.67, 0, 0, 0, 0, 151420.9, 96138, 40875, 0, 0, 0, 1000000000, 200, 0, 1.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 22.6, -50.2, -2.96, 150000, 50000, 180000, 87000, 84000, 38000, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", Nr_max = 25, OmViz_max = 99.9, PN_gain = 4, - Range_max = 153000, + Range_max = 180000, Reflection = 0.15, SeekerGen = 4, - X_back = -1.507, + X_back = -2.6, + X_back_acc = -4.3, Y_back = 0, + Y_back_acc = 0, Z_back = 0, + Z_back_acc = 0, _unique_resource_name = "weapons.missiles.SM_6", ccm_k0 = 0.5, display_name = "SM-6", display_name_short = "SM-6", - exhaust = { 1, 1, 1, 1 }, + exhaust1 = <1>{ 1, 1, 1, 1 }, + exhaust2 =
, name = "SM_6", nozzle_exit_area = 0.025, - sigma = { 50, 50, 50 }, + sigma = { 20, 20, 20 }, supersonic_A_coef_skew = 0.01, t_acc = 4, t_b = 6, diff --git a/_G/warheads/Mk_84.lua b/_G/warheads/Mk_84.lua index cbff1874..73d2282b 100644 --- a/_G/warheads/Mk_84.lua +++ b/_G/warheads/Mk_84.lua @@ -1,5 +1,5 @@ _G["warheads"]["Mk_84"] = { - caliber = 457.2, + caliber = 457, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, cumulative_factor = 0, diff --git a/_G/weapons_table/aircraft_gunpods/{SUU_23_POD}.lua b/_G/weapons_table/aircraft_gunpods/{SUU_23_POD}.lua index 64ffc974..d2c3a282 100644 --- a/_G/weapons_table/aircraft_gunpods/{SUU_23_POD}.lua +++ b/_G/weapons_table/aircraft_gunpods/{SUU_23_POD}.lua @@ -28,7 +28,7 @@ _G["weapons_table"]["aircraft_gunpods"]["{SUU_23_POD}"] = { } }, ejector_dir = { 0, 0, 0 }, ejector_pos = { 0, 0, 0 }, - ejector_pos_connector = "Gun_point", + ejector_pos_connector = "pnt_shell_pod", elevation_initial = 0, gun = { barrels_count = 1, @@ -50,7 +50,7 @@ _G["weapons_table"]["aircraft_gunpods"]["{SUU_23_POD}"] = { short_name = "M-61A1", smoke_dir = { 0, -1, -0.2 }, supply = { - count = 639, + count = 1234, get_mass = , get_mass_ = , mixes = { { 1, 1, 1, 1, 4 }, { 2, 2, 2, 2, 4 }, { 1, 2, 1, 2, 4 }, { 3, 3, 3, 3, 4 } }, diff --git a/_G/weapons_table/weapons/bombs/GBU_15_V_1_B.lua b/_G/weapons_table/weapons/bombs/GBU_15_V_1_B.lua new file mode 100644 index 00000000..031099db --- /dev/null +++ b/_G/weapons_table/weapons/bombs/GBU_15_V_1_B.lua @@ -0,0 +1,271 @@ +_G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_1_B"] = { + I = 1430.7113583333, + L = 3.91, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.bombs.GBU_15_V_1_B", + add_attributes = { "Missiles" }, + caliber = 0.457, + client = { + Ag = -2, + Cx = 0.00461, + LaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 800, 1200, 5400, 8200, 10600, 12400, 14000, 15600, 17000, 200, 1200, 2000, 5800, 8400, 10800, 12800, 14400, 15800, 17400, 300, 1600, 3600, 6000, 8800, 11000, 13000, 14600, 16000, 17600, 400, 2000, 3800, 6400, 9000, 11200, 13200, 14800, 16400, 17800, 500, 2400, 4200, 6600, 9200, 11600, 13400, 15000, 16600, 18000, 600, 2600, 4400, 6800, 9400, 11800, 13800, 15400, 16800, 18400, 700, 2800, 4800, 7000, 9600, 12000, 14000, 15600, 17000, 18600, 800, 3200, 5000, 7200, 9800, 12200, 14200, 15800, 17400, 18800, 900, 3400, 5200, 7600, 10000, 12400, 14400, 16000, 17600, 19200, 1000, 3600, 5400, 7800, 10400, 12600, 14600, 16200, 17800, 19400, 2000, 5200, 8400, 11400, 13800, 15400, 16600, 17600, 18400, 19200, 3000, 6400, 10200, 13600, 16400, 18400, 20000, 21400, 22600, 23800, 4000, 7000, 11800, 15200, 18200, 20600, 22200, 23600, 25000, 25800, 5000, 8400, 12800, 16400, 19400, 21600, 23200, 24600, 25600, 26200, 6000, 9800, 13800, 17000, 20000, 22000, 23600, 24800, 25800, 27400, 7000, 11200, 14600, 17600, 20400, 22400, 24000, 25200, 26800, 28600, 8000, 12800, 15600, 18400, 21000, 22800, 24400, 26000, 27800, 29600, 9000, 14200, 16600, 19000, 21200, 23600, 25200, 26800, 28800, 30800, 10000, 15400, 17400, 19600, 21800, 24000, 25800, 27600, 29800, 32000 }, + MinLaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 850, 1000, 1150, 1300, 1500, 1800, 2050, 2350, 200, 850, 1050, 1250, 1450, 1600, 1800, 2350, 2850, 3300, 300, 1000, 1200, 1450, 1650, 1850, 2050, 2350, 3100, 3700, 400, 1100, 1350, 1600, 1800, 2000, 2200, 2550, 3200, 3850, 500, 1250, 1450, 1700, 1950, 2150, 2400, 2750, 3150, 4000, 600, 1350, 1550, 1800, 2050, 2300, 2500, 2900, 3350, 4050, 700, 1450, 1650, 1900, 2150, 2400, 2650, 3050, 3500, 4150, 800, 1550, 1700, 2000, 2250, 2500, 2750, 3200, 3650, 4150, 900, 1600, 1800, 2050, 2350, 2600, 2850, 3300, 3800, 4300, 1000, 1750, 1900, 2150, 2450, 2700, 2950, 3400, 3950, 4450, 2000, 2350, 3000, 3450, 3600, 3750, 3850, 4200, 4850, 5550, 3000, 2750, 3650, 4450, 5000, 5300, 5450, 5600, 5700, 6250, 4000, 3050, 4200, 5200, 6000, 6600, 6950, 7200, 7300, 7450, 5000, 3300, 4600, 5800, 6800, 7550, 8250, 8650, 8950, 9100, 6000, 3450, 4950, 6250, 7350, 8300, 9150, 9900, 10400, 10700, 7000, 3600, 5200, 6700, 7900, 9000, 10000, 10900, 11800, 12200, 8000, 3700, 5450, 7050, 8400, 9600, 10700, 11800, 12950, 13650, 9000, 3750, 5700, 7350, 8900, 10200, 11400, 12600, 13900, 15050, 10000, 3800, 5850, 7650, 9300, 10700, 12100, 13400, 14800, 16100 }, + VyHold = -100, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Missiles" }, + ap = { + Ka = 4.186854, + Kd = 620, + Kra = 0.5, + Krd = 0.05, + Ks = 0.05, + Tc = 0.23044046, + Tm = 189.385228, + fins_limit = 1, + fins_limit_x = 0.1, + gload_limit = 5, + integ_limit = 0.2, + model_roll = 0.78539816339745, + null_roll = 0, + omega_limit = 0.2, + op_time = 999, + tail_control = false + }, + arming_delay = { + delay_time = 0.8, + enabled = true + }, + arming_vane = { + enabled = false, + velK = 1 + }, + category = 1, + class_name = "wAmmunitionSelfHoming", + controller = { + Ka = 2, + Kpitch = 1.5, + Kra = 0.5, + Kyaw = 1.5, + auto_terminal_t = 15, + midcourse_g_bias = 1, + midcourse_glide_pitch = -0.073304, + pitch_integ_limit = 10, + separation_g_bias = 1, + separation_t = 1.75, + transition_platform_pitch = -0.419 + }, + displayName = "GBU-15(V)1/B - 2000lb TV (EO) Guided Bomb", + display_name_short = "GBU-15(V)1/B", + fm = { + A = 0.36, + I = 1430.7113583333, + I_x = 40, + L = 3.91, + Ma = 0.68, + Ma_x = 3, + Mw = 1.116, + Mw_x = 1.5, + Sw = 0.72, + caliber = 0.457, + cx_coeff = { 1, 1, 0.38, 0.3, 1.5 }, + dCydA = { 0.1, 0.036 }, + draw_fins_conv = { 0, 1, 1 }, + finsTau = 0.1, + ideal_fins = true, + mass = 1123, + maxAoa = 0.23, + model_roll = 0.78539816339745, + release_rnd = 0.3, + release_rnd_x = 1, + wind_sigma = 0, + wind_time = 0 + }, + hMax = 10000, + hMin = 100, + mass = 1123, + model = "HB_F4E_GBU15V1", + name = "GBU_15_V_1_B", + omega_rot = { + rotate_x = 0.78539816339745 + }, + scheme = "schemes/bombs/GBU-15.sch", + seeker = { + FOV = 1.4809609793861, + activate_on_update = false, + delay = 0, + max_lock_dist = 25000, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + max_w_LOS_surf = 0.017, + op_time = 105 + }, + shape_table_data = { { + file = "HB_F4E_GBU15V1", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "HB_F4E_GBU15V1", + username = "GBU-15(V)1/B" + } }, + targeting_data = { + char_time = 20.3 + }, + type = 3, + user_name = "GBU-15(V)1/B", + warhead = { + caliber = 457, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 340, + fantom = 1, + mass = 340, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 68 + }, + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } + }, + cx = { 1, 1, 0.38, 0.3, 1.5 }, + display_name = "GBU-15(V)1/B", + display_name_short = "GBU-15(V)1/B", + mass = 1123, + model = "HB_F4E_GBU15V1", + name = "GBU_15_V_1_B", + server = { + Ag = -2, + Cx = 0.00461, + LaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 800, 1200, 5400, 8200, 10600, 12400, 14000, 15600, 17000, 200, 1200, 2000, 5800, 8400, 10800, 12800, 14400, 15800, 17400, 300, 1600, 3600, 6000, 8800, 11000, 13000, 14600, 16000, 17600, 400, 2000, 3800, 6400, 9000, 11200, 13200, 14800, 16400, 17800, 500, 2400, 4200, 6600, 9200, 11600, 13400, 15000, 16600, 18000, 600, 2600, 4400, 6800, 9400, 11800, 13800, 15400, 16800, 18400, 700, 2800, 4800, 7000, 9600, 12000, 14000, 15600, 17000, 18600, 800, 3200, 5000, 7200, 9800, 12200, 14200, 15800, 17400, 18800, 900, 3400, 5200, 7600, 10000, 12400, 14400, 16000, 17600, 19200, 1000, 3600, 5400, 7800, 10400, 12600, 14600, 16200, 17800, 19400, 2000, 5200, 8400, 11400, 13800, 15400, 16600, 17600, 18400, 19200, 3000, 6400, 10200, 13600, 16400, 18400, 20000, 21400, 22600, 23800, 4000, 7000, 11800, 15200, 18200, 20600, 22200, 23600, 25000, 25800, 5000, 8400, 12800, 16400, 19400, 21600, 23200, 24600, 25600, 26200, 6000, 9800, 13800, 17000, 20000, 22000, 23600, 24800, 25800, 27400, 7000, 11200, 14600, 17600, 20400, 22400, 24000, 25200, 26800, 28600, 8000, 12800, 15600, 18400, 21000, 22800, 24400, 26000, 27800, 29600, 9000, 14200, 16600, 19000, 21200, 23600, 25200, 26800, 28800, 30800, 10000, 15400, 17400, 19600, 21800, 24000, 25800, 27600, 29800, 32000 }, + MinLaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 850, 1000, 1150, 1300, 1500, 1800, 2050, 2350, 200, 850, 1050, 1250, 1450, 1600, 1800, 2350, 2850, 3300, 300, 1000, 1200, 1450, 1650, 1850, 2050, 2350, 3100, 3700, 400, 1100, 1350, 1600, 1800, 2000, 2200, 2550, 3200, 3850, 500, 1250, 1450, 1700, 1950, 2150, 2400, 2750, 3150, 4000, 600, 1350, 1550, 1800, 2050, 2300, 2500, 2900, 3350, 4050, 700, 1450, 1650, 1900, 2150, 2400, 2650, 3050, 3500, 4150, 800, 1550, 1700, 2000, 2250, 2500, 2750, 3200, 3650, 4150, 900, 1600, 1800, 2050, 2350, 2600, 2850, 3300, 3800, 4300, 1000, 1750, 1900, 2150, 2450, 2700, 2950, 3400, 3950, 4450, 2000, 2350, 3000, 3450, 3600, 3750, 3850, 4200, 4850, 5550, 3000, 2750, 3650, 4450, 5000, 5300, 5450, 5600, 5700, 6250, 4000, 3050, 4200, 5200, 6000, 6600, 6950, 7200, 7300, 7450, 5000, 3300, 4600, 5800, 6800, 7550, 8250, 8650, 8950, 9100, 6000, 3450, 4950, 6250, 7350, 8300, 9150, 9900, 10400, 10700, 7000, 3600, 5200, 6700, 7900, 9000, 10000, 10900, 11800, 12200, 8000, 3700, 5450, 7050, 8400, 9600, 10700, 11800, 12950, 13650, 9000, 3750, 5700, 7350, 8900, 10200, 11400, 12600, 13900, 15050, 10000, 3800, 5850, 7650, 9300, 10700, 12100, 13400, 14800, 16100 }, + VyHold = -100, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Missiles" }, + ap = { + Ka = 4.186854, + Kd = 620, + Kra = 0.5, + Krd = 0.05, + Ks = 0.05, + Tc = 0.23044046, + Tm = 189.385228, + fins_limit = 1, + fins_limit_x = 0.1, + gload_limit = 5, + integ_limit = 0.2, + model_roll = 0.78539816339745, + null_roll = 0, + omega_limit = 0.2, + op_time = 999, + tail_control = false + }, + arming_delay = { + delay_time = 0.8, + enabled = true + }, + arming_vane = { + enabled = false, + velK = 1 + }, + category = 1, + class_name = "wAmmunitionSelfHoming", + controller = { + Ka = 2, + Kpitch = 1.5, + Kra = 0.5, + Kyaw = 1.5, + auto_terminal_t = 15, + midcourse_g_bias = 1, + midcourse_glide_pitch = -0.073304, + pitch_integ_limit = 10, + separation_g_bias = 1, + separation_t = 1.75, + transition_platform_pitch = -0.419 + }, + displayName = "GBU-15(V)1/B - 2000lb TV (EO) Guided Bomb", + display_name_short = "GBU-15(V)1/B", + fm = { + A = 0.36, + I = 1430.7113583333, + I_x = 40, + L = 3.91, + Ma = 0.68, + Ma_x = 3, + Mw = 1.116, + Mw_x = 1.5, + Sw = 0.72, + caliber = 0.457, + cx_coeff = { 1, 1, 0.38, 0.3, 1.5 }, + dCydA = { 0.1, 0.036 }, + draw_fins_conv = { 0, 1, 1 }, + finsTau = 0.1, + ideal_fins = true, + mass = 1123, + maxAoa = 0.23, + model_roll = 0.78539816339745, + release_rnd = 0.3, + release_rnd_x = 1, + wind_sigma = 0, + wind_time = 0 + }, + hMax = 10000, + hMin = 100, + mass = 1123, + model = "HB_F4E_GBU15V1", + name = "GBU_15_V_1_B", + omega_rot = { + rotate_x = 0.78539816339745 + }, + scheme = "schemes/bombs/GBU-15.sch", + seeker = { + FOV = 1.4809609793861, + activate_on_update = false, + delay = 0, + max_lock_dist = 25000, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + max_w_LOS_surf = 0.017, + op_time = 105 + }, + shape_table_data = { { + file = "HB_F4E_GBU15V1", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "HB_F4E_GBU15V1", + username = "GBU-15(V)1/B" + } }, + targeting_data = { + char_time = 20.3 + }, + type = 3, + user_name = "GBU-15(V)1/B", + warhead = { + caliber = 457, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 340, + fantom = 0, + mass = 340, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 68 + }, + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } + }, + sounderName = "Weapons/Bomb", + targeting_data = { + char_time = 20.3 + }, + type_name = "bomb", + ws_type = { 4, 5, 36, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/bombs/GBU_15_V_31_B.lua b/_G/weapons_table/weapons/bombs/GBU_15_V_31_B.lua index 5dbf61d0..d989a954 100644 --- a/_G/weapons_table/weapons/bombs/GBU_15_V_31_B.lua +++ b/_G/weapons_table/weapons/bombs/GBU_15_V_31_B.lua @@ -80,6 +80,9 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { mass = 1125, model = "agm-130", name = "GBU_15_V_31_B", + omega_rot = { + rotate_x = 0 + }, scheme = "schemes/bombs/GBU-15.sch", seeker = { FOV = 1.0471975511966, @@ -202,6 +205,9 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { mass = 1125, model = "agm-130", name = "GBU_15_V_31_B", + omega_rot = { + rotate_x = 0 + }, scheme = "schemes/bombs/GBU-15.sch", seeker = { FOV = 1.0471975511966, diff --git a/_G/weapons_table/weapons/bombs/GBU_8_B.lua b/_G/weapons_table/weapons/bombs/GBU_8_B.lua new file mode 100644 index 00000000..126756a8 --- /dev/null +++ b/_G/weapons_table/weapons/bombs/GBU_8_B.lua @@ -0,0 +1,219 @@ +_G["weapons_table"]["weapons"]["bombs"]["GBU_8_B"] = { + I = 1127.723025, + L = 3.63, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.bombs.GBU_8_B", + add_attributes = { "Missiles" }, + caliber = 0.457, + client = { + Ag = -1.5, + Cx = 0.00461, + LaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 850, 1850, 3900, 5650, 7000, 8150, 9200, 10250, 200, 900, 1150, 2250, 4400, 6100, 7400, 8550, 9550, 10600, 300, 1100, 1350, 2550, 4750, 6400, 7750, 8850, 9850, 10900, 400, 1250, 1550, 2800, 5050, 6700, 8000, 9100, 10150, 11200, 500, 1350, 1750, 3050, 5350, 7000, 8250, 9400, 10400, 11450, 600, 1500, 1900, 3300, 5600, 7250, 8500, 9600, 10600, 11650, 700, 1600, 2050, 3550, 5850, 7500, 8750, 9850, 10850, 11900, 800, 1700, 2200, 3800, 6100, 7750, 9000, 10100, 11100, 12150, 900, 1800, 2300, 4050, 6350, 7950, 9250, 10300, 11300, 12350, 1000, 1900, 2450, 4300, 6600, 8200, 9450, 10550, 11500, 12550, 2000, 3150, 4350, 7050, 9100, 10600, 11750, 12700, 13650, 14700, 3000, 4800, 7100, 9950, 11750, 13050, 14100, 15000, 15900, 16900, 4000, 6650, 10050, 12750, 14350, 15600, 16550, 17400, 18200, 19150, 5000, 8750, 13000, 15300, 16900, 18100, 19000, 20150, 21500, 22850, 6000, 11100, 15600, 17700, 19350, 20900, 22100, 23250, 24400, 25650, 7000, 13800, 17800, 19950, 21600, 22950, 24100, 25250, 26450, 27800, 8000, 16450, 19750, 21650, 23150, 24450, 25700, 26900, 28200, 29700, 9000, 18550, 21100, 22900, 24400, 25800, 27050, 28350, 29800, 31450, 10000, 19850, 22100, 23900, 25400, 26800, 28150, 29550, 31200, 33000 }, + MinLaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 800, 1000, 1150, 1300, 1500, 1600, 1800, 2000, 200, 900, 1100, 1300, 1500, 1700, 1900, 2000, 2200, 2450, 300, 1050, 1350, 1550, 1800, 1950, 2200, 2300, 2500, 2800, 400, 1200, 1500, 1750, 2000, 2200, 2450, 2550, 2800, 3100, 500, 1350, 1650, 1950, 2200, 2400, 2650, 2750, 3000, 3300, 600, 1450, 1800, 2100, 2350, 2600, 2800, 2950, 3200, 3550, 700, 1550, 1900, 2250, 2500, 2750, 3000, 3100, 3400, 3700, 800, 1650, 2000, 2350, 2650, 2900, 3150, 3250, 3550, 3900, 900, 1750, 2150, 2450, 2750, 3000, 3250, 3400, 3700, 4050, 1000, 1850, 2250, 2550, 2900, 3150, 3400, 3550, 3850, 4200, 2000, 2550, 3250, 3850, 4250, 4350, 4350, 4450, 4850, 5350, 3000, 3050, 3950, 4800, 5450, 6100, 6450, 6500, 6500, 6500, 4000, 3350, 4500, 5500, 6350, 7100, 7800, 8450, 8650, 8650, 5000, 3650, 4950, 6100, 7100, 8000, 8800, 9550, 10400, 10800, 6000, 3800, 5300, 6600, 7750, 8750, 9750, 10600, 11550, 12550, 7000, 4050, 5650, 7050, 8300, 9450, 10450, 11500, 12650, 13850, 8000, 4200, 5950, 7450, 8850, 10050, 11200, 12350, 13650, 15000, 9000, 4350, 6200, 7850, 9300, 10700, 11950, 13250, 14650, 16150, 10000, 4500, 6400, 8250, 9800, 11250, 12650, 14150, 15600, 17250 }, + PN_autopilot = { + K = 0.024, + K_GBias = 0.4, + Kg = 2.4, + Ki = 0.001, + Krx = 2, + Kx = 0.02, + fins_limit = 0.6 + }, + VyHold = -50, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Missiles" }, + arming_delay = { + delay_time = 0.8, + enabled = true + }, + arming_vane = { + enabled = false, + velK = 1 + }, + category = 1, + class_name = "wAmmunitionSelfHoming", + displayName = "GBU-8/B HOBOS - 2000 lb TV Guided Bomb", + display_name_short = "GBU-8/B", + fm = { + A = 0.36, + I = 1127.723025, + I_x = 40, + L = 3.63, + Ma = 0.75, + Ma_x = 3, + Mw = 1.116, + Mw_x = 1.5, + Sw = 0.72, + caliber = 0.457, + cx_coeff = { 1, 1, 0.38, 0.3, 1.5 }, + dCydA = { 0.05, 0.036 }, + draw_fins_conv = { 0, 1, 1 }, + finsTau = 0.1, + ideal_fins = true, + mass = 1027, + maxAoa = 0.17, + model_roll = 0.78539816339745, + release_rnd = 0.3, + release_rnd_x = 1, + wind_sigma = 0, + wind_time = 0 + }, + hMax = 10000, + hMin = 100, + loft = true, + mass = 1027, + model = "HB_F-4E_EXT_GBU8", + name = "GBU_8_B", + scheme = "schemes/bombs/GBU-8.sch", + seeker = { + FOV = 0.87266462599716, + delay = 1.75, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.055, + max_w_LOS_surf = 0.0275, + op_time = 105 + }, + shape_table_data = { { + file = "HB_F-4E_EXT_GBU8", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "HB_F-4E_EXT_GBU8", + username = "GBU-8/B" + } }, + targeting_data = { + char_time = 20.3 + }, + type = 3, + user_name = "GBU-8/B", + warhead = { + caliber = 457, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 340, + fantom = 1, + mass = 340, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 68 + }, + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } + }, + cx = { 1, 1, 0.38, 0.3, 1.5 }, + display_name = "GBU-8/B", + display_name_short = "GBU-8/B", + mass = 1027, + model = "HB_F-4E_EXT_GBU8", + name = "GBU_8_B", + server = { + Ag = -1.5, + Cx = 0.00461, + LaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 850, 1850, 3900, 5650, 7000, 8150, 9200, 10250, 200, 900, 1150, 2250, 4400, 6100, 7400, 8550, 9550, 10600, 300, 1100, 1350, 2550, 4750, 6400, 7750, 8850, 9850, 10900, 400, 1250, 1550, 2800, 5050, 6700, 8000, 9100, 10150, 11200, 500, 1350, 1750, 3050, 5350, 7000, 8250, 9400, 10400, 11450, 600, 1500, 1900, 3300, 5600, 7250, 8500, 9600, 10600, 11650, 700, 1600, 2050, 3550, 5850, 7500, 8750, 9850, 10850, 11900, 800, 1700, 2200, 3800, 6100, 7750, 9000, 10100, 11100, 12150, 900, 1800, 2300, 4050, 6350, 7950, 9250, 10300, 11300, 12350, 1000, 1900, 2450, 4300, 6600, 8200, 9450, 10550, 11500, 12550, 2000, 3150, 4350, 7050, 9100, 10600, 11750, 12700, 13650, 14700, 3000, 4800, 7100, 9950, 11750, 13050, 14100, 15000, 15900, 16900, 4000, 6650, 10050, 12750, 14350, 15600, 16550, 17400, 18200, 19150, 5000, 8750, 13000, 15300, 16900, 18100, 19000, 20150, 21500, 22850, 6000, 11100, 15600, 17700, 19350, 20900, 22100, 23250, 24400, 25650, 7000, 13800, 17800, 19950, 21600, 22950, 24100, 25250, 26450, 27800, 8000, 16450, 19750, 21650, 23150, 24450, 25700, 26900, 28200, 29700, 9000, 18550, 21100, 22900, 24400, 25800, 27050, 28350, 29800, 31450, 10000, 19850, 22100, 23900, 25400, 26800, 28150, 29550, 31200, 33000 }, + MinLaunchDistData = { 19, 9, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 800, 1000, 1150, 1300, 1500, 1600, 1800, 2000, 200, 900, 1100, 1300, 1500, 1700, 1900, 2000, 2200, 2450, 300, 1050, 1350, 1550, 1800, 1950, 2200, 2300, 2500, 2800, 400, 1200, 1500, 1750, 2000, 2200, 2450, 2550, 2800, 3100, 500, 1350, 1650, 1950, 2200, 2400, 2650, 2750, 3000, 3300, 600, 1450, 1800, 2100, 2350, 2600, 2800, 2950, 3200, 3550, 700, 1550, 1900, 2250, 2500, 2750, 3000, 3100, 3400, 3700, 800, 1650, 2000, 2350, 2650, 2900, 3150, 3250, 3550, 3900, 900, 1750, 2150, 2450, 2750, 3000, 3250, 3400, 3700, 4050, 1000, 1850, 2250, 2550, 2900, 3150, 3400, 3550, 3850, 4200, 2000, 2550, 3250, 3850, 4250, 4350, 4350, 4450, 4850, 5350, 3000, 3050, 3950, 4800, 5450, 6100, 6450, 6500, 6500, 6500, 4000, 3350, 4500, 5500, 6350, 7100, 7800, 8450, 8650, 8650, 5000, 3650, 4950, 6100, 7100, 8000, 8800, 9550, 10400, 10800, 6000, 3800, 5300, 6600, 7750, 8750, 9750, 10600, 11550, 12550, 7000, 4050, 5650, 7050, 8300, 9450, 10450, 11500, 12650, 13850, 8000, 4200, 5950, 7450, 8850, 10050, 11200, 12350, 13650, 15000, 9000, 4350, 6200, 7850, 9300, 10700, 11950, 13250, 14650, 16150, 10000, 4500, 6400, 8250, 9800, 11250, 12650, 14150, 15600, 17250 }, + PN_autopilot = { + K = 0.024, + K_GBias = 0.4, + Kg = 2.4, + Ki = 0.001, + Krx = 2, + Kx = 0.02, + fins_limit = 0.6 + }, + VyHold = -50, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Missiles" }, + arming_delay = { + delay_time = 0.8, + enabled = true + }, + arming_vane = { + enabled = false, + velK = 1 + }, + category = 1, + class_name = "wAmmunitionSelfHoming", + displayName = "GBU-8/B HOBOS - 2000 lb TV Guided Bomb", + display_name_short = "GBU-8/B", + fm = { + A = 0.36, + I = 1127.723025, + I_x = 40, + L = 3.63, + Ma = 0.75, + Ma_x = 3, + Mw = 1.116, + Mw_x = 1.5, + Sw = 0.72, + caliber = 0.457, + cx_coeff = { 1, 1, 0.38, 0.3, 1.5 }, + dCydA = { 0.05, 0.036 }, + draw_fins_conv = { 0, 1, 1 }, + finsTau = 0.1, + ideal_fins = true, + mass = 1027, + maxAoa = 0.17, + model_roll = 0.78539816339745, + release_rnd = 0.3, + release_rnd_x = 1, + wind_sigma = 0, + wind_time = 0 + }, + hMax = 10000, + hMin = 100, + loft = true, + mass = 1027, + model = "HB_F-4E_EXT_GBU8", + name = "GBU_8_B", + scheme = "schemes/bombs/GBU-8.sch", + seeker = { + FOV = 0.87266462599716, + delay = 1.75, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.055, + max_w_LOS_surf = 0.0275, + op_time = 105 + }, + shape_table_data = { { + file = "HB_F-4E_EXT_GBU8", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "HB_F-4E_EXT_GBU8", + username = "GBU-8/B" + } }, + targeting_data = { + char_time = 20.3 + }, + type = 3, + user_name = "GBU-8/B", + warhead = { + caliber = 457, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 340, + fantom = 0, + mass = 340, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 68 + }, + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } + }, + sounderName = "Weapons/Bomb", + targeting_data = { + char_time = 20.3 + }, + type_name = "bomb", + ws_type = { 4, 5, 36, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/AGM_12C.lua b/_G/weapons_table/weapons/missiles/AGM_12C.lua deleted file mode 100644 index 5ab5a613..00000000 --- a/_G/weapons_table/weapons/missiles/AGM_12C.lua +++ /dev/null @@ -1,314 +0,0 @@ -_G["weapons_table"]["weapons"]["missiles"]["AGM_12C"] = { - Reflection = 0.03, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - _unique_resource_name = "weapons.missiles.AGM_12C", - caliber = 0.3048, - client = { - Cx_pil = 4, - D_max = 13000, - D_min = 1500, - Diam = 305, - Escort = 1, - Fi_excort = 0.4, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.1, - H_max = 10000, - H_min = -1, - H_min_t = 0, - Head_Form = 1, - Head_Type = 7, - KillDistance = 0, - LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7000, 8000, 0, 0, 10000, 10500, 11000, 12000, 200, 0, 0, 7000, 0, 0, 12000, 0, 0, 0, 0, 300, 5000, 6000, 7000, 8500, 10500, 11500, 12500, 11000, 12000, 12500, 400, 5500, 6500, 7500, 8500, 10500, 12500, 12500, 11000, 12000, 12500, 500, 5500, 6500, 7500, 9000, 10500, 12500, 14500, 15500, 15000, 12500, 600, 5500, 6500, 7500, 9000, 11000, 13000, 13000, 15000, 16500, 17000, 700, 6000, 6500, 7500, 9500, 11000, 13000, 15500, 15500, 17500, 18500, 800, 6000, 6500, 7500, 9500, 11500, 13500, 15000, 15500, 18000, 18500, 900, 6000, 6500, 8500, 9500, 11500, 13000, 15000, 16000, 18000, 18500, 1000, 6000, 6500, 8000, 10000, 11500, 13500, 15000, 17000, 17500, 19000, 2000, 9500, 10500, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 3000, 9500, 10500, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 4000, 10000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 5000, 10000, 11000, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 20500, 6000, 10000, 11500, 12500, 14000, 15000, 16500, 17500, 18500, 19500, 21000, 7000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 8000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 9000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 10000, 9500, 11000, 12500, 14000, 15500, 16500, 17500, 18000, 20000, 21000 }, - Life_Time = 30, - M = 263, - Mach_max = 1.8, - MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 500, 500, 500, 750, 500, 0, 0, 0, 200, 2050, 2300, 500, 500, 550, 750, 500, 500, 500, 500, 300, 2000, 500, 500, 500, 500, 750, 500, 500, 500, 500, 400, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 600, 500, 500, 500, 500, 500, 650, 500, 500, 500, 500, 700, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 800, 500, 500, 500, 500, 550, 800, 500, 500, 500, 500, 900, 500, 500, 500, 500, 600, 850, 500, 500, 500, 500, 1000, 500, 500, 500, 500, 600, 800, 500, 500, 500, 500, 2000, 500, 600, 600, 600, 500, 700, 500, 500, 500, 500, 3000, 700, 550, 800, 950, 1200, 500, 750, 650, 500, 500, 4000, 800, 700, 700, 850, 850, 900, 800, 700, 650, 550, 5000, 1000, 800, 900, 1000, 1400, 1100, 900, 800, 700, 700, 6000, 1000, 1000, 1500, 1000, 1500, 1500, 1000, 1000, 1000, 1000, 7000, 2000, 1500, 2000, 2500, 1500, 2000, 1500, 1500, 1000, 1500, 8000, 2500, 2500, 1500, 3500, 1500, 1500, 2500, 1500, 1500, 1500, 9000, 3000, 3000, 3000, 2500, 1500, 2000, 2000, 2500, 1500, 1000, 10000, 3500, 3000, 3500, 4500, 3500, 1500, 2500, 3000, 2500, 2000 }, - Nr_max = 1.2, - OmViz_max = 99.9, - Range_max = 13000, - Reflection = 0.03, - X_back = -0.922, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - autopilot = { - Kd = 0.07, - Ki = 0.01, - Kp = 0.07, - delay = 2, - fins_discreet = 0.08, - fins_limit = 1, - max_ctrl_angle = 6.24, - no_ctrl_center_ang = 2e-05, - op_time = 30, - self_destruct_command_timer = 3, - self_destruct_maneuver = 1, - self_destruct_maneuver_cmd_y = 0.3, - self_destruct_maneuver_cmd_z = 0.6, - self_destruct_no_signal_lim = 0.5, - self_destruct_start_timer = 18 - }, - booster = { - custom_smoke_dissipation_factor = 1, - effect_type = 0, - fuel_mass = 41.88, - impulse = 230, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1, 0, 0 } }, - smoke_color = { 0.8, 0.8, 0.8 }, - smoke_transparency = 0.01, - tail_width = 0.18, - work_time = 2.5 - }, - category = 2, - class_name = "wAmmunitionVikhr", - display_name_short = "AGM-12C", - fm = { - A = 0.36, - I = 265.38909287667, - I_x = 10, - L = 3.4798, - Ma = 2, - Ma_x = 3, - Mw = 5, - Mw_x = 1.5, - Mx0Ma = { -0.25, -0.11 }, - Sw = 0.465, - caliber = 0.3048, - cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.01, - ideal_fins = true, - mass = 263, - maxAoa = 0.23, - wind_sigma = 0, - wind_time = 0 - }, - fuze = { - default_arm_delays = { 2 }, - default_function_altitude = 0 - }, - model = "HB_F-4E_EXT_AGM12C", - name = "AGM_12C", - scheme = "schemes/missiles/AGM-12.sch", - shape_table_data = { { - file = "HB_F-4E_EXT_AGM12C", - index = "Redacted", - name = "HB_F-4E_EXT_AGM12C", - username = "AGM-12C" - } }, - sigma = { 4, 4, 4 }, - spiral_nav = { - def_cone_max_dist = 22000, - def_cone_near_rad = 10000, - def_cone_near_rad_st = 0, - def_cone_time_stab_rad = 0, - gb_angle = 0.0036, - gb_max_retW = 0.4, - gb_min_dist = 3200, - gb_ret_Kp = 1.1, - gb_use_time = 5.3, - t_cone_near_rad = 10000 - }, - t_acc = 2.5, - t_b = 0, - t_marsh = 0, - user_name = "AGM-12C", - v_mid = 300, - v_min = 170, - warhead = { - caliber = 207, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, - default_fuze_delay = 0, - expl_mass = 45.2, - fantom = 1, - mass = 45.2, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 9.04 - }, - warhead_air = { - fantom = 1 - }, - wcs = { - activation_delay = 0.75, - base_pulse_length = 0.05, - command_deflection = 0.2, - input_delay = 0.1, - lead_pulse_deadzone = 0.001, - lead_pulse_sensitivity = 0.5, - lifetime = 30, - memory_pulse_sensitivity = 1, - reference_offset = -0.87266462599716, - sustain_pulse_gain_per_cycle = 0.1, - sustain_pulse_sensitity = 1, - sustain_pulse_sentitivity_exponent = 0.2 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - display_name = "AGM-12C", - display_name_short = "AGM-12C", - mass = 263, - model = "HB_F-4E_EXT_AGM12C", - name = "AGM_12C", - server = { - Cx_pil = 4, - D_max = 13000, - D_min = 1500, - Diam = 305, - Escort = 1, - Fi_excort = 0.4, - Fi_rak = 3.14152, - Fi_search = 99.9, - Fi_start = 0.1, - H_max = 10000, - H_min = -1, - H_min_t = 0, - Head_Form = 1, - Head_Type = 7, - KillDistance = 0, - LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7000, 8000, 0, 0, 10000, 10500, 11000, 12000, 200, 0, 0, 7000, 0, 0, 12000, 0, 0, 0, 0, 300, 5000, 6000, 7000, 8500, 10500, 11500, 12500, 11000, 12000, 12500, 400, 5500, 6500, 7500, 8500, 10500, 12500, 12500, 11000, 12000, 12500, 500, 5500, 6500, 7500, 9000, 10500, 12500, 14500, 15500, 15000, 12500, 600, 5500, 6500, 7500, 9000, 11000, 13000, 13000, 15000, 16500, 17000, 700, 6000, 6500, 7500, 9500, 11000, 13000, 15500, 15500, 17500, 18500, 800, 6000, 6500, 7500, 9500, 11500, 13500, 15000, 15500, 18000, 18500, 900, 6000, 6500, 8500, 9500, 11500, 13000, 15000, 16000, 18000, 18500, 1000, 6000, 6500, 8000, 10000, 11500, 13500, 15000, 17000, 17500, 19000, 2000, 9500, 10500, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 3000, 9500, 10500, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 4000, 10000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 5000, 10000, 11000, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 20500, 6000, 10000, 11500, 12500, 14000, 15000, 16500, 17500, 18500, 19500, 21000, 7000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 8000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 9000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 10000, 9500, 11000, 12500, 14000, 15500, 16500, 17500, 18000, 20000, 21000 }, - Life_Time = 30, - M = 263, - Mach_max = 1.8, - MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 500, 500, 500, 750, 500, 0, 0, 0, 200, 2050, 2300, 500, 500, 550, 750, 500, 500, 500, 500, 300, 2000, 500, 500, 500, 500, 750, 500, 500, 500, 500, 400, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 600, 500, 500, 500, 500, 500, 650, 500, 500, 500, 500, 700, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 800, 500, 500, 500, 500, 550, 800, 500, 500, 500, 500, 900, 500, 500, 500, 500, 600, 850, 500, 500, 500, 500, 1000, 500, 500, 500, 500, 600, 800, 500, 500, 500, 500, 2000, 500, 600, 600, 600, 500, 700, 500, 500, 500, 500, 3000, 700, 550, 800, 950, 1200, 500, 750, 650, 500, 500, 4000, 800, 700, 700, 850, 850, 900, 800, 700, 650, 550, 5000, 1000, 800, 900, 1000, 1400, 1100, 900, 800, 700, 700, 6000, 1000, 1000, 1500, 1000, 1500, 1500, 1000, 1000, 1000, 1000, 7000, 2000, 1500, 2000, 2500, 1500, 2000, 1500, 1500, 1000, 1500, 8000, 2500, 2500, 1500, 3500, 1500, 1500, 2500, 1500, 1500, 1500, 9000, 3000, 3000, 3000, 2500, 1500, 2000, 2000, 2500, 1500, 1000, 10000, 3500, 3000, 3500, 4500, 3500, 1500, 2500, 3000, 2500, 2000 }, - Nr_max = 1.2, - OmViz_max = 99.9, - Range_max = 13000, - Reflection = 0.03, - X_back = -0.922, - Y_back = 0, - Z_back = 0, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - autopilot = { - Kd = 0.07, - Ki = 0.01, - Kp = 0.07, - delay = 2, - fins_discreet = 0.08, - fins_limit = 1, - max_ctrl_angle = 6.24, - no_ctrl_center_ang = 2e-05, - op_time = 30, - self_destruct_command_timer = 3, - self_destruct_maneuver = 1, - self_destruct_maneuver_cmd_y = 0.3, - self_destruct_maneuver_cmd_z = 0.6, - self_destruct_no_signal_lim = 0.5, - self_destruct_start_timer = 18 - }, - booster = { - custom_smoke_dissipation_factor = 1, - effect_type = 0, - fuel_mass = 41.88, - impulse = 230, - nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1, 0, 0 } }, - smoke_color = { 0.8, 0.8, 0.8 }, - smoke_transparency = 0.01, - tail_width = 0.18, - work_time = 2.5 - }, - category = 2, - class_name = "wAmmunitionVikhr", - display_name_short = "AGM-12C", - fm = { - A = 0.36, - I = 265.38909287667, - I_x = 10, - L = 3.4798, - Ma = 2, - Ma_x = 3, - Mw = 5, - Mw_x = 1.5, - Mx0Ma = { -0.25, -0.11 }, - Sw = 0.465, - caliber = 0.3048, - cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.01, - ideal_fins = true, - mass = 263, - maxAoa = 0.23, - wind_sigma = 0, - wind_time = 0 - }, - fuze = { - default_arm_delays = { 2 }, - default_function_altitude = 0 - }, - model = "HB_F-4E_EXT_AGM12C", - name = "AGM_12C", - scheme = "schemes/missiles/AGM-12.sch", - shape_table_data = { { - file = "HB_F-4E_EXT_AGM12C", - index = "Redacted", - name = "HB_F-4E_EXT_AGM12C", - username = "AGM-12C" - } }, - sigma = { 4, 4, 4 }, - spiral_nav = { - def_cone_max_dist = 22000, - def_cone_near_rad = 10000, - def_cone_near_rad_st = 0, - def_cone_time_stab_rad = 0, - gb_angle = 0.0036, - gb_max_retW = 0.4, - gb_min_dist = 3200, - gb_ret_Kp = 1.1, - gb_use_time = 5.3, - t_cone_near_rad = 10000 - }, - t_acc = 2.5, - t_b = 0, - t_marsh = 0, - user_name = "AGM-12C", - v_mid = 300, - v_min = 170, - warhead = { - caliber = 207, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, - default_fuze_delay = 0, - expl_mass = 45.2, - fantom = 0, - mass = 45.2, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 9.04 - }, - warhead_air = { - fantom = 0 - }, - wcs = { - activation_delay = 0.75, - base_pulse_length = 0.05, - command_deflection = 0.2, - input_delay = 0.1, - lead_pulse_deadzone = 0.001, - lead_pulse_sensitivity = 0.5, - lifetime = 30, - memory_pulse_sensitivity = 1, - reference_offset = -0.87266462599716, - sustain_pulse_gain_per_cycle = 0.1, - sustain_pulse_sensitity = 1, - sustain_pulse_sentitivity_exponent = 0.2 - }, - wsTypeOfWeapon = { 4, 4, 8, "Redacted" } - }, - sounderName = "Weapons/Missile", - targeting_data = { - fm_type = -1 - }, - type_name = "missile", - ws_type = { 4, 4, 8, "Redacted" } -} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/AGM_45A.lua b/_G/weapons_table/weapons/missiles/AGM_45A.lua index 5639a918..87c09783 100644 --- a/_G/weapons_table/weapons/missiles/AGM_45A.lua +++ b/_G/weapons_table/weapons/missiles/AGM_45A.lua @@ -20,15 +20,18 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { Head_Form = 1, Head_Type = 3, KillDistance = 10, - LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 5000, 3500, 4500, 4500, 4500, 5000, 7000, 8000, 5500, 7500, 700, 5000, 4000, 5000, 5000, 5000, 8500, 7000, 6000, 5500, 7500, 800, 4500, 4500, 6000, 5000, 5500, 8500, 7000, 6000, 5500, 6500, 900, 5500, 5000, 6000, 5000, 5500, 8500, 7000, 7500, 7500, 9500, 1000, 5500, 5000, 7500, 6500, 5500, 8500, 7500, 8500, 7500, 10000, 2000, 6500, 6500, 7500, 8500, 9000, 9500, 9500, 9000, 9500, 10500, 3000, 7000, 8500, 8000, 9000, 10000, 9000, 10500, 9500, 12000, 11500, 4000, 8500, 8500, 8500, 10500, 10500, 10500, 10000, 12000, 12000, 12500, 5000, 9500, 9500, 9500, 11000, 11500, 11000, 11000, 13000, 13000, 13000, 6000, 10000, 10000, 10000, 11000, 12000, 12000, 12000, 13500, 14500, 13500, 7000, 12500, 13500, 11000, 12000, 11500, 13500, 12500, 14000, 16000, 16000, 8000, 12000, 12500, 13500, 12500, 13000, 14000, 15000, 14000, 15000, 16000, 9000, 15500, 14500, 14500, 15500, 13500, 14000, 15000, 16000, 15500, 16000, 10000, 17000, 15500, 15500, 17500, 15500, 18000, 19000, 20500, 17000, 18000, 11000, 16000, 18500, 18000, 19000, 19000, 19500, 17500, 19500, 19000, 17500, 12000, 20000, 18000, 21000, 21500, 19000, 19500, 17500, 19000, 20500, 23000, 13000, 20500, 22000, 19500, 20000, 21000, 21000, 21000, 22000, 22000, 21000, 14000, 19500, 23500, 20500, 24000, 22000, 21500, 22500, 21500, 25000, 26000, 15000, 25000, 23500, 26000, 20500, 24500, 25000, 24500, 27500, 27000, 26000 }, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 5283, 4033, 4308, 4558, 4765, 5016, 4764, 6098, 4947, 5459, 700, 4571, 4092, 4367, 7138, 5256, 5353, 6443, 5672, 6021, 6071, 800, 5781, 5817, 4918, 5567, 6725, 7577, 5391, 6732, 7491, 7419, 900, 4847, 4940, 5821, 6647, 7269, 6532, 5943, 6742, 8942, 6918, 1000, 5911, 5622, 7181, 6349, 5878, 7666, 8238, 6808, 8505, 7655, 2000, 7166, 6832, 8152, 8476, 8512, 8711, 9425, 9463, 9879, 9992, 3000, 8919, 8382, 9394, 9626, 9695, 9777, 9850, 10114, 10699, 11520, 4000, 10660, 9874, 10567, 10936, 11062, 10872, 10995, 13029, 12446, 13501, 5000, 11313, 11756, 11881, 11499, 11736, 13273, 12729, 12664, 13065, 14249, 6000, 11923, 12385, 12732, 13444, 14251, 13760, 13404, 15224, 14974, 15201, 7000, 12909, 13401, 14309, 13993, 14986, 15068, 15502, 15272, 16767, 15607, 8000, 14670, 15268, 15498, 16506, 15867, 16032, 16641, 17277, 18096, 17861, 9000, 16323, 17458, 17284, 17556, 17462, 18148, 17463, 17763, 18115, 19153, 10000, 18410, 17939, 18837, 18897, 19124, 19710, 19794, 19407, 19184, 19849, 11000, 20300, 18886, 20128, 19133, 21129, 20597, 20838, 21493, 21866, 22766, 12000, 21414, 21318, 20241, 21061, 22052, 23042, 22657, 23361, 23062, 23520, 13000, 21219, 22213, 22917, 22995, 24093, 23738, 23602, 24603, 24601, 24439, 14000, 23694, 25204, 23738, 24751, 24728, 25456, 25393, 26383, 26180, 26213, 15000, 25310, 26762, 26563, 26865, 27317, 26410, 28481, 28045, 28301, 27492 }, Life_Time = 300, + LoftData2 = { 3254.0855407279, 0, 0, 0, 0, 2.105036331619, 0, 0, 0, 0, 16.165277772877, 0, 0, 0, 0, 457.73945734647, 0, 0, 0, 0, -8.5097096820393e-05, 0, 0, 0, 0, -0.019419928685535, 0, 0, 0, 0, -1.8267994361067, 0, 0, 0, 0, -0.001015031044631, 0, 0, 0, 0, -0.06533623660628, 0, 0, 0, 0, -0.42005961246243, 0, 0, 0, 0, 2.0913595334776e-09, 0, 0, 0, 0, 9.6311096991665e-06, 0, 0, 0, 0, -0.068933304527203, 0, 0, 0, 0, 1.3811786130703e-07, 0, 0, 0, 0, 3.4035217209411e-06, 0, 0, 0, 0, 2.2993622679303e-06, 0, 0, 0, 0, 0.00062192836641152, 0, 0, 0, 0, 0.0005478427394223, 0, 0, 0, 0, 0.0057813025206964, 0, 0, 0, 0, 0.00014426388702246, 0, 0, 0, 0 }, + LoftStartData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 13821, 15075, 16421, 17877, 19461, 21201, 23111, 25217, 27531, 30082, 200, 13978, 15233, 16583, 18045, 19635, 21383, 23305, 25425, 27756, 30330, 300, 14132, 15388, 16743, 18210, 19808, 21565, 23500, 25633, 27984, 30581, 400, 14286, 15546, 16904, 18377, 19982, 21749, 23696, 25845, 28213, 30834, 500, 14437, 15699, 17062, 18542, 20156, 21933, 23892, 26058, 28445, 31090, 600, 14586, 15853, 17221, 18707, 20330, 22118, 24090, 26271, 28679, 31350, 700, 14735, 16004, 17379, 18873, 20503, 22302, 24289, 26487, 28916, 31613, 800, 14881, 16157, 17535, 19037, 20679, 22488, 24489, 26705, 29155, 31881, 900, 15027, 16308, 17692, 19201, 20853, 22674, 24691, 26925, 29397, 32150, 1000, 15173, 16456, 17849, 19366, 21028, 22861, 24894, 27147, 29642, 32424, 2000, 16580, 17933, 19411, 21032, 22818, 24803, 27019, 29496, 32272, 35425, 3000, 17958, 19411, 21009, 22773, 24727, 26917, 29386, 32180, 35372, 39024, 4000, 19357, 20942, 22698, 24650, 26829, 29304, 32136, 35355, 39078, 43398, 5000, 20818, 22575, 24537, 26738, 29240, 32094, 35374, 39154, 43513, 48528, 6000, 22385, 24367, 26620, 29154, 32047, 35380, 39203, 43580, 48588, 54308, 7000, 24138, 26420, 29013, 31958, 35322, 39170, 43548, 48528, 54211, 60674, 8000, 26136, 28775, 31765, 35159, 39009, 43369, 48309, 53926, 60303, 67492, 9000, 28400, 31422, 34837, 38677, 43005, 47891, 53424, 59684, 66726, 74611, 10000, 30903, 34314, 38136, 42423, 47245, 52686, 58812, 65689, 73336, 81838, 11000, 33600, 37387, 41618, 46358, 51675, 57626, 64275, 71669, 79858, 88911, 12000, 36336, 40490, 45128, 50316, 56089, 62512, 69628, 77511, 86194, 95725, 13000, 39073, 43590, 48632, 54230, 60428, 67268, 74823, 83149, 92259, 102230, 14000, 41785, 46663, 52070, 58049, 64622, 71848, 79804, 88522, 98027, 108346, 15000, 44463, 49663, 55408, 61727, 68639, 76224, 84541, 93609, 103437, 114027 }, M = 180, Mach_max = 2, - MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 3350, 3400, 3400, 3500, 3550, 3600, 3750, 3800, 3900, 4050, 700, 3440, 3490, 3540, 3590, 3640, 3740, 3840, 3940, 4040, 4140, 800, 3580, 3580, 3630, 3680, 3780, 3830, 3930, 4080, 4130, 4280, 900, 3670, 3720, 3720, 3820, 3870, 3920, 4020, 4170, 4270, 4370, 1000, 3760, 3810, 3810, 3910, 3960, 4010, 4160, 4260, 4360, 4510, 2000, 4060, 4210, 4260, 4410, 4560, 4660, 4860, 5010, 5160, 5310, 3000, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4000, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 5000, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 6000, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 7000, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 8000, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 9000, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 10000, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 11000, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 12000, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 13000, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 14000, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 15000, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660 }, Nr_max = 3, OmViz_max = 99.9, Range_max = 30000, Reflection = 0.08, + RmaxData2 = { 1789.3142537829, 0, 0, 0, 0, 2.5344868796669, 0, 0, 0, 0, 21.991036575543, 0, 0, 0, 0, 418.89023300334, 0, 0, 0, 0, -7.4684382731926e-05, 0, 0, 0, 0, -0.036899164333987, 0, 0, 0, 0, 2.4562467569475, 0, 0, 0, 0, -0.0015765534435511, 0, 0, 0, 0, -0.049094603967603, 0, 0, 0, 0, -0.25377644032906, 0, 0, 0, 0, 1.390249769639e-09, 0, 0, 0, 0, 2.847567037942e-05, 0, 0, 0, 0, -0.11981907752464, 0, 0, 0, 0, 1.454119124379e-07, 0, 0, 0, 0, 2.6484307909412e-06, 0, 0, 0, 0, 2.5860549565231e-06, 0, 0, 0, 0, 0.00041718867092244, 0, 0, 0, 0, 0.00028564401965639, 0, 0, 0, 0, 0.0069359986309123, 0, 0, 0, 0, 0.00014091907596761, 0, 0, 0, 0 }, + RminData2 = { 4380.2729539491, 0, 0, 0, 0, 0.85275817318368, 0, 0, 0, 0, 14.201232905361, 0, 0, 0, 0, 419.27315859641, 0, 0, 0, 0, 1.5880078161574e-05, 0, 0, 0, 0, -0.017470759427042, 0, 0, 0, 0, -1.4159818087263, 0, 0, 0, 0, -0.00105303053093, 0, 0, 0, 0, -0.046429113103535, 0, 0, 0, 0, -0.49919642820388, 0, 0, 0, 0, -2.8179394453381e-10, 0, 0, 0, 0, 8.5412414089595e-06, 0, 0, 0, 0, -0.09531615785463, 0, 0, 0, 0, 1.3773800902924e-07, 0, 0, 0, 0, 2.3754564502556e-06, 0, 0, 0, 0, 2.2267632968711e-06, 0, 0, 0, 0, 0.00065236003288354, 0, 0, 0, 0, 0.00058130954724224, 0, 0, 0, 0, 0.0072094680714585, 0, 0, 0, 0, 0.00015187509430858, 0, 0, 0, 0 }, SeekerGen = 1, X_back = 0, Y_back = 0, @@ -38,8 +41,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { ap = { EAS_Cp = { 0.30033732, 0.94117171, 17.82526047, -0.02109645, -0.03571429, 0.35952381, -1.15797619, 1.20857143 }, deadzone = 0, - deflection = 0.087266462599716 + deflection = 0.1221730476396 }, + ballistic_loft = true, boost = { boost_factor = 0, boost_time = 0, @@ -62,8 +66,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { }, display_name_short = "AGM-45A", fm = { - A1trim = { -0.05, -0.05 }, - A2trim = { -0.05, -0.05 }, + A1trim = { 0, 0 }, + A2trim = { 0, 0 }, Cx0 = { 0.2822, 0.2822, 0.2822, 0.2822, 0.2905, 0.913, 1.0541, 1.0209, 0.9877, 0.9296, 0.8715, 0.83, 0.7885, 0.7553, 0.7221, 0.6972, 0.6723, 0.6474, 0.6308, 0.6142, 0.5976 }, CxB = { 0.0913, 0.0913, 0.0913, 0.0913, 0.0913, 0.1494, 0.1577, 0.1411, 0.1328, 0.1162, 0.1079, 0.0996, 0.0996, 0.0913, 0.0913, 0.083, 0.0747, 0.0747, 0.0664, 0.0664, 0.0581 }, Cya = { 0.9234, 0.9234, 0.9234, 0.9234, 0.9234, 1.1502, 1.1826, 1.1259, 1.0692, 0.9315, 0.8586, 0.81, 0.7614, 0.7209, 0.6723, 0.6318, 0.5913, 0.5589, 0.5265, 0.4941, 0.4617 }, @@ -77,14 +81,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { Mx0 = 0.03, Mxd = 17.19, Mxw = -44.5, - Mya = { -0.2, -0.2 }, - Myw = { -1, -1 }, - Mza = { -0.2, -0.2 }, - Mzw = { -1, -1 }, + Mya = { -0.35, -0.35 }, + Myw = { -1.5, -1.5 }, + Mza = { -0.35, -0.35 }, + Mzw = { -1.5, -1.5 }, S = 0.0324, caliber = 0.2, - delta_max = 0.087266462599716, - draw_fins_conv = { 0, 0.166, 0.166 }, + delta_max = 0.1221730476396, + draw_fins_conv = { 0, 0.233, 0.233 }, fins_part_val = 0, fins_stall = 0, mass = 180, @@ -100,11 +104,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { fuze = { default_arm_delays = { 3 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, gyro = { init_roll = 0.78539816339745 }, + loft = 1, + loft_factor = 3, manualWeaponFlag = 1, march = { boost_factor = 0, @@ -124,15 +131,16 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { model = "HB_F-4E_EXT_AGM45", name = "AGM_45A", radio_seeker = { - FOV = 0.78539816339745, + FOV = 1.3962634015955, aim_y_offset = 0, - blind_ctrl_dist = 100, - blind_rad_val = 10, + blind_ctrl_dist = 360, + blind_rad_val = 1, calc_aim_dist = 500000, - err_correct_time = 2.8, - err_val = 0.01, + err_correct_time = 2, + err_val = 0.003, filter_by_frequency = true, keep_aim_time = 0.1, + max_random_boresight_error = 0.017, min_sens_rad_val = 2.5e-06, op_time = 150, pos_memory_time = 0.1, @@ -195,15 +203,18 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { Head_Form = 1, Head_Type = 3, KillDistance = 10, - LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 5000, 3500, 4500, 4500, 4500, 5000, 7000, 8000, 5500, 7500, 700, 5000, 4000, 5000, 5000, 5000, 8500, 7000, 6000, 5500, 7500, 800, 4500, 4500, 6000, 5000, 5500, 8500, 7000, 6000, 5500, 6500, 900, 5500, 5000, 6000, 5000, 5500, 8500, 7000, 7500, 7500, 9500, 1000, 5500, 5000, 7500, 6500, 5500, 8500, 7500, 8500, 7500, 10000, 2000, 6500, 6500, 7500, 8500, 9000, 9500, 9500, 9000, 9500, 10500, 3000, 7000, 8500, 8000, 9000, 10000, 9000, 10500, 9500, 12000, 11500, 4000, 8500, 8500, 8500, 10500, 10500, 10500, 10000, 12000, 12000, 12500, 5000, 9500, 9500, 9500, 11000, 11500, 11000, 11000, 13000, 13000, 13000, 6000, 10000, 10000, 10000, 11000, 12000, 12000, 12000, 13500, 14500, 13500, 7000, 12500, 13500, 11000, 12000, 11500, 13500, 12500, 14000, 16000, 16000, 8000, 12000, 12500, 13500, 12500, 13000, 14000, 15000, 14000, 15000, 16000, 9000, 15500, 14500, 14500, 15500, 13500, 14000, 15000, 16000, 15500, 16000, 10000, 17000, 15500, 15500, 17500, 15500, 18000, 19000, 20500, 17000, 18000, 11000, 16000, 18500, 18000, 19000, 19000, 19500, 17500, 19500, 19000, 17500, 12000, 20000, 18000, 21000, 21500, 19000, 19500, 17500, 19000, 20500, 23000, 13000, 20500, 22000, 19500, 20000, 21000, 21000, 21000, 22000, 22000, 21000, 14000, 19500, 23500, 20500, 24000, 22000, 21500, 22500, 21500, 25000, 26000, 15000, 25000, 23500, 26000, 20500, 24500, 25000, 24500, 27500, 27000, 26000 }, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 5283, 4033, 4308, 4558, 4765, 5016, 4764, 6098, 4947, 5459, 700, 4571, 4092, 4367, 7138, 5256, 5353, 6443, 5672, 6021, 6071, 800, 5781, 5817, 4918, 5567, 6725, 7577, 5391, 6732, 7491, 7419, 900, 4847, 4940, 5821, 6647, 7269, 6532, 5943, 6742, 8942, 6918, 1000, 5911, 5622, 7181, 6349, 5878, 7666, 8238, 6808, 8505, 7655, 2000, 7166, 6832, 8152, 8476, 8512, 8711, 9425, 9463, 9879, 9992, 3000, 8919, 8382, 9394, 9626, 9695, 9777, 9850, 10114, 10699, 11520, 4000, 10660, 9874, 10567, 10936, 11062, 10872, 10995, 13029, 12446, 13501, 5000, 11313, 11756, 11881, 11499, 11736, 13273, 12729, 12664, 13065, 14249, 6000, 11923, 12385, 12732, 13444, 14251, 13760, 13404, 15224, 14974, 15201, 7000, 12909, 13401, 14309, 13993, 14986, 15068, 15502, 15272, 16767, 15607, 8000, 14670, 15268, 15498, 16506, 15867, 16032, 16641, 17277, 18096, 17861, 9000, 16323, 17458, 17284, 17556, 17462, 18148, 17463, 17763, 18115, 19153, 10000, 18410, 17939, 18837, 18897, 19124, 19710, 19794, 19407, 19184, 19849, 11000, 20300, 18886, 20128, 19133, 21129, 20597, 20838, 21493, 21866, 22766, 12000, 21414, 21318, 20241, 21061, 22052, 23042, 22657, 23361, 23062, 23520, 13000, 21219, 22213, 22917, 22995, 24093, 23738, 23602, 24603, 24601, 24439, 14000, 23694, 25204, 23738, 24751, 24728, 25456, 25393, 26383, 26180, 26213, 15000, 25310, 26762, 26563, 26865, 27317, 26410, 28481, 28045, 28301, 27492 }, Life_Time = 300, + LoftData2 = { 3254.0855407279, 0, 0, 0, 0, 2.105036331619, 0, 0, 0, 0, 16.165277772877, 0, 0, 0, 0, 457.73945734647, 0, 0, 0, 0, -8.5097096820393e-05, 0, 0, 0, 0, -0.019419928685535, 0, 0, 0, 0, -1.8267994361067, 0, 0, 0, 0, -0.001015031044631, 0, 0, 0, 0, -0.06533623660628, 0, 0, 0, 0, -0.42005961246243, 0, 0, 0, 0, 2.0913595334776e-09, 0, 0, 0, 0, 9.6311096991665e-06, 0, 0, 0, 0, -0.068933304527203, 0, 0, 0, 0, 1.3811786130703e-07, 0, 0, 0, 0, 3.4035217209411e-06, 0, 0, 0, 0, 2.2993622679303e-06, 0, 0, 0, 0, 0.00062192836641152, 0, 0, 0, 0, 0.0005478427394223, 0, 0, 0, 0, 0.0057813025206964, 0, 0, 0, 0, 0.00014426388702246, 0, 0, 0, 0 }, + LoftStartData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 13821, 15075, 16421, 17877, 19461, 21201, 23111, 25217, 27531, 30082, 200, 13978, 15233, 16583, 18045, 19635, 21383, 23305, 25425, 27756, 30330, 300, 14132, 15388, 16743, 18210, 19808, 21565, 23500, 25633, 27984, 30581, 400, 14286, 15546, 16904, 18377, 19982, 21749, 23696, 25845, 28213, 30834, 500, 14437, 15699, 17062, 18542, 20156, 21933, 23892, 26058, 28445, 31090, 600, 14586, 15853, 17221, 18707, 20330, 22118, 24090, 26271, 28679, 31350, 700, 14735, 16004, 17379, 18873, 20503, 22302, 24289, 26487, 28916, 31613, 800, 14881, 16157, 17535, 19037, 20679, 22488, 24489, 26705, 29155, 31881, 900, 15027, 16308, 17692, 19201, 20853, 22674, 24691, 26925, 29397, 32150, 1000, 15173, 16456, 17849, 19366, 21028, 22861, 24894, 27147, 29642, 32424, 2000, 16580, 17933, 19411, 21032, 22818, 24803, 27019, 29496, 32272, 35425, 3000, 17958, 19411, 21009, 22773, 24727, 26917, 29386, 32180, 35372, 39024, 4000, 19357, 20942, 22698, 24650, 26829, 29304, 32136, 35355, 39078, 43398, 5000, 20818, 22575, 24537, 26738, 29240, 32094, 35374, 39154, 43513, 48528, 6000, 22385, 24367, 26620, 29154, 32047, 35380, 39203, 43580, 48588, 54308, 7000, 24138, 26420, 29013, 31958, 35322, 39170, 43548, 48528, 54211, 60674, 8000, 26136, 28775, 31765, 35159, 39009, 43369, 48309, 53926, 60303, 67492, 9000, 28400, 31422, 34837, 38677, 43005, 47891, 53424, 59684, 66726, 74611, 10000, 30903, 34314, 38136, 42423, 47245, 52686, 58812, 65689, 73336, 81838, 11000, 33600, 37387, 41618, 46358, 51675, 57626, 64275, 71669, 79858, 88911, 12000, 36336, 40490, 45128, 50316, 56089, 62512, 69628, 77511, 86194, 95725, 13000, 39073, 43590, 48632, 54230, 60428, 67268, 74823, 83149, 92259, 102230, 14000, 41785, 46663, 52070, 58049, 64622, 71848, 79804, 88522, 98027, 108346, 15000, 44463, 49663, 55408, 61727, 68639, 76224, 84541, 93609, 103437, 114027 }, M = 180, Mach_max = 2, - MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 3350, 3400, 3400, 3500, 3550, 3600, 3750, 3800, 3900, 4050, 700, 3440, 3490, 3540, 3590, 3640, 3740, 3840, 3940, 4040, 4140, 800, 3580, 3580, 3630, 3680, 3780, 3830, 3930, 4080, 4130, 4280, 900, 3670, 3720, 3720, 3820, 3870, 3920, 4020, 4170, 4270, 4370, 1000, 3760, 3810, 3810, 3910, 3960, 4010, 4160, 4260, 4360, 4510, 2000, 4060, 4210, 4260, 4410, 4560, 4660, 4860, 5010, 5160, 5310, 3000, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4860, 4000, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 6260, 5000, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 7660, 6000, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 9060, 7000, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 10460, 8000, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 11860, 9000, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 13260, 10000, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 14660, 11000, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 16060, 12000, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 17460, 13000, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 18860, 14000, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 20260, 15000, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660, 21660 }, Nr_max = 3, OmViz_max = 99.9, Range_max = 30000, Reflection = 0.08, + RmaxData2 = { 1789.3142537829, 0, 0, 0, 0, 2.5344868796669, 0, 0, 0, 0, 21.991036575543, 0, 0, 0, 0, 418.89023300334, 0, 0, 0, 0, -7.4684382731926e-05, 0, 0, 0, 0, -0.036899164333987, 0, 0, 0, 0, 2.4562467569475, 0, 0, 0, 0, -0.0015765534435511, 0, 0, 0, 0, -0.049094603967603, 0, 0, 0, 0, -0.25377644032906, 0, 0, 0, 0, 1.390249769639e-09, 0, 0, 0, 0, 2.847567037942e-05, 0, 0, 0, 0, -0.11981907752464, 0, 0, 0, 0, 1.454119124379e-07, 0, 0, 0, 0, 2.6484307909412e-06, 0, 0, 0, 0, 2.5860549565231e-06, 0, 0, 0, 0, 0.00041718867092244, 0, 0, 0, 0, 0.00028564401965639, 0, 0, 0, 0, 0.0069359986309123, 0, 0, 0, 0, 0.00014091907596761, 0, 0, 0, 0 }, + RminData2 = { 4380.2729539491, 0, 0, 0, 0, 0.85275817318368, 0, 0, 0, 0, 14.201232905361, 0, 0, 0, 0, 419.27315859641, 0, 0, 0, 0, 1.5880078161574e-05, 0, 0, 0, 0, -0.017470759427042, 0, 0, 0, 0, -1.4159818087263, 0, 0, 0, 0, -0.00105303053093, 0, 0, 0, 0, -0.046429113103535, 0, 0, 0, 0, -0.49919642820388, 0, 0, 0, 0, -2.8179394453381e-10, 0, 0, 0, 0, 8.5412414089595e-06, 0, 0, 0, 0, -0.09531615785463, 0, 0, 0, 0, 1.3773800902924e-07, 0, 0, 0, 0, 2.3754564502556e-06, 0, 0, 0, 0, 2.2267632968711e-06, 0, 0, 0, 0, 0.00065236003288354, 0, 0, 0, 0, 0.00058130954724224, 0, 0, 0, 0, 0.0072094680714585, 0, 0, 0, 0, 0.00015187509430858, 0, 0, 0, 0 }, SeekerGen = 1, X_back = 0, Y_back = 0, @@ -213,8 +224,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { ap = { EAS_Cp = { 0.30033732, 0.94117171, 17.82526047, -0.02109645, -0.03571429, 0.35952381, -1.15797619, 1.20857143 }, deadzone = 0, - deflection = 0.087266462599716 + deflection = 0.1221730476396 }, + ballistic_loft = true, boost = { boost_factor = 0, boost_time = 0, @@ -237,8 +249,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { }, display_name_short = "AGM-45A", fm = { - A1trim = { -0.05, -0.05 }, - A2trim = { -0.05, -0.05 }, + A1trim = { 0, 0 }, + A2trim = { 0, 0 }, Cx0 = { 0.2822, 0.2822, 0.2822, 0.2822, 0.2905, 0.913, 1.0541, 1.0209, 0.9877, 0.9296, 0.8715, 0.83, 0.7885, 0.7553, 0.7221, 0.6972, 0.6723, 0.6474, 0.6308, 0.6142, 0.5976 }, CxB = { 0.0913, 0.0913, 0.0913, 0.0913, 0.0913, 0.1494, 0.1577, 0.1411, 0.1328, 0.1162, 0.1079, 0.0996, 0.0996, 0.0913, 0.0913, 0.083, 0.0747, 0.0747, 0.0664, 0.0664, 0.0581 }, Cya = { 0.9234, 0.9234, 0.9234, 0.9234, 0.9234, 1.1502, 1.1826, 1.1259, 1.0692, 0.9315, 0.8586, 0.81, 0.7614, 0.7209, 0.6723, 0.6318, 0.5913, 0.5589, 0.5265, 0.4941, 0.4617 }, @@ -252,14 +264,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { Mx0 = 0.03, Mxd = 17.19, Mxw = -44.5, - Mya = { -0.2, -0.2 }, - Myw = { -1, -1 }, - Mza = { -0.2, -0.2 }, - Mzw = { -1, -1 }, + Mya = { -0.35, -0.35 }, + Myw = { -1.5, -1.5 }, + Mza = { -0.35, -0.35 }, + Mzw = { -1.5, -1.5 }, S = 0.0324, caliber = 0.2, - delta_max = 0.087266462599716, - draw_fins_conv = { 0, 0.166, 0.166 }, + delta_max = 0.1221730476396, + draw_fins_conv = { 0, 0.233, 0.233 }, fins_part_val = 0, fins_stall = 0, mass = 180, @@ -275,11 +287,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { fuze = { default_arm_delays = { 3 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, gyro = { init_roll = 0.78539816339745 }, + loft = 1, + loft_factor = 3, manualWeaponFlag = 1, march = { boost_factor = 0, @@ -299,15 +314,16 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { model = "HB_F-4E_EXT_AGM45", name = "AGM_45A", radio_seeker = { - FOV = 0.78539816339745, + FOV = 1.3962634015955, aim_y_offset = 0, - blind_ctrl_dist = 100, - blind_rad_val = 10, + blind_ctrl_dist = 360, + blind_rad_val = 1, calc_aim_dist = 500000, - err_correct_time = 2.8, - err_val = 0.01, + err_correct_time = 2, + err_val = 0.003, filter_by_frequency = true, keep_aim_time = 0.1, + max_random_boresight_error = 0.017, min_sens_rad_val = 2.5e-06, op_time = 150, pos_memory_time = 0.1, diff --git a/_G/weapons_table/weapons/missiles/AGM_45B.lua b/_G/weapons_table/weapons/missiles/AGM_45B.lua index f982b5c4..2eb5d79e 100644 --- a/_G/weapons_table/weapons/missiles/AGM_45B.lua +++ b/_G/weapons_table/weapons/missiles/AGM_45B.lua @@ -100,6 +100,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45B"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, gyro = { @@ -273,6 +274,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45B"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, gyro = { diff --git a/_G/weapons_table/weapons/missiles/AGM_78A.lua b/_G/weapons_table/weapons/missiles/AGM_78A.lua index f3b80dff..030d4bfc 100644 --- a/_G/weapons_table/weapons/missiles/AGM_78A.lua +++ b/_G/weapons_table/weapons/missiles/AGM_78A.lua @@ -93,6 +93,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_78A"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, manualWeaponFlag = 1, @@ -114,15 +115,16 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_78A"] = { model = "rim-66", name = "AGM_78A", radio_seeker = { - FOV = 0.78539816339745, + FOV = 1.3962634015955, aim_y_offset = 0, - blind_ctrl_dist = 100, - blind_rad_val = 10, + blind_ctrl_dist = 360, + blind_rad_val = 1, calc_aim_dist = 500000, - err_correct_time = 2.8, - err_val = 0.01, + err_correct_time = 2, + err_val = 0.003, filter_by_frequency = true, keep_aim_time = 0.1, + max_random_boresight_error = 0.017, min_sens_rad_val = 2.5e-06, op_time = 150, pos_memory_time = 0.1, @@ -283,6 +285,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_78A"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, manualWeaponFlag = 1, @@ -304,15 +307,16 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_78A"] = { model = "rim-66", name = "AGM_78A", radio_seeker = { - FOV = 0.78539816339745, + FOV = 1.3962634015955, aim_y_offset = 0, - blind_ctrl_dist = 100, - blind_rad_val = 10, + blind_ctrl_dist = 360, + blind_rad_val = 1, calc_aim_dist = 500000, - err_correct_time = 2.8, - err_val = 0.01, + err_correct_time = 2, + err_val = 0.003, filter_by_frequency = true, keep_aim_time = 0.1, + max_random_boresight_error = 0.017, min_sens_rad_val = 2.5e-06, op_time = 150, pos_memory_time = 0.1, diff --git a/_G/weapons_table/weapons/missiles/AGM_78B.lua b/_G/weapons_table/weapons/missiles/AGM_78B.lua index 4d8c951b..62765c51 100644 --- a/_G/weapons_table/weapons/missiles/AGM_78B.lua +++ b/_G/weapons_table/weapons/missiles/AGM_78B.lua @@ -93,6 +93,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_78B"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, manualWeaponFlag = 1, @@ -282,6 +283,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_78B"] = { fuze = { default_arm_delays = { 10 }, default_proximity_radius = 10, + is_neg_cls_rate_req = true, is_proxy_tdd_always_enabled = true }, manualWeaponFlag = 1, diff --git a/_G/weapons_table/weapons/missiles/AGM_84H.lua b/_G/weapons_table/weapons/missiles/AGM_84H.lua index e68f02c2..1aeb71a9 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84H.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84H.lua @@ -57,9 +57,10 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { default_cruise_height = 50, obj_sensor = 0, seeker_activation_dist = 20000, - stab_aim_diff = 0.1, + stab_aim_diff = 0.2, + stab_vert_diff = 50, turn_before_point_reach = 1, - turn_hor_N = 0.5, + turn_hor_N = 1.6, turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 450, use_horiz_dist = 1 @@ -78,7 +79,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { Kii_ver = 0.2, Kp_eng = 265, Kp_hor_err = 350, - Kp_hor_err_croll = 0.06, + Kp_hor_err_croll = 0.064, Kp_ver = 8.2, Kp_ver_st1 = 0.009, Kp_ver_st2 = 0.00018, @@ -286,9 +287,10 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { default_cruise_height = 50, obj_sensor = 0, seeker_activation_dist = 20000, - stab_aim_diff = 0.1, + stab_aim_diff = 0.2, + stab_vert_diff = 50, turn_before_point_reach = 1, - turn_hor_N = 0.5, + turn_hor_N = 1.6, turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 450, use_horiz_dist = 1 @@ -307,7 +309,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { Kii_ver = 0.2, Kp_eng = 265, Kp_hor_err = 350, - Kp_hor_err_croll = 0.06, + Kp_hor_err_croll = 0.064, Kp_ver = 8.2, Kp_ver_st1 = 0.009, Kp_ver_st2 = 0.00018, diff --git a/_G/weapons_table/weapons/missiles/AGM_84S.lua b/_G/weapons_table/weapons/missiles/AGM_84S.lua index c6e2d898..be3c8266 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84S.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84S.lua @@ -5,7 +5,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { caliber = 0.343, client = { autopilot = { - K = 0.9, + K = 0.85, Kd = 0.01, Kdx = 0.001, Ki = 15, @@ -17,6 +17,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, conv_input = 0, + cumulative_inertial_error = 1, default_glide_height = 381, delay = 6, dont_climb_on_cruise_height = 1, @@ -86,12 +87,12 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { speed_delta = 5 }, final_autopilot = { - K = 5.5, + K = 5, K_loft_err = 1, Kd = 0, Ki = 0, Kix = 0, - Ks = 8, + Ks = 6.4, Kw = 1, Kx = 0, PN_dist_data = { 2000, 1, 500, 1 }, @@ -101,14 +102,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { add_out_vert = 1, conv_input = 0, delay = 1, - fins_limit = 1, + fins_limit = 0.9, loft_active_by_default = 0, loft_angle = 0.13962634015955, loft_angle_vert = 1, loft_trig_angle = 0.24434609527921, op_time = 9999, rotated_WLOS_input = 0, - w_limit = 0.26179938779915 + w_limit = 0.17453292519943 }, fm = { A = 0.5, @@ -214,7 +215,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { name = "AGM_84S", server = { autopilot = { - K = 0.9, + K = 0.85, Kd = 0.01, Kdx = 0.001, Ki = 15, @@ -226,6 +227,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, conv_input = 0, + cumulative_inertial_error = 1, default_glide_height = 381, delay = 6, dont_climb_on_cruise_height = 1, @@ -295,12 +297,12 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { speed_delta = 5 }, final_autopilot = { - K = 5.5, + K = 5, K_loft_err = 1, Kd = 0, Ki = 0, Kix = 0, - Ks = 8, + Ks = 6.4, Kw = 1, Kx = 0, PN_dist_data = { 2000, 1, 500, 1 }, @@ -310,14 +312,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { add_out_vert = 1, conv_input = 0, delay = 1, - fins_limit = 1, + fins_limit = 0.9, loft_active_by_default = 0, loft_angle = 0.13962634015955, loft_angle_vert = 1, loft_trig_angle = 0.24434609527921, op_time = 9999, rotated_WLOS_input = 0, - w_limit = 0.26179938779915 + w_limit = 0.17453292519943 }, fm = { A = 0.5, diff --git a/_G/weapons_table/weapons/missiles/AGM_88.lua b/_G/weapons_table/weapons/missiles/AGM_88.lua index b430b645..cac3064d 100644 --- a/_G/weapons_table/weapons/missiles/AGM_88.lua +++ b/_G/weapons_table/weapons/missiles/AGM_88.lua @@ -41,7 +41,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { }, boost = { custom_smoke_dissipation_factor = 0.3, - fuel_mass = 25.5, + fuel_mass = 70, impulse = 235, nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, @@ -49,11 +49,11 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { smoke_color = { 0.9, 0.9, 0.9 }, smoke_transparency = 0.1, tail_width = 0.4, - work_time = 1 + work_time = 3.4 }, controller = { boost_start = 0, - march_start = 1 + march_start = 3.4 }, conv = { seeker_add_pitch = -0.34906585039887 @@ -95,15 +95,15 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { }, march = { custom_smoke_dissipation_factor = 0.3, - fuel_mass = 101.5, - impulse = 226, + fuel_mass = 57, + impulse = 206, nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2.1, 0, 0 } }, smoke_color = { 0.8, 0.8, 0.8 }, smoke_transparency = 0.1, tail_width = 0.3, - work_time = 20.4 + work_time = 12.5 }, proximity_fuze = { arm_delay = 1.6, @@ -202,7 +202,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { }, boost = { custom_smoke_dissipation_factor = 0.3, - fuel_mass = 25.5, + fuel_mass = 70, impulse = 235, nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, @@ -210,11 +210,11 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { smoke_color = { 0.9, 0.9, 0.9 }, smoke_transparency = 0.1, tail_width = 0.4, - work_time = 1 + work_time = 3.4 }, controller = { boost_start = 0, - march_start = 1 + march_start = 3.4 }, conv = { seeker_add_pitch = -0.34906585039887 @@ -256,15 +256,15 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { }, march = { custom_smoke_dissipation_factor = 0.3, - fuel_mass = 101.5, - impulse = 226, + fuel_mass = 57, + impulse = 206, nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, nozzle_position = { { -2.1, 0, 0 } }, smoke_color = { 0.8, 0.8, 0.8 }, smoke_transparency = 0.1, tail_width = 0.3, - work_time = 20.4 + work_time = 12.5 }, proximity_fuze = { arm_delay = 1.6, diff --git a/_G/weapons_table/weapons/missiles/BK90_MJ1.lua b/_G/weapons_table/weapons/missiles/BK90_MJ1.lua index 226f3271..b4c63900 100644 --- a/_G/weapons_table/weapons/missiles/BK90_MJ1.lua +++ b/_G/weapons_table/weapons/missiles/BK90_MJ1.lua @@ -21,7 +21,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95, @@ -265,7 +265,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95, diff --git a/_G/weapons_table/weapons/missiles/BK90_MJ1_MJ2.lua b/_G/weapons_table/weapons/missiles/BK90_MJ1_MJ2.lua index de8ef95e..99018377 100644 --- a/_G/weapons_table/weapons/missiles/BK90_MJ1_MJ2.lua +++ b/_G/weapons_table/weapons/missiles/BK90_MJ1_MJ2.lua @@ -21,7 +21,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1_MJ2"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95, @@ -345,7 +345,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1_MJ2"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95, diff --git a/_G/weapons_table/weapons/missiles/BK90_MJ2.lua b/_G/weapons_table/weapons/missiles/BK90_MJ2.lua index fb712213..dcd9b88c 100644 --- a/_G/weapons_table/weapons/missiles/BK90_MJ2.lua +++ b/_G/weapons_table/weapons/missiles/BK90_MJ2.lua @@ -21,7 +21,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ2"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95, @@ -263,7 +263,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ2"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 10, 8, 160, 180, 200, 220, 240, 260, 280, 300, 50, 500, 2200, 3000, 4800, 6800, 8800, 9600, 10000, 100, 1200, 2600, 4000, 5800, 7600, 9500, 9800, 10000, 150, 1600, 3000, 4200, 6000, 8000, 9600, 9900, 10000, 200, 1800, 3000, 4400, 6200, 8200, 9600, 9900, 10000, 250, 2000, 3200, 4600, 6200, 8200, 9600, 10000, 10000, 300, 2200, 3300, 4600, 6400, 8400, 9700, 10000, 10000, 350, 2200, 3400, 4700, 6400, 8400, 9800, 10000, 10000, 400, 2400, 3400, 4700, 6600, 8500, 9800, 10000, 10000, 450, 2400, 3400, 4700, 6600, 8500, 9900, 10000, 10000, 500, 2500, 3500, 4800, 6700, 8600, 9900, 10000, 10000 }, + LaunchDistData = { 10, 7, 200, 206, 223, 240, 257, 274, 292, 310, 50, 0, 2175, 2675, 3175, 4075, 4975, 5925, 6875, 100, 0, 2200, 2700, 3200, 4100, 5000, 5950, 6900, 150, 0, 2212, 2718, 3225, 4125, 5025, 5975, 6925, 200, 0, 2225, 2737, 3250, 4150, 5050, 6000, 6950, 250, 0, 0, 0, 3275, 4175, 5075, 6050, 6975, 300, 0, 0, 0, 3300, 4200, 5100, 6100, 7100, 350, 0, 0, 0, 3325, 4225, 5125, 6125, 7125, 400, 0, 0, 0, 3350, 4250, 5150, 6150, 7150, 450, 0, 0, 0, 3375, 4275, 5175, 6175, 7175, 500, 0, 0, 0, 3400, 4300, 5200, 6200, 7200 }, Life_Time = 70, M = 605, Mach_max = 0.95,