diff --git a/_G/__DCS_VERSION__.lua b/_G/__DCS_VERSION__.lua index 310a4b1b..d6ac7ca7 100644 --- a/_G/__DCS_VERSION__.lua +++ b/_G/__DCS_VERSION__.lua @@ -1 +1 @@ -2.9.9.2280 \ No newline at end of file +2.9.10.3948 \ No newline at end of file diff --git a/_G/bombs/HB_F4E_GBU_8_HOBOS.lua b/_G/bombs/HB_F4E_GBU_8_HOBOS.lua deleted file mode 100644 index 62574184..00000000 --- a/_G/bombs/HB_F4E_GBU_8_HOBOS.lua +++ /dev/null @@ -1,30 +0,0 @@ -_G["bombs"]["#Index"] = { - Ag = -5, - LaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 500, 0, 2500, 5500, 9000, 12000, 14500, 17500, 20000, 23000, 200, 0, 0, 3000, 6000, 9000, 12000, 15000, 17500, 20500, 23500, 300, 0, 0, 3000, 6500, 9500, 12500, 15500, 18000, 21000, 24000, 400, 0, 1500, 3500, 6500, 10000, 13000, 16000, 18500, 21500, 24500, 500, 0, 0, 4000, 7000, 10000, 13500, 16500, 19000, 21500, 24500, 600, 0, 0, 4000, 7500, 10500, 14000, 16500, 19500, 22000, 25000, 700, 0, 2000, 4500, 7500, 11000, 14000, 17000, 19500, 22500, 25500, 800, 0, 2000, 5000, 8000, 11500, 14500, 17500, 20000, 23000, 26000, 900, 1500, 2500, 5000, 8500, 11500, 15000, 17500, 20500, 23500, 26500, 1000, 1500, 3000, 5500, 9000, 12000, 15000, 18000, 21000, 24000, 26500, 2000, 3000, 5000, 8500, 12000, 15500, 19000, 22000, 25000, 27500, 31000, 3000, 4000, 7500, 11500, 15000, 18500, 22500, 25500, 29000, 32000, 35000, 4000, 5500, 10500, 14000, 18000, 21500, 25500, 29000, 32500, 36000, 39500, 5000, 7000, 14000, 17000, 20500, 24500, 28500, 32500, 36500, 40000, 43500, 6000, 9000, 16500, 19500, 23500, 27500, 31500, 36000, 40000, 44000, 48000, 7000, 15500, 18500, 22000, 26000, 30000, 34500, 39000, 43500, 48000, 52000, 8000, 17500, 21000, 24500, 28500, 32500, 37000, 42000, 46500, 51500, 56000, 9000, 19000, 23000, 27000, 31000, 35500, 40000, 45000, 50000, 55000, 60000, 10000, 21000, 25500, 29500, 33500, 37500, 42500, 47500, 53000, 58500, 63000, 11000, 23000, 27500, 31500, 35500, 40000, 45000, 50500, 56500, 61500, 65500, 12000, 24500, 29500, 34000, 38000, 42500, 47500, 53500, 59000, 63500, 67500, 13000, 26000, 31500, 36000, 40000, 44500, 50000, 56000, 61000, 65000, 69000, 14000, 27500, 33000, 38000, 42500, 47000, 52500, 58500, 62500, 66500, 70500, 15000, 29000, 35000, 40000, 44500, 49000, 54500, 59500, 63000, 67500, 71500 }, - MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 500, 800, 1150, 1600, 2100, 2650, 3200, 3300, 3600, 3850, 200, 700, 1100, 1500, 2000, 2550, 3100, 3550, 3700, 4250, 4450, 300, 850, 1300, 1800, 2300, 2850, 3400, 3950, 4100, 4600, 4900, 400, 0, 1500, 2000, 2550, 3100, 3700, 4150, 4450, 4950, 5300, 500, 1100, 1650, 2200, 2750, 3350, 3900, 4400, 4700, 5250, 5650, 600, 1200, 1750, 2350, 2950, 3550, 4150, 4600, 4950, 5500, 6050, 700, 1250, 1900, 2500, 3100, 3700, 4300, 4800, 5200, 5750, 6250, 800, 1350, 2000, 2650, 3250, 3900, 4500, 4950, 5400, 6000, 6550, 900, 1400, 2100, 2750, 3400, 4050, 4650, 5200, 5550, 6200, 6750, 1000, 1500, 2200, 2900, 3550, 4150, 4750, 5300, 5750, 6400, 7000, 2000, 1950, 2850, 3650, 4450, 5100, 5800, 6350, 7000, 7850, 8750, 3000, 2300, 3300, 4300, 5000, 5700, 6400, 7000, 7800, 8900, 10000, 4000, 2500, 3700, 4800, 5700, 6500, 7200, 7400, 8500, 9700, 10900, 5000, 2750, 4000, 5250, 6250, 7250, 8250, 9000, 9250, 10500, 11750, 6000, 3000, 4500, 5500, 7000, 8000, 9000, 10000, 11000, 11500, 12500, 7000, 3000, 4500, 6000, 7500, 8500, 10000, 11000, 12000, 12500, 13500, 8000, 3500, 4500, 6500, 8000, 9000, 10500, 12000, 13000, 14000, 14500, 9000, 3500, 5000, 6500, 8000, 9500, 11000, 12500, 14000, 15000, 16000, 10000, 3500, 5000, 6500, 8500, 10000, 12000, 13500, 15000, 16000, 17500, 11000, 4000, 5000, 7000, 9000, 10500, 12500, 14000, 16000, 17500, 18500, 12000, 4000, 5500, 7000, 9000, 11000, 13000, 15000, 16500, 18000, 19500, 13000, 4000, 5500, 7500, 9500, 11500, 13500, 15500, 17500, 19000, 20500, 14000, 4500, 5500, 7500, 10000, 12000, 14000, 16500, 18000, 20000, 21500, 15000, 4500, 6000, 8000, 10000, 12500, 14500, 17000, 19000, 21000, 22500 }, - Name = "Redacted", - VyHold = -50, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - display_name = "GBU-8", - display_name_short = "GBU-8", - hMax = 2000, - hMin = 25, - mass = 1027, - name = "HB_F4E_GBU_8_HOBOS", - type = 1, - 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, - mass = 340, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 68 - }, - ws_type = { 4, 5, 36, "Redacted" } -} \ No newline at end of file diff --git a/_G/db/Countries/Chile.lua b/_G/db/Countries/Chile.lua index a8fdcc2a..a338b8e8 100644 --- a/_G/db/Countries/Chile.lua +++ b/_G/db/Countries/Chile.lua @@ -1097,14 +1097,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "C-130", in_service = 0, out_of_service = 40000 - }, { - Name = "C-101EB", - in_service = 0, - out_of_service = 40000 - }, { - Name = "C-101CC", - in_service = 0, - out_of_service = 40000 }, { Name = "FW-190A8" }, { @@ -1133,6 +1125,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "AV8BNA" }, { Name = "KC130" + }, { + Name = "C-101EB" + }, { + Name = "C-101CC" }, { Name = "JF-17" }, { diff --git a/_G/db/Countries/Ecuador.lua b/_G/db/Countries/Ecuador.lua index 8e8f8b05..d472974b 100644 --- a/_G/db/Countries/Ecuador.lua +++ b/_G/db/Countries/Ecuador.lua @@ -937,14 +937,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "C-130", in_service = 0, out_of_service = 40000 - }, { - Name = "Mirage-F1C", - in_service = 0, - out_of_service = 40000 - }, { - Name = "Mirage-F1CE", - in_service = 0, - out_of_service = 40000 }, { Name = "P-47D-30", in_service = 0, @@ -1033,6 +1025,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "MiG-19P" }, { Name = "MiG-21Bis" + }, { + Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" }, { diff --git a/_G/db/Countries/France.lua b/_G/db/Countries/France.lua index 2b98d273..f710cf13 100644 --- a/_G/db/Countries/France.lua +++ b/_G/db/Countries/France.lua @@ -1097,10 +1097,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage 2000-5", in_service = 0, out_of_service = 40000 - }, { - Name = "Mirage-F1C", - in_service = 0, - out_of_service = 40000 }, { Name = "C-130", in_service = 0, @@ -1231,6 +1227,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "MiG-19P" }, { Name = "MiG-21Bis" + }, { + Name = "Mirage-F1C" }, { Name = "Mirage-F1CE" }, { diff --git a/_G/db/Countries/Honduras.lua b/_G/db/Countries/Honduras.lua index 33366837..453be715 100644 --- a/_G/db/Countries/Honduras.lua +++ b/_G/db/Countries/Honduras.lua @@ -909,14 +909,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "F-5E-3_FC", in_service = 0, out_of_service = 40000 - }, { - Name = "C-101EB", - in_service = 0, - out_of_service = 40000 - }, { - Name = "C-101CC", - in_service = 0, - out_of_service = 40000 }, { Name = "C-47", in_service = 0, @@ -951,6 +943,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "KC130" }, { Name = "KC135MPRS" + }, { + Name = "C-101EB" + }, { + Name = "C-101CC" }, { Name = "JF-17" }, { diff --git a/_G/db/Countries/Jordan.lua b/_G/db/Countries/Jordan.lua index 812567a6..ecf2fe4d 100644 --- a/_G/db/Countries/Jordan.lua +++ b/_G/db/Countries/Jordan.lua @@ -1029,14 +1029,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Hawk", in_service = 0, out_of_service = 40000 - }, { - Name = "C-101EB", - in_service = 0, - out_of_service = 40000 - }, { - Name = "C-101CC", - in_service = 0, - out_of_service = 40000 }, { Name = "FW-190A8" }, { @@ -1067,6 +1059,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "KC130" }, { Name = "KC135MPRS" + }, { + Name = "C-101EB" + }, { + Name = "C-101CC" }, { Name = "JF-17" }, { diff --git a/_G/db/Countries/Spain.lua b/_G/db/Countries/Spain.lua index dd5ce0b3..3afd27ae 100644 --- a/_G/db/Countries/Spain.lua +++ b/_G/db/Countries/Spain.lua @@ -1303,14 +1303,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "AV8BNA", in_service = 0, out_of_service = 40000 - }, { - Name = "C-101EB", - in_service = 0, - out_of_service = 40000 - }, { - Name = "C-101CC", - in_service = 0, - out_of_service = 40000 }, { Name = "I-16", in_service = 0, @@ -1349,6 +1341,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "AJS37" }, { Name = "KC135MPRS" + }, { + Name = "C-101EB" + }, { + Name = "C-101CC" }, { Name = "JF-17" }, { diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua b/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua index e25ef7b6..f537b3f9 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua @@ -4093,7 +4093,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { -1.322, -2.32, 2.118 }, + main_gear_pos = { -1.322, -2.37, 2.118 }, mapclasskey = "P0091000020", mechanimations = { CargoBayGates = { { @@ -4367,7 +4367,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } } }, net_animation = { 458, 80, 85, 457, 1000, 26, 1, 2, 250, 459, 460, 461 }, - nose_gear_pos = { 3.236, -2.489, 0 }, + nose_gear_pos = { 3.236, -2.55, 0 }, panelRadio = { { channels = { { connect = true, diff --git a/_G/db/Units/Planes/Plane/F-4E-45MC.lua b/_G/db/Units/Planes/Plane/F-4E-45MC.lua index 66da2b6c..8ba5bd01 100644 --- a/_G/db/Units/Planes/Plane/F-4E-45MC.lua +++ b/_G/db/Units/Planes/Plane/F-4E-45MC.lua @@ -2237,7 +2237,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BDU_45LG}", arg_value = 0.5 }, { - CLSID = "{HB_F4E_GBU_8}", + CLSID = "{GBU_8_B}", arg_value = 0.5 }, { CLSID = "{AGM_62_I}", @@ -2413,7 +2413,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -2641,7 +2641,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -2869,7 +2869,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -3097,7 +3097,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -3325,7 +3325,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -3553,7 +3553,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -3781,7 +3781,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -4009,7 +4009,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -4237,7 +4237,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -4465,7 +4465,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -4693,7 +4693,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -4921,7 +4921,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -5149,7 +5149,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -5377,7 +5377,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -5605,7 +5605,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -5833,7 +5833,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -9937,7 +9937,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { station = 4 } } }, { - CLSID = "{HB_F4E_GBU_8}", + CLSID = "{GBU_8_B}", arg_value = 0, forbidden = { { loadout = { "{AIM-9B}" }, @@ -13890,7 +13890,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -14118,7 +14118,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -14346,7 +14346,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -14574,7 +14574,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -14802,7 +14802,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -15030,7 +15030,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -15258,7 +15258,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -15486,7 +15486,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -15714,7 +15714,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -15942,7 +15942,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -16170,7 +16170,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -16398,7 +16398,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -16626,7 +16626,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -16854,7 +16854,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -17082,7 +17082,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -17310,7 +17310,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 3 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 3 }, { loadout = { "{AGM_12A}" }, @@ -17765,7 +17765,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -17993,7 +17993,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -18221,7 +18221,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -18449,7 +18449,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -18677,7 +18677,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -18905,7 +18905,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -19133,7 +19133,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -19361,7 +19361,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -19589,7 +19589,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -19817,7 +19817,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -20045,7 +20045,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -20273,7 +20273,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -20501,7 +20501,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -20729,7 +20729,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -20957,7 +20957,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -21185,7 +21185,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -25289,7 +25289,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { station = 12 } } }, { - CLSID = "{HB_F4E_GBU_8}", + CLSID = "{GBU_8_B}", arg_value = 0, forbidden = { { loadout = { "{AIM-9B}" }, @@ -29242,7 +29242,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -29470,7 +29470,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -29698,7 +29698,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -29926,7 +29926,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -30154,7 +30154,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -30382,7 +30382,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -30610,7 +30610,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -30838,7 +30838,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -31066,7 +31066,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -31294,7 +31294,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -31522,7 +31522,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -31750,7 +31750,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -31978,7 +31978,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -32206,7 +32206,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -32434,7 +32434,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -32662,7 +32662,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { loadout = { "{AGM_62_I}" }, station = 11 }, { - loadout = { "{HB_F4E_GBU_8}" }, + loadout = { "{GBU_8_B}" }, station = 11 }, { loadout = { "{AGM_12A}" }, @@ -32895,7 +32895,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{BDU_45LG}", arg_value = 0.5 }, { - CLSID = "{HB_F4E_GBU_8}", + CLSID = "{GBU_8_B}", arg_value = 0.5 }, { CLSID = "{AGM_62_I}", diff --git a/_G/db/Units/Planes/Plane/F-5E-3.lua b/_G/db/Units/Planes/Plane/F-5E-3.lua index 43c52029..832f16ff 100644 --- a/_G/db/Units/Planes/Plane/F-5E-3.lua +++ b/_G/db/Units/Planes/Plane/F-5E-3.lua @@ -261,22 +261,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [29] = { args = { 224 }, critical_damage = 4, - deps_cells = { 23, 25, 27, 147 } + deps_cells = { 23, 27, 147 } }, [30] = { args = { 214 }, critical_damage = 4, - deps_cells = { 24, 26, 28, 151 } + deps_cells = { 24, 28, 151 } }, [35] = { args = { 225 }, critical_damage = 5, - deps_cells = { 29, 37, 148 } + deps_cells = { 29, 25, 37, 148 } }, [36] = { args = { 215 }, critical_damage = 5, - deps_cells = { 30, 38, 150 } + deps_cells = { 30, 26, 38, 150 } }, [37] = { args = { 227 }, @@ -287,13 +287,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [39] = { - args = { 242 }, - critical_damage = 4 + args = { 241 }, + critical_damage = 2 }, [43] = { args = { 242 }, critical_damage = 4, - deps_cells = { 39 } + deps_cells = { 39, 53 } }, [47] = { args = { 240 }, @@ -343,7 +343,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [137] = { - critical_damage = 2 + critical_damage = 1 }, [138] = { args = { 158 }, @@ -400,13 +400,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 266 }, critical_damage = 3 }, + [153] = { + args = { 151 }, + critical_damage = 1 + }, cell_indices = { AIR_BRAKE_L = 19, AIR_BRAKE_R = 20, - Box807 = 137, CABIN_BOTTOM = 6, CABIN_LEFT_SIDE = 4, CABIN_RIGHT_SIDE = 5, + CM_CONTAINER = 137, COCKPIT = 3, ELERON_L = 25, ELERON_R = 26, @@ -446,6 +450,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { TAIL = 55, TAIL_LEFT_SIDE = 56, TAIL_RIGHT_SIDE = 57, + VHF_ANTENNA = 153, WHEEL_F = 83, WHEEL_L = 84, WHEEL_R = 85, @@ -459,7 +464,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { WING_R_PART_CENTER = 28 } }, - DamageParts = { "f-5e3_oblomok_wing_l", "f-5e3_oblomok_wing_r" }, + DamageParts = { "F-5E3_oblomok_wing_r", "F-5E3_oblomok_wing_l" }, DefaultTask = <1>{ Name = "CAP", OldID = "CAP", @@ -555,6 +560,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mm = 0, mmint = 1, prob = 100 + }, { + enable = false, + hh = 0, + id = "hsf_Flight_LowLeakage", + label = "Hydraulic: Flight Control Low Pressure Leakage", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "hsf_Utility_LowLeakage", + label = "Hydraulic: Utility Low Pressure Leakage", + mm = 0, + mmint = 1, + prob = 100 }, { enable = false, hh = 0, @@ -683,13 +704,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_cartridge = 204, effective_fire_distance = 1500, effects = { { - arg = 432, - attenuation = 2, - duration = 0.02, - light_pos = { 0.5, 0, 0 }, - name = "FireEffect" - }, { - add_speed = { 0, -3, 10 }, + add_speed = { 0, -3, 3 }, gas_deflector_arg = 327, name = "SmokeEffect" } }, @@ -773,7 +788,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -837,7 +852,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = 3, @@ -901,7 +916,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -965,7 +980,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -1029,7 +1044,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = 3, @@ -1048,13 +1063,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_cartridge = 204, effective_fire_distance = 1500, effects = { { - arg = 433, - attenuation = 2, - duration = 0.02, - light_pos = { 0.5, 0, 0 }, - name = "FireEffect" - }, { - add_speed = { 0, 3, 10 }, + add_speed = { 0, 3, 3 }, gas_deflector_arg = 328, name = "SmokeEffect" } }, @@ -1089,7 +1098,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, H_max = 16154, HumanCockpit = true, - HumanCockpitPath = "./Mods/aircraft/F-5E/Cockpit/Scripts/", + HumanCockpitPath = "./Mods/aircraft/F-5E 2024/Cockpit/Scripts/", HumanCockpitPlugins = { { _file = "./Mods/aircraft/NS430/entry.lua", _origin = "NS430", @@ -1224,10 +1233,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } } }, - HumanCommPanelPath = "./Mods/aircraft/F-5E/comm.lua", - HumanFM = { "F-5E by Belsimtek", "F5E", + HumanCommPanelPath = "./Mods/aircraft/F-5E 2024/comm.lua", + HumanFM = { "F-5E 2024", "F5E", center_of_mass = { -0.01989, -0.069, 0 }, - config_path = "./Mods/aircraft/F-5E/FM/config.lua", + config_path = "./Mods/aircraft/F-5E 2024/FM/config.lua", debugLine = "{M}:%1.3f {KCAS}:%4.1f {KEAS}:%4.1f {KTAS}:%4.1f {KIAS}:%4.1f {AoA_U}:%2.1f {AoA}:%2.1f {AoS}:%2.1f {ny}:%2.1f {nx}:%1.2f {wx}:%3.1f {wy}:%2.1f {wz}:%3.1f {Pl}:%2.3f {Lstab}:%2.1f {Rud}:%2.1f {mass}:%4.1f {x}:%2.3f {X}:%2.2f {Mz_a}:%.0f", disable_built_in_oxygen_system = true, ffbPitchK = 0.65, @@ -1235,15 +1244,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { major_shake_ampl = 0.25, minor_shake_ampl = 0.07, moment_of_inertia = { 4610, 48882, 52678, 0 }, + new_rods = true, suspension = { { allowable_hard_contact_length = 0.25, amortizer_back_damper_force_factor = 30000, - amortizer_basic_length = 0.177, + amortizer_basic_length = 0.224, amortizer_direct_damper_force_factor = 20000, - amortizer_max_length = 0.177, + amortizer_max_length = 0.224, amortizer_min_length = 0, - amortizer_reduce_length = 0.07, - amortizer_spring_force_factor = 600000, + amortizer_reduce_length = 0.089, + amortizer_spring_force_factor = 375000, amortizer_spring_force_factor_rate = 2, amortizer_static_force = 20000, arg_amortizer = 1, @@ -1267,15 +1277,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { wheel_static_friction_factor = 0.65, yaw_limit = 0.87266462599716 }, { - allowable_hard_contact_length = 0.215, + allowable_hard_contact_length = 0.296, amortizer_back_damper_force_factor = 20000, - amortizer_basic_length = 0.215, + amortizer_basic_length = 0.296, amortizer_direct_damper_force_factor = 30000, - amortizer_max_length = 0.215, - amortizer_reduce_length = 0.2, - amortizer_spring_force_factor = 12600000, + amortizer_max_length = 0.296, + amortizer_reduce_length = 0.275, + amortizer_spring_force_factor = 4880000, amortizer_spring_force_factor_rate = 3, - amortizer_static_force = 10000, + amortizer_static_force = 9000, arg_amortizer = 6, arg_post = 5, arg_wheel_damage = 136, @@ -1292,15 +1302,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { wheel_side_friction_factor = 0.65, wheel_static_friction_factor = 0.7 }, { - allowable_hard_contact_length = 0.215, + allowable_hard_contact_length = 0.296, amortizer_back_damper_force_factor = 20000, - amortizer_basic_length = 0.215, + amortizer_basic_length = 0.296, amortizer_direct_damper_force_factor = 30000, - amortizer_max_length = 0.215, - amortizer_reduce_length = 0.2, - amortizer_spring_force_factor = 12600000, + amortizer_max_length = 0.296, + amortizer_reduce_length = 0.275, + amortizer_spring_force_factor = 4880000, amortizer_spring_force_factor_rate = 3, - amortizer_static_force = 10000, + amortizer_static_force = 9000, arg_amortizer = 4, arg_post = 3, arg_wheel_damage = 135, @@ -1317,6 +1327,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { wheel_side_friction_factor = 0.65, wheel_static_friction_factor = 0.7 } }, + throttle_anim_range = { -1, 1 }, user_options = "F-5E" }, HumanRadio = { @@ -1552,6 +1563,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", add_mass = 55.3, arg_value = 0 + }, { + CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", + add_mass = 55.3, + arg_value = 0 }, { CLSID = "{CBU-52B}", add_mass = 55.3, @@ -1704,6 +1719,18 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{00F5DAC4-0466-4122-998F-B1A298E34113}", add_mass = 77.1, arg_value = 0 + }, { + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + add_mass = 77.1, + arg_value = 0.5 }, { CLSID = "{MER-5E_MK82x5}", add_mass = 77.1, @@ -1832,7 +1859,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { RADAR = "AN/APQ-159", RWR = "Abstract RWR" }, - Shape = "f-5e3", SnapViews = { { { hAngle = 0, rollAngle = 0, @@ -1947,35 +1973,35 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { z_trans = 0 } } }, TACAN_AA = true, - Tasks = { { + Tasks = { <14>{ Name = "CAS", OldID = "CAS", WorldID = 31 - }, { + }, <15>{ Name = "Ground Attack", OldID = "Ground Attack", WorldID = 32 - }, , { + },
, <16>{ Name = "Escort", OldID = "Escort", WorldID = 18 - }, { + }, <17>{ Name = "Fighter Sweep", OldID = "Fighter Sweep", WorldID = 19 - }, { + }, <18>{ Name = "Intercept", OldID = "Intercept", WorldID = 10 - }, { + }, <19>{ Name = "Anti-ship Strike", OldID = "Antiship Strike", WorldID = 30 - }, { + }, <20>{ Name = "Runway Attack", OldID = "Runway Attack", WorldID = 34 - }, { + }, <21>{ Name = "Reconnaissance", OldID = "Reconnaissance", WorldID = 17 @@ -1999,7 +2025,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CameraAngleLimits = { 200, -90, 90 }, CameraAngleRestriction = { false, 90, 0.5 }, CameraViewAngleLimits = { 20, 140 }, - CockpitLocalPoint = { 3.022, 0.86, 0 }, + CockpitLocalPoint = { 3.018, 0.868, 0 }, EyePoint = { 0.05, 0.1, 0 }, ShoulderSize = 0.25, limits_6DOF = { @@ -2014,17 +2040,2040 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Waypoint_Custom_Panel = true, WingSpan = 8.53, WorldID = 276, - _file = "./CoreMods/aircraft/F-5E/F-5E-3.lua", - _file_flyable = "./Mods/aircraft/F-5E/entry.lua", - _origin = "F-5E/E-3 by Belsimtek", - _origin_flyable = "F-5E by Belsimtek", + _file = "./Mods/aircraft/F-5E 2024/F-5E-3.lua", + _file_flyable = "./Mods/aircraft/F-5E 2024/entry.lua", + _origin = "F-5E 2024", + _origin_flyable = "F-5E 2024", + _replace_origin_ = { + ["F-5E/E-3 by Belsimtek"] = { + AOA_take_off = 0.17, + AddPropAircraft = { { + control = "comboList", + defValue = 0, + id = "LAU3ROF", + label = "LAU-3 Rate of Fire", + playerOnly = true, + values = { { + dispName = "Single", + id = 0 + }, { + dispName = "Ripple, 17ms", + id = 1 + }, { + dispName = "Ripple, 20ms", + id = 2 + }, { + dispName = "Ripple, 60ms", + id = 3 + } }, + wCtrl = 150 + }, { + control = "comboList", + defValue = 0, + id = "LAU68ROF", + label = "LAU-68 Rate of Fire", + playerOnly = true, + values = { { + dispName = "Single", + id = 0 + }, { + dispName = "Ripple, 60ms", + id = 1 + } }, + wCtrl = 150 + }, { + control = "comboList", + defValue = 0, + id = "ChaffBurst", + label = "Chaff Burst Count", + playerOnly = true, + values = { { + dispName = "1", + id = 0 + }, { + dispName = "2", + id = 1 + }, { + dispName = "3", + id = 2 + }, { + dispName = "4", + id = 3 + }, { + dispName = "6", + id = 4 + }, { + dispName = "8", + id = 5 + } }, + wCtrl = 150 + }, { + control = "comboList", + defValue = 0, + id = "ChaffSalvo", + label = "Chaff Salvo Count", + playerOnly = true, + values = { { + dispName = "1", + id = 0 + }, { + dispName = "2", + id = 1 + }, { + dispName = "4", + id = 2 + }, { + dispName = "8", + id = 3 + }, { + dispName = "C", + id = 4 + } }, + wCtrl = 150 + }, { + control = "comboList", + defValue = 0, + id = "ChaffBurstInt", + label = "Chaff Burst Interval", + playerOnly = true, + values = { { + dispName = "0.1s", + id = 0 + }, { + dispName = "0.2s", + id = 1 + }, { + dispName = "0.3s", + id = 2 + }, { + dispName = "0.4s", + id = 3 + } }, + wCtrl = 150 + }, { + control = "comboList", + defValue = 0, + id = "ChaffSalvoInt", + label = "Chaff Salvo Interval", + playerOnly = true, + values = { { + dispName = "1s", + id = 0 + }, { + dispName = "2s", + id = 1 + }, { + dispName = "3s", + id = 2 + }, { + dispName = "4s", + id = 3 + }, { + dispName = "5s", + id = 4 + }, { + dispName = "8s", + id = 5 + }, { + dispName = "R", + id = 6 + } }, + wCtrl = 150 + }, { + control = "comboList", + defValue = 0, + id = "FlareBurst", + label = "Flare Burst Count", + playerOnly = true, + values = { { + dispName = "1", + id = 0 + }, { + dispName = "2", + id = 1 + }, { + dispName = "4", + id = 2 + }, { + dispName = "8", + id = 3 + }, { + dispName = "C", + id = 4 + } }, + wCtrl = 150 + }, { + control = "comboList", + defValue = 0, + id = "FlareBurstInt", + label = "Flare Burst Interval ", + playerOnly = true, + values = { { + dispName = "3s", + id = 0 + }, { + dispName = "4s", + id = 1 + }, { + dispName = "6s", + id = 2 + }, { + dispName = "8s", + id = 3 + }, { + dispName = "10s", + id = 4 + } }, + wCtrl = 150 + } }, + AmmoWeight = 178.08, + CAS_min = 60, + CanopyGeometry = { -0.34202014332567, -0.64085638205579, -0.93969262078591, -0.036833608500735, 0.86602540378444 }, + Categories = { "{78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}", "Interceptor" }, + Damage = { { + args = { 296 }, + critical_damage = 3 + }, { + args = { 297 }, + critical_damage = 3 + }, { + args = { 65 }, + critical_damage = 1 + }, { + args = { 298 }, + critical_damage = 3 + }, { + args = { 299 }, + critical_damage = 3 + }, { + args = { 152 }, + critical_damage = 3 + }, + [0] = { + args = { 146 }, + critical_damage = 3 + }, + [8] = { + args = { 265 }, + critical_damage = 2 + }, + [9] = { + args = { 154 }, + critical_damage = 3 + }, + [10] = { + args = { 153 }, + critical_damage = 3 + }, + [11] = { + args = { 272 }, + critical_damage = 2 + }, + [12] = { + args = { 270 }, + critical_damage = 2 + }, + [19] = { + args = { 185 }, + critical_damage = 1 + }, + [20] = { + args = { 183 }, + critical_damage = 1 + }, + [23] = { + args = { 223 }, + critical_damage = 3 + }, + [24] = { + args = { 213 }, + critical_damage = 3 + }, + [25] = { + args = { 226 }, + critical_damage = 1 + }, + [26] = { + args = { 216 }, + critical_damage = 1 + }, + [27] = { + args = { 230 }, + critical_damage = 1.5 + }, + [28] = { + args = { 220 }, + critical_damage = 1.5 + }, + [29] = { + args = { 224 }, + critical_damage = 4, + deps_cells = { 23, 25, 27, 146 } + }, + [30] = { + args = { 214 }, + critical_damage = 4, + deps_cells = { 24, 26, 28, 150 } + }, + [35] = { + args = { 225 }, + critical_damage = 5, + deps_cells = { 29, 37, 147 } + }, + [36] = { + args = { 215 }, + critical_damage = 5, + deps_cells = { 30, 38, 149 } + }, + [37] = { + args = { 227 }, + critical_damage = 2 + }, + [38] = { + args = { 217 }, + critical_damage = 2 + }, + [39] = { + args = { 242 }, + critical_damage = 4 + }, + [43] = { + args = { 242 }, + critical_damage = 4, + deps_cells = { 39 } + }, + [47] = { + args = { 240 }, + critical_damage = 2 + }, + [48] = { + args = { 238 }, + critical_damage = 2 + }, + [53] = { + args = { 247 }, + critical_damage = 1 + }, + [55] = { + args = { 159 }, + critical_damage = 2 + }, + [56] = { + args = { 167 }, + critical_damage = 3 + }, + [57] = { + args = { 161 }, + critical_damage = 3 + }, + [59] = { + args = { 148 }, + critical_damage = 3 + }, + [82] = { + args = { 156 }, + critical_damage = 4 + }, + [83] = { + args = { 134 }, + critical_damage = 3 + }, + [84] = { + args = { 136 }, + critical_damage = 3 + }, + [85] = { + args = { 135 }, + critical_damage = 3 + }, + [98] = { + critical_damage = 2 + }, + [137] = { + args = { 158 }, + critical_damage = 3 + }, + [138] = { + args = { 157 }, + critical_damage = 3 + }, + [139] = { + args = { 267 }, + critical_damage = 3 + }, + [140] = { + args = { 169 }, + critical_damage = 3 + }, + [141] = { + args = { 163 }, + critical_damage = 3 + }, + [142] = { + args = { 168 }, + critical_damage = 3 + }, + [143] = { + args = { 162 }, + critical_damage = 3 + }, + [144] = { + args = { 166 }, + critical_damage = 3 + }, + [145] = { + args = { 160 }, + critical_damage = 3 + }, + [146] = { + critical_damage = 2 + }, + [147] = { + critical_damage = 2 + }, + [148] = { + critical_damage = 2 + }, + [149] = { + critical_damage = 2 + }, + [150] = { + critical_damage = 2 + }, + [151] = { + args = { 266 }, + critical_damage = 3 + }, + cell_indices = { + AIR_BRAKE_L = 19, + AIR_BRAKE_R = 20, + CABIN_BOTTOM = 6, + CABIN_LEFT_SIDE = 4, + CABIN_RIGHT_SIDE = 5, + COCKPIT = 3, + ELERON_L = 25, + ELERON_R = 26, + ENGINE_L = 11, + ENGINE_R = 12, + FIN_L_BOTTOM = 43, + FIN_L_TOP = 39, + FLAP_L_IN = 37, + FLAP_R_IN = 38, + FRONT_GEAR_BOX = 8, + FUSELAGE_BOTTOM = 82, + FUSELAGE_BOTTOM_LEFT = 137, + FUSELAGE_BOTTOM_RIGHT = 138, + FUSELAGE_LEFT_SIDE = 9, + FUSELAGE_RIGHT_SIDE = 10, + HOOK = 98, + L_GEAR_BOX = 139, + MTG_BOTTOM_LEFT = 140, + MTG_BOTTOM_RIGHT = 141, + MTG_CENTER_L = 142, + MTG_CENTER_R = 143, + MTG_LEFT_SIDE = 144, + MTG_RIGHT_SIDE = 145, + NOSE_BOTTOM = 59, + NOSE_CENTER = 0, + NOSE_LEFT_SIDE = 1, + NOSE_RIGHT_SIDE = 2, + PYLON_02 = 146, + PYLON_03 = 147, + PYLON_04 = 148, + PYLON_05 = 149, + PYLON_06 = 150, + RUDDER = 53, + R_GEAR_BOX = 151, + STABILIZER_L_IN = 47, + STABILIZER_R_IN = 48, + TAIL = 55, + TAIL_LEFT_SIDE = 56, + TAIL_RIGHT_SIDE = 57, + WHEEL_F = 83, + WHEEL_L = 84, + WHEEL_R = 85, + WING_L_CENTER = 29, + WING_L_IN = 35, + WING_L_OUT = 23, + WING_L_PART_CENTER = 27, + WING_R_CENTER = 30, + WING_R_IN = 36, + WING_R_OUT = 24, + WING_R_PART_CENTER = 28 + } + }, + DamageParts = { "f-5e3_oblomok_wing_r", "f-5e3_oblomok_wing_l" }, + DefaultTask =
, + DisplayName = "F-5E-3", + EmptyWeight = 4835, + Failures = { { + enable = false, + hh = 0, + id = "esf_LeftGenerator", + label = "Electricity: Left Generator", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "esf_RightGenerator", + label = "Electricity: Right Generator", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "esf_LeftRectifier", + label = "Electricity: Left Rectifier", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "esf_RightRectifier", + label = "Electricity: Right Rectifier", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "esf_StaticInverter", + label = "Electricity: Static Inverter", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "fsf_AutoBalance", + label = "Fuel System: Fuel Autobalance", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "fsf_LeftBoostPump", + label = "Fuel System: Left Fuel Boost Pump", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "fsf_RightBoostPump", + label = "Fuel System: Right Fuel Boost Pump", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "fsf_CrossfeedValve", + label = "Fuel System: Crossfeed Valve", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "hsf_UtilityHydraulic", + label = "Hydraulic: Utility Hydraulic System", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "hsf_ControlHydraulic", + label = "Hydraulic: Flight Control Hydraulic System", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "hsf_Flight_LowLeakage", + label = "Hydraulic: Flight Control Low Pressure Leakage", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "hsf_Utility_LowLeakage", + label = "Hydraulic: Utility Low Pressure Leakage", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "csf_PitchDamper", + label = "Control: Pitch Damper", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "csf_YawDamper", + label = "Control: Yaw Damper", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "csf_PitchTrim", + label = "Control: Pitch Trim", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "csf_AutoFlap", + label = "Control: Auto Flap System", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "sensf_CADC", + label = "Sensors: Central Air Data Computer", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "sensf_PITOT_DAMAGE", + label = "Sensors: Pitot-static System Leakage", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "ppf_LeftGearbox", + label = "Power Plant: Left Gearbox", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "ppf_RightGearbox", + label = "Power Plant: Right Gearbox", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "ppf_FireLeft", + label = "Power Plant: Fire Left Engine", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "ppf_FireRight", + label = "Power Plant: Fire Right Engine", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "ppf_LeftNozzleControl", + label = "Power Plant: Left Nozzle Control System", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "ppf_RightNozzleControl", + label = "Power Plant: Right Nozzle Control System", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "ppf_LeftOil", + label = "Power Plant: Left Oil System", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "ppf_RightOil", + label = "Power Plant: Right Oil System", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "oxy_FAILURE_TOTAL", + label = "Oxygen System: Total Failure", + mm = 0, + mmint = 1, + prob = 100 + } }, + Guns = { { + aft_gun_mount = false, + azimuth_initial = 0, + display_name = "M-39", + drop_cartridge = 204, + effective_fire_distance = 1500, + effects = { { + arg = 432, + attenuation = 2, + duration = 0.02, + light_pos = { 0.5, 0, 0 }, + name = "FireEffect" + }, { + add_speed = { 0, -3, 3 }, + gas_deflector_arg = 327, + name = "SmokeEffect" + } }, + ejector_dir = { -2, 0, 0 }, + ejector_pos = { -0.5, -0.5, 0 }, + ejector_pos_connector = "ejector_1", + elevation_initial = 0, + gun = { + impulse_vec_rot = { + x = 0, + y = 0, + z = 0 + }, + max_burst_length = 25, + rates =
, + recoil_coeff = 0.91, + trigger = { + name = "GunTrigger" + } + }, + muzzle_pos = { 4.904, 0.239, -0.248 }, + muzzle_pos_connector = "Gun_point_00", + short_name = "M_39", + supply = { + count = 280, + get_mass = , + get_mass_ = , + mixes =
, + shells =
+ }, + supply_position = { 4.8753, 0, -0.2 } + }, { + aft_gun_mount = false, + azimuth_initial = 0, + display_name = "M-39", + drop_cartridge = 204, + effective_fire_distance = 1500, + effects = { { + arg = 433, + attenuation = 2, + duration = 0.02, + light_pos = { 0.5, 0, 0 }, + name = "FireEffect" + }, { + add_speed = { 0, 3, 3 }, + gas_deflector_arg = 328, + name = "SmokeEffect" + } }, + ejector_dir = { -2, 0, 0 }, + ejector_pos = { -0.5, -0.5, 0 }, + ejector_pos_connector = "ejector_2", + elevation_initial = 0, + gun = { + impulse_vec_rot = { + x = 0, + y = 0, + z = 0 + }, + max_burst_length = 25, + rates =
, + recoil_coeff = 0.91, + trigger = { + name = "GunTrigger" + } + }, + muzzle_pos = { 4.904, 0.239, 0.242 }, + muzzle_pos_connector = "Gun_point_01", + short_name = "M_39", + supply = { + count = 280, + get_mass = , + get_mass_ = , + mixes =
, + shells =
+ }, + supply_position = { 4.8753, 0, 0.2 } + } }, + H_max = 16154, + HumanRadio = { + editable = true, + frequency = 305, + maxFrequency = 399.999, + minFrequency = 225, + modulation = 0 + }, + IR_emission_coeff = 0.4, + IR_emission_coeff_ab = 2, + M_empty = 4835, + M_fuel_max = 2046, + M_max = 11187, + M_nominal = 7800, + Mach_max = 1.61, + MaxFuelWeight = 2046, + MaxHeight = 16154, + MaxSpeed = 1742.4, + MaxTakeOffWeight = 11187, + Name = "F-5E-3", + Ny_max = 7.5, + Ny_max_e = 7, + Ny_min = -2, + Picture = "F-5E.png", + Pylons = { { + Launchers = <22>{ { + CLSID = "{AIM-9B}", + Cx_gain = 0.302 + }, { + CLSID = "{AIM-9J}", + Cx_gain = 0.302 + }, { + CLSID = "{AIM-9P5}", + Cx_gain = 0.302 + }, { + CLSID = "{AIM-9P3}", + Cx_gain = 0.302 + }, { + CLSID = "{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}", + Cx_gain = 0.302 + }, { + CLSID = "{A4BCC903-06C8-47bb-9937-A30FEDB4E741}", + Cx_gain = 0.22 + }, { + CLSID = "{A4BCC903-06C8-47bb-9937-A30FEDB4E742}", + Cx_gain = 0.22 + }, { + CLSID = "{A4BCC903-06C8-47bb-9937-A30FEDB4E743}", + Cx_gain = 0.22 + }, { + CLSID = "{A4BCC903-06C8-47bb-9937-A30FEDB4E744}", + Cx_gain = 0.22 + }, { + CLSID = "{A4BCC903-06C8-47bb-9937-A30FEDB4E745}", + Cx_gain = 0.22 + }, { + CLSID = "{A4BCC903-06C8-47bb-9937-A30FEDB4E746}", + Cx_gain = 0.22 + }, { + CLSID = "{AIS_ASQ_T50}", + Cx_gain = 0.302 + }, { + CLSID = "CATM-9M", + Cx_gain = 0.302 + } }, + Number = 1, + Order = 1, + Type = 0, + X = -1.319, + Y = -0.332, + Z = -4.099, + connector = "Pylon1", + use_full_connector_position = true + }, { + Launchers = <23>{ { + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{Mk82SNAKEYE}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{00F5DAC4-0466-4122-998F-B1A298E34113}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{CBU-52B}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{FC85D2ED-501A-48ce-9863-49D468DDD5FC}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{174C6E6D-0C3D-42ff-BCB3-0853CB371F5C}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{65396399-9F5C-4ec3-A7D2-5A8F4C1D90C4}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{A021F29D-18AB-4d3e-985C-FC9C60E35E9E}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{4F977A2A-CD25-44df-90EF-164BFA2AE72F}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{1F7136CB-8120-4e77-B97B-945FF01FB67C}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{647C5F26-BDD1-41e6-A371-8DE1E4CC0E94}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{0877B74B-5A00-4e61-BA8A-A56450BA9E27}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{LAU68_FFAR_WP156}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{LAU68_FFAR_MK1HE}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{LAU68_FFAR_MK5HEAT}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "LAU3_WP156", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + }, { + CLSID = "LAU3_WP1B", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + }, { + CLSID = "LAU3_WP61", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + }, { + CLSID = "LAU3_HE5", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + }, { + CLSID = "LAU3_HE151", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + }, { + CLSID = "{LAU3_FFAR_WP156}", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + }, { + CLSID = "{LAU3_FFAR_MK1HE}", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + }, { + CLSID = "{LAU3_FFAR_MK5HEAT}", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + }, { + CLSID = "{CAE48299-A294-4bad-8EE6-89EFC5DCDF00}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{BDU-33}", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.25, 0, 0 } + }, { + CLSID = "{BDU-50LD}", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { -0.05, -0.008, 0 } + }, { + CLSID = "{BDU-50LGB}", + add_mass = 58.1, + arg_value = 0 + }, { + CLSID = "{BDU-50HD}", + add_mass = 58.1, + arg_value = 0, + attach_point_position = { 0.05, 0, 0 } + } }, + Number = 2, + Order = 2, + Type = 0, + X = -1.122, + Y = -0.861, + Z = -3.132, + arg = 309, + arg_value = 1, + connector = "Pylon2", + droppable_shape = "F-5e3_pylon_02", + use_full_connector_position = true + }, { + Launchers = <24>{ { + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{Mk82SNAKEYE}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{00F5DAC4-0466-4122-998F-B1A298E34113}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{CBU-52B}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{FC85D2ED-501A-48ce-9863-49D468DDD5FC}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{174C6E6D-0C3D-42ff-BCB3-0853CB371F5C}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{65396399-9F5C-4ec3-A7D2-5A8F4C1D90C4}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{A021F29D-18AB-4d3e-985C-FC9C60E35E9E}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{4F977A2A-CD25-44df-90EF-164BFA2AE72F}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{1F7136CB-8120-4e77-B97B-945FF01FB67C}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{647C5F26-BDD1-41e6-A371-8DE1E4CC0E94}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{0877B74B-5A00-4e61-BA8A-A56450BA9E27}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{LAU68_FFAR_WP156}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{LAU68_FFAR_MK1HE}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{LAU68_FFAR_MK5HEAT}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "LAU3_WP156", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.06, 0, 0 } + }, { + CLSID = "LAU3_WP1B", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.06, 0, 0 } + }, { + CLSID = "LAU3_WP61", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.06, 0, 0 } + }, { + CLSID = "LAU3_HE5", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.06, 0, 0 } + }, { + CLSID = "LAU3_HE151", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.06, 0, 0 } + }, { + CLSID = "{LAU3_FFAR_WP156}", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.06, 0, 0 } + }, { + CLSID = "{LAU3_FFAR_MK1HE}", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.06, 0, 0 } + }, { + CLSID = "{LAU3_FFAR_MK5HEAT}", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.06, 0, 0 } + }, { + CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{PTB-150GAL}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "MXU-648-TP", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{BDU-33}", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { 0.17, 0, 0 } + }, { + CLSID = "{BDU-50LD}", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.15, -0.008, 0 } + }, { + CLSID = "{BDU-50LGB}", + add_mass = 55.3, + arg_value = 0 + }, { + CLSID = "{BDU-50HD}", + add_mass = 55.3, + arg_value = 0, + attach_point_position = { -0.08, 0, 0 } + } }, + Number = 3, + Order = 3, + Type = 0, + X = -1.19, + Y = -0.922, + Z = -2.334, + arg = 310, + arg_value = 1, + connector = "Pylon3", + droppable_shape = "F-5e3_pylon_03", + use_full_connector_position = true + }, { + Launchers = { { + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{Mk82SNAKEYE}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{00F5DAC4-0466-4122-998F-B1A298E34113}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + add_mass = 77.1, + arg_value = 0.5 + }, { + CLSID = "{MER-5E_MK82x5}", + add_mass = 77.1, + arg_value = 0, + attach_point_position = { 0, -0.005, 0 } + }, { + CLSID = "{MER-5E_Mk82SNAKEYEx5}", + add_mass = 77.1, + arg_value = 0, + attach_point_position = { 0, -0.005, 0 } + }, { + CLSID = "{CBU-52B}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{0395076D-2F77-4420-9D33-087A4398130B}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{PTB-150GAL}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "MXU-648-TP", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{BDU-33}", + add_mass = 77.1, + arg_value = 0, + attach_point_position = { 0.285, 0, 0 } + }, { + CLSID = "{BDU-50LD}", + add_mass = 77.1, + arg_value = 0, + attach_point_position = { -0.1, -0.008, 0 } + }, { + CLSID = "{BDU-50HD}", + add_mass = 77.1, + arg_value = 0, + attach_point_position = { -0.03, 0, 0 } + } }, + Number = 4, + Order = 4, + Type = 0, + X = 0.065, + Y = -0.93, + Z = 0, + arg = 311, + arg_value = 1, + connector = "Pylon4", + droppable_shape = "F-5e3_pylon_04c", + use_full_connector_position = true + }, { + Launchers =
, + Number = 5, + Order = 5, + Type = 0, + X = -1.19, + Y = -0.922, + Z = 2.334, + arg = 312, + arg_value = 1, + connector = "Pylon5", + droppable_shape = "F-5e3_pylon_05", + use_full_connector_position = true + }, { + Launchers =
, + Number = 6, + Order = 6, + Type = 0, + X = -1.122, + Y = -0.861, + Z = 3.132, + arg = 313, + arg_value = 1, + connector = "Pylon6", + droppable_shape = "F-5e3_pylon_06", + use_full_connector_position = true + }, { + Launchers =
, + Number = 7, + Order = 7, + Type = 0, + X = -1.319, + Y = -0.332, + Z = 4.099, + connector = "Pylon7", + use_full_connector_position = true + } }, + RCS = 3, + Rate = 30, + SFM_Data = { + aerodynamics = { + Cy0 = 0, + Czbe = -0.016, + Mzalfa = 4.355, + Mzalfadt = 0.8, + cx_brk = 0.06, + cx_flap = 0.05, + cx_gear = 0.0268, + cy_flap = 0.52, + kjx = 2.75, + kjz = 0.00125, + table_data = { { 0, 0.017, 0.07, 0.1, 0.0001, 0.5, 30, 1.2 }, { 0.2, 0.017, 0.07, 0.1, 0.0001, 1.5, 30, 1.2 }, { 0.4, 0.017, 0.07, 0.1, 0.0001, 2.5, 30, 1.2 }, { 0.6, 0.017, 0.073, 0.1, 0.0001, 3.5, 30, 1.2 }, { 0.7, 0.017, 0.076, 0.1, 0.0001, 3.5, 28.666666666667, 1.18 }, { 0.8, 0.017, 0.079, 0.1, 0.0001, 3.5, 27.333333333333, 1.16 }, { 0.9, 0.02, 0.083, 0.14, 0.0001, 3.5, 26, 1.14 }, { 1, 0.03, 0.085, 0.16, 0.0001, 3.5, 24.666666666667, 1.12 }, { 1.05, 0.036, 0.0855, 0.18, 0.0001, 3.5, 24, 1.11 }, { 1.1, 0.042, 0.086, 0.2, 0.0001, 3.15, 18, 1.1 }, { 1.2, 0.043, 0.083, 0.23, 0.0001, 2.45, 17, 1.05 }, { 1.3, 0.042, 0.077, 0.25, 0.0001, 1.75, 16, 1 }, { 1.5, 0.04, 0.062, 0.3, 0.0001, 1.5, 13, 0.9 }, { 1.7, 0.036666666666667, 0.051333333333333, 0.348, 0.0001, 0.9, 12, 0.7 }, { 1.8, 0.035, 0.046, 0.372, 0.0001, 0.86, 11.4, 0.64 }, { 2, 0.032, 0.039, 0.42, 9.9999999999999e-06, 0.78, 10.2, 0.52 }, { 2.2, 0.032, 0.034, 0.458, 1e-05, 0.7, 9, 0.4 }, { 2.5, 0.03, 0.033, 0.515, 1e-05, 0.7, 9, 0.4 }, { 3, 0.03, 0.033, 0.61, 1e-05, 0.7, 9, 0.4 }, { 3.9, 0.03, 0.033, 0.61, 1e-05, 0.7, 9, 0.4 } } + }, + engine = { + ForsRUD = 0.91, + MaksRUD = 0.85, + MaxRUD = 1, + MinRUD = 0, + Nmg = 50, + Shutdown_Duration = 20, + Startup_Duration = 30, + cefor = 2.56, + cemax = 1.24, + dcx_eng = 0.0144, + dpdh_f = 2950, + dpdh_m = 1650, + hMaxEng = 19, + table_data = { { 0, 28311.1, 44492 }, { 0.2, 26133.3, 41016.1 }, { 0.4, 25044.4, 39800 }, { 0.6, 24500, 40600 }, { 0.7, 24500, 41500 }, { 0.8, 24500, 42700 }, { 0.9, 25044.4, 45200 }, { 1, 25316.7, 49400 }, { 1.1, 25588.9, 54500 }, { 1.2, 26133.3, 56500 }, { 1.3, 26677.8, 58200 }, { 1.5, 28311.1, 62400 }, { 1.8, 30488.9, 62000 }, { 2, 31577.8, 56500 }, { 2.2, 31033.3, 55700 }, { 2.5, 29944.4, 53000 }, { 3, 27222.2, 55000 } }, + type = "TurboJet" + } + }, + Sensors = { + RADAR = "AN/APQ-159", + RWR = "Abstract RWR" + }, + Shape = "f-5e3", + TACAN_AA = true, + Tasks = {
,
,
,
,
,
,
,
,
}, + V_land = 68, + V_max_h = 484, + V_max_sea_level = 374, + V_opt = 174, + V_take_off = 65, + Vy_max = 200, + WingSpan = 8.53, + WorldID = 276, + _file = "./CoreMods/aircraft/F-5E/F-5E-3.lua", + _origin = "F-5E/E-3 by Belsimtek", + ammo_type = { "HEI - High Explosive Incendiary", "CM - Combat Mix", "AP Armor Piercing", "TP - Target Practice" }, + ammo_type_default = 2, + attribute = { 1, 1, 1, "Redacted", "Fighters", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes", "Battle airplanes" }, + average_fuel_consumption = 0.06, + bank_angle_max = 60, + bigParkingRamp = false, + brakeshute_name = 3, + chaff_flare_dispenser = { { + dir = { 0, -1, 0 }, + pos = { -1.3, -0.506, -0.496 } + } }, + country_of_origin = "USA", + crew_members = { { + canopy_pos = { 1.17, 0, 0 }, + drop_canopy_name = 43, + ejection_seat_name = 17, + pos = { 3.022, 0.86, 0 }, + role = "pilot", + role_display_name = "Pilot" + } }, + defFuelRatio = 1, + desrt = "f-5e3_oblomok", + detection_range_max = 60, + engines_count = 2, + engines_nozzles = { { + azimuth = -2.08, + diameter = 0.5, + elevation = 0.5, + exhaust_length_ab = 4.5, + exhaust_length_ab_K = 0.76, + pos = { -6.922, -0.084, -0.226 }, + smokiness_level = 0.15 + }, { + azimuth = 2.08, + diameter = 0.5, + elevation = 0.5, + exhaust_length_ab = 4.5, + exhaust_length_ab_K = 0.76, + pos = { -6.922, -0.084, 0.226 }, + smokiness_level = 0.15 + } }, + fires_pos = { { -1.801, -0.633, 0 }, + [8] = { -5.922, -0.084, 0.226 }, + [9] = { -5.922, -0.084, -0.226 }, + [10] = { -0.088, 0.55, 0 }, + [11] = { -0.023, -0.61, 0 } + }, + flaps_maneuver = 1, + flaps_transmission = "Electrical", + has_afteburner = true, + has_differential_stabilizer = false, + has_speedbrake = true, + height = 4.06, + length = 14.68, + lights_data = { + lights = { + [2] = { + lights = { { + lights = { { + angle_max = 3.1415926535898, + angle_min = 2.9670597283904, + argument = 208, + color = { 255, 255, 255, 0.25 }, + connector = "MAIN_SPOT_L", + exposure = { { 51, 0.81, 0.82 } }, + movable = true, + range = 2.1, + typename = "Spot" + }, { + color = { 255, 255, 255, 0.25 }, + connector = "MAIN_SPOT_L", + exposure = { { 51, 0.81, 0.82 } }, + movable = true, + pos_correction = { 0.3, 0, 0 }, + range = 3.8, + typename = "Omni" + } }, + typename = "collection" + }, { + lights = { { + angle_max = 3.1415926535898, + angle_min = 2.9670597283904, + argument = 209, + color = { 255, 255, 255, 0.25 }, + connector = "MAIN_SPOT_R", + exposure = { { 51, 0.81, 0.82 } }, + movable = true, + range = 2.1, + typename = "Spot" + }, { + color = { 255, 255, 255, 0.25 }, + connector = "MAIN_SPOT_R", + exposure = { { 51, 0.81, 0.82 } }, + movable = true, + pos_correction = { 0.3, 0, 0 }, + range = 3.8, + typename = "Omni" + } }, + typename = "collection" + } }, + typename = "collection" + }, + [3] = { + lights = { { + lights = { { + argument = 191, + typename = "argumentlight" + }, { + angle_max = 2.0943951023932, + connector = "BANO_015", + dir_correction = { + elevation = -1.5707963267949 + }, + proto = <25>{ + angle_max = 3.1415926535898, + color = { 1, 0.35, 0.15, 0.12 }, + range = 22.2 + }, + typename = "Spot" + }, { + angle_max = 2.0943951023932, + connector = "BANO_018", + dir_correction = { + elevation = -1.5707963267949 + }, + proto = <26>{ + angle_max = 3.1415926535898, + color = { 0, 0.894, 0.6, 0.12 }, + range = 22.2 + }, + typename = "Spot" + } }, + typename = "collection" + }, { + lights = { { + argument = 193, + controller = "Strobe", + cool_down_t = 0.33, + flash_time = 0.522, + mode = 0, + period = 0.744, + power_up_t = 0.33, + typename = "argumentlight" + }, { + connector = "BANO_4", + controller = "Strobe", + cool_down_t = 0.222, + flash_time = 0.522, + mode = 0, + period = 0.744, + pos_correction = { 0, 0.1, 0 }, + power_up_t = 0.33, + proto = <27>{ + angle_max = 3.1415926535898, + color = { 1, 1, 1, 0.155 }, + range = 30 + }, + range = 2, + typename = "Omni" + }, { + angle_max = 2.6179938779915, + angle_min = 1.5707963267949, + connector = "BANO_4", + controller = "Strobe", + cool_down_t = 0.222, + dir_correction = { + elevation = -2.3561944901923 + }, + flash_time = 0.522, + mode = 0, + period = 0.744, + power_up_t = 0.33, + proto =
, + typename = "Spot" + }, { + connector = "BANO_020", + controller = "Strobe", + cool_down_t = 0.222, + flash_time = 0.522, + mode = 0, + period = 0.744, + pos_correction = { 0, -0.1, 0 }, + power_up_t = 0.33, + proto =
, + range = 2, + typename = "Omni" + }, { + angle_max = 2.6179938779915, + angle_min = 1.5707963267949, + connector = "BANO_020", + controller = "Strobe", + cool_down_t = 0.222, + dir_correction = { + elevation = 2.3561944901923 + }, + flash_time = 0.522, + mode = 0, + period = 0.744, + power_up_t = 0.33, + proto =
, + typename = "Spot" + } }, + typename = "collection" + }, { + lights = { { + argument = 194, + controller = "Strobe", + cool_down_t = 0.342, + flash_time = 0.52, + mode = 0, + period = 0.744, + power_up_t = 0.33, + typename = "argumentlight" + }, { + angle_max = 2.6179938779915, + angle_min = 1.5707963267949, + connector = "BANO_016", + controller = "Strobe", + cool_down_t = 0.228, + dir_correction = { + elevation = -1.0471975511966 + }, + flash_time = 0.52, + mode = 0, + period = 0.744, + power_up_t = 0.33, + proto =
, + typename = "Spot" + }, { + angle_max = 2.6179938779915, + angle_min = 1.5707963267949, + connector = "BANO_019", + controller = "Strobe", + cool_down_t = 0.228, + dir_correction = { + elevation = -1.0471975511966 + }, + flash_time = 0.52, + mode = 0, + period = 0.744, + power_up_t = 0.33, + proto =
, + typename = "Spot" + } }, + typename = "collection" + } }, + typename = "collection" + }, + [4] = { + lights = { { + argument = 88, + typename = "argumentlight" + }, { + lights = { { + argument = 190, + typename = "argumentlight" + }, { + connector = "BANO_2", + dir_correction = { + elevation = -2.3561944901923 + }, + proto = <28>{ + angle_max = 2.6179938779915, + angle_min = 1.5707963267949, + color = { 1, 0.35, 0.15, 0.15 }, + range = 40 + }, + typename = "Spot" + }, { + connector = "BANO_013", + dir_correction = { + elevation = -2.3561944901923 + }, + proto = <29>{ + angle_max = 2.6179938779915, + angle_min = 1.5707963267949, + color = { 0, 0.894, 0.6, 0.15 }, + range = 40 + }, + typename = "Spot" + } }, + typename = "collection" + } }, + typename = "collection" + }, + [6] = { + lights = { { + lights = { { + angle_max = 3.1415926535898, + angle_min = 2.9670597283904, + argument = 208, + color = { 255, 255, 255, 0.25 }, + connector = "MAIN_SPOT_L", + exposure = { { 51, 0.81, 0.82 } }, + movable = true, + range = 2.1, + typename = "Spot" + }, { + color = { 255, 255, 255, 0.25 }, + connector = "MAIN_SPOT_L", + exposure = { { 51, 0.81, 0.82 } }, + movable = true, + pos_correction = { 0.3, 0, 0 }, + range = 3.8, + typename = "Omni" + } }, + typename = "collection" + }, { + lights = { { + angle_max = 3.1415926535898, + angle_min = 2.9670597283904, + argument = 209, + color = { 255, 255, 255, 0.25 }, + connector = "MAIN_SPOT_R", + exposure = { { 51, 0.81, 0.82 } }, + movable = true, + range = 2.1, + typename = "Spot" + }, { + color = { 255, 255, 255, 0.25 }, + connector = "MAIN_SPOT_R", + exposure = { { 51, 0.81, 0.82 } }, + movable = true, + pos_correction = { 0.3, 0, 0 }, + range = 3.8, + typename = "Omni" + } }, + typename = "collection" + } }, + typename = "collection" + }, + [7] = { + lights = { { + angle_max = 0.78539816339745, + angular_velocity = 6.6322511575785, + argument = 192, + argument_threshold = 0.47, + cups = 1, + position = { -4.088, 1.97, 0 }, + proto =
, + typename = "RotatingBeacon" + } }, + typename = "collection" + }, + [12] = { + lights = { { + lights = { { + argument = 196, + power_up_t = 1, + typename = "argumentlight" + }, { + angle_change_rate = 0.19198621771938, + angle_max = 1.6406094968747, + angle_min = 0, + connector = "MAIN_SPOT_PTR_L", + power_up_t = 1, + proto = <30>{ + angle_max = 0.48869219055841, + color = { 255, 201, 125, 0.12792304845413 }, + range = 66 + }, + typename = "Spot" + }, { + angle_change_rate = 0.19198621771938, + angle_max = 1.6406094968747, + angle_min = 0, + connector = "MAIN_SPOT_PTR_R", + power_up_t = 1, + proto =
, + typename = "Spot" + } }, + typename = "collection" + } }, + typename = "collection" + } + }, + typename = "collection" + }, + livery_entry = "F-5E-3", + main_gear_amortizer_direct_stroke = 0, + main_gear_amortizer_normal_weight_stroke = -0.223, + main_gear_amortizer_reversal_stroke = -0.291, + main_gear_pos = { -0.758, -1.712, 1.873 }, + main_gear_wheel_diameter = 0.6, + mapclasskey = "P0091000024", + mechanimations = { + CentralStrut = { { + Flags = { "Reversible" }, + Sequence = { { + C = { { "Arg", 474, "set", 0 }, { "VelType", 1 }, { "Arg", 117, "to", 1, "speed", 0.5, "sign", 1 } }, + Width = { 0, 0.25 } + }, { + C = { { "Sleep", "for", 0.5 } }, + Width = { 0.25, 0.5 } + }, { + C = { { "VelType", 3 }, { "Arg", 0, "to", 1, "speed", 0.4, "sign", 1 } }, + Width = { 0.5, 1 } + }, { + C = { { "Sleep", "for", 0.1 } }, + Width = { 0.25, 0.5 } + }, { + C = { { "VelType", 1 }, { "Arg", 117, "to", 0, "speed", 1.5, "sign", -1 } }, + Width = { 0, 0.25 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 1 }, { "Arg", 117, "to", 1, "speed", 1.5, "sign", 1 } }, + Width = { 0, 0.25 } + }, { + C = { { "VelType", 5 }, { "Arg", 474, "to", 0, "speed", 0.13333333333333, "sign", -1 } }, + Width = { 0, 0.5 } + }, { + C = { { "Sleep", "for", 0.5 } }, + Width = { 0.5, 0.75 } + }, { + C = { { "VelType", 5 }, { "Arg", 0, "to", 0, "speed", 0.4, "sign", -1 } }, + Width = { 0, 0.5 } + }, { + C = { { "Sleep", "for", 0.1 } }, + Width = { 0.5, 0.75 } + }, { + C = { { "Arg", 0, "set", 0 }, { "Arg", 474, "set", 0 }, { "VelType", 4 }, { "Arg", 117, "to", 0, "speed", 1.5, "sign", -1 } }, + Width = { 0.75, 1 } + } }, + Transition = { "Extend", "Retract" } + }, { + Sequence = { { + C = { { "PosType", 0 }, { "Arg", 0, "to", 0.441, "speed", 2, "sign", -1 } } + } }, + Transition = { "Any", "Collapse" } + } }, + Door0 = { { + Flags = { "Reversible" }, + Sequence = { { + C = { { "Arg", 38, "to", 0.9, "in", 9 } } + } }, + Transition = { "Close", "Open" } + }, { + Flags = { "Reversible", "StepsBackwards" }, + Sequence = { { + C = { { "Arg", 38, "to", 0, "in", 6 } } + } }, + Transition = { "Open", "Close" } + }, { + Sequence = { { + C = { { "JettisonCanopy", 0 } } + } }, + Transition = { "Any", "Bailout" } + } }, + Door1 = { + DuplicateOf = "Door0" + }, + HeadLights = { { + Sequence = { { + C = { { "Arg", 51, "to", 0, "speed", 0.25 } } + } }, + Transition = { "Any", "Retract" } + }, { + Sequence = { { + C = { { "Arg", 51, "to", 0.92, "speed", 0.25 } } + } }, + Transition = { "Any", "Taxi" } + }, { + Sequence = { { + C = { { "Arg", 51, "to", 1, "speed", 0.25 } } + } }, + Transition = { "Any", "High" } + } }, + LeftStrut = { { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 1 }, { "Arg", 116, "to", 1, "speed", 0.5, "sign", 1 } }, + Width = { 0, 0.25 } + }, { + C = { { "Sleep", "for", 0.5 } }, + Width = { 0.25, 0.5 } + }, { + C = { { "VelType", 5 }, { "Arg", 5, "to", 1, "speed", 0.4, "sign", 1 } }, + Width = { 0.5, 1 } + }, { + C = { { "Sleep", "for", 0.1 } }, + Width = { 0.25, 0.5 } + }, { + C = { { "VelType", 1 }, { "Arg", 116, "to", 0, "speed", 1.5, "sign", -1 } }, + Width = { 0, 0.25 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 1 }, { "Arg", 116, "to", 1, "speed", 1.5, "sign", 1 } }, + Width = { 0, 0.25 } + }, { + C = { { "VelType", 5 }, { "Arg", 5, "to", 0, "speed", 0.4, "sign", -1 } }, + Width = { 0, 0.5 } + }, { + C = { { "Sleep", "for", 3 } } + }, { + C = { { "ArgumentPhase", 6, "x", 0, "to", 0.1, "sign", -1 } } + }, { + C = { { "Sleep", "for", 0.5 } } + }, { + C = { { "ValuePhase", 3 } } + }, { + C = { { "Arg", 5, "set", 0 }, { "VelType", 4 }, { "Arg", 116, "to", 0, "speed", 1.5, "sign", -1 } } + } }, + Transition = { "Extend", "Retract" } + }, { + Sequence = { { + C = { { "VelType", 5 }, { "PosType", 6 }, { "Arg", 5, "to", 0.5, "speed", 2, "sign", -1 } } + } }, + Transition = { "Any", "Collapse" } + } }, + RightStrut = { { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 1 }, { "Arg", 115, "to", 1, "speed", 0.5, "sign", 1 } }, + Width = { 0, 0.25 } + }, { + C = { { "Sleep", "for", 0.5 } }, + Width = { 0.25, 0.5 } + }, { + C = { { "VelType", 3 }, { "Arg", 3, "to", 1, "speed", 0.4, "sign", 1 } }, + Width = { 0.5, 1 } + }, { + C = { { "Sleep", "for", 0.1 } }, + Width = { 0.25, 0.5 } + }, { + C = { { "VelType", 1 }, { "Arg", 115, "to", 0, "speed", 1.5, "sign", -1 } }, + Width = { 0, 0.25 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 1 }, { "Arg", 115, "to", 1, "speed", 1.5, "sign", 1 } }, + Width = { 0, 0.25 } + }, { + C = { { "VelType", 5 }, { "Arg", 3, "to", 0, "speed", 0.4, "sign", -1 } }, + Width = { 0, 0.5 } + }, { + C = { { "Sleep", "for", 3 } } + }, { + C = { { "ArgumentPhase", 6, "x", 0, "to", 0.1, "sign", -1 } } + }, { + C = { { "Sleep", "for", 0.5 } } + }, { + C = { { "ValuePhase", 3 } } + }, { + C = { { "Arg", 3, "set", 0 }, { "VelType", 4 }, { "Arg", 115, "to", 0, "speed", 1.5, "sign", -1 } } + } }, + Transition = { "Extend", "Retract" } + }, { + Sequence = { { + C = { { "VelType", 3 }, { "PosType", 7 }, { "Arg", 3, "to", 0.5, "speed", 2, "sign", -1 } } + } }, + Transition = { "Any", "Collapse" } + } } + }, + net_animation = { 13, 14, 23, 25, 35, 36, 37, 274, 275, 327, 328, 329, 330, 474, 475 }, + nose_gear_amortizer_direct_stroke = 0, + nose_gear_amortizer_normal_weight_stroke = -0.356, + nose_gear_amortizer_reversal_stroke = -0.529, + nose_gear_hiking = 0.306, + nose_gear_pos = { 4.465, -1.92, 0 }, + nose_gear_wheel_diameter = 0.46, + panelRadio = { { + channels = { { + connect = true, + default = 305, + modulation = "AM", + name = "Channel 1" + }, { + default = 264, + modulation = "AM", + name = "Channel 2" + }, { + default = 265, + modulation = "AM", + name = "Channel 3" + }, { + default = 256, + modulation = "AM", + name = "Channel 4" + }, { + default = 254, + modulation = "AM", + name = "Channel 5" + }, { + default = 250, + modulation = "AM", + name = "Channel 6" + }, { + default = 270, + modulation = "AM", + name = "Channel 7" + }, { + default = 257, + modulation = "AM", + name = "Channel 8" + }, { + default = 255, + modulation = "AM", + name = "Channel 9" + }, { + default = 262, + modulation = "AM", + name = "Channel 10" + }, { + default = 259, + modulation = "AM", + name = "Channel 11" + }, { + default = 268, + modulation = "AM", + name = "Channel 12" + }, { + default = 269, + modulation = "AM", + name = "Channel 13" + }, { + default = 260, + modulation = "AM", + name = "Channel 14" + }, { + default = 263, + modulation = "AM", + name = "Channel 15" + }, { + default = 261, + modulation = "AM", + name = "Channel 16" + }, { + default = 267, + modulation = "AM", + name = "Channel 17" + }, { + default = 251, + modulation = "AM", + name = "Channel 18" + }, { + default = 253, + modulation = "AM", + name = "Channel 19" + }, { + default = 266, + modulation = "AM", + name = "Channel 20" + } }, + name = "UHF Radio AN/ARC-164", + range = { + max = 399.999, + min = 225 + } + } }, + passivCounterm = { + CMDS_Edit = true, + SingleChargeTotal = 60, + chaff = { + chargeSz = 1, + default = 30, + increment = 30 + }, + flare = { + chargeSz = 2, + default = 15, + increment = 15 + } + }, + radar_can_see_ground = false, + range = 2112, + shape_table_data = { { + classname = "lLandPlane", + desrt = "F-5E-3_destr", + file = "f-5e3", + fire = { 300, 4 }, + index = "Redacted", + life = 16, + name = "f-5e3", + positioning = "BYNORMAL", + username = "F-5E-3", + vis = 3 + }, { + classname = "lLandPlane", + file = "f-5e3_oblomok", + fire = { 240, 2 }, + name = "F-5E-3_destr", + positioning = "BYNORMAL" + } }, + stores_number = 7, + tand_gear_max = 1.1917, + thrust_sum_ab = 7500, + thrust_sum_max = 4534, + undercarriage_movement = 2, + undercarriage_transmission = "Hydraulic", + wing_area = 17.3, + wing_span = 8.53, + wing_tip_pos = { -2.784, -0.393, 4.037 } + } + }, ammo_type = { "HEI - High Explosive Incendiary", "CM - Combat Mix", "AP Armor Piercing", "TP - Target Practice" }, ammo_type_default = 2, attribute = { 1, 1, 1, "Redacted", "Fighters", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes", "Battle airplanes" }, average_fuel_consumption = 0.06, bank_angle_max = 60, bigParkingRamp = false, - brakeshute_name = 3, + brakeshute_name = 349, chaff_flare_dispenser = { { dir = { 0, -1, 0 }, pos = { -1.3, -0.506, -0.496 } @@ -2033,16 +4082,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { crew_members = { { canopy_pos = { 1.17, 0, 0 }, drop_canopy_name = 43, - ejection_seat_name = 17, - pos = { 3.022, 0.86, 0 }, + ejection_seat_name = 347, + pilot_name = 348, + pos = { 2.94, 0.28, 0 }, role = "pilot", role_display_name = "Pilot" } }, defFuelRatio = 1, - desrt = "f-5e3_oblomok", detection_range_max = 60, + effects_presets = { { + effect = "OVERWING_VAPOR", + file = "./Mods/aircraft/F-5E 2024/Effects/F-5E3_overwingVapor.lua" + } }, engines_count = 2, engines_nozzles = { { + afterburner_circles_count = 11, + afterburner_circles_pos = { 0.2, 0.8 }, + afterburner_circles_scale = 1, + afterburner_effect_texture = "afterburner_F-5-E3", + afterburner_light_color = { 0.6, 0.6, 0.6 }, azimuth = -2.08, diameter = 0.5, elevation = 0.5, @@ -2051,6 +4109,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -6.922, -0.084, -0.226 }, smokiness_level = 0.15 }, { + afterburner_circles_count = 11, + afterburner_circles_pos = { 0.2, 0.8 }, + afterburner_circles_scale = 1, + afterburner_effect_texture = "afterburner_F-5-E3", + afterburner_light_color = { 0.6, 0.6, 0.6 }, azimuth = 2.08, diameter = 0.5, elevation = 0.5, @@ -2059,7 +4122,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -6.922, -0.084, 0.226 }, smokiness_level = 0.15 } }, - fires_pos = { { -1.801, -0.633, 0 }, { -0.961, -0.311, 1.9 }, { -0.961, -0.311, -1.9 }, { -1.42, -0.311, 2.75 }, { -1.42, -0.311, -2.75 }, + fires_pos = { { -1.801, -0.633, 0 }, [8] = { -5.922, -0.084, 0.226 }, [9] = { -5.922, -0.084, -0.226 }, [10] = { -0.088, 0.55, 0 }, @@ -2131,11 +4194,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir_correction = { elevation = -1.5707963267949 }, - proto = <14>{ - angle_max = 3.1415926535898, - color = { 1, 0.35, 0.15, 0.12 }, - range = 22.2 - }, + proto =
, typename = "Spot" }, { angle_max = 2.0943951023932, @@ -2143,11 +4202,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir_correction = { elevation = -1.5707963267949 }, - proto = <15>{ - angle_max = 3.1415926535898, - color = { 0, 0.894, 0.6, 0.12 }, - range = 22.2 - }, + proto =
, typename = "Spot" } }, typename = "collection" @@ -2155,22 +4210,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { argument = 193, controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.33, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, typename = "argumentlight" }, { connector = "BANO_4", controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.222, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, pos_correction = { 0, 0.1, 0 }, - proto = <16>{ - angle_max = 3.1415926535898, - color = { 1, 1, 1, 0.155 }, - range = 30 - }, + power_up_t = 0.33, + proto =
, range = 2, typename = "Omni" }, { @@ -2178,22 +4233,26 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 1.5707963267949, connector = "BANO_4", controller = "Strobe", + cool_down_t = 0.222, dir_correction = { elevation = -2.3561944901923 }, - flash_time = 0.77, + flash_time = 0.522, mode = 0, - period = 1.03, - proto =
, + period = 0.744, + power_up_t = 0.33, + proto =
, typename = "Spot" }, { connector = "BANO_020", controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.222, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, pos_correction = { 0, -0.1, 0 }, - proto =
, + power_up_t = 0.33, + proto =
, range = 2, typename = "Omni" }, { @@ -2201,13 +4260,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 1.5707963267949, connector = "BANO_020", controller = "Strobe", + cool_down_t = 0.222, dir_correction = { elevation = 2.3561944901923 }, - flash_time = 0.77, + flash_time = 0.522, mode = 0, - period = 1.03, - proto =
, + period = 0.744, + power_up_t = 0.33, + proto =
, typename = "Spot" } }, typename = "collection" @@ -2215,35 +4276,41 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { argument = 194, controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.342, + flash_time = 0.52, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, typename = "argumentlight" }, { angle_max = 2.6179938779915, angle_min = 1.5707963267949, connector = "BANO_016", controller = "Strobe", + cool_down_t = 0.228, dir_correction = { elevation = -1.0471975511966 }, - flash_time = 0.77, + flash_time = 0.52, mode = 0, - period = 1.03, - proto =
, + period = 0.744, + power_up_t = 0.33, + proto =
, typename = "Spot" }, { angle_max = 2.6179938779915, angle_min = 1.5707963267949, connector = "BANO_019", controller = "Strobe", + cool_down_t = 0.228, dir_correction = { elevation = -1.0471975511966 }, - flash_time = 0.77, + flash_time = 0.52, mode = 0, - period = 1.03, - proto =
, + period = 0.744, + power_up_t = 0.33, + proto =
, typename = "Spot" } }, typename = "collection" @@ -2263,24 +4330,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir_correction = { elevation = -2.3561944901923 }, - proto = { - angle_max = 2.6179938779915, - angle_min = 1.5707963267949, - color = { 1, 0.35, 0.15, 0.15 }, - range = 40 - }, + proto =
, typename = "Spot" }, { connector = "BANO_013", dir_correction = { elevation = -2.3561944901923 }, - proto = { - angle_max = 2.6179938779915, - angle_min = 1.5707963267949, - color = { 0, 0.894, 0.6, 0.15 }, - range = 40 - }, + proto =
, typename = "Spot" } }, typename = "collection" @@ -2341,7 +4398,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { argument_threshold = 0.47, cups = 1, position = { -4.088, 1.97, 0 }, - proto =
, + proto =
, typename = "RotatingBeacon" } }, typename = "collection" @@ -2358,11 +4415,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 0, connector = "MAIN_SPOT_PTR_L", power_up_t = 1, - proto = <17>{ - angle_max = 0.48869219055841, - color = { 255, 201, 125, 0.12792304845413 }, - range = 66 - }, + proto =
, typename = "Spot" }, { angle_change_rate = 0.19198621771938, @@ -2370,7 +4423,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 0, connector = "MAIN_SPOT_PTR_R", power_up_t = 1, - proto =
, + proto =
, typename = "Spot" } }, typename = "collection" @@ -2380,12 +4433,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "collection" }, - livery_entry = "F-5E-3", + livery_entry = "F-5E3_2024", main_gear_amortizer_direct_stroke = 0, - main_gear_amortizer_normal_weight_stroke = -0.165, - main_gear_amortizer_reversal_stroke = -0.215084, - main_gear_pos = { -0.8546, -1.702458, 1.914661 }, - main_gear_wheel_diameter = 0.6, + main_gear_amortizer_normal_weight_stroke = -0.227, + main_gear_amortizer_reversal_stroke = -0.296, + main_gear_pos = { -0.758, -1.712, 1.873 }, + main_gear_wheel_diameter = 0.609, mapclasskey = "P0091000024", mechanimations = { CentralStrut = { { @@ -2435,6 +4488,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, Transition = { "Any", "Collapse" } } }, + CrewLadder = { { + Sequence = { { + C = { { "Arg", 323, "to", 1, "in", 3 } } + } }, + Transition = { "Dismantle", "Erect" } + }, { + Sequence = { { + C = { { "Arg", 323, "to", 0, "in", 3 } } + } }, + Transition = { "Erect", "Dismantle" } + } }, Door0 = { { Flags = { "Reversible" }, Sequence = { { @@ -2561,15 +4625,30 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { C = { { "VelType", 3 }, { "PosType", 7 }, { "Arg", 3, "to", 0.5, "speed", 2, "sign", -1 } } } }, Transition = { "Any", "Collapse" } + } }, + ServiceHatches = { { + Sequence = { { + C = { { "PosType", 3 }, { "Sleep", "for", 1200 } } + }, { + C = { { "Arg", 428, "to", 1, "speed", 0.6 } } + } }, + Transition = { "Close", "Open" } + }, { + Sequence = { { + C = { { "PosType", 3 }, { "Sleep", "for", 1200 } } + }, { + C = { { "Arg", 428, "to", 0, "speed", 0.6 } } + } }, + Transition = { "Open", "Close" } } } }, net_animation = { 13, 14, 23, 25, 35, 36, 37, 274, 275, 327, 328, 329, 330, 474, 475 }, nose_gear_amortizer_direct_stroke = 0, - nose_gear_amortizer_normal_weight_stroke = -0.375, - nose_gear_amortizer_reversal_stroke = -0.502, - nose_gear_hiking = 0.325, - nose_gear_pos = { 4.406, -1.898, 0 }, - nose_gear_wheel_diameter = 0.46, + nose_gear_amortizer_normal_weight_stroke = -0.355, + nose_gear_amortizer_reversal_stroke = -0.529, + nose_gear_hiking = 0.305, + nose_gear_pos = { 4.431, -1.919, 0 }, + nose_gear_wheel_diameter = 0.456, panelRadio = { { channels = { { connect = true, @@ -2677,7 +4756,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { range = 2112, shape_table_data = { { classname = "lLandPlane", - desrt = "F-5E-3_destr", + desrt = "f-5e3_oblomok", file = "f-5e3", fire = { 300, 4 }, index = "Redacted", @@ -2690,7 +4769,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { classname = "lLandPlane", file = "f-5e3_oblomok", fire = { 240, 2 }, - name = "F-5E-3_destr", + name = "f-5e3_oblomok", positioning = "BYNORMAL" } }, stores_number = 7, diff --git a/_G/db/Units/Planes/Plane/F-5E-3_FC.lua b/_G/db/Units/Planes/Plane/F-5E-3_FC.lua index 8778642a..793d49ae 100644 --- a/_G/db/Units/Planes/Plane/F-5E-3_FC.lua +++ b/_G/db/Units/Planes/Plane/F-5E-3_FC.lua @@ -82,22 +82,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [29] = { args = { 224 }, critical_damage = 4, - deps_cells = { 23, 25, 27, 147 } + deps_cells = { 23, 25, 27, 146 } }, [30] = { args = { 214 }, critical_damage = 4, - deps_cells = { 24, 26, 28, 151 } + deps_cells = { 24, 26, 28, 150 } }, [35] = { args = { 225 }, critical_damage = 5, - deps_cells = { 29, 37, 148 } + deps_cells = { 29, 37, 147 } }, [36] = { args = { 215 }, critical_damage = 5, - deps_cells = { 30, 38, 150 } + deps_cells = { 30, 38, 149 } }, [37] = { args = { 227 }, @@ -164,44 +164,44 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [137] = { - critical_damage = 2 - }, - [138] = { args = { 158 }, critical_damage = 3 }, - [139] = { + [138] = { args = { 157 }, critical_damage = 3 }, - [140] = { + [139] = { args = { 267 }, critical_damage = 3 }, - [141] = { + [140] = { args = { 169 }, critical_damage = 3 }, - [142] = { + [141] = { args = { 163 }, critical_damage = 3 }, - [143] = { + [142] = { args = { 168 }, critical_damage = 3 }, - [144] = { + [143] = { args = { 162 }, critical_damage = 3 }, - [145] = { + [144] = { args = { 166 }, critical_damage = 3 }, - [146] = { + [145] = { args = { 160 }, critical_damage = 3 }, + [146] = { + critical_damage = 2 + }, [147] = { critical_damage = 2 }, @@ -215,16 +215,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [151] = { - critical_damage = 2 - }, - [152] = { args = { 266 }, critical_damage = 3 }, cell_indices = { AIR_BRAKE_L = 19, AIR_BRAKE_R = 20, - Box807 = 137, CABIN_BOTTOM = 6, CABIN_LEFT_SIDE = 4, CABIN_RIGHT_SIDE = 5, @@ -239,29 +235,29 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { FLAP_R_IN = 38, FRONT_GEAR_BOX = 8, FUSELAGE_BOTTOM = 82, - FUSELAGE_BOTTOM_LEFT = 138, - FUSELAGE_BOTTOM_RIGHT = 139, + FUSELAGE_BOTTOM_LEFT = 137, + FUSELAGE_BOTTOM_RIGHT = 138, FUSELAGE_LEFT_SIDE = 9, FUSELAGE_RIGHT_SIDE = 10, HOOK = 98, - L_GEAR_BOX = 140, - MTG_BOTTOM_LEFT = 141, - MTG_BOTTOM_RIGHT = 142, - MTG_CENTER_L = 143, - MTG_CENTER_R = 144, - MTG_LEFT_SIDE = 145, - MTG_RIGHT_SIDE = 146, + L_GEAR_BOX = 139, + MTG_BOTTOM_LEFT = 140, + MTG_BOTTOM_RIGHT = 141, + MTG_CENTER_L = 142, + MTG_CENTER_R = 143, + MTG_LEFT_SIDE = 144, + MTG_RIGHT_SIDE = 145, NOSE_BOTTOM = 59, NOSE_CENTER = 0, NOSE_LEFT_SIDE = 1, NOSE_RIGHT_SIDE = 2, - PYLON_02 = 147, - PYLON_03 = 148, - PYLON_04 = 149, - PYLON_05 = 150, - PYLON_06 = 151, + PYLON_02 = 146, + PYLON_03 = 147, + PYLON_04 = 148, + PYLON_05 = 149, + PYLON_06 = 150, RUDDER = 53, - R_GEAR_BOX = 152, + R_GEAR_BOX = 151, STABILIZER_L_IN = 47, STABILIZER_R_IN = 48, TAIL = 55, @@ -280,7 +276,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { WING_R_PART_CENTER = 28 } }, - DamageParts = { "f-5e3_fc_oblomok_wing_l", "f-5e3_fc_oblomok_wing_r" }, + DamageParts = { "f-5e3_fc_oblomok_wing_r", "f-5e3_fc_oblomok_wing_l" }, DefaultTask = <1>{ Name = "CAP", OldID = "CAP", @@ -376,6 +372,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mm = 0, mmint = 1, prob = 100 + }, { + enable = false, + hh = 0, + id = "hsf_Flight_LowLeakage", + label = "Hydraulic: Flight Control Low Pressure Leakage", + mm = 0, + mmint = 1, + prob = 100 + }, { + enable = false, + hh = 0, + id = "hsf_Utility_LowLeakage", + label = "Hydraulic: Utility Low Pressure Leakage", + mm = 0, + mmint = 1, + prob = 100 }, { enable = false, hh = 0, @@ -510,7 +522,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { light_pos = { 0.5, 0, 0 }, name = "FireEffect" }, { - add_speed = { 0, -3, 10 }, + add_speed = { 0, -3, 3 }, gas_deflector_arg = 327, name = "SmokeEffect" } }, @@ -594,7 +606,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -658,7 +670,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = 3, @@ -722,7 +734,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -786,7 +798,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -850,7 +862,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = 3, @@ -875,7 +887,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { light_pos = { 0.5, 0, 0 }, name = "FireEffect" }, { - add_speed = { 0, 3, 10 }, + add_speed = { 0, 3, 3 }, gas_deflector_arg = 328, name = "SmokeEffect" } }, @@ -1388,7 +1400,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -6.922, -0.084, 0.226 }, smokiness_level = 0.15 } }, - fires_pos = { { -1.801, -0.633, 0 }, { -0.961, -0.311, 1.9 }, { -0.961, -0.311, -1.9 }, { -1.42, -0.311, 2.75 }, { -1.42, -0.311, -2.75 }, + fires_pos = { { -1.801, -0.633, 0 }, [8] = { -5.922, -0.084, 0.226 }, [9] = { -5.922, -0.084, -0.226 }, [10] = { -0.088, 0.55, 0 }, @@ -1484,17 +1496,21 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { argument = 193, controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.33, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, typename = "argumentlight" }, { connector = "BANO_4", controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.222, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, pos_correction = { 0, 0.1, 0 }, + power_up_t = 0.33, proto = <15>{ angle_max = 3.1415926535898, color = { 1, 1, 1, 0.155 }, @@ -1507,21 +1523,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 1.5707963267949, connector = "BANO_4", controller = "Strobe", + cool_down_t = 0.222, dir_correction = { elevation = -2.3561944901923 }, - flash_time = 0.77, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, proto =
, typename = "Spot" }, { connector = "BANO_020", controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.222, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, pos_correction = { 0, -0.1, 0 }, + power_up_t = 0.33, proto =
, range = 2, typename = "Omni" @@ -1530,12 +1550,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 1.5707963267949, connector = "BANO_020", controller = "Strobe", + cool_down_t = 0.222, dir_correction = { elevation = 2.3561944901923 }, - flash_time = 0.77, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, proto =
, typename = "Spot" } }, @@ -1544,21 +1566,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { argument = 194, controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.342, + flash_time = 0.52, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, typename = "argumentlight" }, { angle_max = 2.6179938779915, angle_min = 1.5707963267949, connector = "BANO_016", controller = "Strobe", + cool_down_t = 0.228, dir_correction = { elevation = -1.0471975511966 }, - flash_time = 0.77, + flash_time = 0.52, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, proto =
, typename = "Spot" }, { @@ -1566,12 +1592,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 1.5707963267949, connector = "BANO_019", controller = "Strobe", + cool_down_t = 0.228, dir_correction = { elevation = -1.0471975511966 }, - flash_time = 0.77, + flash_time = 0.52, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, proto =
, typename = "Spot" } }, @@ -1711,9 +1739,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, livery_entry = "F-5E-3", main_gear_amortizer_direct_stroke = 0, - main_gear_amortizer_normal_weight_stroke = -0.165, - main_gear_amortizer_reversal_stroke = -0.215084, - main_gear_pos = { -0.8546, -1.702458, 1.914661 }, + main_gear_amortizer_normal_weight_stroke = -0.223, + main_gear_amortizer_reversal_stroke = -0.291, + main_gear_pos = { -0.758, -1.712, 1.873 }, main_gear_wheel_diameter = 0.6, mapclasskey = "P0091000024", mechanimations = { @@ -1894,10 +1922,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, net_animation = { 13, 14, 23, 25, 35, 36, 37, 274, 275, 327, 328, 329, 330, 474, 475 }, nose_gear_amortizer_direct_stroke = 0, - nose_gear_amortizer_normal_weight_stroke = -0.375, - nose_gear_amortizer_reversal_stroke = -0.502, - nose_gear_hiking = 0.325, - nose_gear_pos = { 4.406, -1.898, 0 }, + nose_gear_amortizer_normal_weight_stroke = -0.356, + nose_gear_amortizer_reversal_stroke = -0.529, + nose_gear_hiking = 0.306, + nose_gear_pos = { 4.465, -1.92, 0 }, nose_gear_wheel_diameter = 0.46, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/F-5E.lua b/_G/db/Units/Planes/Plane/F-5E.lua index 8088e835..87568a11 100644 --- a/_G/db/Units/Planes/Plane/F-5E.lua +++ b/_G/db/Units/Planes/Plane/F-5E.lua @@ -82,22 +82,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [29] = { args = { 224 }, critical_damage = 4, - deps_cells = { 23, 25, 27, 147 } + deps_cells = { 23, 25, 27, 146 } }, [30] = { args = { 214 }, critical_damage = 4, - deps_cells = { 24, 26, 28, 151 } + deps_cells = { 24, 26, 28, 150 } }, [35] = { args = { 225 }, critical_damage = 5, - deps_cells = { 29, 37, 148 } + deps_cells = { 29, 37, 147 } }, [36] = { args = { 215 }, critical_damage = 5, - deps_cells = { 30, 38, 150 } + deps_cells = { 30, 38, 149 } }, [37] = { args = { 227 }, @@ -164,44 +164,44 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [137] = { - critical_damage = 2 - }, - [138] = { args = { 158 }, critical_damage = 3 }, - [139] = { + [138] = { args = { 157 }, critical_damage = 3 }, - [140] = { + [139] = { args = { 267 }, critical_damage = 3 }, - [141] = { + [140] = { args = { 169 }, critical_damage = 3 }, - [142] = { + [141] = { args = { 163 }, critical_damage = 3 }, - [143] = { + [142] = { args = { 168 }, critical_damage = 3 }, - [144] = { + [143] = { args = { 162 }, critical_damage = 3 }, - [145] = { + [144] = { args = { 166 }, critical_damage = 3 }, - [146] = { + [145] = { args = { 160 }, critical_damage = 3 }, + [146] = { + critical_damage = 2 + }, [147] = { critical_damage = 2 }, @@ -215,16 +215,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [151] = { - critical_damage = 2 - }, - [152] = { args = { 266 }, critical_damage = 3 }, cell_indices = { AIR_BRAKE_L = 19, AIR_BRAKE_R = 20, - Box807 = 137, CABIN_BOTTOM = 6, CABIN_LEFT_SIDE = 4, CABIN_RIGHT_SIDE = 5, @@ -239,29 +235,29 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { FLAP_R_IN = 38, FRONT_GEAR_BOX = 8, FUSELAGE_BOTTOM = 82, - FUSELAGE_BOTTOM_LEFT = 138, - FUSELAGE_BOTTOM_RIGHT = 139, + FUSELAGE_BOTTOM_LEFT = 137, + FUSELAGE_BOTTOM_RIGHT = 138, FUSELAGE_LEFT_SIDE = 9, FUSELAGE_RIGHT_SIDE = 10, HOOK = 98, - L_GEAR_BOX = 140, - MTG_BOTTOM_LEFT = 141, - MTG_BOTTOM_RIGHT = 142, - MTG_CENTER_L = 143, - MTG_CENTER_R = 144, - MTG_LEFT_SIDE = 145, - MTG_RIGHT_SIDE = 146, + L_GEAR_BOX = 139, + MTG_BOTTOM_LEFT = 140, + MTG_BOTTOM_RIGHT = 141, + MTG_CENTER_L = 142, + MTG_CENTER_R = 143, + MTG_LEFT_SIDE = 144, + MTG_RIGHT_SIDE = 145, NOSE_BOTTOM = 59, NOSE_CENTER = 0, NOSE_LEFT_SIDE = 1, NOSE_RIGHT_SIDE = 2, - PYLON_02 = 147, - PYLON_03 = 148, - PYLON_04 = 149, - PYLON_05 = 150, - PYLON_06 = 151, + PYLON_02 = 146, + PYLON_03 = 147, + PYLON_04 = 148, + PYLON_05 = 149, + PYLON_06 = 150, RUDDER = 53, - R_GEAR_BOX = 152, + R_GEAR_BOX = 151, STABILIZER_L_IN = 47, STABILIZER_R_IN = 48, TAIL = 55, @@ -280,7 +276,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { WING_R_PART_CENTER = 28 } }, - DamageParts = { "f-5e_oblomok_wing_l", "f-5e_oblomok_wing_r" }, + DamageParts = { "f-5e_oblomok_wing_r", "f-5e_oblomok_wing_l" }, DefaultTask = <1>{ Name = "CAP", OldID = "CAP", @@ -301,7 +297,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { light_pos = { 0.5, 0, 0 }, name = "FireEffect" }, { - add_speed = { 0, -3, 10 }, + add_speed = { 0, -3, 3 }, gas_deflector_arg = 327, name = "SmokeEffect" } }, @@ -385,7 +381,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -449,7 +445,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = 3, @@ -513,7 +509,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -577,7 +573,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, @@ -641,7 +637,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = 3, @@ -666,7 +662,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { light_pos = { 0.5, 0, 0 }, name = "FireEffect" }, { - add_speed = { 0, 3, 10 }, + add_speed = { 0, 3, 3 }, gas_deflector_arg = 328, name = "SmokeEffect" } }, @@ -933,6 +929,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", add_mass = 55.3, arg_value = 0 + }, { + CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", + add_mass = 55.3, + arg_value = 0 }, { CLSID = "{CBU-52B}", add_mass = 55.3, @@ -1085,6 +1085,18 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{00F5DAC4-0466-4122-998F-B1A298E34113}", add_mass = 77.1, arg_value = 0 + }, { + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{0D33DDAE-524F-4A4E-B5B8-621754FE3ADE}", + add_mass = 77.1, + arg_value = 0 + }, { + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + add_mass = 77.1, + arg_value = 0.5 }, { CLSID = "{MER-5E_MK82x5}", add_mass = 77.1, @@ -1295,7 +1307,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -6.922, -0.084, 0.226 }, smokiness_level = 0.15 } }, - fires_pos = { { -1.801, -0.633, 0 }, { -0.961, -0.311, 1.9 }, { -0.961, -0.311, -1.9 }, { -1.42, -0.311, 2.75 }, { -1.42, -0.311, -2.75 }, + fires_pos = { { -1.801, -0.633, 0 }, [8] = { -5.922, -0.084, 0.226 }, [9] = { -5.922, -0.084, -0.226 }, [10] = { -0.088, 0.55, 0 }, @@ -1391,17 +1403,21 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { argument = 193, controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.33, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, typename = "argumentlight" }, { connector = "BANO_4", controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.222, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, pos_correction = { 0, 0.1, 0 }, + power_up_t = 0.33, proto = <15>{ angle_max = 3.1415926535898, color = { 1, 1, 1, 0.155 }, @@ -1414,21 +1430,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 1.5707963267949, connector = "BANO_4", controller = "Strobe", + cool_down_t = 0.222, dir_correction = { elevation = -2.3561944901923 }, - flash_time = 0.77, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, proto =
, typename = "Spot" }, { connector = "BANO_020", controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.222, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, pos_correction = { 0, -0.1, 0 }, + power_up_t = 0.33, proto =
, range = 2, typename = "Omni" @@ -1437,12 +1457,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 1.5707963267949, connector = "BANO_020", controller = "Strobe", + cool_down_t = 0.222, dir_correction = { elevation = 2.3561944901923 }, - flash_time = 0.77, + flash_time = 0.522, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, proto =
, typename = "Spot" } }, @@ -1451,21 +1473,25 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { lights = { { argument = 194, controller = "Strobe", - flash_time = 0.77, + cool_down_t = 0.342, + flash_time = 0.52, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, typename = "argumentlight" }, { angle_max = 2.6179938779915, angle_min = 1.5707963267949, connector = "BANO_016", controller = "Strobe", + cool_down_t = 0.228, dir_correction = { elevation = -1.0471975511966 }, - flash_time = 0.77, + flash_time = 0.52, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, proto =
, typename = "Spot" }, { @@ -1473,12 +1499,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { angle_min = 1.5707963267949, connector = "BANO_019", controller = "Strobe", + cool_down_t = 0.228, dir_correction = { elevation = -1.0471975511966 }, - flash_time = 0.77, + flash_time = 0.52, mode = 0, - period = 1.03, + period = 0.744, + power_up_t = 0.33, proto =
, typename = "Spot" } }, @@ -1617,9 +1645,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { typename = "collection" }, main_gear_amortizer_direct_stroke = 0, - main_gear_amortizer_normal_weight_stroke = -0.165, - main_gear_amortizer_reversal_stroke = -0.215084, - main_gear_pos = { -0.8546, -1.702458, 1.914661 }, + main_gear_amortizer_normal_weight_stroke = -0.223, + main_gear_amortizer_reversal_stroke = -0.291, + main_gear_pos = { -0.758, -1.712, 1.873 }, main_gear_wheel_diameter = 0.6, mapclasskey = "P0091000024", mechanimations = { @@ -1800,10 +1828,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, net_animation = { 13, 14, 23, 25, 35, 36, 37, 274, 275, 327, 328, 329, 330, 474, 475 }, nose_gear_amortizer_direct_stroke = 0, - nose_gear_amortizer_normal_weight_stroke = -0.375, - nose_gear_amortizer_reversal_stroke = -0.502, - nose_gear_hiking = 0.325, - nose_gear_pos = { 4.406, -1.898, 0 }, + nose_gear_amortizer_normal_weight_stroke = -0.356, + nose_gear_amortizer_reversal_stroke = -0.529, + nose_gear_hiking = 0.306, + nose_gear_pos = { 4.465, -1.92, 0 }, nose_gear_wheel_diameter = 0.46, passivCounterm = { CMDS_Edit = false, diff --git a/_G/db/Units/Ships/Ship/CVN_71.lua b/_G/db/Units/Ships/Ship/CVN_71.lua index a69bfc86..53c03fcc 100644 --- a/_G/db/Units/Ships/Ship/CVN_71.lua +++ b/_G/db/Units/Ships/Ship/CVN_71.lua @@ -260,42 +260,42 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Elevators = { { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 23.5, 8.45, 34 }, 1 }, { { 23.5, 8.45, 0 }, 1 }, { { 15, 8.45, -9 }, 1 } }, + Points = { { { 23.5, 8.45, 34 }, 1 }, { { 25, 8.45, 19.75 }, 1 }, { { 21.5, 8.45, 0 }, 1 }, { { 21.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 35, 8.45, 34 }, 1 }, { { 30, 8.45, 20 }, 1 }, { { 33, 8.45, 0 }, 1 }, { { 40, 8.45, -8 }, 1 } }, + Points = { { { 35, 8.45, 34 }, 1 }, { { 30.5, 8.45, 20 }, 1 }, { { 34, 8.45, 0 }, 1 }, { { 34, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 0 }, 1 }, { { -44, 8.45, -9 }, 1 } }, + Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 14 }, 1 }, { { -26.5, 8.45, 0 }, 1 }, { { -26.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -13, 8.45, 33 }, 1 }, { { -26, 8.45, 10 }, 1 }, { { -20, 8.45, -8 }, 1 } }, + Points = { { { -13, 8.45, 33 }, 1 }, { { -18, 8.45, 18 }, 1 }, { { -14, 8.45, 2.5 }, 1 }, { { -14, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -112, 8.45, -7 }, 1 } }, + Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 18.5 }, 1 }, { { -106, 8.45, 0 }, 1 }, { { -106, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -92, 8.45, 34 }, 1 }, { { -96.7, 8.45, 20 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -92, 8.45, 34 }, 1 }, { { -96.5, 8.45, 16.5 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -94, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, + Points = { { { -96, 8.45, -34 }, 1 }, { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -108, 8.45, -34 }, 1 }, { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, TerminalIdx = 2 }, ElevatorsNumber = 8 @@ -476,7 +476,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -96, 20.1494, -34 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -14 }, 2 }, { { -90, 20.1494, -14 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, @@ -500,12 +500,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -116.5, 20.1494, 10 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -13 }, 2 }, { { -90, 20.1494, -13 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, + TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 33 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 34.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, RoutesNumber = 16 }, ThreatRange = 25000, diff --git a/_G/db/Units/Ships/Ship/CVN_72.lua b/_G/db/Units/Ships/Ship/CVN_72.lua index bad18bc1..88ef3a3e 100644 --- a/_G/db/Units/Ships/Ship/CVN_72.lua +++ b/_G/db/Units/Ships/Ship/CVN_72.lua @@ -260,42 +260,42 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Elevators = { { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 23.5, 8.45, 34 }, 1 }, { { 23.5, 8.45, 0 }, 1 }, { { 15, 8.45, -9 }, 1 } }, + Points = { { { 23.5, 8.45, 34 }, 1 }, { { 25, 8.45, 19.75 }, 1 }, { { 21.5, 8.45, 0 }, 1 }, { { 21.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 35, 8.45, 34 }, 1 }, { { 30, 8.45, 20 }, 1 }, { { 33, 8.45, 0 }, 1 }, { { 40, 8.45, -8 }, 1 } }, + Points = { { { 35, 8.45, 34 }, 1 }, { { 30.5, 8.45, 20 }, 1 }, { { 34, 8.45, 0 }, 1 }, { { 34, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 0 }, 1 }, { { -44, 8.45, -9 }, 1 } }, + Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 14 }, 1 }, { { -26.5, 8.45, 0 }, 1 }, { { -26.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -13, 8.45, 33 }, 1 }, { { -26, 8.45, 10 }, 1 }, { { -20, 8.45, -8 }, 1 } }, + Points = { { { -13, 8.45, 33 }, 1 }, { { -18, 8.45, 18 }, 1 }, { { -14, 8.45, 2.5 }, 1 }, { { -14, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -112, 8.45, -7 }, 1 } }, + Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 18.5 }, 1 }, { { -106, 8.45, 0 }, 1 }, { { -106, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -92, 8.45, 34 }, 1 }, { { -96.7, 8.45, 20 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -92, 8.45, 34 }, 1 }, { { -96.5, 8.45, 16.5 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -94, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, + Points = { { { -96, 8.45, -34 }, 1 }, { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -108, 8.45, -34 }, 1 }, { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, TerminalIdx = 2 }, ElevatorsNumber = 8 @@ -476,7 +476,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -96, 20.1494, -34 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -14 }, 2 }, { { -90, 20.1494, -14 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, @@ -500,12 +500,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -116.5, 20.1494, 10 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -13 }, 2 }, { { -90, 20.1494, -13 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, + TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 33 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 34.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, RoutesNumber = 16 }, ThreatRange = 25000, diff --git a/_G/db/Units/Ships/Ship/CVN_73.lua b/_G/db/Units/Ships/Ship/CVN_73.lua index 6c2bb12c..37c3729e 100644 --- a/_G/db/Units/Ships/Ship/CVN_73.lua +++ b/_G/db/Units/Ships/Ship/CVN_73.lua @@ -263,42 +263,42 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Elevators = { { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 23.5, 8.45, 34 }, 1 }, { { 23.5, 8.45, 0 }, 1 }, { { 15, 8.45, -9 }, 1 } }, + Points = { { { 23.5, 8.45, 34 }, 1 }, { { 25, 8.45, 19.75 }, 1 }, { { 21.5, 8.45, 0 }, 1 }, { { 21.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 35, 8.45, 34 }, 1 }, { { 30, 8.45, 20 }, 1 }, { { 33, 8.45, 0 }, 1 }, { { 40, 8.45, -8 }, 1 } }, + Points = { { { 35, 8.45, 34 }, 1 }, { { 30.5, 8.45, 20 }, 1 }, { { 34, 8.45, 0 }, 1 }, { { 34, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 0 }, 1 }, { { -44, 8.45, -9 }, 1 } }, + Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 14 }, 1 }, { { -26.5, 8.45, 0 }, 1 }, { { -26.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -13, 8.45, 33 }, 1 }, { { -26, 8.45, 10 }, 1 }, { { -20, 8.45, -8 }, 1 } }, + Points = { { { -13, 8.45, 33 }, 1 }, { { -18, 8.45, 18 }, 1 }, { { -14, 8.45, 2.5 }, 1 }, { { -14, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -112, 8.45, -7 }, 1 } }, + Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 18.5 }, 1 }, { { -106, 8.45, 0 }, 1 }, { { -106, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -92, 8.45, 34 }, 1 }, { { -96.7, 8.45, 20 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -92, 8.45, 34 }, 1 }, { { -96.5, 8.45, 16.5 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -94, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, + Points = { { { -96, 8.45, -34 }, 1 }, { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -108, 8.45, -34 }, 1 }, { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, TerminalIdx = 2 }, ElevatorsNumber = 8 @@ -374,14 +374,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { BOSS = { HQ_model = "AirBoss_73-75-CPT", cameraLimitsLocal = { { - box = { -0.89, 0.4, -2.5, 3, 2, 2 }, + box = { 0.5, 0.4, -2.5, 3, 2, 2 }, boxPosLocal = { 0, 0, 0, 0 } }, { - box = { -0.89, 1.4, -2.8, 3.3, 2, 2 }, + box = { 0.5, 1.4, -2.8, 3.3, 2, 2 }, boxPosLocal = { 0, 0, 0, 0 } - }, { - box = { -1, 0.4, -2, 1, 2, 2 }, - boxPosLocal = { -1, 0, -0.3, -37 } } }, cameraPosLocal = { 1, 1.75, -0.5, 30 }, dockConnector = "AirBoss_Connector_73", @@ -479,7 +476,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -96, 20.1494, -34 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -14 }, 2 }, { { -90, 20.1494, -14 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, @@ -503,12 +500,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -116.5, 20.1494, 10 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -13 }, 2 }, { { -90, 20.1494, -13 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, + TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 33 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 34.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, RoutesNumber = 16 }, ThreatRange = 25000, diff --git a/_G/db/Units/Ships/Ship/CVN_75.lua b/_G/db/Units/Ships/Ship/CVN_75.lua index 2e21792b..9a9fd411 100644 --- a/_G/db/Units/Ships/Ship/CVN_75.lua +++ b/_G/db/Units/Ships/Ship/CVN_75.lua @@ -263,42 +263,42 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Elevators = { { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 23.5, 8.45, 34 }, 1 }, { { 23.5, 8.45, 0 }, 1 }, { { 15, 8.45, -9 }, 1 } }, + Points = { { { 23.5, 8.45, 34 }, 1 }, { { 25, 8.45, 19.75 }, 1 }, { { 21.5, 8.45, 0 }, 1 }, { { 21.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 35, 8.45, 34 }, 1 }, { { 30, 8.45, 20 }, 1 }, { { 33, 8.45, 0 }, 1 }, { { 40, 8.45, -8 }, 1 } }, + Points = { { { 35, 8.45, 34 }, 1 }, { { 30.5, 8.45, 20 }, 1 }, { { 34, 8.45, 0 }, 1 }, { { 34, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 0 }, 1 }, { { -44, 8.45, -9 }, 1 } }, + Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 14 }, 1 }, { { -26.5, 8.45, 0 }, 1 }, { { -26.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -13, 8.45, 33 }, 1 }, { { -26, 8.45, 10 }, 1 }, { { -20, 8.45, -8 }, 1 } }, + Points = { { { -13, 8.45, 33 }, 1 }, { { -18, 8.45, 18 }, 1 }, { { -14, 8.45, 2.5 }, 1 }, { { -14, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -112, 8.45, -7 }, 1 } }, + Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 18.5 }, 1 }, { { -106, 8.45, 0 }, 1 }, { { -106, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -92, 8.45, 34 }, 1 }, { { -96.7, 8.45, 20 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -92, 8.45, 34 }, 1 }, { { -96.5, 8.45, 16.5 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -94, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, + Points = { { { -96, 8.45, -34 }, 1 }, { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -108, 8.45, -34 }, 1 }, { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, TerminalIdx = 2 }, ElevatorsNumber = 8 @@ -374,14 +374,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { BOSS = { HQ_model = "AirBoss_73-75-CPT", cameraLimitsLocal = { { - box = { -0.89, 0.4, -2.5, 3, 2, 2 }, + box = { 0.5, 0.4, -2.5, 3, 2, 2 }, boxPosLocal = { 0, 0, 0, 0 } }, { - box = { -0.89, 1.4, -2.8, 3.3, 2, 2 }, + box = { 0.5, 1.4, -2.8, 3.3, 2, 2 }, boxPosLocal = { 0, 0, 0, 0 } - }, { - box = { -1, 0.4, -2, 1, 2, 2 }, - boxPosLocal = { -1, 0, -0.3, -37 } } }, cameraPosLocal = { 1, 1.75, -0.5, 30 }, dockConnector = "AirBoss_Connector_75", @@ -479,7 +476,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -96, 20.1494, -34 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -14 }, 2 }, { { -90, 20.1494, -14 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, @@ -503,12 +500,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -116.5, 20.1494, 10 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -13 }, 2 }, { { -90, 20.1494, -13 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, + TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 33 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 34.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, RoutesNumber = 16 }, ThreatRange = 25000, diff --git a/_G/db/Units/Ships/Ship/Stennis.lua b/_G/db/Units/Ships/Ship/Stennis.lua index b001adb8..1b0b8367 100644 --- a/_G/db/Units/Ships/Ship/Stennis.lua +++ b/_G/db/Units/Ships/Ship/Stennis.lua @@ -270,42 +270,42 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Elevators = { { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 23.5, 8.45, 34 }, 1 }, { { 23.5, 8.45, 0 }, 1 }, { { 15, 8.45, -9 }, 1 } }, + Points = { { { 23.5, 8.45, 34 }, 1 }, { { 25, 8.45, 19.75 }, 1 }, { { 21.5, 8.45, 0 }, 1 }, { { 21.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 1, ElevatorType = 1, - Points = { { { 35, 8.45, 34 }, 1 }, { { 30, 8.45, 20 }, 1 }, { { 33, 8.45, 0 }, 1 }, { { 40, 8.45, -8 }, 1 } }, + Points = { { { 35, 8.45, 34 }, 1 }, { { 30.5, 8.45, 20 }, 1 }, { { 34, 8.45, 0 }, 1 }, { { 34, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 0 }, 1 }, { { -44, 8.45, -9 }, 1 } }, + Points = { { { -25, 8.45, 33 }, 1 }, { { -25, 8.45, 14 }, 1 }, { { -26.5, 8.45, 0 }, 1 }, { { -26.5, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 2, ElevatorType = 1, - Points = { { { -13, 8.45, 33 }, 1 }, { { -26, 8.45, 10 }, 1 }, { { -20, 8.45, -8 }, 1 } }, + Points = { { { -13, 8.45, 33 }, 1 }, { { -18, 8.45, 18 }, 1 }, { { -14, 8.45, 2.5 }, 1 }, { { -14, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -112, 8.45, -7 }, 1 } }, + Points = { { { -103.5, 8.45, 34 }, 1 }, { { -103.5, 8.45, 18.5 }, 1 }, { { -106, 8.45, 0 }, 1 }, { { -106, 8.45, -8 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 3, ElevatorType = 1, - Points = { { { -92, 8.45, 34 }, 1 }, { { -96.7, 8.45, 20 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -92, 8.45, 34 }, 1 }, { { -96.5, 8.45, 16.5 }, 1 }, { { -93.7, 8.45, 0 }, 1 }, { { -94, 8.45, -8 }, 1 } }, TerminalIdx = 2 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, + Points = { { { -96, 8.45, -34 }, 1 }, { { -96, 8.45, -34 }, 1 }, { { -103.5, 8.45, 0 }, 1 }, { { -115, 8.45, -5 }, 1 } }, TerminalIdx = 1 }, { ElevatorIdx = 4, ElevatorType = 0, - Points = { { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, + Points = { { { -108, 8.45, -34 }, 1 }, { { -108, 8.45, -34 }, 1 }, { { -91.7, 8.45, 0 }, 1 }, { { -80, 8.45, -5 }, 1 } }, TerminalIdx = 2 }, ElevatorsNumber = 8 @@ -380,14 +380,11 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { BOSS = { HQ_model = "AirBoss_73-75-CPT", cameraLimitsLocal = { { - box = { -0.89, 0.4, -2.5, 3, 2, 2 }, + box = { 0.5, 0.4, -2.5, 3, 2, 2 }, boxPosLocal = { 0, 0, 0, 0 } }, { - box = { -0.89, 1.4, -2.8, 3.3, 2, 2 }, + box = { 0.5, 1.4, -2.8, 3.3, 2, 2 }, boxPosLocal = { 0, 0, 0, 0 } - }, { - box = { -1, 0.4, -2, 1, 2, 2 }, - boxPosLocal = { -1, 0, -0.3, -37 } } }, cameraPosLocal = { 1, 1.75, -0.5, 30 }, dockConnector = "AirBoss_Connector_74", @@ -485,7 +482,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -96, 20.1494, -34 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -108, 20.1494, -34 }, 1 }, { { -108, 20.1494, -14 }, 2 }, { { -90, 20.1494, -14 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, @@ -509,12 +506,12 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -116.5, 20.1494, 10 }, 1 }, { { -96, 20.1494, -16 }, 2 }, { { -75, 20.1494, -16 }, 2 }, { { -65, 20.1494, -17.3 }, 2 }, { { -55, 20.1494, -18.8 }, 2 }, { { -39.4, 20.1494, -19.92 }, 1 } }, RunwayIdx = 3 }, { - Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -15 }, 2 }, { { -95, 20.1494, -15 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, + Points = { { { -141.15, 20.1494, 24.2 }, 1 }, { { -137, 20.1494, 21.2 }, 1 }, { { -130, 20.1494, 4 }, 1 }, { { -108, 20.1494, -13 }, 2 }, { { -90, 20.1494, -13 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, + TaxiRoutes = { { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 21 }, 6 }, { { -131.25, 20.1494, 17.05 }, 2 }, { { -141.15, 20.1494, 24.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 20 }, 6 }, { { -118.7, 20.1494, 15.9 }, 2 }, { { -125.3, 20.1494, 21.3 }, 1 }, { { -129.2, 20.1494, 26.2 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -110, 20.1494, 20 }, 4 }, { { -116.5, 20.1494, 25 }, 2 }, { { -118, 20.1494, 28 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 19 }, 6 }, { { -104, 20.1494, 20 }, 2 }, { { -103.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -80, 20.1494, 16 }, 6 }, { { -92.5, 20.1494, 16 }, 2 }, { { -92, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -65.5, 20.1494, 16 }, 6 }, { { -82, 20.1494, 13 }, 2 }, { { -79, 20.1494, 26.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 14 }, 4 }, { { -72, 20.1494, 7 }, 2 }, { { -65.8, 20.1494, 18.8 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -37.9, 20.1494, 10 }, 3 }, { { -48.2, 20.1494, -1.1 }, 4 }, { { -54.5, 20.1494, 2.5 }, 2 }, { { -55.5, 20.1494, 9.1 }, 1 }, { { -52, 20.1494, 17 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -26, 20.1494, 8 }, 4 }, { { -42.5, 20.1494, 3.5 }, 2 }, { { -37, 20.1494, 16 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -19, 20.1494, 12.8 }, 3 }, { { -23, 20.1494, 21.3 }, 2 }, { { -23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -7, 20.1494, 10 }, 2 }, { { -11, 20.1494, 16 }, 2 }, { { -11, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { 6, 20.1494, 13 }, 2 }, { { 6, 20.1494, 32.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 33 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 3 }, { { 27, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 34.5 }, 1 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 23, 20.1494, 15 }, 2 }, { { 23, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 22, 20.1494, 3.5 }, 2 }, { { 35, 20.1494, 10 }, 2 }, { { 35, 20.1494, 20 }, 2 }, { { 35, 20.1494, 34 }, 1, 180 } }, RoutesNumber = 16 }, ThreatRange = 25000, diff --git a/_G/db/Units/Ships/Ship/atconveyor.lua b/_G/db/Units/Ships/Ship/atconveyor.lua index 8eceb198..4993a528 100644 --- a/_G/db/Units/Ships/Ship/atconveyor.lua +++ b/_G/db/Units/Ships/Ship/atconveyor.lua @@ -124,16 +124,16 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Gamma_max = 0.35, Height = 50.65, HelicopterSpawnTerminal = { { - Points = { { { 59.444, 12.28, 0 }, 0 } }, + Points = { { { 59.444, 12.37, 0 }, 0 } }, TerminalIdx = 1 }, { - Points = { { { -86.8, 14.18, 0 }, 0 } }, + Points = { { { -86.8, 14.19, 0 }, 0 } }, TerminalIdx = 2 }, TerminalNumber = 2 }, Helicopter_Num_ = 1, - Landing_Point = { 59.072, 12.28, 0 }, + Landing_Point = { 59.072, 14.19, 0 }, Length = 211.316, MaxSpeed = 42.588, Name = "SS Atlantic Conveyor", @@ -142,7 +142,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { 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 }, + RunWays = { { { 59.072, 12.37, 0 }, 0, 5, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, { { 59.072, 12.37, 0 }, 0, 2, 25, 0, 2.5, 2.8, 3, 3, 3.2, 3.5 }, RunwaysNumber = 2 }, Sensors = { @@ -153,27 +153,27 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { 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 } }, + Points = { { { 7.791, 12.37, -5.732 }, 1 }, { { 34.954, 12.37, -1.911 }, 2 }, { { 39, 12.37, 0 }, 1 } }, RunwayIdx = 1 }, { - Points = { { { 8, 12.28, 6.436 }, 1 }, { { 34.954, 12.28, 1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + Points = { { { 8, 12.37, 6.436 }, 1 }, { { 34.954, 12.37, 1.911 }, 2 }, { { 39, 12.37, 0 }, 1 } }, RunwayIdx = 1 }, { - Points = { { { -15.371, 12.28, -5.933 }, 1 }, { { 34.954, 12.28, -1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + Points = { { { -15.371, 12.37, -5.933 }, 1 }, { { 34.954, 12.37, -1.911 }, 2 }, { { 39, 12.37, 0 }, 1 } }, RunwayIdx = 1 }, { - Points = { { { -15.161, 12.28, 6.838 }, 2 }, { { 34.954, 12.28, 1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + Points = { { { -15.161, 12.37, 6.838 }, 2 }, { { 34.954, 12.37, 1.911 }, 2 }, { { 39, 12.37, 0 }, 1 } }, RunwayIdx = 1 }, { - Points = { { { -29.479, 12.28, -5.933 }, 2 }, { { 34.954, 12.28, -1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + Points = { { { -29.479, 12.37, -5.933 }, 2 }, { { 34.954, 12.37, -1.911 }, 2 }, { { 39, 12.37, 0 }, 1 } }, RunwayIdx = 1 }, { - Points = { { { -29.479, 12.28, 6.938 }, 2 }, { { 34.954, 12.28, 1.911 }, 2 }, { { 39, 12.28, 0 }, 1 } }, + Points = { { { -29.479, 12.37, 6.938 }, 2 }, { { 34.954, 12.37, 1.911 }, 2 }, { { 39, 12.37, 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 } }, + TaxiRoutes = { { { { 40.5, 12.37, 0 }, -1 }, { { 39, 12.37, 0 }, -1 }, { { 34.954, 12.37, 0 }, -2 }, { { 11.5, 12.37, 0 }, -2 }, { { 5, 12.37, 1 }, -2 }, { { -29.479, 12.37, 6.93 }, -2, 120 } }, { { { 40.5, 12.37, 0 }, -1 }, { { 39, 12.37, 0 }, -1 }, { { 34.954, 12.37, 0 }, -2 }, { { 11.5, 12.37, 0 }, -2 }, { { 5, 12.37, -1 }, -2 }, { { -29.479, 12.37, -6.53 }, -2, 120 } }, { { { 40.5, 12.37, 0 }, -1 }, { { 39, 12.37, 0 }, -1 }, { { 34.954, 12.37, 0 }, -2 }, { { 5, 12.37, 1 }, -2 }, { { -7.791, 12.37, 6.83 }, -2, 120 } }, { { { 40.5, 12.37, 0 }, -1 }, { { 39, 12.37, 0 }, -1 }, { { 34.954, 12.37, 0 }, -2 }, { { 5, 12.37, -1 }, -2 }, { { -7.791, 12.37, -5.93 }, -1, 120 } }, { { { 40.5, 12.37, 0 }, -1 }, { { 39, 12.37, 0 }, -1 }, { { 35, 12.37, 0 }, -2 }, { { 31, 12.37, 3 }, -2 }, { { 18, 12.37, 5.93 }, -1, 120 } }, { { { 40.5, 12.37, 0 }, -1 }, { { 39, 12.37, 0 }, -1 }, { { 35, 12.37, 0 }, -2 }, { { 31, 12.37, -3 }, -2 }, { { 18, 12.37, -4.93 }, -1, 120 } }, RoutesNumber = 6 }, ThreatRange = 74000, @@ -192,8 +192,6 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { animation_arguments = { arresting_wires = {}, blast_fences = {}, - luna_lights = 69, - nav_lights = 88, radar1_rotation = 3, radar2_rotation = 2, water_propeller = 8 @@ -205,7 +203,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { 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 } } }, + carrierIlluminationStates = { { { 69, 0, 1 }, { 88, 0, 0 }, { 792, 0, 1 }, { 797, 0, 1 } }, { { 69, 0, 1 }, { 88, 0, 1 }, { 792, 0, 0 }, { 797, 0, 1 } }, { { 69, 0, 0 }, { 88, 0, 1 }, { 792, 0, 0 }, { 797, 0, 1 } } }, chassis = {}, distFindObstacles = 250, economy_distance = 13000, diff --git a/_G/db/Units/Ships/Ship/leander-gun-achilles.lua b/_G/db/Units/Ships/Ship/leander-gun-achilles.lua index 11fb5eb2..eb0c7182 100644 --- a/_G/db/Units/Ships/Ship/leander-gun-achilles.lua +++ b/_G/db/Units/Ships/Ship/leander-gun-achilles.lua @@ -356,7 +356,7 @@ _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, diff --git a/_G/launcher/DIS_BOMB_250_2.lua b/_G/launcher/DIS_BOMB_250_2.lua index 5b773141..487442c1 100644 --- a/_G/launcher/DIS_BOMB_250_2.lua +++ b/_G/launcher/DIS_BOMB_250_2.lua @@ -12,5 +12,6 @@ _G["launcher"]["DIS_BOMB_250_2"] = { attribute = { 4, 5, 9, "Redacted" }, category = 1, displayName = "250-2 - 250kg GP Bombs HD", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8 } \ No newline at end of file diff --git a/_G/launcher/DIS_BOMB_250_3.lua b/_G/launcher/DIS_BOMB_250_3.lua index 5cda2a80..1da29ff7 100644 --- a/_G/launcher/DIS_BOMB_250_3.lua +++ b/_G/launcher/DIS_BOMB_250_3.lua @@ -12,5 +12,6 @@ _G["launcher"]["DIS_BOMB_250_3"] = { attribute = { 4, 5, 9, "Redacted" }, category = 1, displayName = "250-3 - 250kg GP Bombs LD", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8 } \ No newline at end of file diff --git a/_G/launcher/DIS_GBU_10.lua b/_G/launcher/DIS_GBU_10.lua index 3ce7c8f8..49c1aa9b 100644 --- a/_G/launcher/DIS_GBU_10.lua +++ b/_G/launcher/DIS_GBU_10.lua @@ -15,6 +15,7 @@ _G["launcher"]["DIS_GBU_10"] = { attribute = { 4, 5, 36, "Redacted" }, category = 1, displayName = "GBU-10", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, settings = { { baseDim = "", diff --git a/_G/launcher/DIS_GBU_12.lua b/_G/launcher/DIS_GBU_12.lua index d9a76634..f000358a 100644 --- a/_G/launcher/DIS_GBU_12.lua +++ b/_G/launcher/DIS_GBU_12.lua @@ -15,6 +15,7 @@ _G["launcher"]["DIS_GBU_12"] = { attribute = { 4, 5, 36, "Redacted" }, category = 1, displayName = "GBU-12", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, settings = { { baseDim = "", diff --git a/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_L.lua b/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_L.lua index dc383fbf..8337236d 100644 --- a/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_L.lua +++ b/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_L.lua @@ -21,6 +21,7 @@ _G["launcher"]["DIS_GBU_12_DUAL_GDJ_II19_L"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x GBU-12", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "DIS_GBU_12_DUAL_GDJ_II19_L", settings = { { diff --git a/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_R.lua b/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_R.lua index 864b55ad..98deac7b 100644 --- a/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_R.lua +++ b/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_R.lua @@ -21,6 +21,7 @@ _G["launcher"]["DIS_GBU_12_DUAL_GDJ_II19_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x GBU-12", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, settings = { { baseDim = "", diff --git a/_G/launcher/DIS_GBU_16.lua b/_G/launcher/DIS_GBU_16.lua index eadcc732..9a3d87b0 100644 --- a/_G/launcher/DIS_GBU_16.lua +++ b/_G/launcher/DIS_GBU_16.lua @@ -15,6 +15,7 @@ _G["launcher"]["DIS_GBU_16"] = { attribute = { 4, 5, 36, "Redacted" }, category = 1, displayName = "GBU-16", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, settings = { { baseDim = "", diff --git a/_G/launcher/DIS_MER6_250_2_N6.lua b/_G/launcher/DIS_MER6_250_2_N6.lua index d2c132ec..72984c7d 100644 --- a/_G/launcher/DIS_MER6_250_2_N6.lua +++ b/_G/launcher/DIS_MER6_250_2_N6.lua @@ -31,6 +31,7 @@ _G["launcher"]["DIS_MER6_250_2_N6"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "MER6 - 6 x 250-2 - 250kg GP Bombs HD", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "DIS_MER6_250_2_N6", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } diff --git a/_G/launcher/DIS_MER6_250_3_N6.lua b/_G/launcher/DIS_MER6_250_3_N6.lua index 84af2581..ecfc4aba 100644 --- a/_G/launcher/DIS_MER6_250_3_N6.lua +++ b/_G/launcher/DIS_MER6_250_3_N6.lua @@ -28,6 +28,7 @@ _G["launcher"]["DIS_MER6_250_3_N6"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "MER6 - 6 x 250-3 - 250kg GP Bombs LD", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "DIS_MER6_250_3_N6", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } diff --git a/_G/launcher/DIS_MK_20.lua b/_G/launcher/DIS_MK_20.lua index e9afb72b..1abc911f 100644 --- a/_G/launcher/DIS_MK_20.lua +++ b/_G/launcher/DIS_MK_20.lua @@ -14,6 +14,7 @@ _G["launcher"]["DIS_MK_20"] = { attribute = { 4, 5, 38, "Redacted" }, category = 1, displayName = "Mk-20", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, settings = { { baseDim = "", diff --git a/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_L.lua b/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_L.lua index db6f6877..63890c91 100644 --- a/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_L.lua +++ b/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_L.lua @@ -20,6 +20,7 @@ _G["launcher"]["DIS_MK_20_DUAL_GDJ_II19_L"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-20", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "DIS_MK_20_DUAL_GDJ_II19_L", settings = { { diff --git a/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_R.lua b/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_R.lua index 13fd44dc..8ad219ec 100644 --- a/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_R.lua +++ b/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_R.lua @@ -20,6 +20,7 @@ _G["launcher"]["DIS_MK_20_DUAL_GDJ_II19_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-20", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, settings = { { baseDim = "", diff --git a/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_L.lua b/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_L.lua index 97f64f36..c5016de3 100644 --- a/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_L.lua +++ b/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_L.lua @@ -20,6 +20,7 @@ _G["launcher"]["DIS_MK_82S_DUAL_GDJ_II19_L"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-82 SnakeEye", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "DIS_MK_82S_DUAL_GDJ_II19_L", settings = { { diff --git a/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_R.lua b/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_R.lua index 043f733b..8a322168 100644 --- a/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_R.lua +++ b/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_R.lua @@ -20,6 +20,7 @@ _G["launcher"]["DIS_MK_82S_DUAL_GDJ_II19_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-82 SnakeEye", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, settings = { { baseDim = "", diff --git a/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_L.lua b/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_L.lua index 4e41201d..baab1f96 100644 --- a/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_L.lua +++ b/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_L.lua @@ -20,6 +20,7 @@ _G["launcher"]["DIS_MK_82_DUAL_GDJ_II19_L"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-82", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "DIS_MK_82_DUAL_GDJ_II19_L", settings = { { diff --git a/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_R.lua b/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_R.lua index a1cff086..cfb5f47e 100644 --- a/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_R.lua +++ b/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_R.lua @@ -20,6 +20,7 @@ _G["launcher"]["DIS_MK_82_DUAL_GDJ_II19_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-82", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, settings = { { baseDim = "", diff --git a/_G/launcher/{AGM_12A_SWA}.lua b/_G/launcher/{AGM_12A_SWA}.lua index e33f7c71..f581e36c 100644 --- a/_G/launcher/{AGM_12A_SWA}.lua +++ b/_G/launcher/{AGM_12A_SWA}.lua @@ -8,7 +8,7 @@ _G["launcher"]["{AGM_12A_SWA}"] = { ShapeName = "HB_F-4E_LAU-34" }, { Position = { 0, 0, 0 }, - ShapeName = "HB_F-4E_EXT_AGM12A", + ShapeName = "HB_F-4E_EXT_AGM12B", connector_name = "AGM45_ATTACH" } }, JettisonSubmunitionOnly = true, diff --git a/_G/launcher/{AGM_12A}.lua b/_G/launcher/{AGM_12A}.lua index 85c87da6..6ab4378e 100644 --- a/_G/launcher/{AGM_12A}.lua +++ b/_G/launcher/{AGM_12A}.lua @@ -8,7 +8,7 @@ _G["launcher"]["{AGM_12A}"] = { ShapeName = "HB_F-4E_LAU-34" }, { Position = { 0, 0, 0 }, - ShapeName = "HB_F-4E_EXT_AGM12A", + ShapeName = "HB_F-4E_EXT_AGM12B", connector_name = "AGM45_ATTACH" } }, JettisonSubmunitionOnly = true, diff --git a/_G/launcher/{AGM_130C_9}.lua b/_G/launcher/{AGM_130C_9}.lua index 926a2c18..df7f73e0 100644 --- a/_G/launcher/{AGM_130C_9}.lua +++ b/_G/launcher/{AGM_130C_9}.lua @@ -2,7 +2,7 @@ _G["launcher"]["{AGM_130C_9}"] = { CLSID = "{AGM_130C_9}", Count = 1, Elements = { { - ShapeName = "agm_130" + ShapeName = "agm-130" } }, Picture = "GBU31.png", _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", diff --git a/_G/launcher/{FAB_250_DUAL_L}.lua b/_G/launcher/{FAB_250_DUAL_L}.lua index d90fac7e..3fa7b157 100644 --- a/_G/launcher/{FAB_250_DUAL_L}.lua +++ b/_G/launcher/{FAB_250_DUAL_L}.lua @@ -19,6 +19,7 @@ _G["launcher"]["{FAB_250_DUAL_L}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x FAB-250", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "{FAB_250_DUAL_L}", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } diff --git a/_G/launcher/{FAB_250_DUAL_R}.lua b/_G/launcher/{FAB_250_DUAL_R}.lua index 07a2a436..53ffcaaa 100644 --- a/_G/launcher/{FAB_250_DUAL_R}.lua +++ b/_G/launcher/{FAB_250_DUAL_R}.lua @@ -19,6 +19,7 @@ _G["launcher"]["{FAB_250_DUAL_R}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x FAB-250", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{FAB_500_DUAL_L}.lua b/_G/launcher/{FAB_500_DUAL_L}.lua index 4bb76a1a..c86fb4ce 100644 --- a/_G/launcher/{FAB_500_DUAL_L}.lua +++ b/_G/launcher/{FAB_500_DUAL_L}.lua @@ -22,6 +22,7 @@ _G["launcher"]["{FAB_500_DUAL_L}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x FAB-500", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "{FAB_500_DUAL_L}", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } diff --git a/_G/launcher/{FAB_500_DUAL_R}.lua b/_G/launcher/{FAB_500_DUAL_R}.lua index a9d483de..62cdf98e 100644 --- a/_G/launcher/{FAB_500_DUAL_R}.lua +++ b/_G/launcher/{FAB_500_DUAL_R}.lua @@ -22,6 +22,7 @@ _G["launcher"]["{FAB_500_DUAL_R}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x FAB-500", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{GBU_15_V_31B}.lua b/_G/launcher/{GBU_15_V_31B}.lua index 6cd5b50c..22429a8a 100644 --- a/_G/launcher/{GBU_15_V_31B}.lua +++ b/_G/launcher/{GBU_15_V_31B}.lua @@ -3,7 +3,7 @@ _G["launcher"]["{GBU_15_V_31B}"] = { Count = 1, Cx_pil = 0.00264, Elements = { { - ShapeName = "agm_130" + ShapeName = "agm-130" } }, Picture = "GBU31.png", Weight = 1125, 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 bbe98d83..c66f0897 100644 --- a/_G/launcher/{HB_ALQ-131_ON_ADAPTER_IN_AERO7}.lua +++ b/_G/launcher/{HB_ALQ-131_ON_ADAPTER_IN_AERO7}.lua @@ -16,7 +16,7 @@ _G["launcher"]["{HB_ALQ-131_ON_ADAPTER_IN_AERO7}"] = { _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", adapter_type = { 4, 15, 47, "" }, - attribute = { 4, 6, 32, "Redacted" }, + attribute = { 4, 7, 32, "Redacted" }, category = 6, displayName = "ALQ-131 - ECM Pod Rack", name = "HB_ORD_Missile_Well_Adapter", diff --git a/_G/launcher/{HB_F4E_GBU_8}.lua b/_G/launcher/{HB_F4E_GBU_8}.lua deleted file mode 100644 index b56a7da4..00000000 --- a/_G/launcher/{HB_F4E_GBU_8}.lua +++ /dev/null @@ -1,14 +0,0 @@ -_G["launcher"]["{HB_F4E_GBU_8}"] = { - CLSID = "{HB_F4E_GBU_8}", - Count = 1, - Elements = { { - ShapeName = "HB_F-4E_EXT_GBU8" - } }, - Picture = "Picto_GBU8.png", - Weight = 1027, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - attribute = { 4, 5, 36, "Redacted" }, - category = 1, - displayName = "GBU-8 HOBOS - 2000 lb TV Guided Bomb" -} \ 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 43d9b8f0..a09e86af 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 @@ -16,7 +16,7 @@ _G["launcher"]["{HB_PAVE_SPIKE_FAST_ON_ADAPTER_IN_AERO7}"] = { _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", _origin = "F-4E AI by Heatblur Simulations", adapter_type = { 4, 15, 47, "" }, - attribute = { 4, 6, 32, "Redacted" }, + attribute = { 4, 7, 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_ON_ADAPTER_IN_AERO7}.lua b/_G/launcher/{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}.lua index 3a3baeef..df262fce 100644 --- a/_G/launcher/{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}.lua +++ b/_G/launcher/{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}.lua @@ -13,7 +13,7 @@ _G["launcher"]["{HB_PAVE_SPIKE_ON_ADAPTER_IN_AERO7}"] = { _origin = "F-4E AI by Heatblur Simulations", _unique_resource_name = "weapons.containers.HB_ORD_Missile_Well_Adapter", adapter_type = { 4, 15, 47, "" }, - attribute = { 4, 6, 32, "Redacted" }, + attribute = { 4, 7, 32, "Redacted" }, category = 6, displayName = "AN/AVQ-23 Pave Spike - Targeting Pod Rack", name = "HB_ORD_Missile_Well_Adapter", diff --git a/_G/launcher/{RBK_250_PTAB25M_DUAL_L}.lua b/_G/launcher/{RBK_250_PTAB25M_DUAL_L}.lua index d1616635..e80bc3df 100644 --- a/_G/launcher/{RBK_250_PTAB25M_DUAL_L}.lua +++ b/_G/launcher/{RBK_250_PTAB25M_DUAL_L}.lua @@ -22,6 +22,7 @@ _G["launcher"]["{RBK_250_PTAB25M_DUAL_L}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x RBK-250 PTAB-2.5M", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "{RBK_250_PTAB25M_DUAL_L}", wsTypeOfWeapon = { 4, 5, 38, "Redacted" } diff --git a/_G/launcher/{RBK_250_PTAB25M_DUAL_R}.lua b/_G/launcher/{RBK_250_PTAB25M_DUAL_R}.lua index 2d3704fc..3ec1e477 100644 --- a/_G/launcher/{RBK_250_PTAB25M_DUAL_R}.lua +++ b/_G/launcher/{RBK_250_PTAB25M_DUAL_R}.lua @@ -22,6 +22,7 @@ _G["launcher"]["{RBK_250_PTAB25M_DUAL_R}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x RBK-250 PTAB-2.5M", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{RBK_500_PTAB105_DUAL_L}.lua b/_G/launcher/{RBK_500_PTAB105_DUAL_L}.lua index 29fe0d4d..8be9e7e1 100644 --- a/_G/launcher/{RBK_500_PTAB105_DUAL_L}.lua +++ b/_G/launcher/{RBK_500_PTAB105_DUAL_L}.lua @@ -23,6 +23,7 @@ _G["launcher"]["{RBK_500_PTAB105_DUAL_L}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x RBK-500-255 PTAB-10-5", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, name = "{RBK_500_PTAB105_DUAL_L}", wsTypeOfWeapon = { 4, 5, 38, "Redacted" } diff --git a/_G/launcher/{RBK_500_PTAB105_DUAL_R}.lua b/_G/launcher/{RBK_500_PTAB105_DUAL_R}.lua index 530b08f5..3066a392 100644 --- a/_G/launcher/{RBK_500_PTAB105_DUAL_R}.lua +++ b/_G/launcher/{RBK_500_PTAB105_DUAL_R}.lua @@ -23,6 +23,7 @@ _G["launcher"]["{RBK_500_PTAB105_DUAL_R}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x RBK-500-255 PTAB-10-5", + ejectDirection = { 0, -1, 0 }, ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{YJ_83}.lua b/_G/launcher/{YJ_83}.lua new file mode 100644 index 00000000..4c9fe414 --- /dev/null +++ b/_G/launcher/{YJ_83}.lua @@ -0,0 +1,15 @@ +_G["launcher"]["{YJ_83}"] = { + CLSID = "{YJ_83}", + Count = 1, + Cx_pil = 0.0018, + Elements = { { + ShapeName = "yj83" + } }, + Picture = "yj83.png", + Weight = 715, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 8, "Redacted" }, + category = 2, + displayName = "YJ-83" +} \ No newline at end of file diff --git a/_G/rockets/9M317.lua b/_G/rockets/9M317.lua index 929c0bee..2ef7c6d0 100644 --- a/_G/rockets/9M317.lua +++ b/_G/rockets/9M317.lua @@ -26,6 +26,7 @@ _G["rockets"]["#Index"] = { PN_coeffs = { 3, 5000, 1, 10000, 0.5, 15000, 0.2 }, Range_max = 42000, Reflection = 0.0918, + SeekerGen = 4, X_back = -2.15, Y_back = -0.18, Z_back = 0, diff --git a/_G/rockets/AGM_12A.lua b/_G/rockets/AGM_12A.lua index 0ec7f861..fa8fb121 100644 --- a/_G/rockets/AGM_12A.lua +++ b/_G/rockets/AGM_12A.lua @@ -121,7 +121,7 @@ _G["rockets"]["#Index"] = { init_roll = 0.78539816339745 }, manualWeaponFlag = 3, - model = "HB_F-4E_EXT_AGM12A", + model = "HB_F-4E_EXT_AGM12B", name = "AGM_12A", scheme = "AGM-12_v2", shape_table_data = { { diff --git a/_G/rockets/AGM_130.lua b/_G/rockets/AGM_130.lua index f34d846c..bae1f00c 100644 --- a/_G/rockets/AGM_130.lua +++ b/_G/rockets/AGM_130.lua @@ -147,7 +147,7 @@ _G["rockets"]["#Index"] = { op_time = 7200 }, shape_table_data = { { - file = "agm_130", + file = "agm-130", fire = { 0, 1 }, index = "Redacted", life = 1, diff --git a/_G/rockets/HB-AIM-7E-2.lua b/_G/rockets/HB-AIM-7E-2.lua index 0fa0994e..bfd2975f 100644 --- a/_G/rockets/HB-AIM-7E-2.lua +++ b/_G/rockets/HB-AIM-7E-2.lua @@ -125,7 +125,7 @@ _G["rockets"]["#Index"] = { work_time = 2.8 }, mass = 230, - model = "aim-7", + model = "HB_F-4E_EXT_AIM-7E2", name = "HB-AIM-7E-2", proximity_fuze = { arm_delay = 2.9, @@ -148,7 +148,7 @@ _G["rockets"]["#Index"] = { sens_near_dist = 100 }, shape_table_data = { { - file = "HB_F-4E_AIM7E", + file = "HB_F-4E_EXT_AIM-7E2", fire = { 0, 1 }, index = "Redacted", life = 1, diff --git a/_G/rockets/HB-AIM-7E.lua b/_G/rockets/HB-AIM-7E.lua index 0d5f7bc5..1248f805 100644 --- a/_G/rockets/HB-AIM-7E.lua +++ b/_G/rockets/HB-AIM-7E.lua @@ -125,7 +125,7 @@ _G["rockets"]["#Index"] = { work_time = 2.8 }, mass = 230, - model = "aim-7", + model = "HB_F-4E_AIM7E", name = "HB-AIM-7E", proximity_fuze = { arm_delay = 4, diff --git a/_G/rockets/HHQ-9.lua b/_G/rockets/HHQ-9.lua index a3cfda14..88ca90cd 100644 --- a/_G/rockets/HHQ-9.lua +++ b/_G/rockets/HHQ-9.lua @@ -25,6 +25,7 @@ _G["rockets"]["#Index"] = { PN_gain = 4, Range_max = 150000, Reflection = 0.2, + SeekerGen = 4, X_back = -3.681, Y_back = 0, Z_back = 0, diff --git a/_G/rockets/HQ-16.lua b/_G/rockets/HQ-16.lua index 93f01a33..27e0eb81 100644 --- a/_G/rockets/HQ-16.lua +++ b/_G/rockets/HQ-16.lua @@ -26,6 +26,7 @@ _G["rockets"]["#Index"] = { PN_coeffs = { 3, 10000, 1, 20000, 0.6, 30000, 0.2 }, Range_max = 45000, Reflection = 0.0918, + SeekerGen = 4, X_back = -2.55, Y_back = 0, Z_back = 0, diff --git a/_G/rockets/YJ-62.lua b/_G/rockets/YJ-62.lua index e2f2cb2a..fb38f3b0 100644 --- a/_G/rockets/YJ-62.lua +++ b/_G/rockets/YJ-62.lua @@ -19,56 +19,92 @@ _G["rockets"]["#Index"] = { M = 1240, Mach_max = 0.8, Name = "Redacted", - Nr_max = 12, + Nr_max = 14, OmViz_max = 99.9, Range_max = 300000, Reflection = 0.121, - X_back = -2.236, - X_back_acc = -3.925, + X_back = -3, + X_back_acc = -3.9, Y_back = 0, Y_back_acc = 0.06, Z_back = 0, Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 25, delay = 1, - finsLimit = 0.68, - glide_height = 15, - inertial_km_error = 0.05, - max_vert_speed = 100, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 12, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 10, + op_time = 9999, + pre_maneuver_glide_height = 15, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_factor = 0, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 220, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj62_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, - nozzle_position = { { -3.925, 0.06, 0 } }, + nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 1, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, + start_impulse = 0, tail_width = 0.5, + wind_sigma = 0, work_time = 4 }, - booster_animation = { - start_val = 1 - }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01, - suppres_march = 0.01 + boost_start = 0, + march_start = 6 }, display_name = "YJ-62", display_name_short = "YJ-62", @@ -77,24 +113,33 @@ _G["rockets"]["#Index"] = { Kd = 0.01, Ki = 0.001, burst_signal = 9999, - default_speed = 235 + default_speed = 235, + speed_delta = 10 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.5, - J_Angle_W = 2, - J_Diff_K = 0.8, - J_FinAngle_K = 0.3, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 5, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 0 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_angle = 0.1221730476396, + loft_angle_vert = 0, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { A = 0.08, @@ -115,34 +160,49 @@ _G["rockets"]["#Index"] = { wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 15000 - }, march = { + custom_smoke_dissipation_factor = 0.2, fuel_mass = 180, impulse = 660, max_thrust = 6500, min_fuel_rate = 0.005, min_thrust = 0, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -3, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 1240, - mode_switcher = { - delay = 1, - trigger_dist = 500 - }, model = "yj62", name = "YJ-62", - play_booster_animation = { - val = 1 - }, - scheme = "anti_ship_missile_tb", - self_destruct = { + scheme = "anti_ship_missile", + seeker = { + FOV = 0.87266462599716, + add_y = 1.5, delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + flag_dist = 6000, + max_target_speed = 36, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.05, + mid_vel = 290, + op_time = 9999, + primary_target_filter = 0, + sens_far_dist = 80000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj62", @@ -153,18 +213,21 @@ _G["rockets"]["#Index"] = { username = "YJ-62" } }, sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, - t_acc = 3, + t_acc = 4, t_b = 0, t_marsh = 1500, + triggers_control = { + action_wait_timer = 5, + default_destruct_tg_dist = 1000, + default_final_maneuver_tg_dist = 4000, + default_sensor_tg_dist = 8000, + default_straight_nav_tg_dist = 1000, + final_maneuver_by_default = 1, + trigger_by_path = 1 + }, user_name = "YJ-62", - v_mid = 150, - v_min = 100, + v_mid = 285, + v_min = 170, warhead = <1>{ caliber = 540, concrete_factors = { 3, 1, 1 }, diff --git a/_G/rockets/YJ-83.lua b/_G/rockets/YJ-83.lua index 7c091bba..2082c9a0 100644 --- a/_G/rockets/YJ-83.lua +++ b/_G/rockets/YJ-83.lua @@ -1,9 +1,9 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1, - D_max = 180000, - D_min = 12000, + Cx_pil = 8, + D_max = 230000, + D_min = 15000, Damage = 825, - Diam = 343, + Diam = 360, Engine_Type = 6, Engine_Type_ = 6, Escort = 0, @@ -12,18 +12,18 @@ _G["rockets"]["#Index"] = { Fi_search = 99.9, Fi_start = 0.25, H_max = 10000, - H_min = -1, + H_min = 500, H_min_t = 0, - Head_Form = 1, + Head_Form = 0, Head_Type = 5, KillDistance = 0, Life_Time = 1850, M = 850, - Mach_max = 1.5, + Mach_max = 0.9, Name = "Redacted", - Nr_max = 6, + Nr_max = 18, OmViz_max = 99.9, - Range_max = 180000, + Range_max = 230000, Reflection = 0.121, Stage = 2, Stage_ = 2, @@ -35,117 +35,180 @@ _G["rockets"]["#Index"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 30, delay = 1, - finsLimit = 0.68, - glide_height = 20, - inertial_km_error = 0.05, - max_vert_speed = 60, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 18, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 15, + op_time = 9999, + pre_maneuver_glide_height = 18, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { - boost_factor = 0, + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 125, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj83_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 3.9, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, - tail_width = 0.1, - work_time = 4 - }, - booster_animation = { - start_val = 1 + start_impulse = 0, + tail_width = 0.5, + wind_sigma = 0, + work_time = 6 }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01 + boost_start = 0, + march_start = 6 }, display_name = "YJ-83", display_name_short = "YJ-83", engine_control = { - K = 300, - Kd = 0.01, + K = 350, + Kd = 1, Ki = 0.001, - burst_signal = 9999, - default_speed = 300 + default_speed = 285, + speed_delta = 5 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.7, - J_Angle_W = 3, - J_Diff_K = 0.8, - J_FinAngle_K = 0.52, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 6, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 1 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_active_by_default = 1, + loft_angle = 0.1221730476396, + loft_angle_vert = 1, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.05, + A = 0.5, + I = 1477.9655625, L = 5.145, - Ma = 0.6, + Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, + Mw_x = 2.6, Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, + finsTau = 0.02, + mass = 670, maxAoa = 0.3, wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 10000 - }, march = { - fuel_mass = 80, - impulse = 660, - max_thrust = 5000, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, - min_thrust = 0, + min_thrust = -100, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 850, - mode_switcher = { - delay = 1, - trigger_dist = 4000 - }, model = "yj83", name = "YJ-83", - play_booster_animation = { - val = 1 - }, - scheme = "anti_ship_missile_tb", - self_destruct = { - delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + scheme = "Harpoon", + seeker = { + FOV = 1.0471975511966, + add_y = 1.5, + delay = 0, + flag_dist = 5000, + max_small_target_rcs = 29999.99, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + mid_vel = 285, + min_detectable_rcs = 50, + min_large_target_rcs = 60000, + op_time = 9999, + primary_target_filter = 1, + sens_far_dist = 65000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj83", @@ -155,19 +218,26 @@ _G["rockets"]["#Index"] = { name = "YJ-83", username = "YJ-83" } }, - sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, + sigma = { 10, 10, 10 }, t_acc = 5, t_b = 0, t_marsh = 1800, + triggers_control = { + can_increase_tg_dist = 1, + final_maneuver_tg_dist = 6000, + final_maneuver_trig_v_lim = 3, + pre_maneuver_glide_height = 1000, + self_destruct_tg_dist = 1000, + send_final_maneuver_by_default = 1, + sensor_tg_dist = 10000, + straight_nav_tg_dist = 1000, + target_upd_jump_dist = 40000, + update_pos_from_input = 0, + use_horiz_dist = 1 + }, user_name = "YJ-83", - v_mid = 150, - v_min = 100, + v_mid = 272, + v_min = 150, warhead = <1>{ caliber = 360, concrete_factors = { 3, 1, 1 }, diff --git a/_G/rockets/YJ-84.lua b/_G/rockets/YJ-84.lua index 7e0680a3..973a0294 100644 --- a/_G/rockets/YJ-84.lua +++ b/_G/rockets/YJ-84.lua @@ -1,9 +1,9 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1, - D_max = 180000, - D_min = 12000, + Cx_pil = 8, + D_max = 230000, + D_min = 15000, Damage = 825, - Diam = 343, + Diam = 360, Engine_Type = 6, Engine_Type_ = 6, Escort = 0, @@ -12,18 +12,18 @@ _G["rockets"]["#Index"] = { Fi_search = 99.9, Fi_start = 0.25, H_max = 10000, - H_min = -1, + H_min = 500, H_min_t = 0, - Head_Form = 1, + Head_Form = 0, Head_Type = 5, KillDistance = 0, Life_Time = 1850, M = 850, - Mach_max = 1.5, + Mach_max = 0.9, Name = "Redacted", - Nr_max = 6, + Nr_max = 18, OmViz_max = 99.9, - Range_max = 180000, + Range_max = 230000, Reflection = 0.121, Stage = 2, Stage_ = 2, @@ -35,117 +35,180 @@ _G["rockets"]["#Index"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 30, delay = 1, - finsLimit = 0.68, - glide_height = 20, - inertial_km_error = 0.05, - max_vert_speed = 60, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 18, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 15, + op_time = 9999, + pre_maneuver_glide_height = 18, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { - boost_factor = 0, + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 125, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj83_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 3.9, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, - tail_width = 0.1, - work_time = 4 - }, - booster_animation = { - start_val = 1 + start_impulse = 0, + tail_width = 0.5, + wind_sigma = 0, + work_time = 6 }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01 + boost_start = 0, + march_start = 6 }, display_name = "YJ-84", display_name_short = "YJ-84", engine_control = { - K = 300, - Kd = 0.01, + K = 350, + Kd = 1, Ki = 0.001, - burst_signal = 9999, - default_speed = 300 + default_speed = 285, + speed_delta = 5 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.7, - J_Angle_W = 3, - J_Diff_K = 0.8, - J_FinAngle_K = 0.52, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 6, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 1 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_active_by_default = 1, + loft_angle = 0.1221730476396, + loft_angle_vert = 1, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.05, + A = 0.5, + I = 1477.9655625, L = 5.145, - Ma = 0.6, + Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, + Mw_x = 2.6, Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, + finsTau = 0.02, + mass = 670, maxAoa = 0.3, wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 10000 - }, march = { - fuel_mass = 80, - impulse = 660, - max_thrust = 5000, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, - min_thrust = 0, + min_thrust = -100, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 850, - mode_switcher = { - delay = 1, - trigger_dist = 4000 - }, model = "yj83", name = "YJ-84", - play_booster_animation = { - val = 1 - }, - scheme = "anti_ship_missile_tb", - self_destruct = { - delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + scheme = "Harpoon", + seeker = { + FOV = 1.0471975511966, + add_y = 1.5, + delay = 0, + flag_dist = 5000, + max_small_target_rcs = 29999.99, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + mid_vel = 285, + min_detectable_rcs = 50, + min_large_target_rcs = 60000, + op_time = 9999, + primary_target_filter = 1, + sens_far_dist = 65000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj83", @@ -155,19 +218,26 @@ _G["rockets"]["#Index"] = { name = "YJ-84", username = "YJ-84" } }, - sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, + sigma = { 10, 10, 10 }, t_acc = 5, t_b = 0, t_marsh = 1800, + triggers_control = { + can_increase_tg_dist = 1, + final_maneuver_tg_dist = 6000, + final_maneuver_trig_v_lim = 3, + pre_maneuver_glide_height = 1000, + self_destruct_tg_dist = 1000, + send_final_maneuver_by_default = 1, + sensor_tg_dist = 10000, + straight_nav_tg_dist = 1000, + target_upd_jump_dist = 40000, + update_pos_from_input = 0, + use_horiz_dist = 1 + }, user_name = "YJ-84", - v_mid = 150, - v_min = 100, + v_mid = 272, + v_min = 150, warhead = { caliber = 360, concrete_factors = { 3, 1, 1 }, diff --git a/_G/warheads/YJ_83.lua b/_G/warheads/YJ_83.lua new file mode 100644 index 00000000..483a1e8e --- /dev/null +++ b/_G/warheads/YJ_83.lua @@ -0,0 +1,13 @@ +_G["warheads"]["YJ_83"] = { + caliber = 360, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 2, + cumulative_thickness = 0.1, + default_fuze_delay = 0, + expl_mass = 76, + mass = 76, + obj_factors = { 2.5, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 15.2 +} \ 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 d989a954..01ea9fdd 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 @@ -96,7 +96,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { op_time = 800 }, shape_table_data = { { - file = "agm_130", + file = "agm-130", fire = { 0, 1 }, index = "Redacted", life = 1, @@ -221,7 +221,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { op_time = 800 }, shape_table_data = { { - file = "agm_130", + file = "agm-130", fire = { 0, 1 }, index = "Redacted", life = 1, diff --git a/_G/weapons_table/weapons/bombs/HB_F4E_GBU_8_HOBOS.lua b/_G/weapons_table/weapons/bombs/HB_F4E_GBU_8_HOBOS.lua deleted file mode 100644 index 9f6b4fe6..00000000 --- a/_G/weapons_table/weapons/bombs/HB_F4E_GBU_8_HOBOS.lua +++ /dev/null @@ -1,216 +0,0 @@ -_G["weapons_table"]["weapons"]["bombs"]["HB_F4E_GBU_8_HOBOS"] = { - I = 1524.763968, - L = 4.368, - Reflection = 0.2, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - _unique_resource_name = "weapons.bombs.HB_F4E_GBU_8_HOBOS", - add_attributes = { "Missiles" }, - caliber = 0.457, - client = { - Ag = -5, - LaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 500, 0, 2500, 5500, 9000, 12000, 14500, 17500, 20000, 23000, 200, 0, 0, 3000, 6000, 9000, 12000, 15000, 17500, 20500, 23500, 300, 0, 0, 3000, 6500, 9500, 12500, 15500, 18000, 21000, 24000, 400, 0, 1500, 3500, 6500, 10000, 13000, 16000, 18500, 21500, 24500, 500, 0, 0, 4000, 7000, 10000, 13500, 16500, 19000, 21500, 24500, 600, 0, 0, 4000, 7500, 10500, 14000, 16500, 19500, 22000, 25000, 700, 0, 2000, 4500, 7500, 11000, 14000, 17000, 19500, 22500, 25500, 800, 0, 2000, 5000, 8000, 11500, 14500, 17500, 20000, 23000, 26000, 900, 1500, 2500, 5000, 8500, 11500, 15000, 17500, 20500, 23500, 26500, 1000, 1500, 3000, 5500, 9000, 12000, 15000, 18000, 21000, 24000, 26500, 2000, 3000, 5000, 8500, 12000, 15500, 19000, 22000, 25000, 27500, 31000, 3000, 4000, 7500, 11500, 15000, 18500, 22500, 25500, 29000, 32000, 35000, 4000, 5500, 10500, 14000, 18000, 21500, 25500, 29000, 32500, 36000, 39500, 5000, 7000, 14000, 17000, 20500, 24500, 28500, 32500, 36500, 40000, 43500, 6000, 9000, 16500, 19500, 23500, 27500, 31500, 36000, 40000, 44000, 48000, 7000, 15500, 18500, 22000, 26000, 30000, 34500, 39000, 43500, 48000, 52000, 8000, 17500, 21000, 24500, 28500, 32500, 37000, 42000, 46500, 51500, 56000, 9000, 19000, 23000, 27000, 31000, 35500, 40000, 45000, 50000, 55000, 60000, 10000, 21000, 25500, 29500, 33500, 37500, 42500, 47500, 53000, 58500, 63000, 11000, 23000, 27500, 31500, 35500, 40000, 45000, 50500, 56500, 61500, 65500, 12000, 24500, 29500, 34000, 38000, 42500, 47500, 53500, 59000, 63500, 67500, 13000, 26000, 31500, 36000, 40000, 44500, 50000, 56000, 61000, 65000, 69000, 14000, 27500, 33000, 38000, 42500, 47000, 52500, 58500, 62500, 66500, 70500, 15000, 29000, 35000, 40000, 44500, 49000, 54500, 59500, 63000, 67500, 71500 }, - MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 500, 800, 1150, 1600, 2100, 2650, 3200, 3300, 3600, 3850, 200, 700, 1100, 1500, 2000, 2550, 3100, 3550, 3700, 4250, 4450, 300, 850, 1300, 1800, 2300, 2850, 3400, 3950, 4100, 4600, 4900, 400, 0, 1500, 2000, 2550, 3100, 3700, 4150, 4450, 4950, 5300, 500, 1100, 1650, 2200, 2750, 3350, 3900, 4400, 4700, 5250, 5650, 600, 1200, 1750, 2350, 2950, 3550, 4150, 4600, 4950, 5500, 6050, 700, 1250, 1900, 2500, 3100, 3700, 4300, 4800, 5200, 5750, 6250, 800, 1350, 2000, 2650, 3250, 3900, 4500, 4950, 5400, 6000, 6550, 900, 1400, 2100, 2750, 3400, 4050, 4650, 5200, 5550, 6200, 6750, 1000, 1500, 2200, 2900, 3550, 4150, 4750, 5300, 5750, 6400, 7000, 2000, 1950, 2850, 3650, 4450, 5100, 5800, 6350, 7000, 7850, 8750, 3000, 2300, 3300, 4300, 5000, 5700, 6400, 7000, 7800, 8900, 10000, 4000, 2500, 3700, 4800, 5700, 6500, 7200, 7400, 8500, 9700, 10900, 5000, 2750, 4000, 5250, 6250, 7250, 8250, 9000, 9250, 10500, 11750, 6000, 3000, 4500, 5500, 7000, 8000, 9000, 10000, 11000, 11500, 12500, 7000, 3000, 4500, 6000, 7500, 8500, 10000, 11000, 12000, 12500, 13500, 8000, 3500, 4500, 6500, 8000, 9000, 10500, 12000, 13000, 14000, 14500, 9000, 3500, 5000, 6500, 8000, 9500, 11000, 12500, 14000, 15000, 16000, 10000, 3500, 5000, 6500, 8500, 10000, 12000, 13500, 15000, 16000, 17500, 11000, 4000, 5000, 7000, 9000, 10500, 12500, 14000, 16000, 17500, 18500, 12000, 4000, 5500, 7000, 9000, 11000, 13000, 15000, 16500, 18000, 19500, 13000, 4000, 5500, 7500, 9500, 11500, 13500, 15500, 17500, 19000, 20500, 14000, 4500, 5500, 7500, 10000, 12000, 14000, 16500, 18000, 20000, 21500, 15000, 4500, 6000, 8000, 10000, 12500, 14500, 17000, 19000, 21000, 22500 }, - PN_autopilot = { - K = 0.024, - K_GBias = 0.4, - Kg = 2.4, - Ki = 0.001, - Krx = 2, - Kx = 0.02, - fins_limit = 0.6 - }, - Reflection = 0.2, - VyHold = -50, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - add_attributes = { "Missiles" }, - arming_delay = { - delay_time = 2, - enabled = true - }, - arming_vane = { - enabled = false, - velK = 1 - }, - category = 1, - class_name = "wAmmunitionSelfHoming", - displayName = "GBU-8 HOBOS - 2000 lb TV Guided Bomb", - display_name_short = "GBU-8", - fm = { - A = 0.36, - I = 1524.763968, - L = 4.368, - Ma = 0.85727626967319, - Ma_x = 0.1, - Mw = 4.6132861341704, - Mw_x = 1, - Sw = 0.6453888, - caliber = 0.457, - cx_coeff = { 1.037, 0.91, 0.6, 0.382, 1.34 }, - dCydA = { 0.14404178394221, 0.036 }, - finsTau = 0.1, - mass = 1027, - maxAoa = 0.1221730476396, - release_rnd = 0.3, - release_rnd_x = 1, - wind_sigma = 0 - }, - hMax = 2000, - hMin = 25, - march = { - smoke_color = { 0.9, 0.9, 0.9 }, - smoke_transparency = 0.5 - }, - mass = 1027, - model = "HB_F-4E_EXT_GBU8", - name = "HB_F4E_GBU_8_HOBOS", - scheme = "schemes/bombs/AGM-62.sch", - seeker = { - FOV = 1.0471975511966, - activate_on_update = 0, - delay = 0, - max_lock_dist = 60000, - max_target_speed = 33, - max_target_speed_rnd_coeff = 10, - max_w_LOS = 0.06, - max_w_LOS_surf = 0.03, - op_time = 800 - }, - shape_table_data = { { - file = "HB_F-4E_EXT_GBU8", - index = "Redacted", - name = "HB_F-4E_EXT_GBU8", - username = "GBU-8" - } }, - targeting_data = { - char_time = 20.3 - }, - type = 1, - user_name = "GBU-8", - 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.037, 0.91, 0.6, 0.382, 1.34 }, - display_name = "GBU-8", - display_name_short = "GBU-8", - mass = 1027, - model = "HB_F-4E_EXT_GBU8", - name = "HB_F4E_GBU_8_HOBOS", - server = { - Ag = -5, - LaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 500, 0, 2500, 5500, 9000, 12000, 14500, 17500, 20000, 23000, 200, 0, 0, 3000, 6000, 9000, 12000, 15000, 17500, 20500, 23500, 300, 0, 0, 3000, 6500, 9500, 12500, 15500, 18000, 21000, 24000, 400, 0, 1500, 3500, 6500, 10000, 13000, 16000, 18500, 21500, 24500, 500, 0, 0, 4000, 7000, 10000, 13500, 16500, 19000, 21500, 24500, 600, 0, 0, 4000, 7500, 10500, 14000, 16500, 19500, 22000, 25000, 700, 0, 2000, 4500, 7500, 11000, 14000, 17000, 19500, 22500, 25500, 800, 0, 2000, 5000, 8000, 11500, 14500, 17500, 20000, 23000, 26000, 900, 1500, 2500, 5000, 8500, 11500, 15000, 17500, 20500, 23500, 26500, 1000, 1500, 3000, 5500, 9000, 12000, 15000, 18000, 21000, 24000, 26500, 2000, 3000, 5000, 8500, 12000, 15500, 19000, 22000, 25000, 27500, 31000, 3000, 4000, 7500, 11500, 15000, 18500, 22500, 25500, 29000, 32000, 35000, 4000, 5500, 10500, 14000, 18000, 21500, 25500, 29000, 32500, 36000, 39500, 5000, 7000, 14000, 17000, 20500, 24500, 28500, 32500, 36500, 40000, 43500, 6000, 9000, 16500, 19500, 23500, 27500, 31500, 36000, 40000, 44000, 48000, 7000, 15500, 18500, 22000, 26000, 30000, 34500, 39000, 43500, 48000, 52000, 8000, 17500, 21000, 24500, 28500, 32500, 37000, 42000, 46500, 51500, 56000, 9000, 19000, 23000, 27000, 31000, 35500, 40000, 45000, 50000, 55000, 60000, 10000, 21000, 25500, 29500, 33500, 37500, 42500, 47500, 53000, 58500, 63000, 11000, 23000, 27500, 31500, 35500, 40000, 45000, 50500, 56500, 61500, 65500, 12000, 24500, 29500, 34000, 38000, 42500, 47500, 53500, 59000, 63500, 67500, 13000, 26000, 31500, 36000, 40000, 44500, 50000, 56000, 61000, 65000, 69000, 14000, 27500, 33000, 38000, 42500, 47000, 52500, 58500, 62500, 66500, 70500, 15000, 29000, 35000, 40000, 44500, 49000, 54500, 59500, 63000, 67500, 71500 }, - MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 500, 800, 1150, 1600, 2100, 2650, 3200, 3300, 3600, 3850, 200, 700, 1100, 1500, 2000, 2550, 3100, 3550, 3700, 4250, 4450, 300, 850, 1300, 1800, 2300, 2850, 3400, 3950, 4100, 4600, 4900, 400, 0, 1500, 2000, 2550, 3100, 3700, 4150, 4450, 4950, 5300, 500, 1100, 1650, 2200, 2750, 3350, 3900, 4400, 4700, 5250, 5650, 600, 1200, 1750, 2350, 2950, 3550, 4150, 4600, 4950, 5500, 6050, 700, 1250, 1900, 2500, 3100, 3700, 4300, 4800, 5200, 5750, 6250, 800, 1350, 2000, 2650, 3250, 3900, 4500, 4950, 5400, 6000, 6550, 900, 1400, 2100, 2750, 3400, 4050, 4650, 5200, 5550, 6200, 6750, 1000, 1500, 2200, 2900, 3550, 4150, 4750, 5300, 5750, 6400, 7000, 2000, 1950, 2850, 3650, 4450, 5100, 5800, 6350, 7000, 7850, 8750, 3000, 2300, 3300, 4300, 5000, 5700, 6400, 7000, 7800, 8900, 10000, 4000, 2500, 3700, 4800, 5700, 6500, 7200, 7400, 8500, 9700, 10900, 5000, 2750, 4000, 5250, 6250, 7250, 8250, 9000, 9250, 10500, 11750, 6000, 3000, 4500, 5500, 7000, 8000, 9000, 10000, 11000, 11500, 12500, 7000, 3000, 4500, 6000, 7500, 8500, 10000, 11000, 12000, 12500, 13500, 8000, 3500, 4500, 6500, 8000, 9000, 10500, 12000, 13000, 14000, 14500, 9000, 3500, 5000, 6500, 8000, 9500, 11000, 12500, 14000, 15000, 16000, 10000, 3500, 5000, 6500, 8500, 10000, 12000, 13500, 15000, 16000, 17500, 11000, 4000, 5000, 7000, 9000, 10500, 12500, 14000, 16000, 17500, 18500, 12000, 4000, 5500, 7000, 9000, 11000, 13000, 15000, 16500, 18000, 19500, 13000, 4000, 5500, 7500, 9500, 11500, 13500, 15500, 17500, 19000, 20500, 14000, 4500, 5500, 7500, 10000, 12000, 14000, 16500, 18000, 20000, 21500, 15000, 4500, 6000, 8000, 10000, 12500, 14500, 17000, 19000, 21000, 22500 }, - PN_autopilot = { - K = 0.024, - K_GBias = 0.4, - Kg = 2.4, - Ki = 0.001, - Krx = 2, - Kx = 0.02, - fins_limit = 0.6 - }, - Reflection = 0.2, - VyHold = -50, - _file = "./CoreMods/aircraft/F-4E/Entry/Weapons.lua", - _origin = "F-4E AI by Heatblur Simulations", - add_attributes = { "Missiles" }, - arming_delay = { - delay_time = 2, - enabled = true - }, - arming_vane = { - enabled = false, - velK = 1 - }, - category = 1, - class_name = "wAmmunitionSelfHoming", - displayName = "GBU-8 HOBOS - 2000 lb TV Guided Bomb", - display_name_short = "GBU-8", - fm = { - A = 0.36, - I = 1524.763968, - L = 4.368, - Ma = 0.85727626967319, - Ma_x = 0.1, - Mw = 4.6132861341704, - Mw_x = 1, - Sw = 0.6453888, - caliber = 0.457, - cx_coeff = { 1.037, 0.91, 0.6, 0.382, 1.34 }, - dCydA = { 0.14404178394221, 0.036 }, - finsTau = 0.1, - mass = 1027, - maxAoa = 0.1221730476396, - release_rnd = 0.3, - release_rnd_x = 1, - wind_sigma = 0 - }, - hMax = 2000, - hMin = 25, - march = { - smoke_color = { 0.9, 0.9, 0.9 }, - smoke_transparency = 0.5 - }, - mass = 1027, - model = "HB_F-4E_EXT_GBU8", - name = "HB_F4E_GBU_8_HOBOS", - scheme = "schemes/bombs/AGM-62.sch", - seeker = { - FOV = 1.0471975511966, - activate_on_update = 0, - delay = 0, - max_lock_dist = 60000, - max_target_speed = 33, - max_target_speed_rnd_coeff = 10, - max_w_LOS = 0.06, - max_w_LOS_surf = 0.03, - op_time = 800 - }, - shape_table_data = { { - file = "HB_F-4E_EXT_GBU8", - index = "Redacted", - name = "HB_F-4E_EXT_GBU8", - username = "GBU-8" - } }, - targeting_data = { - char_time = 20.3 - }, - type = 1, - user_name = "GBU-8", - 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_12A.lua b/_G/weapons_table/weapons/missiles/AGM_12A.lua index aefca29e..b934b900 100644 --- a/_G/weapons_table/weapons/missiles/AGM_12A.lua +++ b/_G/weapons_table/weapons/missiles/AGM_12A.lua @@ -124,7 +124,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_12A"] = { init_roll = 0.78539816339745 }, manualWeaponFlag = 3, - model = "HB_F-4E_EXT_AGM12A", + model = "HB_F-4E_EXT_AGM12B", name = "AGM_12A", scheme = "schemes/missiles/AGM-12_v2.sch", shape_table_data = { { @@ -192,7 +192,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_12A"] = { display_name = "AGM-12A", display_name_short = "AGM-12A", mass = 257, - model = "HB_F-4E_EXT_AGM12A", + model = "HB_F-4E_EXT_AGM12B", name = "AGM_12A", server = { Cx_pil = 3.3, @@ -314,7 +314,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_12A"] = { init_roll = 0.78539816339745 }, manualWeaponFlag = 3, - model = "HB_F-4E_EXT_AGM12A", + model = "HB_F-4E_EXT_AGM12B", name = "AGM_12A", scheme = "schemes/missiles/AGM-12_v2.sch", shape_table_data = { { diff --git a/_G/weapons_table/weapons/missiles/AGM_130.lua b/_G/weapons_table/weapons/missiles/AGM_130.lua index de965325..024a545f 100644 --- a/_G/weapons_table/weapons/missiles/AGM_130.lua +++ b/_G/weapons_table/weapons/missiles/AGM_130.lua @@ -151,7 +151,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_130"] = { op_time = 7200 }, shape_table_data = { { - file = "agm_130", + file = "agm-130", fire = { 0, 1 }, index = "Redacted", life = 1, @@ -344,7 +344,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_130"] = { op_time = 7200 }, shape_table_data = { { - file = "agm_130", + file = "agm-130", fire = { 0, 1 }, index = "Redacted", life = 1, diff --git a/_G/weapons_table/weapons/missiles/AGM_84S.lua b/_G/weapons_table/weapons/missiles/AGM_84S.lua index be3c8266..280c315a 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84S.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84S.lua @@ -19,7 +19,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { conv_input = 0, cumulative_inertial_error = 1, default_glide_height = 381, - delay = 6, + delay = 5, dont_climb_on_cruise_height = 1, fins_limit = 0.87266462599716, fins_limit_x = 0.43633231299858, @@ -54,14 +54,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { L = 0.3, Ma = 0.5, Mw = 0.1, - boost_factor = 0, - boost_time = 0, + boost_factor = 4, + boost_time = 0.5, caliber = 0.343, custom_smoke_dissipation_factor = 0.2, fuel_mass = 121.5, - impulse = 150, + impulse = 155, impulse_sigma = 1, - mass = 50, + mass = 35, model_name = "agm-84s_booster", moment_sigma = 1000000, nozzle_orientationXYZ = { { 0, 0, 0 } }, @@ -72,11 +72,11 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { start_impulse = 0, tail_width = 0.7, wind_sigma = 0, - work_time = 12 + work_time = 9 }, controller = { boost_start = 0, - march_start = 12 + march_start = 9 }, display_name_short = "RGM-84", engine_control = { @@ -229,7 +229,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { conv_input = 0, cumulative_inertial_error = 1, default_glide_height = 381, - delay = 6, + delay = 5, dont_climb_on_cruise_height = 1, fins_limit = 0.87266462599716, fins_limit_x = 0.43633231299858, @@ -264,14 +264,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { L = 0.3, Ma = 0.5, Mw = 0.1, - boost_factor = 0, - boost_time = 0, + boost_factor = 4, + boost_time = 0.5, caliber = 0.343, custom_smoke_dissipation_factor = 0.2, fuel_mass = 121.5, - impulse = 150, + impulse = 155, impulse_sigma = 1, - mass = 50, + mass = 35, model_name = "agm-84s_booster", moment_sigma = 1000000, nozzle_orientationXYZ = { { 0, 0, 0 } }, @@ -282,11 +282,11 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84S"] = { start_impulse = 0, tail_width = 0.7, wind_sigma = 0, - work_time = 12 + work_time = 9 }, controller = { boost_start = 0, - march_start = 12 + march_start = 9 }, display_name_short = "RGM-84", engine_control = { diff --git a/_G/weapons_table/weapons/missiles/HB-AIM-7E-2.lua b/_G/weapons_table/weapons/missiles/HB-AIM-7E-2.lua index b06c81b2..eca8303a 100644 --- a/_G/weapons_table/weapons/missiles/HB-AIM-7E-2.lua +++ b/_G/weapons_table/weapons/missiles/HB-AIM-7E-2.lua @@ -128,7 +128,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HB-AIM-7E-2"] = { work_time = 2.8 }, mass = 230, - model = "aim-7", + model = "HB_F-4E_EXT_AIM-7E2", name = "HB-AIM-7E-2", proximity_fuze = { arm_delay = 2.9, @@ -151,7 +151,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HB-AIM-7E-2"] = { sens_near_dist = 100 }, shape_table_data = { { - file = "HB_F-4E_AIM7E", + file = "HB_F-4E_EXT_AIM-7E2", fire = { 0, 1 }, index = "Redacted", life = 1, @@ -196,7 +196,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HB-AIM-7E-2"] = { display_name = "AIM-7E-2", display_name_short = "AIM-7E-2", mass = 230, - model = "aim-7", + model = "HB_F-4E_EXT_AIM-7E2", name = "HB-AIM-7E-2", server = { Cx_pil = 2.21, @@ -322,7 +322,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HB-AIM-7E-2"] = { work_time = 2.8 }, mass = 230, - model = "aim-7", + model = "HB_F-4E_EXT_AIM-7E2", name = "HB-AIM-7E-2", proximity_fuze = { arm_delay = 2.9, @@ -345,7 +345,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HB-AIM-7E-2"] = { sens_near_dist = 100 }, shape_table_data = { { - file = "HB_F-4E_AIM7E", + file = "HB_F-4E_EXT_AIM-7E2", fire = { 0, 1 }, index = "Redacted", life = 1, diff --git a/_G/weapons_table/weapons/missiles/HB-AIM-7E.lua b/_G/weapons_table/weapons/missiles/HB-AIM-7E.lua index 457f571e..d9533917 100644 --- a/_G/weapons_table/weapons/missiles/HB-AIM-7E.lua +++ b/_G/weapons_table/weapons/missiles/HB-AIM-7E.lua @@ -128,7 +128,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HB-AIM-7E"] = { work_time = 2.8 }, mass = 230, - model = "aim-7", + model = "HB_F-4E_AIM7E", name = "HB-AIM-7E", proximity_fuze = { arm_delay = 4, @@ -196,7 +196,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HB-AIM-7E"] = { display_name = "AIM-7E", display_name_short = "AIM-7E", mass = 230, - model = "aim-7", + model = "HB_F-4E_AIM7E", name = "HB-AIM-7E", server = { Cx_pil = 2.21, @@ -322,7 +322,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HB-AIM-7E"] = { work_time = 2.8 }, mass = 230, - model = "aim-7", + model = "HB_F-4E_AIM7E", name = "HB-AIM-7E", proximity_fuze = { arm_delay = 4, diff --git a/_G/weapons_table/weapons/missiles/YJ-62.lua b/_G/weapons_table/weapons/missiles/YJ-62.lua index 230321af..148f295c 100644 --- a/_G/weapons_table/weapons/missiles/YJ-62.lua +++ b/_G/weapons_table/weapons/missiles/YJ-62.lua @@ -3,7 +3,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", _unique_resource_name = "weapons.missiles.YJ-62", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, caliber = 0.54, client = { Cx_pil = 1, @@ -24,56 +24,92 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { Life_Time = 1850, M = 1240, Mach_max = 0.8, - Nr_max = 12, + Nr_max = 14, OmViz_max = 99.9, Range_max = 300000, Reflection = 0.121, - X_back = -2.236, - X_back_acc = -3.925, + X_back = -3, + X_back_acc = -3.9, Y_back = 0, Y_back_acc = 0.06, Z_back = 0, Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 25, delay = 1, - finsLimit = 0.68, - glide_height = 15, - inertial_km_error = 0.05, - max_vert_speed = 100, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 12, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 10, + op_time = 9999, + pre_maneuver_glide_height = 15, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_factor = 0, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 220, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj62_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, - nozzle_position = { { -3.925, 0.06, 0 } }, + nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 1, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, + start_impulse = 0, tail_width = 0.5, + wind_sigma = 0, work_time = 4 }, - booster_animation = { - start_val = 1 - }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01, - suppres_march = 0.01 + boost_start = 0, + march_start = 6 }, display_name_short = "YJ-62", engine_control = { @@ -81,24 +117,33 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { Kd = 0.01, Ki = 0.001, burst_signal = 9999, - default_speed = 235 + default_speed = 235, + speed_delta = 10 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.5, - J_Angle_W = 2, - J_Diff_K = 0.8, - J_FinAngle_K = 0.3, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 5, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 0 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_angle = 0.1221730476396, + loft_angle_vert = 0, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { A = 0.08, @@ -119,34 +164,49 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 15000 - }, march = { + custom_smoke_dissipation_factor = 0.2, fuel_mass = 180, impulse = 660, max_thrust = 6500, min_fuel_rate = 0.005, min_thrust = 0, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -3, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 1240, - mode_switcher = { - delay = 1, - trigger_dist = 500 - }, model = "yj62", name = "YJ-62", - play_booster_animation = { - val = 1 - }, - scheme = "schemes/missiles/anti_ship_missile_tb.sch", - self_destruct = { + scheme = "schemes/missiles/anti_ship_missile.sch", + seeker = { + FOV = 0.87266462599716, + add_y = 1.5, delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + flag_dist = 6000, + max_target_speed = 36, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.05, + mid_vel = 290, + op_time = 9999, + primary_target_filter = 0, + sens_far_dist = 80000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj62", @@ -157,18 +217,21 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { username = "YJ-62" } }, sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, - t_acc = 3, + t_acc = 4, t_b = 0, t_marsh = 1500, + triggers_control = { + action_wait_timer = 5, + default_destruct_tg_dist = 1000, + default_final_maneuver_tg_dist = 4000, + default_sensor_tg_dist = 8000, + default_straight_nav_tg_dist = 1000, + final_maneuver_by_default = 1, + trigger_by_path = 1 + }, user_name = "YJ-62", - v_mid = 150, - v_min = 100, + v_mid = 285, + v_min = 170, warhead = { caliber = 540, concrete_factors = { 3, 1, 1 }, @@ -224,56 +287,92 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { Life_Time = 1850, M = 1240, Mach_max = 0.8, - Nr_max = 12, + Nr_max = 14, OmViz_max = 99.9, Range_max = 300000, Reflection = 0.121, - X_back = -2.236, - X_back_acc = -3.925, + X_back = -3, + X_back_acc = -3.9, Y_back = 0, Y_back_acc = 0.06, Z_back = 0, Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Cruise missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 25, delay = 1, - finsLimit = 0.68, - glide_height = 15, - inertial_km_error = 0.05, - max_vert_speed = 100, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 12, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 10, + op_time = 9999, + pre_maneuver_glide_height = 15, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_factor = 0, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 220, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj62_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, - nozzle_position = { { -3.925, 0.06, 0 } }, + nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 1, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, + start_impulse = 0, tail_width = 0.5, + wind_sigma = 0, work_time = 4 }, - booster_animation = { - start_val = 1 - }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01, - suppres_march = 0.01 + boost_start = 0, + march_start = 6 }, display_name_short = "YJ-62", engine_control = { @@ -281,24 +380,33 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { Kd = 0.01, Ki = 0.001, burst_signal = 9999, - default_speed = 235 + default_speed = 235, + speed_delta = 10 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.5, - J_Angle_W = 2, - J_Diff_K = 0.8, - J_FinAngle_K = 0.3, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 5, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 0 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_angle = 0.1221730476396, + loft_angle_vert = 0, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { A = 0.08, @@ -319,34 +427,49 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 15000 - }, march = { + custom_smoke_dissipation_factor = 0.2, fuel_mass = 180, impulse = 660, max_thrust = 6500, min_fuel_rate = 0.005, min_thrust = 0, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -3, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 1240, - mode_switcher = { - delay = 1, - trigger_dist = 500 - }, model = "yj62", name = "YJ-62", - play_booster_animation = { - val = 1 - }, - scheme = "schemes/missiles/anti_ship_missile_tb.sch", - self_destruct = { + scheme = "schemes/missiles/anti_ship_missile.sch", + seeker = { + FOV = 0.87266462599716, + add_y = 1.5, delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + flag_dist = 6000, + max_target_speed = 36, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.05, + mid_vel = 290, + op_time = 9999, + primary_target_filter = 0, + sens_far_dist = 80000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj62", @@ -357,18 +480,21 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { username = "YJ-62" } }, sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, - t_acc = 3, + t_acc = 4, t_b = 0, t_marsh = 1500, + triggers_control = { + action_wait_timer = 5, + default_destruct_tg_dist = 1000, + default_final_maneuver_tg_dist = 4000, + default_sensor_tg_dist = 8000, + default_straight_nav_tg_dist = 1000, + final_maneuver_by_default = 1, + trigger_by_path = 1 + }, user_name = "YJ-62", - v_mid = 150, - v_min = 100, + v_mid = 285, + v_min = 170, warhead = { caliber = 540, concrete_factors = { 3, 1, 1 }, diff --git a/_G/weapons_table/weapons/missiles/YJ-83.lua b/_G/weapons_table/weapons/missiles/YJ-83.lua index 2a21d603..9ea66f53 100644 --- a/_G/weapons_table/weapons/missiles/YJ-83.lua +++ b/_G/weapons_table/weapons/missiles/YJ-83.lua @@ -2,14 +2,13 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { Reflection = 0.121, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - _unique_resource_name = "weapons.missiles.YJ-83", - add_attributes = { "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, caliber = 0.36, client = { - Cx_pil = 1, - D_max = 180000, - D_min = 12000, - Diam = 343, + Cx_pil = 8, + D_max = 230000, + D_min = 15000, + Diam = 360, Engine_Type = 6, Engine_Type_ = 6, Escort = 0, @@ -18,17 +17,17 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { Fi_search = 99.9, Fi_start = 0.25, H_max = 10000, - H_min = -1, + H_min = 500, H_min_t = 0, - Head_Form = 1, + Head_Form = 0, Head_Type = 5, KillDistance = 0, Life_Time = 1850, M = 850, - Mach_max = 1.5, - Nr_max = 6, + Mach_max = 0.9, + Nr_max = 18, OmViz_max = 99.9, - Range_max = 180000, + Range_max = 230000, Reflection = 0.121, Stage = 2, Stage_ = 2, @@ -40,116 +39,179 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 30, delay = 1, - finsLimit = 0.68, - glide_height = 20, - inertial_km_error = 0.05, - max_vert_speed = 60, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 18, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 15, + op_time = 9999, + pre_maneuver_glide_height = 18, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { - boost_factor = 0, + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 125, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj83_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 3.9, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, - tail_width = 0.1, - work_time = 4 - }, - booster_animation = { - start_val = 1 + start_impulse = 0, + tail_width = 0.5, + wind_sigma = 0, + work_time = 6 }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01 + boost_start = 0, + march_start = 6 }, display_name_short = "YJ-83", engine_control = { - K = 300, - Kd = 0.01, + K = 350, + Kd = 1, Ki = 0.001, - burst_signal = 9999, - default_speed = 300 + default_speed = 285, + speed_delta = 5 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.7, - J_Angle_W = 3, - J_Diff_K = 0.8, - J_FinAngle_K = 0.52, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 6, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 1 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_active_by_default = 1, + loft_angle = 0.1221730476396, + loft_angle_vert = 1, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.05, + A = 0.5, + I = 1477.9655625, L = 5.145, - Ma = 0.6, + Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, + Mw_x = 2.6, Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, + finsTau = 0.02, + mass = 670, maxAoa = 0.3, wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 10000 - }, march = { - fuel_mass = 80, - impulse = 660, - max_thrust = 5000, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, - min_thrust = 0, + min_thrust = -100, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 850, - mode_switcher = { - delay = 1, - trigger_dist = 4000 - }, model = "yj83", name = "YJ-83", - play_booster_animation = { - val = 1 - }, - scheme = "schemes/missiles/anti_ship_missile_tb.sch", - self_destruct = { - delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + scheme = "schemes/missiles/Harpoon.sch", + seeker = { + FOV = 1.0471975511966, + add_y = 1.5, + delay = 0, + flag_dist = 5000, + max_small_target_rcs = 29999.99, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + mid_vel = 285, + min_detectable_rcs = 50, + min_large_target_rcs = 60000, + op_time = 9999, + primary_target_filter = 1, + sens_far_dist = 65000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj83", @@ -159,19 +221,26 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { name = "YJ-83", username = "YJ-83" } }, - sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, + sigma = { 10, 10, 10 }, t_acc = 5, t_b = 0, t_marsh = 1800, + triggers_control = { + can_increase_tg_dist = 1, + final_maneuver_tg_dist = 6000, + final_maneuver_trig_v_lim = 3, + pre_maneuver_glide_height = 1000, + self_destruct_tg_dist = 1000, + send_final_maneuver_by_default = 1, + sensor_tg_dist = 10000, + straight_nav_tg_dist = 1000, + target_upd_jump_dist = 40000, + update_pos_from_input = 0, + use_horiz_dist = 1 + }, user_name = "YJ-83", - v_mid = 150, - v_min = 100, + v_mid = 272, + v_min = 150, warhead = { caliber = 360, concrete_factors = { 3, 1, 1 }, @@ -209,10 +278,10 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { model = "yj83", name = "YJ-83", server = { - Cx_pil = 1, - D_max = 180000, - D_min = 12000, - Diam = 343, + Cx_pil = 8, + D_max = 230000, + D_min = 15000, + Diam = 360, Engine_Type = 6, Engine_Type_ = 6, Escort = 0, @@ -221,17 +290,17 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { Fi_search = 99.9, Fi_start = 0.25, H_max = 10000, - H_min = -1, + H_min = 500, H_min_t = 0, - Head_Form = 1, + Head_Form = 0, Head_Type = 5, KillDistance = 0, Life_Time = 1850, M = 850, - Mach_max = 1.5, - Nr_max = 6, + Mach_max = 0.9, + Nr_max = 18, OmViz_max = 99.9, - Range_max = 180000, + Range_max = 230000, Reflection = 0.121, Stage = 2, Stage_ = 2, @@ -243,116 +312,179 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 30, delay = 1, - finsLimit = 0.68, - glide_height = 20, - inertial_km_error = 0.05, - max_vert_speed = 60, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 18, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 15, + op_time = 9999, + pre_maneuver_glide_height = 18, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { - boost_factor = 0, + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 125, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj83_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 3.9, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, - tail_width = 0.1, - work_time = 4 - }, - booster_animation = { - start_val = 1 + start_impulse = 0, + tail_width = 0.5, + wind_sigma = 0, + work_time = 6 }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01 + boost_start = 0, + march_start = 6 }, display_name_short = "YJ-83", engine_control = { - K = 300, - Kd = 0.01, + K = 350, + Kd = 1, Ki = 0.001, - burst_signal = 9999, - default_speed = 300 + default_speed = 285, + speed_delta = 5 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.7, - J_Angle_W = 3, - J_Diff_K = 0.8, - J_FinAngle_K = 0.52, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 6, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 1 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_active_by_default = 1, + loft_angle = 0.1221730476396, + loft_angle_vert = 1, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.05, + A = 0.5, + I = 1477.9655625, L = 5.145, - Ma = 0.6, + Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, + Mw_x = 2.6, Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, + finsTau = 0.02, + mass = 670, maxAoa = 0.3, wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 10000 - }, march = { - fuel_mass = 80, - impulse = 660, - max_thrust = 5000, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, - min_thrust = 0, + min_thrust = -100, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 850, - mode_switcher = { - delay = 1, - trigger_dist = 4000 - }, model = "yj83", name = "YJ-83", - play_booster_animation = { - val = 1 - }, - scheme = "schemes/missiles/anti_ship_missile_tb.sch", - self_destruct = { - delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + scheme = "schemes/missiles/Harpoon.sch", + seeker = { + FOV = 1.0471975511966, + add_y = 1.5, + delay = 0, + flag_dist = 5000, + max_small_target_rcs = 29999.99, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + mid_vel = 285, + min_detectable_rcs = 50, + min_large_target_rcs = 60000, + op_time = 9999, + primary_target_filter = 1, + sens_far_dist = 65000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj83", @@ -362,19 +494,26 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { name = "YJ-83", username = "YJ-83" } }, - sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, + sigma = { 10, 10, 10 }, t_acc = 5, t_b = 0, t_marsh = 1800, + triggers_control = { + can_increase_tg_dist = 1, + final_maneuver_tg_dist = 6000, + final_maneuver_trig_v_lim = 3, + pre_maneuver_glide_height = 1000, + self_destruct_tg_dist = 1000, + send_final_maneuver_by_default = 1, + sensor_tg_dist = 10000, + straight_nav_tg_dist = 1000, + target_upd_jump_dist = 40000, + update_pos_from_input = 0, + use_horiz_dist = 1 + }, user_name = "YJ-83", - v_mid = 150, - v_min = 100, + v_mid = 272, + v_min = 150, warhead = { caliber = 360, concrete_factors = { 3, 1, 1 }, diff --git a/_G/weapons_table/weapons/missiles/YJ-84.lua b/_G/weapons_table/weapons/missiles/YJ-84.lua index 44f96c29..61c90224 100644 --- a/_G/weapons_table/weapons/missiles/YJ-84.lua +++ b/_G/weapons_table/weapons/missiles/YJ-84.lua @@ -3,13 +3,13 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", _unique_resource_name = "weapons.missiles.YJ-84", - add_attributes = { "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, caliber = 0.36, client = { - Cx_pil = 1, - D_max = 180000, - D_min = 12000, - Diam = 343, + Cx_pil = 8, + D_max = 230000, + D_min = 15000, + Diam = 360, Engine_Type = 6, Engine_Type_ = 6, Escort = 0, @@ -18,17 +18,17 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { Fi_search = 99.9, Fi_start = 0.25, H_max = 10000, - H_min = -1, + H_min = 500, H_min_t = 0, - Head_Form = 1, + Head_Form = 0, Head_Type = 5, KillDistance = 0, Life_Time = 1850, M = 850, - Mach_max = 1.5, - Nr_max = 6, + Mach_max = 0.9, + Nr_max = 18, OmViz_max = 99.9, - Range_max = 180000, + Range_max = 230000, Reflection = 0.121, Stage = 2, Stage_ = 2, @@ -40,116 +40,179 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 30, delay = 1, - finsLimit = 0.68, - glide_height = 20, - inertial_km_error = 0.05, - max_vert_speed = 60, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 18, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 15, + op_time = 9999, + pre_maneuver_glide_height = 18, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { - boost_factor = 0, + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 125, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj83_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 3.9, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, - tail_width = 0.1, - work_time = 4 - }, - booster_animation = { - start_val = 1 + start_impulse = 0, + tail_width = 0.5, + wind_sigma = 0, + work_time = 6 }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01 + boost_start = 0, + march_start = 6 }, display_name_short = "YJ-84", engine_control = { - K = 300, - Kd = 0.01, + K = 350, + Kd = 1, Ki = 0.001, - burst_signal = 9999, - default_speed = 300 + default_speed = 285, + speed_delta = 5 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.7, - J_Angle_W = 3, - J_Diff_K = 0.8, - J_FinAngle_K = 0.52, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 6, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 1 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_active_by_default = 1, + loft_angle = 0.1221730476396, + loft_angle_vert = 1, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.05, + A = 0.5, + I = 1477.9655625, L = 5.145, - Ma = 0.6, + Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, + Mw_x = 2.6, Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, + finsTau = 0.02, + mass = 670, maxAoa = 0.3, wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 10000 - }, march = { - fuel_mass = 80, - impulse = 660, - max_thrust = 5000, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, - min_thrust = 0, + min_thrust = -100, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 850, - mode_switcher = { - delay = 1, - trigger_dist = 4000 - }, model = "yj83", name = "YJ-84", - play_booster_animation = { - val = 1 - }, - scheme = "schemes/missiles/anti_ship_missile_tb.sch", - self_destruct = { - delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + scheme = "schemes/missiles/Harpoon.sch", + seeker = { + FOV = 1.0471975511966, + add_y = 1.5, + delay = 0, + flag_dist = 5000, + max_small_target_rcs = 29999.99, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + mid_vel = 285, + min_detectable_rcs = 50, + min_large_target_rcs = 60000, + op_time = 9999, + primary_target_filter = 1, + sens_far_dist = 65000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj83", @@ -159,19 +222,26 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { name = "YJ-84", username = "YJ-84" } }, - sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, + sigma = { 10, 10, 10 }, t_acc = 5, t_b = 0, t_marsh = 1800, + triggers_control = { + can_increase_tg_dist = 1, + final_maneuver_tg_dist = 6000, + final_maneuver_trig_v_lim = 3, + pre_maneuver_glide_height = 1000, + self_destruct_tg_dist = 1000, + send_final_maneuver_by_default = 1, + sensor_tg_dist = 10000, + straight_nav_tg_dist = 1000, + target_upd_jump_dist = 40000, + update_pos_from_input = 0, + use_horiz_dist = 1 + }, user_name = "YJ-84", - v_mid = 150, - v_min = 100, + v_mid = 272, + v_min = 150, warhead = { caliber = 360, concrete_factors = { 3, 1, 1 }, @@ -209,10 +279,10 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { model = "yj83", name = "YJ-84", server = { - Cx_pil = 1, - D_max = 180000, - D_min = 12000, - Diam = 343, + Cx_pil = 8, + D_max = 230000, + D_min = 15000, + Diam = 360, Engine_Type = 6, Engine_Type_ = 6, Escort = 0, @@ -221,17 +291,17 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { Fi_search = 99.9, Fi_start = 0.25, H_max = 10000, - H_min = -1, + H_min = 500, H_min_t = 0, - Head_Form = 1, + Head_Form = 0, Head_Type = 5, KillDistance = 0, Life_Time = 1850, M = 850, - Mach_max = 1.5, - Nr_max = 6, + Mach_max = 0.9, + Nr_max = 18, OmViz_max = 99.9, - Range_max = 180000, + Range_max = 230000, Reflection = 0.121, Stage = 2, Stage_ = 2, @@ -243,116 +313,179 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { Z_back_acc = 0, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - add_attributes = { "Anti-Ship missiles" }, + add_attributes = { "Cruise missiles", "Anti-Ship missiles" }, autopilot = { - Kdh = 5, - Kdv = 2, - Kih = 0, - Kiv = 6e-05, - Kph = 500, - Kpv = 0.02, - altim_vel_k = 1, + K = 1.6, + Kd = 0, + Kdx = 0.001, + Ki = 18, + Ks = 2, + Ksd = 0, + Ksi = 0, + Kw = 1.6, + Kx = 0.04, + PN_dist_data = { 2000, 0, 500, 0 }, + altim_vel_k = 4, + conv_input = 0, + default_glide_height = 30, delay = 1, - finsLimit = 0.68, - glide_height = 20, - inertial_km_error = 0.05, - max_vert_speed = 60, - use_current_height = 0 + dont_climb_on_cruise_height = 0, + fins_limit = 0.61086523819802, + fins_limit_x = 0.34906585039887, + glide_height = 18, + glide_height_eq_error = 2, + hor_err_limit = 0.5, + inertial_km_error = 4, + integr_val_limit = 0.5, + max_climb_ang_hdiff = 200, + max_climb_angle = 0.17453292519943, + max_climb_h = 3000, + max_climb_vel = 200, + max_dive_ang_hdiff = -500, + max_dive_angle = -0.43633231299858, + min_climb_h = 10000, + min_climb_h_factor = 0.5, + min_climb_vel = 120, + min_climb_vel_factor = 0, + min_glide_height = 15, + op_time = 9999, + pre_maneuver_glide_height = 18, + rotated_WLOS_input = 0, + skim_glide_height = 8, + use_start_bar_height = 1, + vel_proj_div = 6, + w_limit = 0.087266462599716 }, boost = { - boost_factor = 0, + Cx = 0.9, + I = 100, + L = 0.3, + Ma = 0.5, + Mw = 0.1, boost_time = 0, + caliber = 0.343, custom_smoke_dissipation_factor = 0.5, fuel_mass = 125, impulse = 170, + impulse_sigma = 1, + mass = 50, + model_name = "yj83_booster", + moment_sigma = 1000000, nozzle_orientationXYZ = { { -1, 0, 0 } }, nozzle_position = { { -3.9, 0, 0 } }, + pos_shift = { 3.9, 0, 0 }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.8, - tail_width = 0.1, - work_time = 4 - }, - booster_animation = { - start_val = 1 + start_impulse = 0, + tail_width = 0.5, + wind_sigma = 0, + work_time = 6 }, category = 2, - class_name = "wAmmunitionSelfHoming", + class_name = "wAmmunitionAntiShip", controller = { - boost_start = 0.001, - march_start = 0.01 + boost_start = 0, + march_start = 6 }, display_name_short = "YJ-84", engine_control = { - K = 300, - Kd = 0.01, + K = 350, + Kd = 1, Ki = 0.001, - burst_signal = 9999, - default_speed = 300 + default_speed = 285, + speed_delta = 5 }, exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { - J_Angle_K = 0.7, - J_Angle_W = 3, - J_Diff_K = 0.8, - J_FinAngle_K = 0.52, - J_Int_K = 0, - J_Power_K = 2, - J_Trigger_Vert = 1, - K = 60, - Kg = 6, + K = 6.4, + K_loft_err = 1, + Kd = 0, Ki = 0, - bang_bang = 0, - delay = 0, - finsLimit = 0.9, - useJumpByDefault = 1 + Kix = 0, + Ks = 5, + Kw = 1, + Kx = 0, + PN_dist_data = { 2000, 1, 500, 1 }, + add_err_val = 0, + add_err_vert = 0, + add_out_val = 0.075, + add_out_vert = 1, + conv_input = 0, + delay = 1, + fins_limit = 0.87266462599716, + loft_active_by_default = 1, + loft_angle = 0.1221730476396, + loft_angle_vert = 1, + loft_trig_angle = 0.20943951023932, + op_time = 9999, + rotated_WLOS_input = 0, + w_limit = 0.26179938779915 }, fm = { - A = 0.08, - I = 1577.23190625, - Kw_x = 0.05, + A = 0.5, + I = 1477.9655625, L = 5.145, - Ma = 0.6, + Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, + Mw_x = 2.6, Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.3, 0.65, 0.018, 1.6 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, - mass = 715, + finsTau = 0.02, + mass = 670, maxAoa = 0.3, wind_sigma = 0, wind_time = 1000 }, - h_glide_on = { - delay = 1, - trigger_dist = 10000 - }, march = { - fuel_mass = 80, - impulse = 660, - max_thrust = 5000, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, - min_thrust = 0, + min_thrust = -100, + nozzle_orientationXYZ = { { -1, 0, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, + smoke_color = { 0.5, 0.5, 0.5 }, + smoke_transparency = 0.03, + start_burn_effect = 1, + start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_size = { 0.09, 0.104, 0.11 }, + start_effect_smoke = { 0.01, 0.4, 0.01 }, + start_effect_time = { 0.7, 1, 0.1 }, + start_effect_x_dist = { 1.1, 0.9, 0 }, + start_effect_x_pow = { 1, 1, 1 }, + start_effect_x_shift = { 0.15, 0.15, 0.2 }, + tail_width = 0.5, thrust_Tau = 0.0017, work_time = 9999 }, mass = 850, - mode_switcher = { - delay = 1, - trigger_dist = 4000 - }, model = "yj83", name = "YJ-84", - play_booster_animation = { - val = 1 - }, - scheme = "schemes/missiles/anti_ship_missile_tb.sch", - self_destruct = { - delay = 1, - inactivation_dist = 900, - trigger_dist = 1000 + scheme = "schemes/missiles/Harpoon.sch", + seeker = { + FOV = 1.0471975511966, + add_y = 1.5, + delay = 0, + flag_dist = 5000, + max_small_target_rcs = 29999.99, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + mid_vel = 285, + min_detectable_rcs = 50, + min_large_target_rcs = 60000, + op_time = 9999, + primary_target_filter = 1, + sens_far_dist = 65000, + sens_near_dist = 10, + sens_ref_dist = 40000, + sens_ref_rcs = 10000, + ship_track_by_default = 1 }, shape_table_data = { { file = "yj83", @@ -362,19 +495,26 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { name = "YJ-84", username = "YJ-84" } }, - sigma = { 30, 30, 20 }, - simple_seeker = { - FOV = 0.78539816339745, - delay = 1, - opTime = 9999, - stTime = 0.5 - }, + sigma = { 10, 10, 10 }, t_acc = 5, t_b = 0, t_marsh = 1800, + triggers_control = { + can_increase_tg_dist = 1, + final_maneuver_tg_dist = 6000, + final_maneuver_trig_v_lim = 3, + pre_maneuver_glide_height = 1000, + self_destruct_tg_dist = 1000, + send_final_maneuver_by_default = 1, + sensor_tg_dist = 10000, + straight_nav_tg_dist = 1000, + target_upd_jump_dist = 40000, + update_pos_from_input = 0, + use_horiz_dist = 1 + }, user_name = "YJ-84", - v_mid = 150, - v_min = 100, + v_mid = 272, + v_min = 150, warhead = { caliber = 360, concrete_factors = { 3, 1, 1 }, diff --git a/_G/weapons_table/weapons/shells/M39_20_API.lua b/_G/weapons_table/weapons/shells/M39_20_API.lua index c09c5759..77d069b3 100644 --- a/_G/weapons_table/weapons/shells/M39_20_API.lua +++ b/_G/weapons_table/weapons/shells/M39_20_API.lua @@ -53,7 +53,7 @@ _G["weapons_table"]["weapons"]["shells"]["M39_20_API"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, diff --git a/_G/weapons_table/weapons/shells/M39_20_HEI.lua b/_G/weapons_table/weapons/shells/M39_20_HEI.lua index 4e394332..fa37ab10 100644 --- a/_G/weapons_table/weapons/shells/M39_20_HEI.lua +++ b/_G/weapons_table/weapons/shells/M39_20_HEI.lua @@ -53,7 +53,7 @@ _G["weapons_table"]["weapons"]["shells"]["M39_20_HEI"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, diff --git a/_G/weapons_table/weapons/shells/M39_20_HEI_T.lua b/_G/weapons_table/weapons/shells/M39_20_HEI_T.lua index f56e7558..5ecc8d63 100644 --- a/_G/weapons_table/weapons/shells/M39_20_HEI_T.lua +++ b/_G/weapons_table/weapons/shells/M39_20_HEI_T.lua @@ -53,7 +53,7 @@ _G["weapons_table"]["weapons"]["shells"]["M39_20_HEI_T"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = 3, diff --git a/_G/weapons_table/weapons/shells/M39_20_TP.lua b/_G/weapons_table/weapons/shells/M39_20_TP.lua index 7478d26f..6452aabb 100644 --- a/_G/weapons_table/weapons/shells/M39_20_TP.lua +++ b/_G/weapons_table/weapons/shells/M39_20_TP.lua @@ -53,7 +53,7 @@ _G["weapons_table"]["weapons"]["shells"]["M39_20_TP"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = -100, diff --git a/_G/weapons_table/weapons/shells/M39_20_TP_T.lua b/_G/weapons_table/weapons/shells/M39_20_TP_T.lua index a6e2c3b3..da37bb9e 100644 --- a/_G/weapons_table/weapons/shells/M39_20_TP_T.lua +++ b/_G/weapons_table/weapons/shells/M39_20_TP_T.lua @@ -53,7 +53,7 @@ _G["weapons_table"]["weapons"]["shells"]["M39_20_TP_T"] = { s = 0, scale_smoke = 1, silent_self_destruction = false, - smoke_opacity = 0.3, + smoke_opacity = 0.6, smoke_tail_life_time = -1, subcalibre = false, tracer_off = 3,