diff --git a/_G/Pylons/APU-60-1.lua b/_G/Pylons/APU-60-1.lua new file mode 100644 index 00000000..e4a5cc47 --- /dev/null +++ b/_G/Pylons/APU-60-1.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["APU-60-1"] = { + IsAdapter = true, + ShapeName = "APU-60-1", + _unique_resource_name = "weapons.adapters.APU-60-1", + index = "Redacted", + name = "APU-60-1", + shape_table_data = { { + file = "APU-60-1", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "APU-60-1", + username = "APU-60-1" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/B_1_B_10-store_Conventional_Bomb_Module.lua b/_G/Pylons/B_1_B_10-store_Conventional_Bomb_Module.lua new file mode 100644 index 00000000..bf00ba1c --- /dev/null +++ b/_G/Pylons/B_1_B_10-store_Conventional_Bomb_Module.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["B_1_B_10-store_Conventional_Bomb_Module"] = { + IsAdapter = true, + ShapeName = "B_1_B_10-store_Conventional_Bomb_Module", + _unique_resource_name = "weapons.adapters.B_1_B_10-store_Conventional_Bomb_Module", + index = "Redacted", + name = "B_1_B_10-store_Conventional_Bomb_Module", + shape_table_data = { { + file = "B_1_B_10-store_Conventional_Bomb_Module", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "B_1_B_10-store_Conventional_Bomb_Module", + username = "B_1_B_10-store_Conventional_Bomb_Module" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/B_1_B_28-store_Conventional_Bomb_Module.lua b/_G/Pylons/B_1_B_28-store_Conventional_Bomb_Module.lua new file mode 100644 index 00000000..fac6c6b3 --- /dev/null +++ b/_G/Pylons/B_1_B_28-store_Conventional_Bomb_Module.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["B_1_B_28-store_Conventional_Bomb_Module"] = { + IsAdapter = true, + ShapeName = "B_1_B_28-store_Conventional_Bomb_Module", + _unique_resource_name = "weapons.adapters.B_1_B_28-store_Conventional_Bomb_Module", + index = "Redacted", + name = "B_1_B_28-store_Conventional_Bomb_Module", + shape_table_data = { { + file = "B_1_B_28-store_Conventional_Bomb_Module", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "B_1_B_28-store_Conventional_Bomb_Module", + username = "B_1_B_28-store_Conventional_Bomb_Module" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/B_1_B_Conventional_Rotary_Launcher.lua b/_G/Pylons/B_1_B_Conventional_Rotary_Launcher.lua new file mode 100644 index 00000000..b543169e --- /dev/null +++ b/_G/Pylons/B_1_B_Conventional_Rotary_Launcher.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["B_1_B_Conventional_Rotary_Launcher"] = { + IsAdapter = true, + ShapeName = "B_1_B_Conventional_Rotary_Launcher", + _unique_resource_name = "weapons.adapters.B_1_B_Conventional_Rotary_Launcher", + index = "Redacted", + name = "B_1_B_Conventional_Rotary_Launcher", + shape_table_data = { { + file = "B_1_B_Conventional_Rotary_Launcher", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "B_1_B_Conventional_Rotary_Launcher", + username = "B_1_B_Conventional_Rotary_Launcher" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/aero-3b.lua b/_G/Pylons/aero-3b.lua index 65545cce..0df5a3eb 100644 --- a/_G/Pylons/aero-3b.lua +++ b/_G/Pylons/aero-3b.lua @@ -1,6 +1,5 @@ _G["Pylons"]["aero-3b"] = { IsAdapter = true, - Position = { 0, 0, 0 }, ShapeName = "aero-3b", _unique_resource_name = "weapons.adapters.aero-3b", index = "Redacted", diff --git a/_G/Pylons/apu-60-2l.lua b/_G/Pylons/apu-60-2l.lua deleted file mode 100644 index de1809b5..00000000 --- a/_G/Pylons/apu-60-2l.lua +++ /dev/null @@ -1,16 +0,0 @@ -_G["Pylons"]["apu-60-2l"] = { - IsAdapter = true, - ShapeName = "apu-60-2l", - _unique_resource_name = "weapons.adapters.apu-60-2l", - index = "Redacted", - name = "apu-60-2l", - shape_table_data = { { - file = "apu-60-2l", - fire = { 0, 1 }, - index = "Redacted", - life = 60, - name = "apu-60-2l", - username = "apu-60-2l" - } }, - ws_type = { 4, 15, 47, "Redacted" } -} \ No newline at end of file diff --git a/_G/Pylons/apu-60-2r.lua b/_G/Pylons/apu-60-2r.lua deleted file mode 100644 index dddf7561..00000000 --- a/_G/Pylons/apu-60-2r.lua +++ /dev/null @@ -1,16 +0,0 @@ -_G["Pylons"]["apu-60-2r"] = { - IsAdapter = true, - ShapeName = "apu-60-2r", - _unique_resource_name = "weapons.adapters.apu-60-2r", - index = "Redacted", - name = "apu-60-2r", - shape_table_data = { { - file = "apu-60-2r", - fire = { 0, 1 }, - index = "Redacted", - life = 60, - name = "apu-60-2r", - username = "apu-60-2r" - } }, - ws_type = { 4, 15, 47, "Redacted" } -} \ No newline at end of file diff --git a/_G/Pylons/apu-60.lua b/_G/Pylons/apu-60.lua deleted file mode 100644 index b0d0fb5a..00000000 --- a/_G/Pylons/apu-60.lua +++ /dev/null @@ -1,17 +0,0 @@ -_G["Pylons"]["apu-60"] = { - IsAdapter = true, - Position = { 0, -0.155, 0 }, - ShapeName = "apu-60", - _unique_resource_name = "weapons.adapters.apu-60", - index = "Redacted", - name = "apu-60", - shape_table_data = { { - file = "apu-60", - fire = { 0, 1 }, - index = "Redacted", - life = 60, - name = "apu-60", - username = "apu-60" - } }, - ws_type = { 4, 15, 47, "Redacted" } -} \ No newline at end of file diff --git a/_G/Pylons/b-52_CSRL_ALCM.lua b/_G/Pylons/b-52_CSRL_ALCM.lua new file mode 100644 index 00000000..46a17bda --- /dev/null +++ b/_G/Pylons/b-52_CSRL_ALCM.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["b-52_CSRL_ALCM"] = { + IsAdapter = true, + ShapeName = "b-52_CSRL_ALCM", + _unique_resource_name = "weapons.adapters.b-52_CSRL_ALCM", + index = "Redacted", + name = "b-52_CSRL_ALCM", + shape_table_data = { { + file = "b-52_CSRL_ALCM", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "b-52_CSRL_ALCM", + username = "b-52_CSRL_ALCM" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/b-52_HSAB.lua b/_G/Pylons/b-52_HSAB.lua new file mode 100644 index 00000000..d802908e --- /dev/null +++ b/_G/Pylons/b-52_HSAB.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["b-52_HSAB"] = { + IsAdapter = true, + ShapeName = "b-52_HSAB", + _unique_resource_name = "weapons.adapters.b-52_HSAB", + index = "Redacted", + name = "b-52_HSAB", + shape_table_data = { { + file = "b-52_HSAB", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "b-52_HSAB", + username = "b-52_HSAB" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/b-52_suu67.lua b/_G/Pylons/b-52_suu67.lua new file mode 100644 index 00000000..a9ed76f9 --- /dev/null +++ b/_G/Pylons/b-52_suu67.lua @@ -0,0 +1,16 @@ +_G["Pylons"]["b-52_suu67"] = { + IsAdapter = true, + ShapeName = "b-52_suu67", + _unique_resource_name = "weapons.adapters.b-52_suu67", + index = "Redacted", + name = "b-52_suu67", + shape_table_data = { { + file = "b-52_suu67", + fire = { 0, 1 }, + index = "Redacted", + life = 60, + name = "b-52_suu67", + username = "b-52_suu67" + } }, + ws_type = { 4, 15, 47, "Redacted" } +} \ No newline at end of file diff --git a/_G/Pylons/lau-117.lua b/_G/Pylons/lau-117.lua index 3a476374..332a7fcc 100644 --- a/_G/Pylons/lau-117.lua +++ b/_G/Pylons/lau-117.lua @@ -1,17 +1,7 @@ -_G["Pylons"]["lau-117"] = { - IsAdapter = true, - Position = { 0, 0, 0 }, - ShapeName = "lau-117", - _unique_resource_name = "weapons.adapters.lau-117", +_G["Pylons"]["LAU-117"] = { + ShapeName = "LAU-117", + _unique_resource_name = "weapons.adapters.LAU-117", index = "Redacted", - name = "lau-117", - shape_table_data = { { - file = "lau-117", - fire = { 0, 1 }, - index = "Redacted", - life = 60, - name = "lau-117", - username = "lau-117" - } }, + name = "LAU-117", ws_type = { 4, 15, 47, "Redacted" } } \ No newline at end of file diff --git a/_G/__DCS_VERSION__.lua b/_G/__DCS_VERSION__.lua index 00e77756..b3a19a43 100644 --- a/_G/__DCS_VERSION__.lua +++ b/_G/__DCS_VERSION__.lua @@ -1 +1 @@ -2.8.8.43489 \ No newline at end of file +2.9.0.46801 \ No newline at end of file diff --git a/_G/bombs/250-2.lua b/_G/bombs/250-2.lua index bdbe3fee..26245e1c 100644 --- a/_G/bombs/250-2.lua +++ b/_G/bombs/250-2.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/bomb_misc.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", display_name = "250-2 - 250kg GP Bombs HD", + display_name_short = "250-2 - 250kg GP Bombs HD", hMax = 20000, hMin = 200, mass = 250, diff --git a/_G/bombs/250-3.lua b/_G/bombs/250-3.lua index 77703b78..b286698e 100644 --- a/_G/bombs/250-3.lua +++ b/_G/bombs/250-3.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/bomb_misc.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", display_name = "250-3 - 250kg GP Bombs LD", + display_name_short = "250-3 - 250kg GP Bombs LD", hMax = 10000, hMin = 100, mass = 250, diff --git a/_G/bombs/AB_250_2_SD_10A.lua b/_G/bombs/AB_250_2_SD_10A.lua index b60cf29d..d04fb272 100644 --- a/_G/bombs/AB_250_2_SD_10A.lua +++ b/_G/bombs/AB_250_2_SD_10A.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "AB 250-2 SD-10A", + display_name_short = "AB 250-2 SD-10A", hMax = 5000, hMin = 90, mass = 220, diff --git a/_G/bombs/AB_250_2_SD_2.lua b/_G/bombs/AB_250_2_SD_2.lua index 08672bb3..1af0895f 100644 --- a/_G/bombs/AB_250_2_SD_2.lua +++ b/_G/bombs/AB_250_2_SD_2.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "AB 250-2 SD-2", + display_name_short = "AB 250-2 SD-2", hMax = 5000, hMin = 90, mass = 280, diff --git a/_G/bombs/AB_500_1_SD_10A.lua b/_G/bombs/AB_500_1_SD_10A.lua index 946659a8..bca70795 100644 --- a/_G/bombs/AB_500_1_SD_10A.lua +++ b/_G/bombs/AB_500_1_SD_10A.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "AB 500-1 SD-10A", + display_name_short = "AB 500-1 SD-10A", hMax = 5000, hMin = 90, mass = 470, diff --git a/_G/bombs/AGM_62.lua b/_G/bombs/AGM_62.lua index 8f824138..f25697d9 100644 --- a/_G/bombs/AGM_62.lua +++ b/_G/bombs/AGM_62.lua @@ -1,8 +1,8 @@ _G["bombs"]["#Index"] = { Ag = -2, Cx = 0.0009, - LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 1325, 4000, 6825, 9425, 11700, 14000, 16325, 18825, 200, 0, 0, 1525, 4450, 7250, 9775, 12100, 14400, 16650, 19125, 400, 0, 0, 2350, 5200, 7950, 10475, 12775, 15075, 17375, 19850, 700, 1250, 1800, 3400, 6225, 9000, 11500, 13800, 16075, 18400, 20900, 1000, 1500, 2200, 4300, 7200, 9900, 12450, 14800, 17050, 19350, 21950, 2000, 2550, 4200, 7150, 10200, 13050, 15650, 18050, 20300, 22650, 25350, 3000, 3600, 6100, 9700, 13000, 15900, 18700, 21100, 23500, 26000, 28700, 4000, 4800, 8200, 12200, 15600, 18800, 21700, 24200, 26700, 29300, 32200, 5000, 5900, 10300, 14800, 18100, 21500, 24500, 27400, 30000, 32700, 35700, 6000, 7100, 13800, 17300, 20600, 24100, 27300, 30400, 33300, 36200, 39300, 7000, 8000, 16250, 19500, 22750, 26250, 29750, 33000, 36250, 39500, 42750, 8000, 9250, 18000, 21500, 25000, 28500, 32250, 36000, 39500, 42750, 46250, 9000, 10250, 20000, 23500, 27250, 30750, 34750, 38500, 42500, 46250, 50000, 10000, 18000, 21500, 25250, 29250, 33000, 37000, 41250, 45250, 49500, 53500, 11000, 19500, 23000, 27000, 31000, 35000, 39000, 43500, 48000, 52500, 57000, 12000, 21000, 24500, 28500, 33000, 37000, 41000, 46000, 50500, 55000, 59500, 13000, 22000, 26000, 30000, 34000, 39000, 43000, 48000, 53000, 57000, 62000, 14000, 23000, 27000, 32000, 36000, 40000, 45000, 49000, 54000, 58000, 63000, 15000, 13000, 28000, 33000, 38000, 42000, 46000, 50000, 55000, 59000, 65000 }, - MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 975, 1250, 1550, 1900, 2200, 2325, 2925, 3375, 200, 0, 0, 1300, 1625, 1975, 2325, 2650, 2900, 3175, 3525, 400, 0, 0, 1750, 2150, 2525, 2900, 3250, 3525, 3950, 4275, 700, 1175, 1700, 2200, 2650, 3100, 3525, 3900, 4225, 4750, 5200, 1000, 1400, 2050, 2550, 3050, 3550, 4000, 4400, 4800, 5350, 5900, 2000, 1850, 2700, 3350, 3950, 4500, 5000, 5450, 6000, 6750, 7550, 3000, 2100, 3200, 4100, 4800, 5400, 5600, 6100, 6800, 7800, 8700, 4000, 2200, 3500, 4600, 5600, 6500, 7100, 7400, 7500, 8600, 9700, 5000, 2400, 3600, 5000, 6200, 7300, 8200, 9000, 9300, 9300, 10500, 6000, 2600, 3700, 5300, 6700, 8000, 9100, 10100, 10900, 11100, 11300, 7000, 2750, 4250, 5500, 7250, 8750, 10000, 11250, 12250, 13000, 13000, 8000, 3000, 4250, 6000, 7500, 9250, 10750, 12000, 13500, 14500, 14750, 9000, 3250, 4500, 6250, 8000, 9750, 11250, 13000, 14500, 15750, 16500, 10000, 3500, 4750, 6500, 8250, 10000, 12000, 13750, 15250, 16750, 17750, 11000, 4000, 5000, 7000, 8500, 10500, 12500, 14500, 16500, 18000, 19000, 12000, 4000, 5000, 7000, 9000, 11000, 13000, 15000, 17000, 19000, 20500, 13000, 4000, 6000, 7000, 10000, 12000, 14000, 16000, 18000, 20000, 22000, 14000, 5000, 6000, 8000, 10000, 12000, 14000, 17000, 19000, 21000, 23000, 15000, 5000, 6000, 8000, 10000, 13000, 15000, 17000, 20000, 22000, 24000 }, + LaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 2250, 5050, 8010, 10810, 13390, 15920, 18460, 21200, 200, 0, 1100, 2680, 5450, 8400, 11190, 13770, 16300, 18850, 21600, 300, 0, 1340, 3050, 5820, 8760, 11560, 14140, 16670, 19220, 21990, 400, 0, 1550, 3390, 6180, 9120, 11910, 14490, 17030, 19590, 22380, 500, 1100, 1740, 3710, 6520, 9470, 12260, 14850, 17390, 19960, 22750, 600, 1210, 1930, 4030, 6860, 9820, 12620, 15200, 17750, 20320, 23130, 700, 1320, 2120, 4340, 7180, 10160, 12970, 15560, 18110, 20700, 23500, 800, 1425, 2300, 4600, 7500, 10475, 13300, 15900, 18450, 21050, 23850, 900, 1525, 2525, 4925, 7800, 10825, 13625, 16250, 18825, 21425, 24225, 1000, 1650, 2775, 5200, 8150, 11125, 14000, 16600, 19175, 21775, 24600, 2000, 2850, 4900, 7975, 11125, 14325, 17325, 20100, 22725, 25450, 28325, 3000, 4150, 7000, 10550, 13900, 17250, 20400, 23450, 26250, 29100, 32100, 4000, 5250, 9300, 13150, 16550, 20050, 23400, 26650, 29750, 32750, 35950, 5000, 6500, 12400, 15700, 19100, 22700, 26200, 29700, 33100, 36300, 39800, 6000, 7500, 14750, 18000, 21250, 25000, 28750, 32750, 36250, 39750, 43500, 7000, 9000, 17000, 20250, 23750, 27750, 31500, 35500, 39500, 43250, 47250, 8000, 15750, 19000, 22500, 26000, 30000, 33750, 38250, 42750, 47000, 51000, 9000, 17250, 21000, 24500, 28250, 32500, 36500, 41000, 45500, 50250, 54750, 10000, 19250, 22750, 26500, 30500, 34500, 38750, 43500, 48500, 53500, 58000, 11000, 20500, 24500, 28500, 32500, 36500, 41000, 46000, 51000, 56500, 60500, 12000, 22000, 26000, 30500, 34500, 38500, 43500, 48500, 54000, 58500, 62500, 13000, 23000, 27500, 32500, 36500, 40500, 45500, 51000, 56500, 60000, 64000, 14000, 24500, 29500, 34500, 38500, 43000, 47500, 53000, 58000, 61500, 65500, 15000, 25000, 30500, 35500, 40500, 45000, 49500, 54500, 58500, 62500, 66500 }, + MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 1180, 1740, 2400, 3120, 3710, 4120, 4410, 5010, 200, 0, 1060, 1550, 2170, 2850, 3570, 4160, 4620, 5010, 5660, 300, 0, 1280, 1840, 2490, 3190, 3910, 4510, 5000, 5460, 6170, 400, 0, 1460, 2060, 2750, 3470, 4200, 4800, 5330, 5850, 6580, 500, 1060, 1610, 2260, 2980, 3710, 4440, 5060, 5600, 6180, 6930, 600, 1160, 1750, 2440, 3180, 3920, 4660, 5290, 5850, 6480, 7260, 700, 1240, 1870, 2610, 3350, 4110, 4860, 5500, 6080, 6740, 7550, 800, 1325, 1975, 2750, 3500, 4275, 5025, 5700, 6275, 7000, 7800, 900, 1400, 2100, 2900, 3675, 4475, 5225, 5875, 6500, 7225, 8050, 1000, 1450, 2200, 3000, 3825, 4600, 5350, 6050, 6650, 7450, 8275, 2000, 1975, 2950, 3975, 4875, 5750, 6575, 7350, 8100, 9150, 10075, 3000, 2400, 3600, 4700, 5600, 6550, 7400, 8200, 9150, 10450, 11500, 4000, 2600, 4000, 5350, 6500, 7400, 8200, 8850, 10000, 11450, 12750, 5000, 2900, 4500, 5900, 7100, 8300, 9300, 10200, 10800, 12400, 13800, 6000, 3250, 4750, 6500, 7750, 9000, 10250, 11500, 12500, 13250, 14750, 7000, 3500, 5250, 6750, 8250, 9750, 11250, 12250, 13750, 14500, 15750, 8000, 4250, 5500, 7250, 9000, 10250, 12000, 13500, 15000, 16250, 16750, 9000, 4500, 6000, 7750, 9250, 11000, 12750, 14250, 16000, 17500, 18250, 10000, 4750, 6000, 8000, 10000, 11500, 13500, 15250, 17000, 18750, 20000, 11000, 5500, 6500, 8500, 10500, 12000, 14000, 16000, 18000, 20000, 21000, 12000, 5500, 6500, 9000, 10500, 12500, 15000, 17000, 19000, 21000, 22500, 13000, 6000, 7500, 9000, 11000, 13500, 15500, 17500, 20000, 22000, 23500, 14000, 6000, 7500, 9500, 11500, 14000, 16000, 19000, 21000, 22500, 25000, 15000, 6000, 8000, 9500, 12500, 14500, 17000, 19500, 21500, 23500, 26000 }, Name = "Redacted", VyHold = -100, add_attributes = { "Missiles" }, diff --git a/_G/bombs/AN_M30A1.lua b/_G/bombs/AN_M30A1.lua index 52eb547a..2d94ce91 100644 --- a/_G/bombs/AN_M30A1.lua +++ b/_G/bombs/AN_M30A1.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "AN-M30A1", + display_name_short = "AN-M30A1", hMax = 12000, hMin = 300, mass = 45.8, diff --git a/_G/bombs/AN_M57.lua b/_G/bombs/AN_M57.lua index 291cd3ee..6496c14a 100644 --- a/_G/bombs/AN_M57.lua +++ b/_G/bombs/AN_M57.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "AN-M57", + display_name_short = "AN-M57", hMax = 12000, hMin = 300, mass = 113, diff --git a/_G/bombs/AN_M64.lua b/_G/bombs/AN_M64.lua index 99cb2a8b..4ad26ee2 100644 --- a/_G/bombs/AN_M64.lua +++ b/_G/bombs/AN_M64.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "AN-M64", + display_name_short = "AN-M64", hMax = 20000, hMin = 200, mass = 227, diff --git a/_G/bombs/AN_M65.lua b/_G/bombs/AN_M65.lua index 1bed418a..2614ace0 100644 --- a/_G/bombs/AN_M65.lua +++ b/_G/bombs/AN_M65.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "AN-M65", + display_name_short = "AN-M65", hMax = 12000, hMin = 300, mass = 475, diff --git a/_G/bombs/AN_M66.lua b/_G/bombs/AN_M66.lua index 83eb5bd3..694091de 100644 --- a/_G/bombs/AN_M66.lua +++ b/_G/bombs/AN_M66.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "AN-M66", + display_name_short = "AN-M66", hMax = 12000, hMin = 300, mass = 977, diff --git a/_G/bombs/AO_2_5RT.lua b/_G/bombs/AO_2_5RT.lua index 8bcac22c..24cd9dca 100644 --- a/_G/bombs/AO_2_5RT.lua +++ b/_G/bombs/AO_2_5RT.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.AO_2_5RT", display_name = "AO-2.5RT", + display_name_short = "AO-2.5RT", explMass = 0, hMax = 3000, hMin = 50, diff --git a/_G/bombs/BAP-100.lua b/_G/bombs/BAP-100.lua index 5c4ab779..7a054f81 100644 --- a/_G/bombs/BAP-100.lua +++ b/_G/bombs/BAP-100.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BAP-100", + display_name_short = "BAP-100", hMax = 3000, hMin = 40, mass = 32.5, diff --git a/_G/bombs/BAP_100.lua b/_G/bombs/BAP_100.lua index 19197d17..71a0e32c 100644 --- a/_G/bombs/BAP_100.lua +++ b/_G/bombs/BAP_100.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/M-2000C/WEAPONS/M2KC_BAP100.lua", _origin = "M-2000C AI by RAZBAM Sims", display_name = "BAP-100", + display_name_short = "BAP-100", hMax = 3000, hMin = 50, mass = 32.5, diff --git a/_G/bombs/BAT-120.lua b/_G/bombs/BAT-120.lua index cc350760..5d3a8c07 100644 --- a/_G/bombs/BAT-120.lua +++ b/_G/bombs/BAT-120.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BAT-120 ABL", + display_name_short = "BAT-120 ABL", hMax = 1000, hMin = 40, mass = 34, diff --git a/_G/bombs/BDU_33.lua b/_G/bombs/BDU_33.lua index 1e364e4a..329d8e94 100644 --- a/_G/bombs/BDU_33.lua +++ b/_G/bombs/BDU_33.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "BDU-33", + display_name_short = "BDU-33", hMax = 12000, hMin = 100, mass = 11.3, diff --git a/_G/bombs/BDU_45.lua b/_G/bombs/BDU_45.lua index 66d8879d..97fe55e1 100644 --- a/_G/bombs/BDU_45.lua +++ b/_G/bombs/BDU_45.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BDU-45", + display_name_short = "BDU-45", hMax = 10000, hMin = 100, mass = 232, diff --git a/_G/bombs/BDU_45B.lua b/_G/bombs/BDU_45B.lua index 058eeabb..dcc5ea2c 100644 --- a/_G/bombs/BDU_45B.lua +++ b/_G/bombs/BDU_45B.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BDU-45B", + display_name_short = "BDU-45B", hMax = 10000, hMin = 100, mass = 232, diff --git a/_G/bombs/BDU_45LGB.lua b/_G/bombs/BDU_45LGB.lua index a5a22b58..75f1890c 100644 --- a/_G/bombs/BDU_45LGB.lua +++ b/_G/bombs/BDU_45LGB.lua @@ -8,6 +8,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/paveway.lua", _origin = "AircraftWeaponPack", display_name = "BDU-45LGB", + display_name_short = "BDU-45LGB", hMax = 40000, hMin = 1000, mass = 277, diff --git a/_G/bombs/BDU_50HD.lua b/_G/bombs/BDU_50HD.lua index 3373b905..3266bf65 100644 --- a/_G/bombs/BDU_50HD.lua +++ b/_G/bombs/BDU_50HD.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "BDU-50HD", + display_name_short = "BDU-50HD", hMax = 12000, hMin = 100, mass = 241, diff --git a/_G/bombs/BDU_50LD.lua b/_G/bombs/BDU_50LD.lua index 97b4800e..12087e5d 100644 --- a/_G/bombs/BDU_50LD.lua +++ b/_G/bombs/BDU_50LD.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "BDU-50LD", + display_name_short = "BDU-50LD", hMax = 12000, hMin = 100, mass = 241, diff --git a/_G/bombs/BDU_50LGB.lua b/_G/bombs/BDU_50LGB.lua index 57974c7f..c27c007e 100644 --- a/_G/bombs/BDU_50LGB.lua +++ b/_G/bombs/BDU_50LGB.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "BDU-50LGB", + display_name_short = "BDU-50LGB", hMax = 40000, hMin = 1000, mass = 280, diff --git a/_G/bombs/BEER_BOMB.lua b/_G/bombs/BEER_BOMB.lua index 8b3faad1..c3b480f8 100644 --- a/_G/bombs/BEER_BOMB.lua +++ b/_G/bombs/BEER_BOMB.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = '"Beer Bomb"', + display_name_short = '"Beer Bomb"', hMax = 12000, hMin = 300, mass = 100, diff --git a/_G/bombs/BELOUGA.lua b/_G/bombs/BELOUGA.lua index 7591b745..1f55a21a 100644 --- a/_G/bombs/BELOUGA.lua +++ b/_G/bombs/BELOUGA.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/C-101/Weapons.lua", _origin = "C-101 Aviojet by AvioDev", display_name = "Belouga", + display_name_short = "Belouga", hMax = 5000, hMin = 60.96, mass = 290, diff --git a/_G/bombs/BETAB-500M.lua b/_G/bombs/BETAB-500M.lua index d9a317d8..73d5f9f4 100644 --- a/_G/bombs/BETAB-500M.lua +++ b/_G/bombs/BETAB-500M.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "BETAB-500M - 479 kg, bomb, penetrating", + display_name_short = "BETAB-500M - 479 kg, bomb, penetrating", hMax = 20000, hMin = 400, mass = 479, diff --git a/_G/bombs/BETAB-500S.lua b/_G/bombs/BETAB-500S.lua index 9ab859b5..eff8fae1 100644 --- a/_G/bombs/BETAB-500S.lua +++ b/_G/bombs/BETAB-500S.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "BETAB-500S - 425 kg, bomb, penetrating", + display_name_short = "BETAB-500S - 425 kg, bomb, penetrating", hMax = 3500, hMin = 180, mass = 425, diff --git a/_G/bombs/BIN_200.lua b/_G/bombs/BIN_200.lua index f4091a63..8cbc7f5c 100644 --- a/_G/bombs/BIN_200.lua +++ b/_G/bombs/BIN_200.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/C-101/Weapons.lua", _origin = "C-101 Aviojet by AvioDev", display_name = "BIN-200 - 200kg Napalm Incendiary Bomb", + display_name_short = "BIN-200 - 200kg Napalm Incendiary Bomb", hMax = 12000, hMin = 1000, mass = 200, diff --git a/_G/bombs/BKF_AO2_5RT.lua b/_G/bombs/BKF_AO2_5RT.lua index f12a446b..dbd1497e 100644 --- a/_G/bombs/BKF_AO2_5RT.lua +++ b/_G/bombs/BKF_AO2_5RT.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BKF - 12 x AO-2.5RT", + display_name_short = "BKF - 12 x AO-2.5RT", hMax = 1000, hMin = 30, mass = 76, diff --git a/_G/bombs/BKF_PTAB2_5KO.lua b/_G/bombs/BKF_PTAB2_5KO.lua index bce4bc8d..b4c08676 100644 --- a/_G/bombs/BKF_PTAB2_5KO.lua +++ b/_G/bombs/BKF_PTAB2_5KO.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BKF - 12 x PTAB-2.5KO", + display_name_short = "BKF - 12 x PTAB-2.5KO", hMax = 1000, hMin = 30, mass = 63.2, diff --git a/_G/bombs/BLG66_BELOUGA.lua b/_G/bombs/BLG66_BELOUGA.lua index 887b1c61..d76e7d06 100644 --- a/_G/bombs/BLG66_BELOUGA.lua +++ b/_G/bombs/BLG66_BELOUGA.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/M-2000C/WEAPONS/M2KC_BLG66.lua", _origin = "M-2000C AI by RAZBAM Sims", display_name = "BLG-66 Belouga", + display_name_short = "BLG-66 Belouga", hMax = 5000, hMin = 60.96, mass = 290, diff --git a/_G/bombs/BL_755.lua b/_G/bombs/BL_755.lua index c6fb7fe9..0d6c9333 100644 --- a/_G/bombs/BL_755.lua +++ b/_G/bombs/BL_755.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "BL755", + display_name_short = "BL755", hMax = 25000, hMin = 100, mass = 277, diff --git a/_G/bombs/BR_250.lua b/_G/bombs/BR_250.lua index 97d952c8..88196539 100644 --- a/_G/bombs/BR_250.lua +++ b/_G/bombs/BR_250.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BR-250 - 250kg GP Bomb LD", + display_name_short = "BR-250 - 250kg GP Bomb LD", hMax = 12000, hMin = 100, mass = 250, diff --git a/_G/bombs/BR_500.lua b/_G/bombs/BR_500.lua index 043a5bce..332e0fc4 100644 --- a/_G/bombs/BR_500.lua +++ b/_G/bombs/BR_500.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BR-500 - 500kg GP Bomb LD", + display_name_short = "BR-500 - 500kg GP Bomb LD", hMax = 12000, hMin = 200, mass = 500, diff --git a/_G/bombs/BetAB_500.lua b/_G/bombs/BetAB_500.lua index 549f2bb8..31729b1d 100644 --- a/_G/bombs/BetAB_500.lua +++ b/_G/bombs/BetAB_500.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -50, display_name = "BetAB-500", + display_name_short = "BetAB-500", hMax = 25000, hMin = 50, mass = 478, diff --git a/_G/bombs/BetAB_500ShP.lua b/_G/bombs/BetAB_500ShP.lua index 9627e2b3..4dbc9b6a 100644 --- a/_G/bombs/BetAB_500ShP.lua +++ b/_G/bombs/BetAB_500ShP.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -50, display_name = "BetAB-500ShP", + display_name_short = "BetAB-500", hMax = 3000, hMin = 50, mass = 380, diff --git a/_G/bombs/British_GP_250LB_Bomb_Mk1.lua b/_G/bombs/British_GP_250LB_Bomb_Mk1.lua index df16e5b1..c32795cb 100644 --- a/_G/bombs/British_GP_250LB_Bomb_Mk1.lua +++ b/_G/bombs/British_GP_250LB_Bomb_Mk1.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "250 lb GP Mk.I", + display_name_short = "250 lb GP Mk.I", hMax = 12000, hMin = 300, mass = 104.326, diff --git a/_G/bombs/British_GP_250LB_Bomb_Mk4.lua b/_G/bombs/British_GP_250LB_Bomb_Mk4.lua index af9bfa0b..21ed93e0 100644 --- a/_G/bombs/British_GP_250LB_Bomb_Mk4.lua +++ b/_G/bombs/British_GP_250LB_Bomb_Mk4.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "250 lb GP Mk.IV", + display_name_short = "250 lb GP Mk.IV", hMax = 12000, hMin = 300, mass = 104.326, diff --git a/_G/bombs/British_GP_250LB_Bomb_Mk5.lua b/_G/bombs/British_GP_250LB_Bomb_Mk5.lua index aa256d9f..2e168a3f 100644 --- a/_G/bombs/British_GP_250LB_Bomb_Mk5.lua +++ b/_G/bombs/British_GP_250LB_Bomb_Mk5.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "250 lb GP Mk.V", + display_name_short = "250 lb GP Mk.V", hMax = 12000, hMin = 300, mass = 104.326, diff --git a/_G/bombs/British_GP_500LB_Bomb_Mk1.lua b/_G/bombs/British_GP_500LB_Bomb_Mk1.lua index 26c9a9ba..b85fe9af 100644 --- a/_G/bombs/British_GP_500LB_Bomb_Mk1.lua +++ b/_G/bombs/British_GP_500LB_Bomb_Mk1.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "500 lb GP Mk.I", + display_name_short = "500 lb GP Mk.I", hMax = 12000, hMin = 300, mass = 213.188, diff --git a/_G/bombs/British_GP_500LB_Bomb_Mk4.lua b/_G/bombs/British_GP_500LB_Bomb_Mk4.lua index dfdc10a5..a43cb1de 100644 --- a/_G/bombs/British_GP_500LB_Bomb_Mk4.lua +++ b/_G/bombs/British_GP_500LB_Bomb_Mk4.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "500 lb GP Mk.IV", + display_name_short = "500 lb GP Mk.IV", hMax = 12000, hMin = 300, mass = 213.188, diff --git a/_G/bombs/British_GP_500LB_Bomb_Mk4_Short.lua b/_G/bombs/British_GP_500LB_Bomb_Mk4_Short.lua index 47a9a122..b65550ca 100644 --- a/_G/bombs/British_GP_500LB_Bomb_Mk4_Short.lua +++ b/_G/bombs/British_GP_500LB_Bomb_Mk4_Short.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "500 lb GP Short tail", + display_name_short = "500 lb GP Short tail", hMax = 12000, hMin = 300, mass = 207.7, diff --git a/_G/bombs/British_GP_500LB_Bomb_Mk5.lua b/_G/bombs/British_GP_500LB_Bomb_Mk5.lua index 51395414..898f5bbb 100644 --- a/_G/bombs/British_GP_500LB_Bomb_Mk5.lua +++ b/_G/bombs/British_GP_500LB_Bomb_Mk5.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "500 lb GP Mk.V", + display_name_short = "500 lb GP Mk.V", hMax = 12000, hMin = 300, mass = 213.188, diff --git a/_G/bombs/British_MC_250LB_Bomb_Mk1.lua b/_G/bombs/British_MC_250LB_Bomb_Mk1.lua index 6279a74d..4b01189d 100644 --- a/_G/bombs/British_MC_250LB_Bomb_Mk1.lua +++ b/_G/bombs/British_MC_250LB_Bomb_Mk1.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "250 lb MC Mk.I", + display_name_short = "250 lb MC Mk.I", hMax = 12000, hMin = 300, mass = 102, diff --git a/_G/bombs/British_MC_250LB_Bomb_Mk2.lua b/_G/bombs/British_MC_250LB_Bomb_Mk2.lua index edd083ae..3ee041ee 100644 --- a/_G/bombs/British_MC_250LB_Bomb_Mk2.lua +++ b/_G/bombs/British_MC_250LB_Bomb_Mk2.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "250 lb MC Mk.II", + display_name_short = "250 lb MC Mk.II", hMax = 12000, hMin = 300, mass = 102, diff --git a/_G/bombs/British_MC_500LB_Bomb_Mk1_Short.lua b/_G/bombs/British_MC_500LB_Bomb_Mk1_Short.lua index 40f2304b..a48b2803 100644 --- a/_G/bombs/British_MC_500LB_Bomb_Mk1_Short.lua +++ b/_G/bombs/British_MC_500LB_Bomb_Mk1_Short.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "500 lb MC Short tail", + display_name_short = "500 lb MC Short tail", hMax = 12000, hMin = 300, mass = 226.3, diff --git a/_G/bombs/British_MC_500LB_Bomb_Mk2.lua b/_G/bombs/British_MC_500LB_Bomb_Mk2.lua index 7e847b5b..f4d8b2ff 100644 --- a/_G/bombs/British_MC_500LB_Bomb_Mk2.lua +++ b/_G/bombs/British_MC_500LB_Bomb_Mk2.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "500 lb MC Mk.II", + display_name_short = "500 lb MC Mk.II", hMax = 12000, hMin = 300, mass = 231.8, diff --git a/_G/bombs/British_SAP_250LB_Bomb_Mk5.lua b/_G/bombs/British_SAP_250LB_Bomb_Mk5.lua index 9fe4578f..57c79486 100644 --- a/_G/bombs/British_SAP_250LB_Bomb_Mk5.lua +++ b/_G/bombs/British_SAP_250LB_Bomb_Mk5.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "250 lb S.A.P.", + display_name_short = "250 lb S.A.P.", hMax = 12000, hMin = 300, mass = 111.13, diff --git a/_G/bombs/British_SAP_500LB_Bomb_Mk5.lua b/_G/bombs/British_SAP_500LB_Bomb_Mk5.lua index 74b692c2..13e59dcc 100644 --- a/_G/bombs/British_SAP_500LB_Bomb_Mk5.lua +++ b/_G/bombs/British_SAP_500LB_Bomb_Mk5.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "500 lb S.A.P.", + display_name_short = "500 lb S.A.P.", hMax = 12000, hMin = 300, mass = 222.26, diff --git a/_G/bombs/CBU_103.lua b/_G/bombs/CBU_103.lua index 735a21b8..36067cd9 100644 --- a/_G/bombs/CBU_103.lua +++ b/_G/bombs/CBU_103.lua @@ -20,6 +20,7 @@ _G["bombs"]["#Index"] = { TOFMin_15Deg_Dive_Coeff = { 18, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 900, 0.8531, 0.8482, 0.8685, 0.8642, 0.7126, 0.5953, 0.5295, 0.1122, 0.0988, 0.0874, 1000, 0.8769, 0.922, 1.0345, 1.0722, 1.093, 1.0688, 1.002, 0.719, 0.5731, 0.495, 1200, 0.9125, 0.9809, 1.0231, 1.0436, 1.0658, 1.0882, 1.1107, 1.1189, 1.1279, 1.0846, 1500, 0.9348, 0.9689, 0.9792, 0.9844, 0.9944, 0.991, 0.9997, 1.0336, 1.0565, 1.0768, 2000, 0.9339, 0.9306, 0.9237, 0.9275, 0.9276, 0.9367, 0.9368, 0.9738, 0.9895, 1.0047, 3000, 0.9331, 0.9184, 0.9078, 0.9008, 0.9074, 0.9126, 0.9142, 0.9199, 0.9305, 0.9481, 4000, 0.9433, 0.9228, 0.9169, 0.9147, 0.9162, 0.913, 0.9041, 0.9161, 0.9241, 0.9252, 5000, 0.9474, 0.9307, 0.9231, 0.9185, 0.9158, 0.914, 0.9086, 0.9178, 0.9238, 0.923, 6000, 0.9499, 0.9354, 0.9291, 0.9191, 0.9178, 0.9163, 0.9143, 0.9174, 0.923, 0.9193, 7000, 0.9543, 0.9386, 0.9345, 0.9277, 0.9216, 0.9219, 0.9137, 0.9258, 0.9241, 0.9185, 8000, 0.9569, 0.9446, 0.9382, 0.9296, 0.9268, 0.9267, 0.9143, 0.9252, 0.9233, 0.917, 9000, 0.9586, 0.9444, 0.942, 0.9313, 0.929, 0.9282, 0.9199, 0.9264, 0.9257, 0.9132, 10000, 0.9631, 0.9478, 0.9419, 0.9343, 0.9321, 0.9319, 0.9224, 0.9282, 0.9205, 0.914, 11000, 0.963, 0.9495, 0.9424, 0.9361, 0.9355, 0.9278, 0.928, 0.9285, 0.9171, 0.9075, 12000, 0.9664, 0.9521, 0.9454, 0.9382, 0.9371, 0.9281, 0.9324, 0.926, 0.9151, 0.9069, 13000, 0.9682, 0.9521, 0.9473, 0.935, 0.9375, 0.9261, 0.9331, 0.9243, 0.9147, 0.9069, 14000, 0.964, 0.9544, 0.953, 0.9393, 0.9396, 0.9228, 0.931, 0.923, 0.9111, 0.9061, 15000, 0.9669, 0.9537, 0.9514, 0.9387, 0.9392, 0.9185, 0.93, 0.9146, 0.9123, 0.9049 }, VyHold = -100, display_name = "CBU-103", + display_name_short = "CBU-103", hMax = 5000, hMin = 90, mass = 420, diff --git a/_G/bombs/CBU_105.lua b/_G/bombs/CBU_105.lua index 295c903c..d1425fde 100644 --- a/_G/bombs/CBU_105.lua +++ b/_G/bombs/CBU_105.lua @@ -9,6 +9,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "CBU-105", + display_name_short = "CBU-105", hMax = 5000, hMin = 90, mass = 420, diff --git a/_G/bombs/CBU_52B.lua b/_G/bombs/CBU_52B.lua index 33e2e09d..58b8e59d 100644 --- a/_G/bombs/CBU_52B.lua +++ b/_G/bombs/CBU_52B.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "CBU-52B", + display_name_short = "CBU-52B", hMax = 5000, hMin = 90, mass = 136, diff --git a/_G/bombs/CBU_87.lua b/_G/bombs/CBU_87.lua index ea8d9503..601ff494 100644 --- a/_G/bombs/CBU_87.lua +++ b/_G/bombs/CBU_87.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "CBU-87", + display_name_short = "CBU-87", hMax = 5000, hMin = 90, mass = 420, diff --git a/_G/bombs/CBU_97.lua b/_G/bombs/CBU_97.lua index ab2945f3..e35b252c 100644 --- a/_G/bombs/CBU_97.lua +++ b/_G/bombs/CBU_97.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "CBU-97", + display_name_short = "CBU-97", hMax = 5000, hMin = 90, mass = 420, diff --git a/_G/bombs/CBU_99.lua b/_G/bombs/CBU_99.lua index 13f37713..a8d88dcc 100644 --- a/_G/bombs/CBU_99.lua +++ b/_G/bombs/CBU_99.lua @@ -6,7 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/cluster_bombs.lua", _origin = "AircraftWeaponPack", display_name = "CBU-99 - 490lbs, 247 x HEAT Bomblets", - display_name_short = "RBK-500U", + display_name_short = "CBU-99", hMax = 5000, hMin = 90, mass = 222, diff --git a/_G/bombs/Durandal.lua b/_G/bombs/Durandal.lua index af2f9ed6..eacc3dd2 100644 --- a/_G/bombs/Durandal.lua +++ b/_G/bombs/Durandal.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "BLU-107/B Durandal", + display_name_short = "BLU-107/B Durandal", hMax = 5000, hMin = 60, mass = 219, diff --git a/_G/bombs/FAB-250-M62.lua b/_G/bombs/FAB-250-M62.lua index c5e66bf7..4eeb6ba2 100644 --- a/_G/bombs/FAB-250-M62.lua +++ b/_G/bombs/FAB-250-M62.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "FAB-250-M62 GP", + display_name_short = "FAB-250-M62 GP", hMax = 12000, hMin = 500, mass = 227, diff --git a/_G/bombs/FAB-250M54.lua b/_G/bombs/FAB-250M54.lua index 936eecc9..22124d2e 100644 --- a/_G/bombs/FAB-250M54.lua +++ b/_G/bombs/FAB-250M54.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "FAB-250 M54 - 235 kg, bomb, parachute", + display_name_short = "FAB-250 M54 - 235 kg, bomb, parachute", hMax = 20000, hMin = 200, mass = 235, diff --git a/_G/bombs/FAB-250M54TU.lua b/_G/bombs/FAB-250M54TU.lua index 4ffbeead..a941d140 100644 --- a/_G/bombs/FAB-250M54TU.lua +++ b/_G/bombs/FAB-250M54TU.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "FAB-250 M54 TU - 235 kg, bomb, parachute", + display_name_short = "FAB-250 M54 TU - 235 kg, bomb, parachute", hMax = 8000, hMin = 75, mass = 235, diff --git a/_G/bombs/FAB-500M54.lua b/_G/bombs/FAB-500M54.lua index 036252f9..6297ce8d 100644 --- a/_G/bombs/FAB-500M54.lua +++ b/_G/bombs/FAB-500M54.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "FAB-500 M54 - 474 kg, bomb, free-fall", + display_name_short = "FAB-500 M54 - 474 kg, bomb, free-fall", hMax = 15000, hMin = 1000, mass = 474, diff --git a/_G/bombs/FAB-500M54TU.lua b/_G/bombs/FAB-500M54TU.lua index 0c5bee3c..424aa62a 100644 --- a/_G/bombs/FAB-500M54TU.lua +++ b/_G/bombs/FAB-500M54TU.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "FAB-500 M54 TU - 480 kg, bomb, parachute", + display_name_short = "FAB-500 M54 TU - 480 kg, bomb, parachute", hMax = 15000, hMin = 100, mass = 480, diff --git a/_G/bombs/FAB-500SL.lua b/_G/bombs/FAB-500SL.lua index 4fd78602..f3cd79a7 100644 --- a/_G/bombs/FAB-500SL.lua +++ b/_G/bombs/FAB-500SL.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "FAB-500 SL - 515 kg, bomb, parachute", + display_name_short = "FAB-500 SL - 515 kg, bomb, parachute", hMax = 8000, hMin = 100, mass = 515, diff --git a/_G/bombs/FAB-500TA.lua b/_G/bombs/FAB-500TA.lua index 8871bd80..b183d183 100644 --- a/_G/bombs/FAB-500TA.lua +++ b/_G/bombs/FAB-500TA.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "FAB-500 TA - 477 kg, bomb, free-fall", + display_name_short = "FAB-500 TA - 477 kg, bomb, free-fall", hMax = 20000, hMin = 1000, mass = 477, diff --git a/_G/bombs/FAB_100.lua b/_G/bombs/FAB_100.lua index 3724aef0..58d74edb 100644 --- a/_G/bombs/FAB_100.lua +++ b/_G/bombs/FAB_100.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "FAB-100", + display_name_short = "FAB-100", hMax = 20000, hMin = 100, mass = 100, diff --git a/_G/bombs/FAB_100M.lua b/_G/bombs/FAB_100M.lua index c05f9835..3779fced 100644 --- a/_G/bombs/FAB_100M.lua +++ b/_G/bombs/FAB_100M.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", _origin = "MiG-15bis AI by Eagle Dynamics", display_name = "FAB-100M - 100kg GP Bomb LD", + display_name_short = "FAB-100M - 100kg GP Bomb LD", hMax = 12000, hMin = 1000, mass = 100, diff --git a/_G/bombs/FAB_100SV.lua b/_G/bombs/FAB_100SV.lua index 7261be88..3ec53bc5 100644 --- a/_G/bombs/FAB_100SV.lua +++ b/_G/bombs/FAB_100SV.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/I-16/entry.lua", _origin = "I-16 AI by OctopusG", display_name = "FAB-100SV", + display_name_short = "FAB-100SV", hMax = 12000, hMin = 1000, mass = 100, diff --git a/_G/bombs/FAB_250.lua b/_G/bombs/FAB_250.lua index a82282f0..25375972 100644 --- a/_G/bombs/FAB_250.lua +++ b/_G/bombs/FAB_250.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "FAB-250", + display_name_short = "FAB-250", hMax = 20000, hMin = 200, mass = 250, diff --git a/_G/bombs/FAB_50.lua b/_G/bombs/FAB_50.lua index 714c87a0..e3724946 100644 --- a/_G/bombs/FAB_50.lua +++ b/_G/bombs/FAB_50.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-15bis/MiG-15bis.lua", _origin = "MiG-15bis AI by Eagle Dynamics", display_name = "FAB-50 - 50kg GP Bomb LD", + display_name_short = "FAB-50 - 50kg GP Bomb LD", hMax = 12000, hMin = 1000, mass = 50, diff --git a/_G/bombs/GBU_10.lua b/_G/bombs/GBU_10.lua index 0acb5d57..0c9e4ea7 100644 --- a/_G/bombs/GBU_10.lua +++ b/_G/bombs/GBU_10.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "GBU-10", + display_name_short = "GBU-10", hMax = 40000, hMin = 1000, mass = 959, diff --git a/_G/bombs/GBU_11.lua b/_G/bombs/GBU_11.lua index f23dc4a8..3c06074e 100644 --- a/_G/bombs/GBU_11.lua +++ b/_G/bombs/GBU_11.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.GBU_11", display_name = "GBU-11", + display_name_short = "GBU-11", hMax = 40000, hMin = 1000, mass = 900, diff --git a/_G/bombs/GBU_12.lua b/_G/bombs/GBU_12.lua index 87241c68..47663d99 100644 --- a/_G/bombs/GBU_12.lua +++ b/_G/bombs/GBU_12.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "GBU-12", + display_name_short = "GBU-12", hMax = 40000, hMin = 1000, mass = 277, diff --git a/_G/bombs/GBU_15_V_31_B.lua b/_G/bombs/GBU_15_V_31_B.lua index 37a0c8f4..acec24d4 100644 --- a/_G/bombs/GBU_15_V_31_B.lua +++ b/_G/bombs/GBU_15_V_31_B.lua @@ -8,6 +8,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", _origin = "AircraftWeaponPack", display_name = "GBU-15(V)31/B", + display_name_short = "GBU-15(V)31/B", hMax = 30000, hMin = 400, mass = 1125, diff --git a/_G/bombs/GBU_16.lua b/_G/bombs/GBU_16.lua index acf6f91f..d9832459 100644 --- a/_G/bombs/GBU_16.lua +++ b/_G/bombs/GBU_16.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "GBU-16", + display_name_short = "GBU-16", hMax = 40000, hMin = 1000, mass = 513, diff --git a/_G/bombs/GBU_17.lua b/_G/bombs/GBU_17.lua index 2111f27a..d8f65b64 100644 --- a/_G/bombs/GBU_17.lua +++ b/_G/bombs/GBU_17.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.GBU_17", display_name = "GBU-17", + display_name_short = "GBU-17", hMax = 40000, hMin = 1000, mass = 500, diff --git a/_G/bombs/GBU_24.lua b/_G/bombs/GBU_24.lua index 705ef9d4..a2b145b0 100644 --- a/_G/bombs/GBU_24.lua +++ b/_G/bombs/GBU_24.lua @@ -15,6 +15,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/paveway.lua", _origin = "AircraftWeaponPack", display_name = "GBU-24A/B Paveway III", + display_name_short = "GBU-24A/B Paveway III", hMax = 40000, hMin = 1000, mass = 1087, diff --git a/_G/bombs/GBU_27.lua b/_G/bombs/GBU_27.lua index 1e6acd95..edb8002e 100644 --- a/_G/bombs/GBU_27.lua +++ b/_G/bombs/GBU_27.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.GBU_27", display_name = "GBU-27", + display_name_short = "GBU-27", hMax = 40000, hMin = 1000, mass = 991, diff --git a/_G/bombs/GBU_28.lua b/_G/bombs/GBU_28.lua index 402ebadc..fc7f2cc8 100644 --- a/_G/bombs/GBU_28.lua +++ b/_G/bombs/GBU_28.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.GBU_28", display_name = "GBU-28", + display_name_short = "GBU-28", hMax = 40000, hMin = 1000, mass = 2130, diff --git a/_G/bombs/GBU_29.lua b/_G/bombs/GBU_29.lua index 40e8efbd..eabc7159 100644 --- a/_G/bombs/GBU_29.lua +++ b/_G/bombs/GBU_29.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.GBU_29", display_name = "GBU-29", + display_name_short = "GBU-29", hMax = 40000, hMin = 1000, mass = 225, diff --git a/_G/bombs/GBU_30.lua b/_G/bombs/GBU_30.lua index c962a468..ab72d484 100644 --- a/_G/bombs/GBU_30.lua +++ b/_G/bombs/GBU_30.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.GBU_30", display_name = "GBU-30", + display_name_short = "GBU-30", hMax = 40000, hMin = 1000, mass = 225, diff --git a/_G/bombs/GBU_31.lua b/_G/bombs/GBU_31.lua index b66e3ae4..a4b2cbda 100644 --- a/_G/bombs/GBU_31.lua +++ b/_G/bombs/GBU_31.lua @@ -12,6 +12,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/JDAM.lua", _origin = "AircraftWeaponPack", display_name = "GBU-31(V)1/B", + display_name_short = "GBU-31(V)1/B", hMax = 15000, hMin = 400, mass = 925, diff --git a/_G/bombs/GBU_31_V_2B.lua b/_G/bombs/GBU_31_V_2B.lua index bee51122..7e4a74ea 100644 --- a/_G/bombs/GBU_31_V_2B.lua +++ b/_G/bombs/GBU_31_V_2B.lua @@ -12,6 +12,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/JDAM.lua", _origin = "AircraftWeaponPack", display_name = "GBU-31(V)2/B", + display_name_short = "GBU-31(V)2/B", hMax = 15000, hMin = 400, mass = 934, diff --git a/_G/bombs/GBU_31_V_3B.lua b/_G/bombs/GBU_31_V_3B.lua index 1ac00a83..0288a62e 100644 --- a/_G/bombs/GBU_31_V_3B.lua +++ b/_G/bombs/GBU_31_V_3B.lua @@ -12,6 +12,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/JDAM.lua", _origin = "AircraftWeaponPack", display_name = "GBU-31(V)3/B", + display_name_short = "GBU-31(V)3/B", hMax = 15000, hMin = 400, mass = 961, diff --git a/_G/bombs/GBU_31_V_4B.lua b/_G/bombs/GBU_31_V_4B.lua index 4f795aa8..dba1653f 100644 --- a/_G/bombs/GBU_31_V_4B.lua +++ b/_G/bombs/GBU_31_V_4B.lua @@ -12,6 +12,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/JDAM.lua", _origin = "AircraftWeaponPack", display_name = "GBU-31(V)4/B", + display_name_short = "GBU-31(V)4/B", hMax = 15000, hMin = 400, mass = 970, diff --git a/_G/bombs/GBU_32_V_2B.lua b/_G/bombs/GBU_32_V_2B.lua index af269dbf..018b322d 100644 --- a/_G/bombs/GBU_32_V_2B.lua +++ b/_G/bombs/GBU_32_V_2B.lua @@ -12,6 +12,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/JDAM.lua", _origin = "AircraftWeaponPack", display_name = "GBU-32(V)2/B", + display_name_short = "GBU-32(V)2/B", hMax = 15000, hMin = 400, mass = 467, diff --git a/_G/bombs/GBU_38.lua b/_G/bombs/GBU_38.lua index b6b09aec..0eede6ca 100644 --- a/_G/bombs/GBU_38.lua +++ b/_G/bombs/GBU_38.lua @@ -12,6 +12,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/JDAM.lua", _origin = "AircraftWeaponPack", display_name = "GBU-38(V)1/B", + display_name_short = "GBU-38(V)1/B", hMax = 15000, hMin = 300, mass = 253.1, diff --git a/_G/bombs/GBU_54_V_1B.lua b/_G/bombs/GBU_54_V_1B.lua index 4bc66685..20c2c2bc 100644 --- a/_G/bombs/GBU_54_V_1B.lua +++ b/_G/bombs/GBU_54_V_1B.lua @@ -12,6 +12,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/JDAM.lua", _origin = "AircraftWeaponPack", display_name = "GBU-54(V)1/B", + display_name_short = "GBU-54(V)1/B", hMax = 15000, hMin = 400, mass = 253.1, diff --git a/_G/bombs/HEBOMB.lua b/_G/bombs/HEBOMB.lua index 2a1e8cd2..ac34221a 100644 --- a/_G/bombs/HEBOMB.lua +++ b/_G/bombs/HEBOMB.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", _origin = "AJS37 AI by Heatblur Simulations", display_name = "M/71 HE-Bomb", + display_name_short = "M/71 HE-Bomb", hMax = 15000, hMin = 100, mass = 121, diff --git a/_G/bombs/HEBOMBD.lua b/_G/bombs/HEBOMBD.lua index a74209e0..4808a42e 100644 --- a/_G/bombs/HEBOMBD.lua +++ b/_G/bombs/HEBOMBD.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", _origin = "AJS37 AI by Heatblur Simulations", display_name = "M/71 HE-Bomb w chute", + display_name_short = "M/71 HE-Bomb w chute", hMax = 15000, hMin = 100, mass = 121, diff --git a/_G/bombs/IAB-500.lua b/_G/bombs/IAB-500.lua index b09dad19..4492d2c9 100644 --- a/_G/bombs/IAB-500.lua +++ b/_G/bombs/IAB-500.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "IAB-500 - 470 kg, bomb, free fall", + display_name_short = "IAB-500 - 470 kg, bomb, free fall", hMax = 12000, hMin = 1000, mass = 470, diff --git a/_G/bombs/KAB_1500Kr.lua b/_G/bombs/KAB_1500Kr.lua index ecde4af9..e2d674a6 100644 --- a/_G/bombs/KAB_1500Kr.lua +++ b/_G/bombs/KAB_1500Kr.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -80, display_name = "KAB-1500LG-Pr", + display_name_short = "KAB-1500", hMax = 15000, hMin = 1000, mass = 1500, diff --git a/_G/bombs/KAB_1500LG.lua b/_G/bombs/KAB_1500LG.lua index af64e309..86a5a933 100644 --- a/_G/bombs/KAB_1500LG.lua +++ b/_G/bombs/KAB_1500LG.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/KABs.lua", _origin = "AircraftWeaponPack", display_name = "KAB-1500LG-Pr", + display_name_short = "KAB-1500LG-Pr", hMax = 10000, hMin = 1000, mass = 1525, diff --git a/_G/bombs/KAB_1500T.lua b/_G/bombs/KAB_1500T.lua index cf609814..221646bd 100644 --- a/_G/bombs/KAB_1500T.lua +++ b/_G/bombs/KAB_1500T.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/KABs.lua", _origin = "AircraftWeaponPack", display_name = "KAB-1500Kr", + display_name_short = "KAB-1500Kr", hMax = 15000, hMin = 1000, mass = 1525, diff --git a/_G/bombs/KAB_500.lua b/_G/bombs/KAB_500.lua index 9d32aeda..87439a78 100644 --- a/_G/bombs/KAB_500.lua +++ b/_G/bombs/KAB_500.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -60, display_name = "KAB-500", + display_name_short = "KAB-500", hMax = 10000, hMin = 1000, mass = 534, diff --git a/_G/bombs/KAB_500Kr.lua b/_G/bombs/KAB_500Kr.lua index cd27c45f..cacfc1af 100644 --- a/_G/bombs/KAB_500Kr.lua +++ b/_G/bombs/KAB_500Kr.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -60, display_name = "KAB-500Kr", + display_name_short = "KAB-500", hMax = 10000, hMin = 1000, mass = 560, diff --git a/_G/bombs/KAB_500KrOD.lua b/_G/bombs/KAB_500KrOD.lua index 2d6fedce..be6750ef 100644 --- a/_G/bombs/KAB_500KrOD.lua +++ b/_G/bombs/KAB_500KrOD.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -60, _unique_resource_name = "weapons.bombs.KAB_500KrOD", display_name = "KAB-500Kr-OD", + display_name_short = "KAB-500", hMax = 10000, hMin = 1000, mass = 460, diff --git a/_G/bombs/KAB_500S.lua b/_G/bombs/KAB_500S.lua index 6803744e..12fcaa47 100644 --- a/_G/bombs/KAB_500S.lua +++ b/_G/bombs/KAB_500S.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/KABs.lua", _origin = "AircraftWeaponPack", display_name = "KAB-500S", + display_name_short = "KAB-500S", hMax = 10000, hMin = 1000, mass = 500, diff --git a/_G/bombs/LS-6-100.lua b/_G/bombs/LS-6-100.lua index afef4f62..c7e8051f 100644 --- a/_G/bombs/LS-6-100.lua +++ b/_G/bombs/LS-6-100.lua @@ -12,6 +12,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/jdam_ls6.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", display_name = "LS-6-100", + display_name_short = "LS-6-100", hMax = 15000, hMin = 400, mass = 88, diff --git a/_G/bombs/LUU_19.lua b/_G/bombs/LUU_19.lua index d2393ee6..c937d73f 100644 --- a/_G/bombs/LUU_19.lua +++ b/_G/bombs/LUU_19.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -10, _unique_resource_name = "weapons.bombs.LUU_19", display_name = "LUU-19", + display_name_short = "LUU-19", hMax = 7000, hMin = 400, mass = 16.3, diff --git a/_G/bombs/LUU_2AB.lua b/_G/bombs/LUU_2AB.lua index 3ba50335..4e343b37 100644 --- a/_G/bombs/LUU_2AB.lua +++ b/_G/bombs/LUU_2AB.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -10, _unique_resource_name = "weapons.bombs.LUU_2AB", display_name = "LUU-2AB", + display_name_short = "LUU-2AB", hMax = 7000, hMin = 400, mass = 13.6, diff --git a/_G/bombs/LUU_2B.lua b/_G/bombs/LUU_2B.lua index 5f801f7b..6880a35b 100644 --- a/_G/bombs/LUU_2B.lua +++ b/_G/bombs/LUU_2B.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", _origin = "AircraftWeaponPack", display_name = "LUU-2B Flare", + display_name_short = "LUU-2B Flare", hMax = 7000, hMin = 400, mass = 13.6, diff --git a/_G/bombs/LUU_2BB.lua b/_G/bombs/LUU_2BB.lua index 4591215e..dbc33af0 100644 --- a/_G/bombs/LUU_2BB.lua +++ b/_G/bombs/LUU_2BB.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -10, _unique_resource_name = "weapons.bombs.LUU_2BB", display_name = "LUU-2BB", + display_name_short = "LUU-2BB", hMax = 7000, hMin = 400, mass = 13.6, diff --git a/_G/bombs/LYSBOMB.lua b/_G/bombs/LYSBOMB.lua index 6cf6eb7a..8e55b91e 100644 --- a/_G/bombs/LYSBOMB.lua +++ b/_G/bombs/LYSBOMB.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", _origin = "AJS37 AI by Heatblur Simulations", display_name = "LYSBOMB Illumination bomb", + display_name_short = "LYSBOMB Illumination bomb", hMax = 15000, hMin = 1000, mass = 25, diff --git a/_G/bombs/LYSBOMB_CANDLE.lua b/_G/bombs/LYSBOMB_CANDLE.lua index 4804ec2e..26fc2247 100644 --- a/_G/bombs/LYSBOMB_CANDLE.lua +++ b/_G/bombs/LYSBOMB_CANDLE.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", _origin = "AJS37 AI by Heatblur Simulations", display_name = "LYSBOMB_CANDLE whatever", + display_name_short = "LYSBOMB_CANDLE whatever", hMax = 15000, hMin = 1000, mass = 25, diff --git a/_G/bombs/M257_FLARE.lua b/_G/bombs/M257_FLARE.lua index 225e3222..b6957b80 100644 --- a/_G/bombs/M257_FLARE.lua +++ b/_G/bombs/M257_FLARE.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", _origin = "AircraftWeaponPack", display_name = "M257 Flare", + display_name_short = "M257 Flare", hMax = 2000, hMin = 25, mass = 5, diff --git a/_G/bombs/MK106.lua b/_G/bombs/MK106.lua index e5392b34..63d12877 100644 --- a/_G/bombs/MK106.lua +++ b/_G/bombs/MK106.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "Mk 106", + display_name_short = "Mk 106", hMax = 12000, hMin = 200, mass = 2.27, diff --git a/_G/bombs/MK76.lua b/_G/bombs/MK76.lua index 1c489e4b..b98768ff 100644 --- a/_G/bombs/MK76.lua +++ b/_G/bombs/MK76.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "Mk 76", + display_name_short = "Mk 76", hMax = 12000, hMin = 200, mass = 11.3, diff --git a/_G/bombs/MK_82AIR.lua b/_G/bombs/MK_82AIR.lua index 8664390c..63595828 100644 --- a/_G/bombs/MK_82AIR.lua +++ b/_G/bombs/MK_82AIR.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "Mk-82AIR", + display_name_short = "Mk-82AIR", hMax = 12000, hMin = 100, mass = 242, diff --git a/_G/bombs/MK_82SNAKEYE.lua b/_G/bombs/MK_82SNAKEYE.lua index 76d43b9f..09be04ab 100644 --- a/_G/bombs/MK_82SNAKEYE.lua +++ b/_G/bombs/MK_82SNAKEYE.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "Mk-82 Snakeye", + display_name_short = "Mk-82 Snakeye", hMax = 12000, hMin = 100, mass = 249.5, diff --git a/_G/bombs/M_117.lua b/_G/bombs/M_117.lua index c038f484..66e0eb09 100644 --- a/_G/bombs/M_117.lua +++ b/_G/bombs/M_117.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "M117", + display_name_short = "M117", hMax = 12000, hMin = 300, mass = 340, diff --git a/_G/bombs/Mk_81.lua b/_G/bombs/Mk_81.lua index 4d912b67..db971eba 100644 --- a/_G/bombs/Mk_81.lua +++ b/_G/bombs/Mk_81.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "Mk-81", + display_name_short = "Mk-81", hMax = 12000, hMin = 100, mass = 113.4, diff --git a/_G/bombs/Mk_82.lua b/_G/bombs/Mk_82.lua index a5d93d7e..a9b9e053 100644 --- a/_G/bombs/Mk_82.lua +++ b/_G/bombs/Mk_82.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "Mk-82", + display_name_short = "Mk-82", hMax = 12000, hMin = 100, mass = 228, diff --git a/_G/bombs/Mk_82Y.lua b/_G/bombs/Mk_82Y.lua index 7dc65896..c700346d 100644 --- a/_G/bombs/Mk_82Y.lua +++ b/_G/bombs/Mk_82Y.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "Mk-82Y - 500lb GP Chute Retarded HD", + display_name_short = "Mk-82Y - 500lb GP Chute Retarded HD", hMax = 10000, hMin = 100, mass = 232, diff --git a/_G/bombs/Mk_83.lua b/_G/bombs/Mk_83.lua index abed7a1f..d3f8499e 100644 --- a/_G/bombs/Mk_83.lua +++ b/_G/bombs/Mk_83.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "Mk-83", + display_name_short = "Mk-83", hMax = 12000, hMin = 200, mass = 454, diff --git a/_G/bombs/Mk_83CT.lua b/_G/bombs/Mk_83CT.lua index fdd52804..e3b49397 100644 --- a/_G/bombs/Mk_83CT.lua +++ b/_G/bombs/Mk_83CT.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "Mk-83CT", + display_name_short = "Mk-83CT", hMax = 10000, hMin = 100, mass = 454, diff --git a/_G/bombs/Mk_84.lua b/_G/bombs/Mk_84.lua index 587270dd..3fed822a 100644 --- a/_G/bombs/Mk_84.lua +++ b/_G/bombs/Mk_84.lua @@ -4,6 +4,7 @@ _G["bombs"]["#Index"] = { Name = "Redacted", VyHold = -100, display_name = "Mk-84", + display_name_short = "Mk-84", hMax = 12000, hMin = 300, mass = 894, diff --git a/_G/bombs/Mk_84AIR_GP.lua b/_G/bombs/Mk_84AIR_GP.lua index 13a7f943..610cc9ea 100644 --- a/_G/bombs/Mk_84AIR_GP.lua +++ b/_G/bombs/Mk_84AIR_GP.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "Mk-84 AIR GP HD", + display_name_short = "Mk-84 AIR GP HD", hMax = 2000, hMin = 25, mass = 911.7, diff --git a/_G/bombs/Mk_84AIR_TP.lua b/_G/bombs/Mk_84AIR_TP.lua index 5a58052b..e04f9986 100644 --- a/_G/bombs/Mk_84AIR_TP.lua +++ b/_G/bombs/Mk_84AIR_TP.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "Mk-84 AIR TP HD", + display_name_short = "Mk-84 AIR TP HD", hMax = 2000, hMin = 25, mass = 911.7, diff --git a/_G/bombs/ODAB-500PM.lua b/_G/bombs/ODAB-500PM.lua index 0218f5a0..2b21294b 100644 --- a/_G/bombs/ODAB-500PM.lua +++ b/_G/bombs/ODAB-500PM.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "ODAB-500PM - 525 kg, bomb, parachute, simulated aerosol", + display_name_short = "ODAB-500PM - 525 kg, bomb, parachute, simulated aerosol", hMax = 15000, hMin = 200, mass = 520, diff --git a/_G/bombs/OFAB-100 Jupiter.lua b/_G/bombs/OFAB-100 Jupiter.lua index 22bd083c..c2645ac2 100644 --- a/_G/bombs/OFAB-100 Jupiter.lua +++ b/_G/bombs/OFAB-100 Jupiter.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/L-39/L-39ZA.lua", _origin = "L-39C/ZA by Eagle Dynamics", display_name = "OFAB-100 Jupiter - 100kg GP Bomb HD", + display_name_short = "OFAB-100 Jupiter - 100kg GP Bomb HD", hMax = 12000, hMin = 50, mass = 121, diff --git a/_G/bombs/OFAB-100-120TU.lua b/_G/bombs/OFAB-100-120TU.lua index 79e59976..2894b756 100644 --- a/_G/bombs/OFAB-100-120TU.lua +++ b/_G/bombs/OFAB-100-120TU.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "OFAB 100-120 TU - 123 kg, bomb, parachute", + display_name_short = "OFAB 100-120 TU - 123 kg, bomb, parachute", hMax = 5000, hMin = 50, mass = 123, diff --git a/_G/bombs/P-50T.lua b/_G/bombs/P-50T.lua index 6b09730f..1b4352c2 100644 --- a/_G/bombs/P-50T.lua +++ b/_G/bombs/P-50T.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/L-39/L-39C.lua", _origin = "L-39C/ZA by Eagle Dynamics", display_name = "P-50T - 50kg Practice Bomb LD", + display_name_short = "P-50T - 50kg Practice Bomb LD", hMax = 12000, hMin = 200, mass = 50, diff --git a/_G/bombs/PTAB_2_5KO.lua b/_G/bombs/PTAB_2_5KO.lua index 6eba9b36..173ac37b 100644 --- a/_G/bombs/PTAB_2_5KO.lua +++ b/_G/bombs/PTAB_2_5KO.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.PTAB_2_5KO", display_name = "PTAB-2.5KO", + display_name_short = "PTAB-2.5KO", explMass = 0, hMax = 3000, hMin = 50, diff --git a/_G/bombs/RBK_500SOAB.lua b/_G/bombs/RBK_500SOAB.lua index 1485f548..6033411b 100644 --- a/_G/bombs/RBK_500SOAB.lua +++ b/_G/bombs/RBK_500SOAB.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { VyHold = -100, _unique_resource_name = "weapons.bombs.RBK_500SOAB", display_name = "RBK-500SHOAB", + display_name_short = "RBK-500SHOAB", explMass = 210, hMax = 25000, hMin = 200, diff --git a/_G/bombs/RN-24.lua b/_G/bombs/RN-24.lua index 8dba08cf..85571c3e 100644 --- a/_G/bombs/RN-24.lua +++ b/_G/bombs/RN-24.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "RN-24 - 470kg, nuclear bomb, free fall", + display_name_short = "RN-24 - 470kg, nuclear bomb, free fall", hMax = 12000, hMin = 1000, mass = 470, diff --git a/_G/bombs/RN-28.lua b/_G/bombs/RN-28.lua index 4deef7f1..3445b54a 100644 --- a/_G/bombs/RN-28.lua +++ b/_G/bombs/RN-28.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", _origin = "MiG-21Bis AI by Magnitude 3 LLC", display_name = "RN-28 - 260 kg, nuclear bomb, free fall", + display_name_short = "RN-28 - 260 kg, nuclear bomb, free fall", hMax = 12000, hMin = 1000, mass = 260, diff --git a/_G/bombs/SAB_100MN.lua b/_G/bombs/SAB_100MN.lua index 65e936cc..d51265f7 100644 --- a/_G/bombs/SAB_100MN.lua +++ b/_G/bombs/SAB_100MN.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAB-100MN", + display_name_short = "SAB-100MN", hMax = 7000, hMin = 400, mass = 106, diff --git a/_G/bombs/SAB_100_FLARE.lua b/_G/bombs/SAB_100_FLARE.lua index 1cf02323..8da7ecfa 100644 --- a/_G/bombs/SAB_100_FLARE.lua +++ b/_G/bombs/SAB_100_FLARE.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAB-100 Flare", + display_name_short = "SAB-100 Flare", hMax = 2000, hMin = 25, mass = 5.21, diff --git a/_G/bombs/SAB_250_200.lua b/_G/bombs/SAB_250_200.lua index dc657a9e..deeb3ed1 100644 --- a/_G/bombs/SAB_250_200.lua +++ b/_G/bombs/SAB_250_200.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAB-250-200", + display_name_short = "SAB-250-200", hMax = 7000, hMin = 400, mass = 201, diff --git a/_G/bombs/SAB_250_FLARE.lua b/_G/bombs/SAB_250_FLARE.lua index b7494da9..5f1035aa 100644 --- a/_G/bombs/SAB_250_FLARE.lua +++ b/_G/bombs/SAB_250_FLARE.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAB-250 Flare", + display_name_short = "SAB-250 Flare", hMax = 2000, hMin = 25, mass = 9.83, diff --git a/_G/bombs/SAMP125LD.lua b/_G/bombs/SAMP125LD.lua index 613575cf..b9fa2d5f 100644 --- a/_G/bombs/SAMP125LD.lua +++ b/_G/bombs/SAMP125LD.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAMP-125 LD", + display_name_short = "SAMP-125 LD", hMax = 12000, hMin = 50, mass = 120, diff --git a/_G/bombs/SAMP250HD.lua b/_G/bombs/SAMP250HD.lua index c0fc919f..7b5a7912 100644 --- a/_G/bombs/SAMP250HD.lua +++ b/_G/bombs/SAMP250HD.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAMP-250 HD", + display_name_short = "SAMP-250 HD", hMax = 2000, hMin = 50, mass = 269, diff --git a/_G/bombs/SAMP250LD.lua b/_G/bombs/SAMP250LD.lua index fc45c97e..6677a06c 100644 --- a/_G/bombs/SAMP250LD.lua +++ b/_G/bombs/SAMP250LD.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAMP-250 LD", + display_name_short = "SAMP-250 LD", hMax = 12000, hMin = 50, mass = 245, diff --git a/_G/bombs/SAMP400HD.lua b/_G/bombs/SAMP400HD.lua index 6c2a26a0..311c8869 100644 --- a/_G/bombs/SAMP400HD.lua +++ b/_G/bombs/SAMP400HD.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAMP-400 HD", + display_name_short = "SAMP-400 HD", hMax = 2000, hMin = 50, mass = 395, diff --git a/_G/bombs/SAMP400LD.lua b/_G/bombs/SAMP400LD.lua index cbbca166..907c41d8 100644 --- a/_G/bombs/SAMP400LD.lua +++ b/_G/bombs/SAMP400LD.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", display_name = "SAMP-400 LD", + display_name_short = "SAMP-400 LD", hMax = 12000, hMin = 200, mass = 360, diff --git a/_G/bombs/SC_250_T1_L2.lua b/_G/bombs/SC_250_T1_L2.lua index 6c16a02f..b98ebe35 100644 --- a/_G/bombs/SC_250_T1_L2.lua +++ b/_G/bombs/SC_250_T1_L2.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "SC 250 Type 1 L2", + display_name_short = "SC 250 Type 1 L2", hMax = 12000, hMin = 300, mass = 250, diff --git a/_G/bombs/SC_250_T3_J.lua b/_G/bombs/SC_250_T3_J.lua index ace9b5f4..e9b32399 100644 --- a/_G/bombs/SC_250_T3_J.lua +++ b/_G/bombs/SC_250_T3_J.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "SC 250 Type 3 J", + display_name_short = "SC 250 Type 3 J", hMax = 12000, hMin = 300, mass = 250, diff --git a/_G/bombs/SC_50.lua b/_G/bombs/SC_50.lua index 216374de..fb9c59d3 100644 --- a/_G/bombs/SC_50.lua +++ b/_G/bombs/SC_50.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "SC 50", + display_name_short = "SC 50", hMax = 12000, hMin = 1000, mass = 50, diff --git a/_G/bombs/SC_500_J.lua b/_G/bombs/SC_500_J.lua index c37c0497..d740e71f 100644 --- a/_G/bombs/SC_500_J.lua +++ b/_G/bombs/SC_500_J.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "SC 500 J", + display_name_short = "SC 500 J", hMax = 12000, hMin = 300, mass = 500, diff --git a/_G/bombs/SC_500_L2.lua b/_G/bombs/SC_500_L2.lua index cb89c343..3b03e070 100644 --- a/_G/bombs/SC_500_L2.lua +++ b/_G/bombs/SC_500_L2.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "SC 500 L2", + display_name_short = "SC 500 L2", hMax = 12000, hMin = 300, mass = 500, diff --git a/_G/bombs/SD_250_Stg.lua b/_G/bombs/SD_250_Stg.lua index 277da6d2..e2916159 100644 --- a/_G/bombs/SD_250_Stg.lua +++ b/_G/bombs/SD_250_Stg.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "SD 250 Stg", + display_name_short = "SD 250 Stg", hMax = 12000, hMin = 300, mass = 250, diff --git a/_G/bombs/SD_500_A.lua b/_G/bombs/SD_500_A.lua index 17f3d56b..2a5d514c 100644 --- a/_G/bombs/SD_500_A.lua +++ b/_G/bombs/SD_500_A.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", display_name = "SD 500 A", + display_name_short = "SD 500 A", hMax = 12000, hMin = 300, mass = 500, diff --git a/_G/bombs/S_8OM_FLARE.lua b/_G/bombs/S_8OM_FLARE.lua index 916c6c72..1b3658ca 100644 --- a/_G/bombs/S_8OM_FLARE.lua +++ b/_G/bombs/S_8OM_FLARE.lua @@ -5,6 +5,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", _origin = "AircraftWeaponPack", display_name = "S-8OM Flare", + display_name_short = "S-8OM Flare", hMax = 2000, hMin = 25, mass = 4.4, diff --git a/_G/bombs/TYPE-200A.lua b/_G/bombs/TYPE-200A.lua index 7e6d8653..b8c8f660 100644 --- a/_G/bombs/TYPE-200A.lua +++ b/_G/bombs/TYPE-200A.lua @@ -6,6 +6,7 @@ _G["bombs"]["#Index"] = { _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/bomb_type200.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", display_name = "TYPE-200A", + display_name_short = "TYPE-200A", hMax = 5000, hMin = 60, mass = 200, diff --git a/_G/bombs/Type_200A.lua b/_G/bombs/Type_200A.lua new file mode 100644 index 00000000..e7412fcf --- /dev/null +++ b/_G/bombs/Type_200A.lua @@ -0,0 +1,17 @@ +_G["bombs"]["#Index"] = { + Ag = -20, + Cx = 0.00018, + Name = "Redacted", + VyHold = -75, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + display_name = "TYPE-200A", + display_name_short = "TYPE-200A", + hMax = 5000, + hMin = 60, + mass = 200, + name = "Type_200A", + type = 1, + warhead = "_G/warheads/Type200A.lua", + ws_type = { 4, 5, 37, "Redacted" } +} \ No newline at end of file diff --git a/_G/db/Countries/Abkhazia.lua b/_G/db/Countries/Abkhazia.lua index 47141d85..a9373b08 100644 --- a/_G/db/Countries/Abkhazia.lua +++ b/_G/db/Countries/Abkhazia.lua @@ -1001,6 +1001,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Ju-88A4" }, { diff --git a/_G/db/Countries/Algeria.lua b/_G/db/Countries/Algeria.lua index ffacf82b..2485fe5c 100644 --- a/_G/db/Countries/Algeria.lua +++ b/_G/db/Countries/Algeria.lua @@ -427,6 +427,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -1279,6 +1287,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Argentina.lua b/_G/db/Countries/Argentina.lua index 3ecea55a..21abdd1c 100644 --- a/_G/db/Countries/Argentina.lua +++ b/_G/db/Countries/Argentina.lua @@ -893,6 +893,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Australia.lua b/_G/db/Countries/Australia.lua index d8b057b1..9e0e74da 100644 --- a/_G/db/Countries/Australia.lua +++ b/_G/db/Countries/Australia.lua @@ -1149,6 +1149,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Austria.lua b/_G/db/Countries/Austria.lua index 8f7556b7..f2dabaea 100644 --- a/_G/db/Countries/Austria.lua +++ b/_G/db/Countries/Austria.lua @@ -765,6 +765,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Bahrain.lua b/_G/db/Countries/Bahrain.lua index ffd6ec11..10926e7f 100644 --- a/_G/db/Countries/Bahrain.lua +++ b/_G/db/Countries/Bahrain.lua @@ -815,6 +815,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Belarus.lua b/_G/db/Countries/Belarus.lua index a9d09a56..e85a5407 100644 --- a/_G/db/Countries/Belarus.lua +++ b/_G/db/Countries/Belarus.lua @@ -329,6 +329,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -1167,6 +1175,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Ju-88A4" }, { diff --git a/_G/db/Countries/Belgium.lua b/_G/db/Countries/Belgium.lua index eeec9610..ebb12254 100644 --- a/_G/db/Countries/Belgium.lua +++ b/_G/db/Countries/Belgium.lua @@ -955,12 +955,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { Name = "Ju-88A4" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/Bolivia.lua b/_G/db/Countries/Bolivia.lua index 73d45222..d701c07f 100644 --- a/_G/db/Countries/Bolivia.lua +++ b/_G/db/Countries/Bolivia.lua @@ -977,6 +977,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Brazil.lua b/_G/db/Countries/Brazil.lua index 3301d2a1..df4c111f 100644 --- a/_G/db/Countries/Brazil.lua +++ b/_G/db/Countries/Brazil.lua @@ -841,6 +841,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Bulgaria.lua b/_G/db/Countries/Bulgaria.lua index b10e53d8..4d11a6c0 100644 --- a/_G/db/Countries/Bulgaria.lua +++ b/_G/db/Countries/Bulgaria.lua @@ -269,6 +269,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-18 Igla manpad", in_service = 0, @@ -1035,6 +1043,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Ju-88A4" }, { diff --git a/_G/db/Countries/Canada.lua b/_G/db/Countries/Canada.lua index 5f7be2e3..ba4220fa 100644 --- a/_G/db/Countries/Canada.lua +++ b/_G/db/Countries/Canada.lua @@ -965,6 +965,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Chile.lua b/_G/db/Countries/Chile.lua index 2e74e549..d14619bd 100644 --- a/_G/db/Countries/Chile.lua +++ b/_G/db/Countries/Chile.lua @@ -925,6 +925,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/China.lua b/_G/db/Countries/China.lua index 14100d89..2abec779 100644 --- a/_G/db/Countries/China.lua +++ b/_G/db/Countries/China.lua @@ -331,6 +331,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 54K6 cp", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "p-19 s-125 sr", in_service = 0, @@ -1081,6 +1089,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Combined Joint Task Forces Blue.lua b/_G/db/Countries/Combined Joint Task Forces Blue.lua index bc6bafc4..3472bb49 100644 --- a/_G/db/Countries/Combined Joint Task Forces Blue.lua +++ b/_G/db/Countries/Combined Joint Task Forces Blue.lua @@ -521,6 +521,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -1289,6 +1297,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "US Carrier Technician Static Yellow", in_service = 0, out_of_service = 40000 + }, { + Name = "HEMTT_C-RAM_Phalanx", + in_service = 0, + out_of_service = 40000 }, { Name = "soldier_wwii_us", in_service = 0, @@ -1973,6 +1985,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { @@ -2007,6 +2023,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "IL-78M", in_service = 0, out_of_service = 40000 + }, { + Name = "L-39ZA", + in_service = 0, + out_of_service = 40000 }, { Name = "MiG-23MLD", in_service = 0, @@ -2035,10 +2055,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "P-51D", in_service = 0, out_of_service = 40000 - }, { - Name = "TF-51D", - in_service = 0, - out_of_service = 40000 }, { Name = "Su-17M4", in_service = 0, @@ -2115,10 +2131,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CH", in_service = 0, out_of_service = 40000 - }, { - Name = "Mirage-F1BE", - in_service = 0, - out_of_service = 40000 }, { Name = "Mirage-F1EQ", in_service = 0, @@ -2207,10 +2219,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Su-34", in_service = 0, out_of_service = 40000 - }, { - Name = "L-39ZA", - in_service = 0, - out_of_service = 40000 }, { Name = "F-15C", in_service = 0, diff --git a/_G/db/Countries/Combined Joint Task Forces Red.lua b/_G/db/Countries/Combined Joint Task Forces Red.lua index 6c5f7856..5ec63bab 100644 --- a/_G/db/Countries/Combined Joint Task Forces Red.lua +++ b/_G/db/Countries/Combined Joint Task Forces Red.lua @@ -521,6 +521,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -1289,6 +1297,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "US Carrier Technician Static Yellow", in_service = 0, out_of_service = 40000 + }, { + Name = "HEMTT_C-RAM_Phalanx", + in_service = 0, + out_of_service = 40000 }, { Name = "soldier_wwii_us", in_service = 0, @@ -1973,6 +1985,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { @@ -2007,6 +2023,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "IL-78M", in_service = 0, out_of_service = 40000 + }, { + Name = "L-39ZA", + in_service = 0, + out_of_service = 40000 }, { Name = "MiG-23MLD", in_service = 0, @@ -2035,10 +2055,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "P-51D", in_service = 0, out_of_service = 40000 - }, { - Name = "TF-51D", - in_service = 0, - out_of_service = 40000 }, { Name = "Su-17M4", in_service = 0, @@ -2115,10 +2131,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CH", in_service = 0, out_of_service = 40000 - }, { - Name = "Mirage-F1BE", - in_service = 0, - out_of_service = 40000 }, { Name = "Mirage-F1EQ", in_service = 0, @@ -2207,10 +2219,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Su-34", in_service = 0, out_of_service = 40000 - }, { - Name = "L-39ZA", - in_service = 0, - out_of_service = 40000 }, { Name = "F-15C", in_service = 0, diff --git a/_G/db/Countries/Croatia.lua b/_G/db/Countries/Croatia.lua index fc40dd04..0e945b06 100644 --- a/_G/db/Countries/Croatia.lua +++ b/_G/db/Countries/Croatia.lua @@ -771,6 +771,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Cuba.lua b/_G/db/Countries/Cuba.lua index 5178eabe..ceb944b2 100644 --- a/_G/db/Countries/Cuba.lua +++ b/_G/db/Countries/Cuba.lua @@ -979,6 +979,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Cyprus.lua b/_G/db/Countries/Cyprus.lua index 362236ac..462574d7 100644 --- a/_G/db/Countries/Cyprus.lua +++ b/_G/db/Countries/Cyprus.lua @@ -197,6 +197,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -827,6 +835,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Czech Republic.lua b/_G/db/Countries/Czech Republic.lua index 6e285ba0..96a82311 100644 --- a/_G/db/Countries/Czech Republic.lua +++ b/_G/db/Countries/Czech Republic.lua @@ -911,6 +911,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Denmark.lua b/_G/db/Countries/Denmark.lua index dcaa375e..24f2617b 100644 --- a/_G/db/Countries/Denmark.lua +++ b/_G/db/Countries/Denmark.lua @@ -909,12 +909,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { Name = "Ju-88A4" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/Ecuador.lua b/_G/db/Countries/Ecuador.lua index 4d1c9587..54531eb7 100644 --- a/_G/db/Countries/Ecuador.lua +++ b/_G/db/Countries/Ecuador.lua @@ -787,6 +787,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1JA" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Egypt.lua b/_G/db/Countries/Egypt.lua index bb2039a7..b165d93d 100644 --- a/_G/db/Countries/Egypt.lua +++ b/_G/db/Countries/Egypt.lua @@ -317,6 +317,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk LN 9A310M1", in_service = 0, @@ -1111,6 +1119,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Ethiopia.lua b/_G/db/Countries/Ethiopia.lua index fdc282d4..09e8b584 100644 --- a/_G/db/Countries/Ethiopia.lua +++ b/_G/db/Countries/Ethiopia.lua @@ -855,6 +855,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Finland.lua b/_G/db/Countries/Finland.lua index 8f760c58..18531074 100644 --- a/_G/db/Countries/Finland.lua +++ b/_G/db/Countries/Finland.lua @@ -947,6 +947,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/France.lua b/_G/db/Countries/France.lua index 34feaeb8..e5484a1c 100644 --- a/_G/db/Countries/France.lua +++ b/_G/db/Countries/France.lua @@ -993,12 +993,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CT" }, { Name = "Mirage-F1B" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { Name = "Ju-88A4" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/GDR.lua b/_G/db/Countries/GDR.lua index a93dbae8..5a0b4adb 100644 --- a/_G/db/Countries/GDR.lua +++ b/_G/db/Countries/GDR.lua @@ -337,6 +337,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "Kub 2P25 ln", in_service = 0, @@ -1019,6 +1027,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Georgia.lua b/_G/db/Countries/Georgia.lua index ac90135f..9a575b32 100644 --- a/_G/db/Countries/Georgia.lua +++ b/_G/db/Countries/Georgia.lua @@ -1137,12 +1137,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Ju-88A4" }, { Name = "C-47" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/Germany.lua b/_G/db/Countries/Germany.lua index de020fef..cc4ad6f4 100644 --- a/_G/db/Countries/Germany.lua +++ b/_G/db/Countries/Germany.lua @@ -469,6 +469,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "rapier_fsa_launcher", in_service = 0, @@ -1314,9 +1322,11 @@ _G["db"]["Countries"]["#Index"] = { }, { Name = "Mirage-F1EE" }, { - Name = "Ju-88A4" + Name = "Mirage-F1BE" }, { Name = "TF-51D" + }, { + Name = "Ju-88A4" } } }, Ships = { diff --git a/_G/db/Countries/Ghana.lua b/_G/db/Countries/Ghana.lua index 4b5e2c28..cfaab08f 100644 --- a/_G/db/Countries/Ghana.lua +++ b/_G/db/Countries/Ghana.lua @@ -775,6 +775,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Greece.lua b/_G/db/Countries/Greece.lua index 6a7b7936..de2dfb30 100644 --- a/_G/db/Countries/Greece.lua +++ b/_G/db/Countries/Greece.lua @@ -449,6 +449,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 54K6 cp", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "M2A1_halftrack", in_service = 0, @@ -1133,6 +1141,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1CG" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Honduras.lua b/_G/db/Countries/Honduras.lua index 5b164577..aeb630d8 100644 --- a/_G/db/Countries/Honduras.lua +++ b/_G/db/Countries/Honduras.lua @@ -745,6 +745,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Hungary.lua b/_G/db/Countries/Hungary.lua index 9451da74..99a9b7c9 100644 --- a/_G/db/Countries/Hungary.lua +++ b/_G/db/Countries/Hungary.lua @@ -991,6 +991,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Ju-88A4" } } diff --git a/_G/db/Countries/India.lua b/_G/db/Countries/India.lua index fa97e9e0..72825947 100644 --- a/_G/db/Countries/India.lua +++ b/_G/db/Countries/India.lua @@ -927,6 +927,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Indonesia.lua b/_G/db/Countries/Indonesia.lua index 676a9987..807d1a60 100644 --- a/_G/db/Countries/Indonesia.lua +++ b/_G/db/Countries/Indonesia.lua @@ -939,6 +939,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Insurgents.lua b/_G/db/Countries/Insurgents.lua index 6030f73f..b4453c60 100644 --- a/_G/db/Countries/Insurgents.lua +++ b/_G/db/Countries/Insurgents.lua @@ -889,6 +889,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Iran.lua b/_G/db/Countries/Iran.lua index f60e4a68..c46f9453 100644 --- a/_G/db/Countries/Iran.lua +++ b/_G/db/Countries/Iran.lua @@ -233,6 +233,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 54K6 cp", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "Kub 1S91 str", in_service = 0, @@ -1021,8 +1029,12 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1EQ" + }, { + Name = "Mirage-F1BE" }, { Name = "Mirage-F1BQ" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Iraq.lua b/_G/db/Countries/Iraq.lua index 1c23acd3..92924f69 100644 --- a/_G/db/Countries/Iraq.lua +++ b/_G/db/Countries/Iraq.lua @@ -987,8 +987,12 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1EQ" + }, { + Name = "Mirage-F1BE" }, { Name = "Mirage-F1BQ" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Israel.lua b/_G/db/Countries/Israel.lua index c912cb6d..afe123c3 100644 --- a/_G/db/Countries/Israel.lua +++ b/_G/db/Countries/Israel.lua @@ -1005,6 +1005,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Italian Social Republic.lua b/_G/db/Countries/Italian Social Republic.lua index 46e90505..b03983a6 100644 --- a/_G/db/Countries/Italian Social Republic.lua +++ b/_G/db/Countries/Italian Social Republic.lua @@ -753,6 +753,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Italy.lua b/_G/db/Countries/Italy.lua index 70b5f0e2..a8ca36f7 100644 --- a/_G/db/Countries/Italy.lua +++ b/_G/db/Countries/Italy.lua @@ -1047,6 +1047,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Japan.lua b/_G/db/Countries/Japan.lua index 4861d5aa..a7223c8c 100644 --- a/_G/db/Countries/Japan.lua +++ b/_G/db/Countries/Japan.lua @@ -965,6 +965,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Jordan.lua b/_G/db/Countries/Jordan.lua index e849bc11..a0a0c5ad 100644 --- a/_G/db/Countries/Jordan.lua +++ b/_G/db/Countries/Jordan.lua @@ -861,8 +861,12 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1CJ" + }, { + Name = "Mirage-F1BE" }, { Name = "Mirage-F1DDA" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Kazakhstan.lua b/_G/db/Countries/Kazakhstan.lua index 433e81e7..bf2e2db8 100644 --- a/_G/db/Countries/Kazakhstan.lua +++ b/_G/db/Countries/Kazakhstan.lua @@ -185,6 +185,18 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 5P85D ln", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 54K6 cp", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk SR 9S18M1", in_service = 0, @@ -333,10 +345,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "BTR_D", in_service = 0, out_of_service = 40000 - }, { - Name = "S-300PS 54K6 cp", - in_service = 0, - out_of_service = 40000 }, { Name = "GAZ-3307", in_service = 0, @@ -1185,6 +1193,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Kuwait.lua b/_G/db/Countries/Kuwait.lua index 8373cc3e..a150844b 100644 --- a/_G/db/Countries/Kuwait.lua +++ b/_G/db/Countries/Kuwait.lua @@ -859,6 +859,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1CK" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Lebanon.lua b/_G/db/Countries/Lebanon.lua index 8e4aea82..fb8047d5 100644 --- a/_G/db/Countries/Lebanon.lua +++ b/_G/db/Countries/Lebanon.lua @@ -851,6 +851,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Libya.lua b/_G/db/Countries/Libya.lua index 36c280f4..c51818d7 100644 --- a/_G/db/Countries/Libya.lua +++ b/_G/db/Countries/Libya.lua @@ -863,8 +863,12 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1ED" + }, { + Name = "Mirage-F1BE" }, { Name = "Mirage-F1BD" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Malaysia.lua b/_G/db/Countries/Malaysia.lua index 0d287cc2..28ffe584 100644 --- a/_G/db/Countries/Malaysia.lua +++ b/_G/db/Countries/Malaysia.lua @@ -779,6 +779,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Mexico.lua b/_G/db/Countries/Mexico.lua index 23abd7c7..c9c59f38 100644 --- a/_G/db/Countries/Mexico.lua +++ b/_G/db/Countries/Mexico.lua @@ -765,6 +765,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Morocco.lua b/_G/db/Countries/Morocco.lua index d13b9db9..a02d4973 100644 --- a/_G/db/Countries/Morocco.lua +++ b/_G/db/Countries/Morocco.lua @@ -883,6 +883,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CH" }, { Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Nigeria.lua b/_G/db/Countries/Nigeria.lua index 20fe1bc1..622c9af5 100644 --- a/_G/db/Countries/Nigeria.lua +++ b/_G/db/Countries/Nigeria.lua @@ -821,6 +821,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/North Korea.lua b/_G/db/Countries/North Korea.lua index d1768cd9..9ffb2239 100644 --- a/_G/db/Countries/North Korea.lua +++ b/_G/db/Countries/North Korea.lua @@ -839,6 +839,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Norway.lua b/_G/db/Countries/Norway.lua index a075b755..bb4ac5bd 100644 --- a/_G/db/Countries/Norway.lua +++ b/_G/db/Countries/Norway.lua @@ -919,12 +919,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { Name = "Ju-88A4" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/Oman.lua b/_G/db/Countries/Oman.lua index d2b8af4e..db2ba8bf 100644 --- a/_G/db/Countries/Oman.lua +++ b/_G/db/Countries/Oman.lua @@ -865,6 +865,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Pakistan.lua b/_G/db/Countries/Pakistan.lua index 2b8c1d31..5001c855 100644 --- a/_G/db/Countries/Pakistan.lua +++ b/_G/db/Countries/Pakistan.lua @@ -871,6 +871,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Peru.lua b/_G/db/Countries/Peru.lua index c97504a8..e290e3f2 100644 --- a/_G/db/Countries/Peru.lua +++ b/_G/db/Countries/Peru.lua @@ -871,6 +871,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Philippines.lua b/_G/db/Countries/Philippines.lua index 2bde5e5d..43409ace 100644 --- a/_G/db/Countries/Philippines.lua +++ b/_G/db/Countries/Philippines.lua @@ -731,6 +731,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Poland.lua b/_G/db/Countries/Poland.lua index d4167be3..947f97c7 100644 --- a/_G/db/Countries/Poland.lua +++ b/_G/db/Countries/Poland.lua @@ -1087,6 +1087,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Portugal.lua b/_G/db/Countries/Portugal.lua index 8d6352d6..53193b44 100644 --- a/_G/db/Countries/Portugal.lua +++ b/_G/db/Countries/Portugal.lua @@ -901,6 +901,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Qatar.lua b/_G/db/Countries/Qatar.lua index eb63d8e7..84289509 100644 --- a/_G/db/Countries/Qatar.lua +++ b/_G/db/Countries/Qatar.lua @@ -801,8 +801,12 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1EDA" + }, { + Name = "Mirage-F1BE" }, { Name = "Mirage-F1DDA" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Romania.lua b/_G/db/Countries/Romania.lua index 26a493ad..0130dce0 100644 --- a/_G/db/Countries/Romania.lua +++ b/_G/db/Countries/Romania.lua @@ -951,6 +951,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Ju-88A4" }, { diff --git a/_G/db/Countries/Russia.lua b/_G/db/Countries/Russia.lua index 69ea5174..71616541 100644 --- a/_G/db/Countries/Russia.lua +++ b/_G/db/Countries/Russia.lua @@ -465,6 +465,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -1445,12 +1453,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Ju-88A4" }, { Name = "C-47" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/Saudi Arabia.lua b/_G/db/Countries/Saudi Arabia.lua index 4293826f..6acfca2e 100644 --- a/_G/db/Countries/Saudi Arabia.lua +++ b/_G/db/Countries/Saudi Arabia.lua @@ -913,6 +913,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Serbia.lua b/_G/db/Countries/Serbia.lua index 00a64c50..8012be19 100644 --- a/_G/db/Countries/Serbia.lua +++ b/_G/db/Countries/Serbia.lua @@ -945,6 +945,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Slovakia.lua b/_G/db/Countries/Slovakia.lua index 760d83a8..cbd42e1e 100644 --- a/_G/db/Countries/Slovakia.lua +++ b/_G/db/Countries/Slovakia.lua @@ -249,6 +249,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-18 Igla manpad", in_service = 0, @@ -883,6 +891,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Slovenia.lua b/_G/db/Countries/Slovenia.lua index adc2534f..a446a970 100644 --- a/_G/db/Countries/Slovenia.lua +++ b/_G/db/Countries/Slovenia.lua @@ -905,6 +905,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/South Africa.lua b/_G/db/Countries/South Africa.lua index 6ee05c12..c4ab3700 100644 --- a/_G/db/Countries/South Africa.lua +++ b/_G/db/Countries/South Africa.lua @@ -923,6 +923,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1EE" }, { Name = "Mirage-F1CZ" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/South Korea.lua b/_G/db/Countries/South Korea.lua index 62b05cb5..1395c74b 100644 --- a/_G/db/Countries/South Korea.lua +++ b/_G/db/Countries/South Korea.lua @@ -887,6 +887,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/South Ossetia.lua b/_G/db/Countries/South Ossetia.lua index cac3d1cc..782e9cb6 100644 --- a/_G/db/Countries/South Ossetia.lua +++ b/_G/db/Countries/South Ossetia.lua @@ -931,6 +931,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Spain.lua b/_G/db/Countries/Spain.lua index c7b4cc84..71246414 100644 --- a/_G/db/Countries/Spain.lua +++ b/_G/db/Countries/Spain.lua @@ -1157,14 +1157,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1BE" }, { Name = "Mirage-F1DDA" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { Name = "Ju-88A4" }, { Name = "C-47" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/Sudan.lua b/_G/db/Countries/Sudan.lua index 3e2a3530..24d6e038 100644 --- a/_G/db/Countries/Sudan.lua +++ b/_G/db/Countries/Sudan.lua @@ -825,6 +825,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Sweden.lua b/_G/db/Countries/Sweden.lua index 35731a20..2c3effca 100644 --- a/_G/db/Countries/Sweden.lua +++ b/_G/db/Countries/Sweden.lua @@ -787,6 +787,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Switzerland.lua b/_G/db/Countries/Switzerland.lua index 0ce4876c..51febed5 100644 --- a/_G/db/Countries/Switzerland.lua +++ b/_G/db/Countries/Switzerland.lua @@ -979,6 +979,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Syria.lua b/_G/db/Countries/Syria.lua index 33ebe61a..79d69f26 100644 --- a/_G/db/Countries/Syria.lua +++ b/_G/db/Countries/Syria.lua @@ -405,6 +405,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "tt_KORD", in_service = 0, @@ -1013,6 +1021,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Thailand.lua b/_G/db/Countries/Thailand.lua index 1ba85a4a..5a3599f6 100644 --- a/_G/db/Countries/Thailand.lua +++ b/_G/db/Countries/Thailand.lua @@ -815,6 +815,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/The Netherlands.lua b/_G/db/Countries/The Netherlands.lua index 82ab9dc1..f4a7fc22 100644 --- a/_G/db/Countries/The Netherlands.lua +++ b/_G/db/Countries/The Netherlands.lua @@ -1075,6 +1075,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Third Reich.lua b/_G/db/Countries/Third Reich.lua index e3233bb5..900e5bcf 100644 --- a/_G/db/Countries/Third Reich.lua +++ b/_G/db/Countries/Third Reich.lua @@ -789,6 +789,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Tunisia.lua b/_G/db/Countries/Tunisia.lua index 110c5fe0..61d0e860 100644 --- a/_G/db/Countries/Tunisia.lua +++ b/_G/db/Countries/Tunisia.lua @@ -751,6 +751,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Turkey.lua b/_G/db/Countries/Turkey.lua index 11082720..54a65f7f 100644 --- a/_G/db/Countries/Turkey.lua +++ b/_G/db/Countries/Turkey.lua @@ -1001,12 +1001,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { Name = "Ju-88A4" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/UK.lua b/_G/db/Countries/UK.lua index e1955350..6b5e142c 100644 --- a/_G/db/Countries/UK.lua +++ b/_G/db/Countries/UK.lua @@ -1019,6 +1019,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/USA.lua b/_G/db/Countries/USA.lua index 5b570621..10eb1828 100644 --- a/_G/db/Countries/USA.lua +++ b/_G/db/Countries/USA.lua @@ -1597,6 +1597,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "HL_ZU-23", in_service = 0, out_of_service = 40000 + }, { + Name = "HEMTT_C-RAM_Phalanx" }, { Name = "Electric locomotive" }, { diff --git a/_G/db/Countries/USAF Aggressors.lua b/_G/db/Countries/USAF Aggressors.lua index b9d1aa90..0cf40d61 100644 --- a/_G/db/Countries/USAF Aggressors.lua +++ b/_G/db/Countries/USAF Aggressors.lua @@ -1613,6 +1613,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -2381,6 +2389,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "US Carrier Technician Static Yellow", in_service = 0, out_of_service = 40000 + }, { + Name = "HEMTT_C-RAM_Phalanx", + in_service = 0, + out_of_service = 40000 }, { Name = "soldier_wwii_us", in_service = 0, @@ -3067,6 +3079,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { @@ -3101,6 +3117,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "IL-78M", in_service = 0, out_of_service = 40000 + }, { + Name = "L-39ZA", + in_service = 0, + out_of_service = 40000 }, { Name = "MiG-23MLD", in_service = 0, @@ -3129,10 +3149,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "P-51D", in_service = 0, out_of_service = 40000 - }, { - Name = "TF-51D", - in_service = 0, - out_of_service = 40000 }, { Name = "Su-17M4", in_service = 0, @@ -3209,10 +3225,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CH", in_service = 0, out_of_service = 40000 - }, { - Name = "Mirage-F1BE", - in_service = 0, - out_of_service = 40000 }, { Name = "Mirage-F1EQ", in_service = 0, @@ -3301,10 +3313,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Su-34", in_service = 0, out_of_service = 40000 - }, { - Name = "L-39ZA", - in_service = 0, - out_of_service = 40000 }, { Name = "F-15C", in_service = 0, diff --git a/_G/db/Countries/USSR.lua b/_G/db/Countries/USSR.lua index 0c0f15c1..ae2626c3 100644 --- a/_G/db/Countries/USSR.lua +++ b/_G/db/Countries/USSR.lua @@ -345,6 +345,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -1123,6 +1131,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "L-39C", in_service = 0, out_of_service = 40000 + }, { + Name = "L-39ZA", + in_service = 0, + out_of_service = 40000 }, { Name = "MiG-15bis", in_service = 0, @@ -1289,6 +1301,8 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" }, { Name = "Ju-88A4" } } diff --git a/_G/db/Countries/Ukraine.lua b/_G/db/Countries/Ukraine.lua index 531187f5..e31c9cff 100644 --- a/_G/db/Countries/Ukraine.lua +++ b/_G/db/Countries/Ukraine.lua @@ -401,6 +401,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -685,6 +693,74 @@ _G["db"]["Countries"]["#Index"] = { Name = "HL_ZU-23", in_service = 0, out_of_service = 40000 + }, { + Name = "M978 HEMTT Tanker", + in_service = 0, + out_of_service = 40000 + }, { + Name = "MLRS", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Soldier stinger", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Stinger comm", + in_service = 0, + out_of_service = 40000 + }, { + Name = "TPZ", + in_service = 0, + out_of_service = 40000 + }, { + Name = "NASAMS_Command_Post", + in_service = 0, + out_of_service = 40000 + }, { + Name = "NASAMS_Radar_MPQ64F1", + in_service = 0, + out_of_service = 40000 + }, { + Name = "NASAMS_LN_B", + in_service = 0, + out_of_service = 40000 + }, { + Name = "NASAMS_LN_C", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M-113", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Hawk sr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Hawk cwar", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Hawk pcp", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Hawk tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Hawk ln", + in_service = 0, + out_of_service = 40000 + }, { + Name = "Gepard", + in_service = 0, + out_of_service = 40000 + }, { + Name = "M-109", + in_service = 0, + out_of_service = 40000 }, { Name = "tacr2a" }, { @@ -1317,12 +1393,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Ju-88A4" }, { Name = "C-47" - }, { - Name = "TF-51D" } } }, Ships = { diff --git a/_G/db/Countries/United Arab Emirates.lua b/_G/db/Countries/United Arab Emirates.lua index 1377524a..3eb83c53 100644 --- a/_G/db/Countries/United Arab Emirates.lua +++ b/_G/db/Countries/United Arab Emirates.lua @@ -893,6 +893,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/United Nations Peacekeepers.lua b/_G/db/Countries/United Nations Peacekeepers.lua index ba3229b7..bbc4b2f5 100644 --- a/_G/db/Countries/United Nations Peacekeepers.lua +++ b/_G/db/Countries/United Nations Peacekeepers.lua @@ -521,6 +521,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-11 Buk CC 9S470M1", in_service = 0, @@ -1289,6 +1297,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "US Carrier Technician Static Yellow", in_service = 0, out_of_service = 40000 + }, { + Name = "HEMTT_C-RAM_Phalanx", + in_service = 0, + out_of_service = 40000 }, { Name = "soldier_wwii_us", in_service = 0, @@ -1973,6 +1985,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { @@ -2007,6 +2023,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "IL-78M", in_service = 0, out_of_service = 40000 + }, { + Name = "L-39ZA", + in_service = 0, + out_of_service = 40000 }, { Name = "MiG-23MLD", in_service = 0, @@ -2035,10 +2055,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "P-51D", in_service = 0, out_of_service = 40000 - }, { - Name = "TF-51D", - in_service = 0, - out_of_service = 40000 }, { Name = "Su-17M4", in_service = 0, @@ -2115,10 +2131,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CH", in_service = 0, out_of_service = 40000 - }, { - Name = "Mirage-F1BE", - in_service = 0, - out_of_service = 40000 }, { Name = "Mirage-F1EQ", in_service = 0, @@ -2207,10 +2219,6 @@ _G["db"]["Countries"]["#Index"] = { Name = "Su-34", in_service = 0, out_of_service = 40000 - }, { - Name = "L-39ZA", - in_service = 0, - out_of_service = 40000 }, { Name = "F-15C", in_service = 0, diff --git a/_G/db/Countries/Venezuela.lua b/_G/db/Countries/Venezuela.lua index aa0d4ef9..981cb00c 100644 --- a/_G/db/Countries/Venezuela.lua +++ b/_G/db/Countries/Venezuela.lua @@ -257,6 +257,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "Tor 9A331", in_service = 0, @@ -865,6 +873,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Vietnam.lua b/_G/db/Countries/Vietnam.lua index 5730711a..9f5ae308 100644 --- a/_G/db/Countries/Vietnam.lua +++ b/_G/db/Countries/Vietnam.lua @@ -269,6 +269,14 @@ _G["db"]["Countries"]["#Index"] = { Name = "S-300PS 64H6E sr", in_service = 0, out_of_service = 40000 + }, { + Name = "S-300PS 5H63C 30H6_tr", + in_service = 0, + out_of_service = 40000 + }, { + Name = "S-300PS 40B6MD sr_19J6", + in_service = 0, + out_of_service = 40000 }, { Name = "SA-18 Igla manpad", in_service = 0, @@ -923,6 +931,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Ju-88A4" } } diff --git a/_G/db/Countries/Yemen.lua b/_G/db/Countries/Yemen.lua index 59ae37f7..8cf13a2e 100644 --- a/_G/db/Countries/Yemen.lua +++ b/_G/db/Countries/Yemen.lua @@ -873,6 +873,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Countries/Yugoslavia.lua b/_G/db/Countries/Yugoslavia.lua index 88927a20..3df535d9 100644 --- a/_G/db/Countries/Yugoslavia.lua +++ b/_G/db/Countries/Yugoslavia.lua @@ -841,6 +841,10 @@ _G["db"]["Countries"]["#Index"] = { Name = "Mirage-F1CE" }, { Name = "Mirage-F1EE" + }, { + Name = "Mirage-F1BE" + }, { + Name = "TF-51D" }, { Name = "Yak-52" }, { diff --git a/_G/db/Pods/Pod/WMD7 POD.lua b/_G/db/Pods/Pod/AVIC WMD7 POD.lua similarity index 72% rename from _G/db/Pods/Pod/WMD7 POD.lua rename to _G/db/Pods/Pod/AVIC WMD7 POD.lua index 5aed0663..0b9a3132 100644 --- a/_G/db/Pods/Pod/WMD7 POD.lua +++ b/_G/db/Pods/Pod/AVIC WMD7 POD.lua @@ -1,5 +1,5 @@ _G["db"]["Pods"]["Pod"]["#Index"] = { - DisplayName = "WMD7 POD", + DisplayName = "AVIC WMD7 POD", Name = "Redacted", OPTIC = { "WMD7 FLIR" } } \ No newline at end of file diff --git a/_G/db/Sensors/Sensor/C_RAM_Phalanx.lua b/_G/db/Sensors/Sensor/C_RAM_Phalanx.lua new file mode 100644 index 00000000..b569352f --- /dev/null +++ b/_G/db/Sensors/Sensor/C_RAM_Phalanx.lua @@ -0,0 +1,23 @@ +_G["db"]["Sensors"]["Sensor"]["#Index"] = { + DisplayName = "C_RAM_Phalanx", + Name = "C_RAM_Phalanx", + SensorType = 1, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_sensors.lua", + _origin = "HeavyMetalCore", + category = 1, + detection_distance = { { 20000, + [0] = 20000 + }, + [0] = { 20000, + [0] = 20000 + } + }, + lock_on_distance_coeff = 0.85, + max_measuring_distance = 10000, + scan_period = 1, + scan_volume = { + azimuth = { -180, 180 }, + elevation = { -15, 80 } + }, + type = 0 +} \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/1L13 EWR.lua b/_G/db/Units/Cars/Car/1L13 EWR.lua index 1ffd3735..497d7481 100644 --- a/_G/db/Units/Cars/Car/1L13 EWR.lua +++ b/_G/db/Units/Cars/Car/1L13 EWR.lua @@ -165,7 +165,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 300000, radar_rotation_type = 0, - radar_type = 105 + radar_type = 105, + searchRadarFrequencies = { { 180000000, 220000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { @@ -197,7 +198,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "1L13 EWR", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.31, 0.0044, 1.425 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } }, agony_explosion_size = 2, fire_pos = { 1, 1.1, 0 }, diff --git a/_G/db/Units/Cars/Car/2S6 Tunguska.lua b/_G/db/Units/Cars/Car/2S6 Tunguska.lua index 5576191a..68f7a057 100644 --- a/_G/db/Units/Cars/Car/2S6 Tunguska.lua +++ b/_G/db/Units/Cars/Car/2S6 Tunguska.lua @@ -95,6 +95,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 18000, radar_rotation_type = 1, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 3000000000 } }, searchRadarMaxElevation = 0.78539816339745 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Cars/Car/55G6 EWR.lua b/_G/db/Units/Cars/Car/55G6 EWR.lua index 20bb41ec..690ee66d 100644 --- a/_G/db/Units/Cars/Car/55G6 EWR.lua +++ b/_G/db/Units/Cars/Car/55G6 EWR.lua @@ -165,7 +165,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 400000, radar_rotation_type = 0, - radar_type = 105 + radar_type = 105, + searchRadarFrequencies = { { 30000000, 300000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { @@ -197,7 +198,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "55G6 EWR", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.31, 0.0044, 1.425 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } }, agony_explosion_size = 2, fire_pos = { 0.7, 1, 0 }, diff --git a/_G/db/Units/Cars/Car/ATZ-60_Maz.lua b/_G/db/Units/Cars/Car/ATZ-60_Maz.lua index 17bb7aa2..09463d1b 100644 --- a/_G/db/Units/Cars/Car/ATZ-60_Maz.lua +++ b/_G/db/Units/Cars/Car/ATZ-60_Maz.lua @@ -12,6 +12,31 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Name = "Refueler ATZ-60 Tractor (MAZ-7410)", Rate = 3, ThreatRange = 0, + WS = { { + LN = { { + customViewPoint = { "DriverCockpit/DriverCockpit", { 0.1, 0, 0 } }, + distanceMax = 0, + distanceMin = 0, + type = 103 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.13962634015955, 0.5235987755983 } }, + omegaY = 1.7453292519943, + omegaZ = 1.7453292519943, + pidY = { + d = 12, + i = 0.1, + inn = 50, + p = 100 + }, + pidZ = { + d = 12, + i = 0.1, + inn = 50, + p = 100 + }, + pos = { 4.7, 3.4, -1.085 }, + reference_angle_Y = 3.1415926535898 + } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", _origin = "TechWeaponPack", @@ -23,7 +48,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { turret_elevation = { {} } }, attribute = { 2, 17, 25, "Redacted", "Trucks", "All", "Ground Units", "Vehicles", "Ground vehicles", "Ground Units Non Airdefence", "NonAndLightArmoredUnits", "NonArmoredUnits", "Unarmed vehicles" }, - canTow = { "Saddle22", "Saddle60" }, + canTow = { "Saddle60" }, category = "Unarmed", chassis = {}, driverViewPoint = { 4.7, 2.4, -1.085 }, diff --git a/_G/db/Units/Cars/Car/BMD-1.lua b/_G/db/Units/Cars/Car/BMD-1.lua index 229fad60..3a30f3bf 100644 --- a/_G/db/Units/Cars/Car/BMD-1.lua +++ b/_G/db/Units/Cars/Car/BMD-1.lua @@ -21,7 +21,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, ThreatRange = 3000, Transportable = { - size = 8700 + size = 8700, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/BMP-3.lua b/_G/db/Units/Cars/Car/BMP-3.lua index 315c38dc..113a0a12 100644 --- a/_G/db/Units/Cars/Car/BMP-3.lua +++ b/_G/db/Units/Cars/Car/BMP-3.lua @@ -21,23 +21,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ThreatRange = 4000, WS = { { LN = { { - BR = { { - connector_name = "POINT_MGUN_01", - pos = {} - } }, - PL = { { - ammo_capacity = 2000, - portionAmmoCapacity = 2000, - reload_time = 600, - shell_name = {}, - switch_on_delay = 0.1 - } }, - beamWidth = 0.017453292519943, - distanceMaxForFCS = 2000, - fireAnimationArgument = 45, - secondary = true, - sensor = {} - }, { BR = { { connector_name = "POINT_GUN_01", recoilArgument = 26, @@ -55,6 +38,23 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { sensor = {}, sightIndicationMode = 1, sightMasterMode = 1 + }, { + BR = { { + connector_name = "POINT_MGUN_01", + pos = {} + } }, + PL = { { + ammo_capacity = 2000, + portionAmmoCapacity = 2000, + reload_time = 600, + shell_name = {}, + switch_on_delay = 0.1 + } }, + beamWidth = 0.017453292519943, + distanceMaxForFCS = 2000, + fireAnimationArgument = 45, + secondary = true, + sensor = {} }, { BR = { { connector_name = "POINT_GUN", @@ -150,7 +150,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { smoke = { "SMOKE_03", "SMOKE_04", "SMOKE_02", "SMOKE_05", "SMOKE_01", "SMOKE_06" } }, Waypoint_Custom_Panel = true, - airWeaponDist = 2000, + airWeaponDist = 1000, animation_arguments = {}, armour_scheme = { hull_azimuth = { {}, {}, {} }, diff --git a/_G/db/Units/Cars/Car/BTR-80.lua b/_G/db/Units/Cars/Car/BTR-80.lua index a0c0a1d2..7ef52e05 100644 --- a/_G/db/Units/Cars/Car/BTR-80.lua +++ b/_G/db/Units/Cars/Car/BTR-80.lua @@ -94,7 +94,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, attribute = { 2, 17, 26, "Redacted", "APC", "Infantry carriers", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Armor", - chassis = {}, + chassis = { + trace_width = 0.36 + }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "POINT_DRIVER", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/Centaur_IV.lua b/_G/db/Units/Cars/Car/Centaur_IV.lua index 03f7a9ee..7ff1d6f3 100644 --- a/_G/db/Units/Cars/Car/Centaur_IV.lua +++ b/_G/db/Units/Cars/Car/Centaur_IV.lua @@ -196,13 +196,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 22, - reload_time = 330, + portion_reload_time = 15, shell_name = {}, virtualStwID = 1 }, { ammo_capacity = 29, automaticLoader = false, - reload_time = 435, + portion_reload_time = 15, shell_name = { "QF95_206R_fixed" }, shot_delay = 20, virtualStwID = 2 diff --git a/_G/db/Units/Cars/Car/Challenger2.lua b/_G/db/Units/Cars/Car/Challenger2.lua index 1b1ed502..a9769599 100644 --- a/_G/db/Units/Cars/Car/Challenger2.lua +++ b/_G/db/Units/Cars/Car/Challenger2.lua @@ -23,16 +23,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 14, - reload_time = 210, + portion_reload_time = 15, shell_name = { "L23_120_AP" }, - shot_delay = 6, - virtualStwID = 1 + shot_delay = 6 }, { ammo_capacity = 14, - reload_time = 210, + portion_reload_time = 15, shell_name = { "L23_120_AP" }, - shot_delay = 14, - virtualStwID = 2 + shot_delay = 14 } }, beamWidth = 0.017453292519943, combatRange = 1200, @@ -43,12 +41,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 11, - shell_name = { "L31_120mm_HESH" }, - virtualStwID = 1 + shell_name = { "L31_120mm_HESH" } }, { ammo_capacity = 10, - shell_name = { "L31_120mm_HESH" }, - virtualStwID = 2 + shell_name = { "L31_120mm_HESH" } } }, combatRange = 800, distanceMax = 8000, @@ -132,7 +128,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { life = 32 }, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, diff --git a/_G/db/Units/Cars/Car/Chieftain_mk3.lua b/_G/db/Units/Cars/Car/Chieftain_mk3.lua index 5da1c44d..41b18312 100644 --- a/_G/db/Units/Cars/Car/Chieftain_mk3.lua +++ b/_G/db/Units/Cars/Car/Chieftain_mk3.lua @@ -130,14 +130,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 8, - reload_time = 120, + portion_reload_time = 15, shell_name = { "L23A1_APFSDS" }, shot_delay = 6, virtualStwID = 1 }, { ammo_capacity = 11, automaticLoader = false, - reload_time = 165, + portion_reload_time = 15, shell_name = { "L23A1_APFSDS" }, shot_delay = 10, virtualStwID = 2 @@ -152,12 +152,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 10, - reload_time = 150, shell_name = { "L31A7_HESH" }, virtualStwID = 1 }, { ammo_capacity = 24, - reload_time = 360, shell_name = { "L31A7_HESH" }, virtualStwID = 2 } }, @@ -276,7 +274,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Armor", chassis = {}, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/Churchill_VII.lua b/_G/db/Units/Cars/Car/Churchill_VII.lua index 3bcbb151..cde96842 100644 --- a/_G/db/Units/Cars/Car/Churchill_VII.lua +++ b/_G/db/Units/Cars/Car/Churchill_VII.lua @@ -192,13 +192,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 35, - reload_time = 525, + portion_reload_time = 15, shell_name = {}, virtualStwID = 1 }, { ammo_capacity = 25, automaticLoader = false, - reload_time = 375, + portion_reload_time = 15, shell_name = { "M61" }, shot_delay = 12, virtualStwID = 2 @@ -211,14 +211,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 14, - reload_time = 210, - shell_name = { "M46" }, - virtualStwID = 1 + shell_name = { "M46" } }, { ammo_capacity = 10, - reload_time = 150, - shell_name = { "M46" }, - virtualStwID = 2 + shell_name = { "M46" } } }, distanceMax = 4000, distanceMin = 300, diff --git a/_G/db/Units/Cars/Car/Cromwell_IV.lua b/_G/db/Units/Cars/Car/Cromwell_IV.lua index 0d0dd317..f7afabbf 100644 --- a/_G/db/Units/Cars/Car/Cromwell_IV.lua +++ b/_G/db/Units/Cars/Car/Cromwell_IV.lua @@ -197,13 +197,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 23, - reload_time = 345, + portion_reload_time = 15, shell_name = {}, virtualStwID = 1 }, { ammo_capacity = 25, automaticLoader = false, - reload_time = 375, + portion_reload_time = 15, shell_name = { "M61" }, shot_delay = 15, virtualStwID = 2 @@ -216,14 +216,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 5, - reload_time = 75, - shell_name = { "M46" }, - virtualStwID = 1 + shell_name = { "M46" } }, { ammo_capacity = 11, - reload_time = 165, - shell_name = { "M46" }, - virtualStwID = 2 + shell_name = { "M46" } } }, distanceMax = 4000, distanceMin = 300, diff --git a/_G/db/Units/Cars/Car/Daimler_AC.lua b/_G/db/Units/Cars/Car/Daimler_AC.lua index 99d1c5a7..bb575546 100644 --- a/_G/db/Units/Cars/Car/Daimler_AC.lua +++ b/_G/db/Units/Cars/Car/Daimler_AC.lua @@ -22,11 +22,11 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 10, - reload_time = 50, + portion_reload_time = 5, shell_name = {} }, { ammo_capacity = 31, - reload_time = 217, + portion_reload_time = 7, shell_name = {}, shot_delay = 5, virtualStwID = 2 @@ -39,13 +39,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 30, shell_name = { "HE_T_MkII_40mm" } }, { ammo_capacity = 28, - reload_time = 196, - shell_name = {}, - shot_delay = 5 + shell_name = { "HE_T_MkII_40mm" } } }, distanceMax = 2000, distanceMin = 20, diff --git a/_G/db/Units/Cars/Car/Dog Ear radar.lua b/_G/db/Units/Cars/Car/Dog Ear radar.lua index 7fd62a94..c7f6944a 100644 --- a/_G/db/Units/Cars/Car/Dog Ear radar.lua +++ b/_G/db/Units/Cars/Car/Dog Ear radar.lua @@ -168,7 +168,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 35000, radar_rotation_type = 0, - radar_type = 104 + radar_type = 104, + searchRadarFrequencies = { { 3000000000, 6000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { @@ -207,7 +208,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "Dog Ear radar", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } }, agony_explosion_size = 2, dirt_pos = { -2.8, 0.4, -1.128 }, diff --git a/_G/db/Units/Cars/Car/Elefant_SdKfz_184.lua b/_G/db/Units/Cars/Car/Elefant_SdKfz_184.lua index ba95e6de..b2282335 100644 --- a/_G/db/Units/Cars/Car/Elefant_SdKfz_184.lua +++ b/_G/db/Units/Cars/Car/Elefant_SdKfz_184.lua @@ -191,14 +191,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 19, - reload_time = 285, + portion_reload_time = 15, shell_name = {}, shot_delay = 8, virtualStwID = 1 }, { ammo_capacity = 19, automaticLoader = false, - reload_time = 285, + portion_reload_time = 15, shell_name = { "Pzgr_39/43" }, shot_delay = 15, virtualStwID = 2 @@ -211,11 +211,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 90, shell_name = { "Sprgr_43_L71" } }, { ammo_capacity = 6, - reload_time = 90, shell_name = { "Sprgr_43_L71" } } }, distanceMax = 6000, diff --git a/_G/db/Units/Cars/Car/FPS-117 Dome.lua b/_G/db/Units/Cars/Car/FPS-117 Dome.lua index 2cb3ea75..72a814ed 100644 --- a/_G/db/Units/Cars/Car/FPS-117 Dome.lua +++ b/_G/db/Units/Cars/Car/FPS-117 Dome.lua @@ -166,7 +166,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 400000, radar_rotation_type = 0, - radar_type = 105 + radar_type = 105, + searchRadarFrequencies = { { 1215000000, 1400000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", @@ -213,7 +214,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "FPS-117 Dome", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.00019047619047619 } } + coeffs = { { 0.035, 0.0012 }, { 0, 0 }, { 0.31, 0.0044, 1.425 }, { 0.001, 0.17 }, { 0.2, 0.00019047619047619 } } }, agony_explosion_size = 0.2, fire_pos = { diff --git a/_G/db/Units/Cars/Car/FPS-117.lua b/_G/db/Units/Cars/Car/FPS-117.lua index b1f797fd..ec8e146e 100644 --- a/_G/db/Units/Cars/Car/FPS-117.lua +++ b/_G/db/Units/Cars/Car/FPS-117.lua @@ -167,7 +167,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 463000, radar_rotation_type = 0, radar_type = 105, - requiredUnits = { { "FPS-117 ECS", 50, 2 } } + requiredUnits = { { "FPS-117 ECS", 50, 2 } }, + searchRadarFrequencies = { { 1215000000, 1400000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", @@ -214,7 +215,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "FPS-117", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.00019047619047619 } } + coeffs = { { 0.035, 0.0012 }, { 0, 0 }, { 0.31, 0.0044, 1.425 }, { 0.001, 0.17 }, { 0.2, 0.00019047619047619 } } }, agony_explosion_size = 0, fire_pos = {}, diff --git a/_G/db/Units/Cars/Car/FuMG-401.lua b/_G/db/Units/Cars/Car/FuMG-401.lua index b0c11934..e732c14f 100644 --- a/_G/db/Units/Cars/Car/FuMG-401.lua +++ b/_G/db/Units/Cars/Car/FuMG-401.lua @@ -166,7 +166,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 10, 0 } }, maxTargetDetectionRange = 160000, - radar_type = 105 + radar_type = 105, + searchRadarFrequencies = { { 120000000, 130000000 } } }, Waypoint_Custom_Panel = true, _file = "./Mods/tech/WWII Units/Database/db_units_cars.lua", @@ -215,7 +216,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "FuMG-401", visual = { IR = { - coeffs = { { 0.02, 0.0012 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.27, 0.00049090909090909 } } + coeffs = { { 0.02, 0.0012 }, { 0, 0 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.27, 0.00049090909090909 } } }, agony_explosion_size = 0, fire_pos = {}, diff --git a/_G/db/Units/Cars/Car/FuSe-65.lua b/_G/db/Units/Cars/Car/FuSe-65.lua index 9d1c0e05..7af9ff70 100644 --- a/_G/db/Units/Cars/Car/FuSe-65.lua +++ b/_G/db/Units/Cars/Car/FuSe-65.lua @@ -62,7 +62,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 60000, radar_rotation_type = 0, - radar_type = 105 + radar_type = 105, + searchRadarFrequencies = { { 560000000 } } }, Waypoint_Custom_Panel = true, _file = "./Mods/tech/WWII Units/Database/db_units_cars.lua", @@ -111,7 +112,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "FuSe-65", visual = { IR = { - coeffs = { { 0.02, 0.0012 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.27, 0.00049090909090909 } } + coeffs = { { 0.02, 0.0012 }, { 0, 0 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.27, 0.00049090909090909 } } }, agony_explosion_size = 0, fire_pos = {}, diff --git a/_G/db/Units/Cars/Car/Gepard.lua b/_G/db/Units/Cars/Car/Gepard.lua index bcaab4e2..a276d4af 100644 --- a/_G/db/Units/Cars/Car/Gepard.lua +++ b/_G/db/Units/Cars/Car/Gepard.lua @@ -58,6 +58,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 10000, radar_rotation_type = 1, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 3000000000 } }, searchRadarMaxElevation = 0.78539816339745, smoke = { "SMOKE_04", "SMOKE_05", "SMOKE_03", "SMOKE_06", "SMOKE_02", "SMOKE_07", "SMOKE_01", "SMOKE_08" } }, diff --git a/_G/db/Units/Cars/Car/Grad-URAL.lua b/_G/db/Units/Cars/Car/Grad-URAL.lua index 07b0ecfc..b6db4c4d 100644 --- a/_G/db/Units/Cars/Car/Grad-URAL.lua +++ b/_G/db/Units/Cars/Car/Grad-URAL.lua @@ -99,8 +99,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { PL = { { ammo_capacity = 40, reload_time = 420, - rocket_name = "weapons.nurs.GRAD_9M22U", - shot_delay = 0.01 + shot_delay = 0.01, + type_ammunition = "weapons.nurs.GRAD_9M22U" } }, barrels_reload_type = 3, customViewPoint = { "genericMLRS", { -3, 0.3, -0.8 }, @@ -158,6 +158,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { chassis = {}, driverViewConnectorName = "POINT_DRIVER", enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.278, + [0] = 0.38, + [3] = 1, + [9] = 1 + } + }, mapclasskey = "P0091000208", sensor = { height = 2.85 diff --git a/_G/db/Units/Cars/Car/Grad_FDDM.lua b/_G/db/Units/Cars/Car/Grad_FDDM.lua index 11d88e90..116e24a5 100644 --- a/_G/db/Units/Cars/Car/Grad_FDDM.lua +++ b/_G/db/Units/Cars/Car/Grad_FDDM.lua @@ -20,8 +20,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { PL = { { ammo_capacity = 1, reload_time = 1, - rocket_name = "weapons.nurs.GRAD_9M22U", - shot_delay = 0.01 + shot_delay = 0.01, + type_ammunition = "weapons.nurs.GRAD_9M22U" } }, aiming_director = true, distanceMax = 19000, diff --git a/_G/db/Units/Cars/Car/HEMTT_C-RAM_Phalanx.lua b/_G/db/Units/Cars/Car/HEMTT_C-RAM_Phalanx.lua new file mode 100644 index 00000000..08261555 --- /dev/null +++ b/_G/db/Units/Cars/Car/HEMTT_C-RAM_Phalanx.lua @@ -0,0 +1,128 @@ +_G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + CanopyGeometry = { + azimuth = {}, + elevation = {} + }, + Countries = { "USA" }, + DetectionRange = 10000, + DisplayName = "LPWS C-RAM", + DisplayNameShort = "C-RAM", + EPLRS = true, + IR_emission_coeff = 0.1, + MaxSpeed = 74.99988, + Name = "LPWS C-RAM", + Rate = 15, + Sensors = { + RADAR = "C_RAM_Phalanx" + }, + ThreatRange = 2000, + WS = { { + LN = { { + BR = { { + connector_name = "POINT_GUN_01" + } }, + PL = { { + reload_time = 300, + shell_name = { "M246_20_HE_gr" } + } }, + createMuzzleFlashEffect = true, + fireAnimationArgument = 23, + reflection_limit = 0.01, + sensor = {}, + useTargetAccelInSight = true + } }, + angles = { { 2.833716573538, 0.31415926535898, -0.17453292519943, 1.5707963267949 }, { 0.31415926535898, -0.31415926535898, -0.076794487087751, 1.5707963267949 }, { -0.31415926535898, -2.833716573538, -0.17453292519943, 1.5707963267949 }, { -2.833716573538, 2.833716573538, -0.076794487087751, 1.5707963267949 } }, + center = "CENTER_TOWER", + drawArgument1 = 0, + drawArgument2 = 1, + pidY = {}, + pidZ = {}, + pointer = "POINT_SIGHT_01", + reference_angle_Y = 3.1415926535898, + reference_angle_Z = 0.087266462599716 + }, + fire_on_march = false, + maxTargetDetectionRange = 10000, + radar_type = 104, + searchRadarFrequencies = { { 12000000000, 18000000000 } } + }, + Waypoint_Custom_Panel = true, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", + animation_arguments = { + alarm_state_sequence = { { 2, { { + endTime = 20, + startTime = 0 + }, { + endTime = 25, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, + totalDuration = 25 + } + }, + armour_scheme = { + hull_azimuth = { {} }, + hull_elevation = { {} }, + turret_azimuth = { {} }, + turret_elevation = { {} } + }, + attribute = { 2, 16, 105, "Redacted", "AA_flak", "SAM TR", "Mobile AAA", "C-RAM", "Datalink", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements", "Armed Air Defence", "Rocket Attack Valid AirDefence", "AAA" }, + category = "Air Defence", + chassis = {}, + defaultStartAlarmState = 2, + enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { 0.439, 1, + [0] = -0.137, + [8] = 0.184 + } + }, + mapclasskey = "SPAAA_RAD_Truck", + maxVerticalDeviationAngle = 0.17453292519943, + sensor = { + height = 3.872, + max_alt_finding_target = 6000, + max_range_finding_target = 10000, + min_alt_finding_target = 0, + min_range_finding_target = 0 + }, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "HEMTT_C-RAM_Phalanx_p_1", + file = "HEMTT_C-RAM_Phalanx", + life = 5, + name = "HEMTT_C-RAM_Phalanx", + positioning = "BYNORMAL", + username = "HEMTT_C-RAM_Phalanx" + }, { + file = "HEMTT_C-RAM_Phalanx_p_1", + name = "HEMTT_C-RAM_Phalanx_p_1" + } }, + snd = { + engine_pitch = { {}, {}, {} }, + engine_vol_a = { {}, {}, {} }, + engine_vol_v = { {}, {}, {} }, + move_pitch = { {}, {} }, + move_vol = { {}, {}, {} } + }, + swapped_names = true, + swing_on_run = false, + tags = { "Air Defence", "SP AAA" }, + type = "HEMTT_C-RAM_Phalanx", + verticalDeviationCompensationPeriod = 10, + visual = { + IR = { + coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0.0322, 0.0028 }, { 0.001, 0.17 }, { 0.25, 0.00023809523809524 } } + }, + agony_explosion_size = 15, + fire_pos = { -2.3, 1, 0 }, + fire_size = 1, + fire_time = 900, + max_time_agony = 120, + min_time_agony = 10, + shape = "HEMTT_C-RAM_Phalanx", + shape_dstr = "HEMTT_C-RAM_Phalanx_p_1" + } +} \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/HL_DSHK.lua b/_G/db/Units/Cars/Car/HL_DSHK.lua index 33ce891c..72b4642e 100644 --- a/_G/db/Units/Cars/Car/HL_DSHK.lua +++ b/_G/db/Units/Cars/Car/HL_DSHK.lua @@ -33,6 +33,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = -1, + machineGunBeltArgument = 90, reactionTime = 0.5, sensor = {}, sightIndicationMode = 1, diff --git a/_G/db/Units/Cars/Car/HL_KORD.lua b/_G/db/Units/Cars/Car/HL_KORD.lua index 7175c35b..80a0d4d0 100644 --- a/_G/db/Units/Cars/Car/HL_KORD.lua +++ b/_G/db/Units/Cars/Car/HL_KORD.lua @@ -33,6 +33,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = -1, + machineGunBeltArgument = 90, reactionTime = 0.5, sensor = {}, sightIndicationMode = 1, diff --git a/_G/db/Units/Cars/Car/HQ-7_LN_SP.lua b/_G/db/Units/Cars/Car/HQ-7_LN_SP.lua index aab4656a..b93349aa 100644 --- a/_G/db/Units/Cars/Car/HQ-7_LN_SP.lua +++ b/_G/db/Units/Cars/Car/HQ-7_LN_SP.lua @@ -110,6 +110,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { fire_on_march = false, maxTargetDetectionRange = 15000, radar_type = 104, + searchRadarFrequencies = { { 4000000000, 8000000000 } }, searchRadarMaxElevation = 0.78539816339745 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Cars/Car/HQ-7_STR_SP.lua b/_G/db/Units/Cars/Car/HQ-7_STR_SP.lua index 13d42845..90cb462c 100644 --- a/_G/db/Units/Cars/Car/HQ-7_STR_SP.lua +++ b/_G/db/Units/Cars/Car/HQ-7_STR_SP.lua @@ -318,7 +318,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 30000, radar_rotation_type = 1, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 2000000000, 3000000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/hq7_str.lua", diff --git a/_G/db/Units/Cars/Car/Hawk cwar.lua b/_G/db/Units/Cars/Car/Hawk cwar.lua index a4c388d5..b5283c04 100644 --- a/_G/db/Units/Cars/Car/Hawk cwar.lua +++ b/_G/db/Units/Cars/Car/Hawk cwar.lua @@ -264,7 +264,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 70000, radar_rotation_type = 0, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 10000000000, 20000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { @@ -296,7 +297,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "Hawk cwar", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.003, 0.0031 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.0004 } } + coeffs = { { 0.035, 0.0012 }, { 0.003, 0.0031 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.2, 0.0004 } } }, agony_explosion_size = 0, fire_pos = {}, diff --git a/_G/db/Units/Cars/Car/Hawk sr.lua b/_G/db/Units/Cars/Car/Hawk sr.lua index f1e7b535..bc3126c8 100644 --- a/_G/db/Units/Cars/Car/Hawk sr.lua +++ b/_G/db/Units/Cars/Car/Hawk sr.lua @@ -265,7 +265,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 90000, radar_rotation_type = 0, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 500000000, 1000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { @@ -297,7 +298,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "Hawk sr", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.003, 0.0031 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.0004 } } + coeffs = { { 0.035, 0.0012 }, { 0.003, 0.0031 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.2, 0.0004 } } }, agony_explosion_size = 0, fire_pos = {}, diff --git a/_G/db/Units/Cars/Car/Hawk tr.lua b/_G/db/Units/Cars/Car/Hawk tr.lua index 5d2363db..5229bbab 100644 --- a/_G/db/Units/Cars/Car/Hawk tr.lua +++ b/_G/db/Units/Cars/Car/Hawk tr.lua @@ -75,7 +75,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 0, 0 } }, maxTargetDetectionRange = 90000, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 8000000000, 12000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = {}, @@ -104,7 +105,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "Hawk tr", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.003, 0.0031 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.0004 } } + coeffs = { { 0.035, 0.0012 }, { 0.003, 0.0031 }, { 0.41, 0.005, 1.7 }, { 0.001, 0.17 }, { 0.2, 0.0004 } } }, agony_explosion_size = 0, fire_pos = {}, diff --git a/_G/db/Units/Cars/Car/Igla manpad INS.lua b/_G/db/Units/Cars/Car/Igla manpad INS.lua index cbafcddd..f8161c9a 100644 --- a/_G/db/Units/Cars/Car/Igla manpad INS.lua +++ b/_G/db/Units/Cars/Car/Igla manpad INS.lua @@ -8,7 +8,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 5, ThreatRange = 5200, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Infantry AK Ins.lua b/_G/db/Units/Cars/Car/Infantry AK Ins.lua index a4407d47..a92beec7 100644 --- a/_G/db/Units/Cars/Car/Infantry AK Ins.lua +++ b/_G/db/Units/Cars/Car/Infantry AK Ins.lua @@ -9,7 +9,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Infantry AK ver2.lua b/_G/db/Units/Cars/Car/Infantry AK ver2.lua index c0fcaeeb..8d806e6e 100644 --- a/_G/db/Units/Cars/Car/Infantry AK ver2.lua +++ b/_G/db/Units/Cars/Car/Infantry AK ver2.lua @@ -9,7 +9,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Infantry AK ver3.lua b/_G/db/Units/Cars/Car/Infantry AK ver3.lua index 652b4cb7..b6e0b596 100644 --- a/_G/db/Units/Cars/Car/Infantry AK ver3.lua +++ b/_G/db/Units/Cars/Car/Infantry AK ver3.lua @@ -9,7 +9,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Infantry AK.lua b/_G/db/Units/Cars/Car/Infantry AK.lua index 80c689f1..b6fb521b 100644 --- a/_G/db/Units/Cars/Car/Infantry AK.lua +++ b/_G/db/Units/Cars/Car/Infantry AK.lua @@ -9,7 +9,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Infantry Animated.lua b/_G/db/Units/Cars/Car/Infantry Animated.lua deleted file mode 100644 index 73d16769..00000000 --- a/_G/db/Units/Cars/Car/Infantry Animated.lua +++ /dev/null @@ -1,110 +0,0 @@ -_G["db"]["Units"]["Cars"]["Car"]["#Index"] = { - CustomAimPoint = { 0, 1, 0 }, - DetectionRange = 0, - DisplayName = "Infantry", - DisplayNameShort = "AK74", - IR_emission_coeff = 0.004, - MaxSpeed = 13.356, - Name = "Infantry", - Rate = 1, - ThreatRange = 500, - Transportable = { - size = 100 - }, - WS = { { - LN = { { - BR = { { - pos = { 0.9, 0.4, 0.2 } - } }, - PL = { { - shell_name = {} - }, { - shell_name = {} - }, { - shell_name = {} - }, { - shell_name = {} - }, { - shell_name = {} - }, { - shell_name = {} - }, { - shell_name = {} - }, { - shell_name = {} - } }, - additionalShotDispersion = {}, - connectorFire = false, - fireAnimationArgument = 23, - maxShootingSpeed = 2, - sensor = {} - } }, - angles = { { 0.78539816339745, -0.78539816339745, -0.5235987755983, 1.0471975511966 } }, - canSetTacticalDir = true, - center = "POINT_TOWER", - drawArgument1 = 0, - drawArgument2 = 1, - omegaY = 1.7453292519943, - omegaZ = 1.7453292519943, - pidY = { - d = 9, - i = 1.5, - inn = 10, - p = 100 - }, - pidZ = { - d = 9, - i = 1.5, - inn = 10, - p = 100 - } - }, - fire_on_march = false, - maxTargetDetectionRange = 2000 - }, - Waypoint_Custom_Panel = true, - animation_arguments = {}, - armour_scheme = { - hull_azimuth = { {} }, - hull_elevation = { {} }, - turret_azimuth = { {} }, - turret_elevation = { {} } - }, - attribute = { 2, 17, 26, "Redacted", "Infantry", "CustomAimPoint", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "NonAndLightArmoredUnits", "NonArmoredUnits" }, - blackboard = "BlackboardHuman", - blocks = { - BehaviorTree = { - actions = { "initialize", "update" }, - load_data = "./CoreMods/characters/behaviors/human_simple_move_tree.xml" - }, - HumanMovementBlock = { - actions = { "initialize", "update" } - } - }, - category = "Infantry", - chassis = { - max_cruise_velocity = 1.715, - max_road_velocity = 3.71, - min_velocity = 0.415 - }, - enablePlayerCanDrive = false, - mapclasskey = "P0091000201", - mobile = true, - morale = {}, - sensor = { - height = 1.8, - max_range_finding_target = 500 - }, - snd = {}, - swapped_names = true, - tags = { "Infantry" }, - type = "Infantry Animated", - visual = { - IR = { - coeffs = { {}, {}, {}, {} } - }, - fire_pos = {}, - shape = "unit_infantry_rus", - shape_dstr = "" - } -} \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/JTAC.lua b/_G/db/Units/Cars/Car/JTAC.lua index f8affc11..d7665de9 100644 --- a/_G/db/Units/Cars/Car/JTAC.lua +++ b/_G/db/Units/Cars/Car/JTAC.lua @@ -33,6 +33,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { OPTIC = { "JTAC_sensor", "JTAC_sensor_LLTV", "JTAC_sensor_IR" } }, ThreatRange = 0, + Transportable = { + size = 100, + valide = true + }, WS = { { LN = { {} }, angles = { {} }, @@ -66,6 +70,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, fire_pos = {}, fire_size = 0, + parachute = 19, shape = "Stinger_com2", shape_dstr = "Stinger_com2_d" } diff --git a/_G/db/Units/Cars/Car/JagdPz_IV.lua b/_G/db/Units/Cars/Car/JagdPz_IV.lua index c60795ae..67b75855 100644 --- a/_G/db/Units/Cars/Car/JagdPz_IV.lua +++ b/_G/db/Units/Cars/Car/JagdPz_IV.lua @@ -162,14 +162,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 14, - reload_time = 210, + portion_reload_time = 15, shell_name = {}, shot_delay = 6.5, virtualStwID = 1 }, { ammo_capacity = 42, automaticLoader = false, - reload_time = 630, + portion_reload_time = 15, shell_name = { "Pzgr_39/40" }, shot_delay = 16, virtualStwID = 2 @@ -182,14 +182,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 90, - shell_name = { "Sprgr_34_L48" }, - virtualStwID = 1 + shell_name = { "Sprgr_34_L48" } }, { ammo_capacity = 17, - reload_time = 255, - shell_name = { "Sprgr_34_L48" }, - virtualStwID = 2 + shell_name = { "Sprgr_34_L48" } } }, distanceMax = 6000, distanceMin = 300, diff --git a/_G/db/Units/Cars/Car/Jagdpanther_G1.lua b/_G/db/Units/Cars/Car/Jagdpanther_G1.lua index 8c6ed382..a1dc9e33 100644 --- a/_G/db/Units/Cars/Car/Jagdpanther_G1.lua +++ b/_G/db/Units/Cars/Car/Jagdpanther_G1.lua @@ -122,14 +122,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 12, - reload_time = 180, + portion_reload_time = 15, shell_name = {}, shot_delay = 9.5, virtualStwID = 1 }, { ammo_capacity = 30, automaticLoader = false, - reload_time = 450, + portion_reload_time = 15, shell_name = { "Pzgr_39/43" }, shot_delay = 17, virtualStwID = 2 @@ -142,14 +142,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 90, - shell_name = { "Sprgr_43_L71" }, - virtualStwID = 1 + shell_name = { "Sprgr_43_L71" } }, { ammo_capacity = 12, - reload_time = 180, - shell_name = { "Sprgr_43_L71" }, - virtualStwID = 2 + shell_name = { "Sprgr_43_L71" } } }, distanceMax = 5000, distanceMin = 10, diff --git a/_G/db/Units/Cars/Car/KS-19.lua b/_G/db/Units/Cars/Car/KS-19.lua index 0f74b78b..f7460406 100644 --- a/_G/db/Units/Cars/Car/KS-19.lua +++ b/_G/db/Units/Cars/Car/KS-19.lua @@ -21,7 +21,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { reloadDuration = 1.8 } }, PL = { { - shell_name = {} + shell_name = {}, + virtualStwID = 1 } }, depends_on_unit = { { { "SON_9", 2 } }, { { "none" } } }, reloadSound = { @@ -33,7 +34,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, { BR = { {} }, PL = { { - shell_name = {} + shell_name = {}, + virtualStwID = 1 } }, sensor = {} } }, diff --git a/_G/db/Units/Cars/Car/Kub 1S91 str.lua b/_G/db/Units/Cars/Car/Kub 1S91 str.lua index d6be3ba9..081c9cf5 100644 --- a/_G/db/Units/Cars/Car/Kub 1S91 str.lua +++ b/_G/db/Units/Cars/Car/Kub 1S91 str.lua @@ -54,6 +54,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 70000, radar_rotation_type = 1, radar_type = 103, + searchRadarFrequencies = { { 4000000000, 8000000000 } }, searchRadarMaxElevation = 0.5235987755983 }, Waypoint_Custom_Panel = true, @@ -80,7 +81,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { enablePlayerCanDrive = false, encyclopediaAnimation = { args = { - [24] = 1 + [3] = 1, + [11] = -0.776, + [24] = 0.18, + [25] = 0.153 } }, mapclasskey = "P0091000083", @@ -106,7 +110,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "Kub 1S91 str", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.00775, 0.00265 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.00775, 0.00265 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } }, agony_explosion_size = 2, dirt_pos = { -3, 0.41, -1.331 }, diff --git a/_G/db/Units/Cars/Car/LAV-25.lua b/_G/db/Units/Cars/Car/LAV-25.lua index 628d4914..3edbe302 100644 --- a/_G/db/Units/Cars/Car/LAV-25.lua +++ b/_G/db/Units/Cars/Car/LAV-25.lua @@ -20,7 +20,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, ThreatRange = 2500, Transportable = { - size = 14000 + size = 14000, + valide = true }, WS = { { LN = { { @@ -33,12 +34,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { feedSlot = 1, portionAmmoCapacity = 60, reload_time = 900, - shell_name = {} + shell_name = {}, + virtualStwID = 1 }, { ammo_capacity = 60, feedSlot = 2, reload_time = 300, - shell_name = {} + shell_name = {}, + virtualStwID = 1 } }, fireAnimationArgument = 23, sensor = {}, diff --git a/_G/db/Units/Cars/Car/Land_Rover_101_FC.lua b/_G/db/Units/Cars/Car/Land_Rover_101_FC.lua index 790ecd28..31e0a1b6 100644 --- a/_G/db/Units/Cars/Car/Land_Rover_101_FC.lua +++ b/_G/db/Units/Cars/Car/Land_Rover_101_FC.lua @@ -69,6 +69,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { max_vert_obstacle = 0.5, min_turn_radius = 7.15, r_max = 0.46, + trace_width = 0.212, width = 1.83 }, driverCockpit = "DriverCockpit/DriverCockpit", diff --git a/_G/db/Units/Cars/Car/Land_Rover_109_S3.lua b/_G/db/Units/Cars/Car/Land_Rover_109_S3.lua index 58c0bbc6..68511919 100644 --- a/_G/db/Units/Cars/Car/Land_Rover_109_S3.lua +++ b/_G/db/Units/Cars/Car/Land_Rover_109_S3.lua @@ -56,6 +56,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { max_vert_obstacle = 0.5, min_turn_radius = 7.15, r_max = 0.38, + trace_width = 0.2, width = 1.68 }, driverCockpit = "DriverCockpit/DriverCockpit", diff --git a/_G/db/Units/Cars/Car/Leclerc.lua b/_G/db/Units/Cars/Car/Leclerc.lua index e3359580..9f4d942e 100644 --- a/_G/db/Units/Cars/Car/Leclerc.lua +++ b/_G/db/Units/Cars/Car/Leclerc.lua @@ -22,11 +22,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - shell_name = { "OFL_120F2_AP" }, - virtualStwID = 1 + shell_name = { "OFL_120F2_AP" } }, { - shell_name = {}, - virtualStwID = 2 + shell_name = {} } }, beamWidth = 0.017453292519943, combatRange = 1200, @@ -37,14 +35,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 120, - shell_name = { "120_EXPL_F1_120mm_HE" }, - virtualStwID = 1 + shell_name = { "120_EXPL_F1_120mm_HE" } }, { ammo_capacity = 6, - reload_time = 90, - shell_name = { "120_EXPL_F1_120mm_HE" }, - virtualStwID = 2 + shell_name = { "120_EXPL_F1_120mm_HE" } } }, combatRange = 800, distanceMax = 8000, @@ -106,7 +100,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { life = 32 }, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, diff --git a/_G/db/Units/Cars/Car/Leopard-2.lua b/_G/db/Units/Cars/Car/Leopard-2.lua index c42ccb3b..4e485aad 100644 --- a/_G/db/Units/Cars/Car/Leopard-2.lua +++ b/_G/db/Units/Cars/Car/Leopard-2.lua @@ -195,13 +195,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 9, - reload_time = 135, + portion_reload_time = 15, shell_name = { "DM53_120_AP" }, shot_delay = 6, virtualStwID = 1 }, { ammo_capacity = 16, - reload_time = 240, + portion_reload_time = 15, shell_name = { "DM53_120_AP" }, shot_delay = 10, virtualStwID = 2 @@ -216,16 +216,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 90, shell_name = { "DM12_L55_120mm_HEAT_MP_T" }, - shot_delay = 6, - virtualStwID = 1 + shot_delay = 6 }, { ammo_capacity = 11, - reload_time = 165, shell_name = { "DM12_L55_120mm_HEAT_MP_T" }, - shot_delay = 10, - virtualStwID = 2 + shot_delay = 10 } }, combatRange = 800, distanceMax = 8000, @@ -331,6 +327,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { drawArgument2 = 25, omegaY = 1.0471975511966, omegaZ = 1.0471975511966, + pidY = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, + pidZ = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, pointer = "POINT_SIGHT_02" }, maxTargetDetectionRange = 6000, @@ -353,7 +361,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { gearRatios = {} }, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/Leopard-2A5.lua b/_G/db/Units/Cars/Car/Leopard-2A5.lua index 7407a321..ba149d2b 100644 --- a/_G/db/Units/Cars/Car/Leopard-2A5.lua +++ b/_G/db/Units/Cars/Car/Leopard-2A5.lua @@ -195,13 +195,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 9, - reload_time = 135, + portion_reload_time = 15, shell_name = { "DM33_120_AP" }, shot_delay = 6, virtualStwID = 1 }, { ammo_capacity = 16, - reload_time = 240, + portion_reload_time = 15, shell_name = { "DM33_120_AP" }, shot_delay = 10, virtualStwID = 2 @@ -216,16 +216,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 90, shell_name = { "DM12_120mm_HEAT_MP_T" }, - shot_delay = 6, - virtualStwID = 1 + shot_delay = 6 }, { ammo_capacity = 11, - reload_time = 165, shell_name = { "DM12_120mm_HEAT_MP_T" }, - shot_delay = 10, - virtualStwID = 2 + shot_delay = 10 } }, combatRange = 800, distanceMax = 8000, @@ -331,6 +327,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { drawArgument2 = 25, omegaY = 1.0471975511966, omegaZ = 1.0471975511966, + pidY = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, + pidZ = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, pointer = "POINT_SIGHT_02" }, maxTargetDetectionRange = 6000, @@ -353,7 +361,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { gearRatios = {} }, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/Leopard1A3.lua b/_G/db/Units/Cars/Car/Leopard1A3.lua index fc86b96c..ee60372f 100644 --- a/_G/db/Units/Cars/Car/Leopard1A3.lua +++ b/_G/db/Units/Cars/Car/Leopard1A3.lua @@ -24,14 +24,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 8, - reload_time = 120, shell_name = {}, - shot_delay = 8.5, - virtualStwID = 1 + shot_delay = 8.5 }, { ammo_capacity = 24, automaticLoader = false, - reload_time = 360, + portion_reload_time = 15, shell_name = { "M68_105_AP" }, shot_delay = 13.5, virtualStwID = 2 @@ -45,17 +43,15 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 4, - reload_time = 60, - shell_name = { "HESH_105" }, - virtualStwID = 1 + shell_name = { "HESH_105" } }, { ammo_capacity = 14, - reload_time = 210, - shell_name = { "HESH_105" }, - virtualStwID = 2 + shell_name = { "HESH_105" } } }, combatRange = 700, - customViewPoint = { "genericTankblueHE", { 0.03, 0, 0 } }, + customViewPoint = { + [2] = {} + }, distanceMax = 8000, distanceMin = 20, sensor = {}, @@ -105,7 +101,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Armor", chassis = {}, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, diff --git a/_G/db/Units/Cars/Car/M-1 Abrams.lua b/_G/db/Units/Cars/Car/M-1 Abrams.lua index b4c0d338..a8e0fbd9 100644 --- a/_G/db/Units/Cars/Car/M-1 Abrams.lua +++ b/_G/db/Units/Cars/Car/M-1 Abrams.lua @@ -225,16 +225,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 11, - reload_time = 165, + portion_reload_time = 15, shell_name = { "M256_120_AP" }, - shot_delay = 6, - virtualStwID = 1 + shot_delay = 6 }, { ammo_capacity = 14, - reload_time = 210, + portion_reload_time = 15, shell_name = { "M256_120_AP" }, - shot_delay = 18, - virtualStwID = 2 + shot_delay = 18 } }, beamWidth = 0.017453292519943, combatRange = 1200, @@ -246,16 +244,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 7, - reload_time = 90, shell_name = { "M256_120_HE" }, - shot_delay = 6, - virtualStwID = 1 + shot_delay = 6 }, { ammo_capacity = 10, - reload_time = 150, shell_name = { "M256_120_HE" }, - shot_delay = 18, - virtualStwID = 2 + shot_delay = 18 } }, combatRange = 800, distanceMax = 8000, @@ -335,6 +329,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { drawArgument2 = 26, omegaY = 0.87266462599716, omegaZ = 0.87266462599716, + pidY = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, + pidZ = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, pointer = "POINT_SIGHT_CWS" }, maxTargetDetectionRange = 6000, @@ -355,7 +361,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { gearRatios = {} }, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/M-109.lua b/_G/db/Units/Cars/Car/M-109.lua index cf6cf7a3..37fa1cea 100644 --- a/_G/db/Units/Cars/Car/M-109.lua +++ b/_G/db/Units/Cars/Car/M-109.lua @@ -70,9 +70,16 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "Artillery", "Datalink", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "Indirect fire", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Artillery", chassis = {}, + crew_locale = "ENG", + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.343, 1, 1, + [0] = 0.214 + } + }, mapclasskey = "P0091000006", sensor = { height = 2.8 diff --git a/_G/db/Units/Cars/Car/M-2 Bradley.lua b/_G/db/Units/Cars/Car/M-2 Bradley.lua index d452f837..3ea9ad62 100644 --- a/_G/db/Units/Cars/Car/M-2 Bradley.lua +++ b/_G/db/Units/Cars/Car/M-2 Bradley.lua @@ -70,7 +70,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 7, - reload_time = 140, + portion_reload_time = 20, type_ammunition = {} } }, barrels_reload_type = 3, diff --git a/_G/db/Units/Cars/Car/M-60.lua b/_G/db/Units/Cars/Car/M-60.lua index 68ce7c58..3f887f90 100644 --- a/_G/db/Units/Cars/Car/M-60.lua +++ b/_G/db/Units/Cars/Car/M-60.lua @@ -119,9 +119,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 33, - reload_time = 495, - shell_name = {}, - virtualStwID = 1 + shell_name = {} } }, beamWidth = 0.017453292519943, sensor = {}, @@ -131,9 +129,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 24, - reload_time = 360, - shell_name = { "M68_105_HE" }, - virtualStwID = 1 + shell_name = { "M68_105_HE" } } }, distanceMax = 8000, distanceMin = 20, @@ -193,7 +189,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Armor", chassis = {}, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpit", driverViewConnectorName = { "POINT_DRIVER", offset = { 0.02, 0, 0 } diff --git a/_G/db/Units/Cars/Car/M10_GMC.lua b/_G/db/Units/Cars/Car/M10_GMC.lua index e79646f8..2f5c7b26 100644 --- a/_G/db/Units/Cars/Car/M10_GMC.lua +++ b/_G/db/Units/Cars/Car/M10_GMC.lua @@ -191,13 +191,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 24, - reload_time = 360, + portion_reload_time = 15, shell_name = {}, virtualStwID = 1 }, { ammo_capacity = 12, automaticLoader = false, - reload_time = 180, + portion_reload_time = 15, shell_name = { "M62_APC" }, shot_delay = 15, virtualStwID = 2 @@ -210,11 +210,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 90, shell_name = { "M42A1_HE" } }, { ammo_capacity = 12, - reload_time = 180, shell_name = { "M42A1_HE" } } }, distanceMax = 14000, diff --git a/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua b/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua index 7cbf1966..f8b75f8e 100644 --- a/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua +++ b/_G/db/Units/Cars/Car/M1126 Stryker ICV.lua @@ -12,7 +12,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maximalCapacity = 900, nominalCapacity = 900 }, - MaxSpeed = 72, + MaxSpeed = 96.84, Name = "IFV M1126 Stryker ICV", Rate = 10, Sensors = { diff --git a/_G/db/Units/Cars/Car/M1128 Stryker MGS.lua b/_G/db/Units/Cars/Car/M1128 Stryker MGS.lua index e75b5f06..53367ead 100644 --- a/_G/db/Units/Cars/Car/M1128 Stryker MGS.lua +++ b/_G/db/Units/Cars/Car/M1128 Stryker MGS.lua @@ -8,7 +8,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { DisplayNameShort = "M1128", EPLRS = true, IR_emission_coeff = 0.085, - MaxSpeed = 72, + MaxSpeed = 96.84, Name = "SPG Stryker MGS", Rate = 15, Sensors = { @@ -25,9 +25,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { PL = { { ammo_capacity = 12, automaticLoader = true, - reload_time = 240, - shell_name = {}, - virtualStwID = 1 + portion_reload_time = 20, + shell_name = {} } }, beamWidth = 0.017453292519943, combatRange = 1100, @@ -38,9 +37,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 120, - shell_name = { "HESH_105" }, - virtualStwID = 1 + shell_name = { "HESH_105" } } }, combatRange = 700, distanceMax = 5000, @@ -132,7 +129,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Armor", chassis = {}, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua b/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua index 457ca5f5..fe070907 100644 --- a/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua +++ b/_G/db/Units/Cars/Car/M1134 Stryker ATGM.lua @@ -8,7 +8,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { DisplayNameShort = "M1134", EPLRS = true, IR_emission_coeff = 0.085, - MaxSpeed = 72, + MaxSpeed = 96.84, Name = "ATGM Stryker", Rate = 15, Sensors = { diff --git a/_G/db/Units/Cars/Car/M12_GMC.lua b/_G/db/Units/Cars/Car/M12_GMC.lua index 1a601cdd..895fac81 100644 --- a/_G/db/Units/Cars/Car/M12_GMC.lua +++ b/_G/db/Units/Cars/Car/M12_GMC.lua @@ -228,6 +228,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { mass = 26700 }, enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { 0.235, + [0] = 0.035, + [3] = 1 + } + }, mapclasskey = "P0091000001", sensor = { height = 2.5 diff --git a/_G/db/Units/Cars/Car/M4A4_Sherman_FF.lua b/_G/db/Units/Cars/Car/M4A4_Sherman_FF.lua index 22752c63..53717cc6 100644 --- a/_G/db/Units/Cars/Car/M4A4_Sherman_FF.lua +++ b/_G/db/Units/Cars/Car/M4A4_Sherman_FF.lua @@ -271,13 +271,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 18, - reload_time = 270, + portion_reload_time = 15, shell_name = {}, virtualStwID = 1 }, { ammo_capacity = 40, automaticLoader = false, - reload_time = 600, + portion_reload_time = 15, shell_name = { "APCBC" }, shot_delay = 18, virtualStwID = 2 @@ -290,11 +290,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 5, - reload_time = 75, shell_name = { "QF17_HE" } }, { ammo_capacity = 14, - reload_time = 210, shell_name = { "QF17_HE" } } }, distanceMax = 4000, diff --git a/_G/db/Units/Cars/Car/M4_Sherman.lua b/_G/db/Units/Cars/Car/M4_Sherman.lua index 47b69d18..1f5cc75f 100644 --- a/_G/db/Units/Cars/Car/M4_Sherman.lua +++ b/_G/db/Units/Cars/Car/M4_Sherman.lua @@ -284,13 +284,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 29, - reload_time = 435, + portion_reload_time = 15, shell_name = {}, virtualStwID = 1 }, { ammo_capacity = 44, automaticLoader = false, - reload_time = 660, + portion_reload_time = 15, shell_name = { "M61" }, shot_delay = 15, virtualStwID = 2 @@ -303,11 +303,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 8, - reload_time = 120, shell_name = { "M46" } }, { ammo_capacity = 16, - reload_time = 240, shell_name = { "M46" } } }, distanceMax = 4000, diff --git a/_G/db/Units/Cars/Car/M6 Linebacker.lua b/_G/db/Units/Cars/Car/M6 Linebacker.lua index 6908ca74..36da3a0e 100644 --- a/_G/db/Units/Cars/Car/M6 Linebacker.lua +++ b/_G/db/Units/Cars/Car/M6 Linebacker.lua @@ -5,7 +5,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, DetectionRange = 8000, DisplayName = "SAM Linebacker - Bradley M6", - DisplayNameShort = "Lineback", + DisplayNameShort = "Linebacker", EPLRS = true, IR_emission_coeff = 0.095, InternalCargo = { diff --git a/_G/db/Units/Cars/Car/M8_Greyhound.lua b/_G/db/Units/Cars/Car/M8_Greyhound.lua index 1d9255c9..3576b073 100644 --- a/_G/db/Units/Cars/Car/M8_Greyhound.lua +++ b/_G/db/Units/Cars/Car/M8_Greyhound.lua @@ -221,12 +221,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 10, - reload_time = 50, + portion_reload_time = 5, shell_name = {} }, { ammo_capacity = 36, automaticLoader = false, - reload_time = 252, + portion_reload_time = 7, shell_name = { "M51_37AP" }, shot_delay = 5, virtualStwID = 2 @@ -239,11 +239,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 30, shell_name = { "M63_37HE" } }, { ammo_capacity = 28, - reload_time = 196, shell_name = { "M63_37HE" }, shot_delay = 5 } }, diff --git a/_G/db/Units/Cars/Car/MLRS FDDM.lua b/_G/db/Units/Cars/Car/MLRS FDDM.lua index 6fae0d85..078e98a9 100644 --- a/_G/db/Units/Cars/Car/MLRS FDDM.lua +++ b/_G/db/Units/Cars/Car/MLRS FDDM.lua @@ -17,8 +17,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { PL = { { ammo_capacity = 1, reload_time = 1, - rocket_name = "weapons.nurs.M26", - shot_delay = 0.01 + shot_delay = 0.01, + type_ammunition = "weapons.nurs.M26" } }, aiming_director = true, distanceMax = 32000, diff --git a/_G/db/Units/Cars/Car/MLRS.lua b/_G/db/Units/Cars/Car/MLRS.lua index cdabc41e..703edde2 100644 --- a/_G/db/Units/Cars/Car/MLRS.lua +++ b/_G/db/Units/Cars/Car/MLRS.lua @@ -56,8 +56,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { PL = { { ammo_capacity = 12, reload_time = 540, - rocket_name = "weapons.nurs.M26", - shot_delay = 0.1 + shot_delay = 0.1, + type_ammunition = "weapons.nurs.M26" } }, barrels_reload_type = 3, customViewPoint = { "genericMLRS", { -5, 1.2, -1 }, @@ -120,7 +120,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { driverViewPoint = { 2.4, 2.25, -0.69 }, enablePlayerCanDrive = true, encyclopediaAnimation = { - args = { 0.2, + args = { 0.365, + [0] = 0.317, + [3] = 1, [4] = 1, [5] = 1, [6] = 1, diff --git a/_G/db/Units/Cars/Car/Merkava_Mk4.lua b/_G/db/Units/Cars/Car/Merkava_Mk4.lua index 3e75a41b..d3e21504 100644 --- a/_G/db/Units/Cars/Car/Merkava_Mk4.lua +++ b/_G/db/Units/Cars/Car/Merkava_Mk4.lua @@ -23,17 +23,15 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 7, - reload_time = 105, + portion_reload_time = 15, shell_name = { "M322_120_AP" }, - shot_delay = 6.5, - virtualStwID = 1 + shot_delay = 6.5 }, { ammo_capacity = 22, automaticLoader = false, - reload_time = 330, + portion_reload_time = 15, shell_name = { "M322_120_AP" }, - shot_delay = 13.5, - virtualStwID = 2 + shot_delay = 13.5 } }, beamWidth = 0.017453292519943, combatRange = 1200, @@ -45,14 +43,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 3, - reload_time = 45, - shell_name = { "M339_120mm_HEAT_MP_T" }, - virtualStwID = 1 + shell_name = { "M339_120mm_HEAT_MP_T" } }, { ammo_capacity = 16, - reload_time = 240, - shell_name = { "M339_120mm_HEAT_MP_T" }, - virtualStwID = 2 + shell_name = { "M339_120mm_HEAT_MP_T" } } }, beamWidth = 0.017453292519943, combatRange = 800, @@ -60,8 +54,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { distanceMaxForFCS = 4999, distanceMin = 20, sensor = {}, - sightIndicationMode = 1, - sightMasterMode = 1, type = 6 }, { BR = { { @@ -245,7 +237,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "Tanks", "Modern Tanks", "Datalink", "Armored vehicles", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "AntiAir Armed Vehicles", "HeavyArmoredUnits" }, category = "Armor", chassis = {}, - crew_locale = "IZR", + crew_locale = "ENG", + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, diff --git a/_G/db/Units/Cars/Car/NASAMS_LN_B.lua b/_G/db/Units/Cars/Car/NASAMS_LN_B.lua index 6d4c0675..38fe3f0b 100644 --- a/_G/db/Units/Cars/Car/NASAMS_LN_B.lua +++ b/_G/db/Units/Cars/Car/NASAMS_LN_B.lua @@ -13,45 +13,45 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { { connector_name = "POINT_ROCKET_01", recoilArgument = 4, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_02", recoilArgument = 5, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_03", recoilArgument = 6, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_04", recoilArgument = 7, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_05", recoilArgument = 18, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_06", recoilArgument = 19, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 } }, PL = { { type_ammunition = {} @@ -62,7 +62,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { angles = { { 3.1415926535898, -3.1415926535898, 0, 1.0471975511966 } }, center = "CENTER_TOWER", drawArgument1 = 0, - omegaY = 0.523599, + omegaY = 0.723599, pidY = { d = 4, i = 0.2, diff --git a/_G/db/Units/Cars/Car/NASAMS_LN_C.lua b/_G/db/Units/Cars/Car/NASAMS_LN_C.lua index 64c2bad5..dfbd5832 100644 --- a/_G/db/Units/Cars/Car/NASAMS_LN_C.lua +++ b/_G/db/Units/Cars/Car/NASAMS_LN_C.lua @@ -13,45 +13,45 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { { connector_name = "POINT_ROCKET_01", recoilArgument = 4, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_02", recoilArgument = 5, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_03", recoilArgument = 6, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_04", recoilArgument = 7, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_05", recoilArgument = 18, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 }, { connector_name = "POINT_ROCKET_06", recoilArgument = 19, - recoilT0 = -2, - recoilT1 = -1, + recoilT0 = -0.5, + recoilT1 = -0.3, recoilT2 = 1, - recoilTime = 2 + recoilTime = 10 } }, PL = { { name_ammunition = "AIM-120C", @@ -63,7 +63,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { angles = { { 3.1415926535898, -3.1415926535898, 0, 1.0471975511966 } }, center = "CENTER_TOWER", drawArgument1 = 0, - omegaY = 0.523599, + omegaY = 0.723599, pidY = { d = 4, i = 0.2, diff --git a/_G/db/Units/Cars/Car/NASAMS_Radar_MPQ64F1.lua b/_G/db/Units/Cars/Car/NASAMS_Radar_MPQ64F1.lua index dee42269..f45e01e1 100644 --- a/_G/db/Units/Cars/Car/NASAMS_Radar_MPQ64F1.lua +++ b/_G/db/Units/Cars/Car/NASAMS_Radar_MPQ64F1.lua @@ -265,7 +265,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 60000, radar_rotation_type = 0, - radar_type = 102 + radar_type = 102, + searchRadarFrequencies = { { 8000000000, 12000000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", @@ -285,7 +286,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { chassis = {}, enablePlayerCanDrive = false, mapclasskey = "P0091000083", - radar_rotation_period = 4, + radar_rotation_period = -2, sensor = { height = 2.7, max_alt_finding_target = 17000, @@ -312,7 +313,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "NASAMS_Radar_MPQ64F1", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0.003, 0.0031 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.00026666666666667 } } + coeffs = { { 0.031, 0.0022 }, { 0.003, 0.0031 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.2, 0.00026666666666667 } } }, fire_pos = {}, shape = "NASAMS_Radar_MPQ64F1", diff --git a/_G/db/Units/Cars/Car/Osa 9A33 ln.lua b/_G/db/Units/Cars/Car/Osa 9A33 ln.lua index 3b726eb9..2cff940f 100644 --- a/_G/db/Units/Cars/Car/Osa 9A33 ln.lua +++ b/_G/db/Units/Cars/Car/Osa 9A33 ln.lua @@ -23,6 +23,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, customViewPoint = { "genericMissile", { 0.01, 0, 0 } }, distanceMax = 18000, + frequencyRange = { { 14200000000, 14800000000 } }, inclination_correction_bias = 0, inclination_correction_upper_limit = -1.5707963267949, launch_delay = 4, @@ -57,6 +58,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 30000, radar_rotation_type = 1, radar_type = 104, + searchRadarFrequencies = { { 6000000000, 8000000000 } }, searchRadarMaxElevation = 0.78539816339745 }, Waypoint_Custom_Panel = true, @@ -78,6 +80,25 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { offset = { -0.1, 0, 0 } }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.235, + [0] = 0.2, + [3] = 1, + [4] = 1, + [5] = 1, + [6] = 1, + [7] = 1, + [8] = 1, + [9] = 1, + [11] = -0.722, + [18] = 1, + [19] = 1, + [20] = 0.125, + [21] = 0.024, + [22] = -1, + [50] = 0.408 + } + }, mapclasskey = "P0091000084", radar_rotation_period = 1.8181818181818, sensor = { diff --git a/_G/db/Units/Cars/Car/PLZ05.lua b/_G/db/Units/Cars/Car/PLZ05.lua index 347737b3..a4975d6b 100644 --- a/_G/db/Units/Cars/Car/PLZ05.lua +++ b/_G/db/Units/Cars/Car/PLZ05.lua @@ -121,13 +121,15 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "Artillery", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "Indirect fire", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Artillery", chassis = {}, + crew_locale = "ENG", + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIRandLLTV", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } }, enablePlayerCanDrive = true, encyclopediaAnimation = { - args = { 0.2, + args = { 0.247, [0] = 0.2, [3] = 1 } diff --git a/_G/db/Units/Cars/Car/PT_76.lua b/_G/db/Units/Cars/Car/PT_76.lua index 66bcf61a..76d1a30d 100644 --- a/_G/db/Units/Cars/Car/PT_76.lua +++ b/_G/db/Units/Cars/Car/PT_76.lua @@ -62,6 +62,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { drawArgument2 = 1, omegaY = 0.43633231299858, omegaZ = 0.26179938779915, + pidY = { + d = 4, + i = 2, + inn = 0.2, + p = 10 + }, + pidZ = { + d = 4, + i = 2, + inn = 0.2, + p = 10 + }, reference_angle_Z = 0.087266462599716 }, maxTargetDetectionRange = 5000 diff --git a/_G/db/Units/Cars/Car/Pak40.lua b/_G/db/Units/Cars/Car/Pak40.lua index 344ddad7..b858759c 100644 --- a/_G/db/Units/Cars/Car/Pak40.lua +++ b/_G/db/Units/Cars/Car/Pak40.lua @@ -35,9 +35,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 50, - reload_time = 250, + portion_reload_time = 5, shell_name = {}, - shot_delay = 5 + shot_delay = 5, + virtualStwID = 1 } }, reactionTime = 2, sensor = {} @@ -45,7 +46,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 25, - reload_time = 125, shell_name = { "Sprgr_34_L48" } } }, distanceMax = 6000, diff --git a/_G/db/Units/Cars/Car/Paratrooper AKS-74.lua b/_G/db/Units/Cars/Car/Paratrooper AKS-74.lua index 13894348..20278ec4 100644 --- a/_G/db/Units/Cars/Car/Paratrooper AKS-74.lua +++ b/_G/db/Units/Cars/Car/Paratrooper AKS-74.lua @@ -10,7 +10,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Paratrooper RPG-16.lua b/_G/db/Units/Cars/Car/Paratrooper RPG-16.lua index 6e8b861f..78076bbd 100644 --- a/_G/db/Units/Cars/Car/Paratrooper RPG-16.lua +++ b/_G/db/Units/Cars/Car/Paratrooper RPG-16.lua @@ -10,7 +10,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Patriot ln.lua b/_G/db/Units/Cars/Car/Patriot ln.lua index 16bdd021..24f7a927 100644 --- a/_G/db/Units/Cars/Car/Patriot ln.lua +++ b/_G/db/Units/Cars/Car/Patriot ln.lua @@ -61,6 +61,16 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Air Defence", chassis = {}, enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { + [0] = 0.1, + [3] = 1, + [4] = 1, + [5] = 1, + [6] = 1, + [7] = 1 + } + }, mapclasskey = "P0091000079", sensor = { height = 6.249 diff --git a/_G/db/Units/Cars/Car/Patriot str.lua b/_G/db/Units/Cars/Car/Patriot str.lua index e16b0469..9678ffdb 100644 --- a/_G/db/Units/Cars/Car/Patriot str.lua +++ b/_G/db/Units/Cars/Car/Patriot str.lua @@ -18,7 +18,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { depends_on_unit = { { { "Patriot ECS" } } }, distanceMax = 160000, distanceMin = 3000, - max_number_of_missiles_channels = 3, + max_number_of_missiles_channels = 1, max_trg_alt = 160000, min_trg_alt = 60, reactionTime = 6, @@ -109,6 +109,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 200000, radar_rotation_type = 0, radar_type = 102, + searchRadarFrequencies = { { 4480000000, 5450000000 } }, searchRadarMaxElevation = 1.4835298641952 }, Waypoint_Custom_Panel = true, @@ -138,7 +139,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "Patriot str", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.3, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.31, 0.0044, 1.425 }, { 0.001, 0.17 }, { 0.3, 0.0002 } } }, agony_explosion_size = 2, fire_pos = { -0.5, 1.8, 0 }, diff --git a/_G/db/Units/Cars/Car/Pz_IV_H.lua b/_G/db/Units/Cars/Car/Pz_IV_H.lua index 460fe14f..ea632c33 100644 --- a/_G/db/Units/Cars/Car/Pz_IV_H.lua +++ b/_G/db/Units/Cars/Car/Pz_IV_H.lua @@ -157,14 +157,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 30, - reload_time = 450, + portion_reload_time = 15, shell_name = {}, shot_delay = 7, virtualStwID = 1 }, { ammo_capacity = 30, automaticLoader = false, - reload_time = 450, + portion_reload_time = 15, shell_name = { "Pzgr_39/40" }, shot_delay = 15, virtualStwID = 2 @@ -177,14 +177,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 8, - reload_time = 120, - shell_name = { "Sprgr_34_L48" }, - virtualStwID = 1 + shell_name = { "Sprgr_34_L48" } }, { ammo_capacity = 16, - reload_time = 240, - shell_name = { "Sprgr_34_L48" }, - virtualStwID = 2 + shell_name = { "Sprgr_34_L48" } } }, distanceMax = 6000, distanceMin = 300, diff --git a/_G/db/Units/Cars/Car/Pz_V_Panther_G.lua b/_G/db/Units/Cars/Car/Pz_V_Panther_G.lua index 713c6adc..94ad0845 100644 --- a/_G/db/Units/Cars/Car/Pz_V_Panther_G.lua +++ b/_G/db/Units/Cars/Car/Pz_V_Panther_G.lua @@ -137,14 +137,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 27, - reload_time = 405, + portion_reload_time = 15, shell_name = {}, shot_delay = 9, virtualStwID = 1 }, { ammo_capacity = 33, automaticLoader = false, - reload_time = 495, + portion_reload_time = 15, shell_name = { "Pzgr_39/42" }, shot_delay = 17, virtualStwID = 2 @@ -157,14 +157,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 10, - reload_time = 150, - shell_name = { "Sprgr_34_L70" }, - virtualStwID = 1 + shell_name = { "Sprgr_34_L70" } }, { ammo_capacity = 12, - reload_time = 180, - shell_name = { "Sprgr_34_L70" }, - virtualStwID = 2 + shell_name = { "Sprgr_34_L70" } } }, distanceMax = 4000, distanceMin = 10, diff --git a/_G/db/Units/Cars/Car/QF_37_AA.lua b/_G/db/Units/Cars/Car/QF_37_AA.lua index 47c51d6f..3c41576b 100644 --- a/_G/db/Units/Cars/Car/QF_37_AA.lua +++ b/_G/db/Units/Cars/Car/QF_37_AA.lua @@ -22,7 +22,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shell_display_name = 'QF 3,7" HE', shell_name = { "QF94_AA_HE" }, shot_delay = 6, - switch_on_delay = 0.1 + switch_on_delay = 0.1, + virtualStwID = 1 } }, connectorFire = true, depends_on_unit = { { { "Allies_Director", 2 } }, { { "none" } } }, diff --git a/_G/db/Units/Cars/Car/RLS_19J6.lua b/_G/db/Units/Cars/Car/RLS_19J6.lua index 39cc74a7..116802f1 100644 --- a/_G/db/Units/Cars/Car/RLS_19J6.lua +++ b/_G/db/Units/Cars/Car/RLS_19J6.lua @@ -496,6 +496,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 150000, radar_rotation_type = 0, radar_type = 102, + searchRadarFrequencies = { { 2850000000, 3200000000 } }, searchRadarMaxElevation = 0.78539816339745 }, Waypoint_Custom_Panel = true, @@ -544,7 +545,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "RLS_19J6", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.00026666666666667 } } + coeffs = { { 0.035, 0.0012, 3, 0 }, { 0.0069, 0.0036 }, { 0.31, 0.0044, 1.425 }, { 0.001, 0.17 }, { 0.2, 0.0002, 1, 0.2 } } }, fire_pos = { -3.2, 1.1, 0 }, fire_size = 0.4, diff --git a/_G/db/Units/Cars/Car/RPC_5N62V.lua b/_G/db/Units/Cars/Car/RPC_5N62V.lua index fbd47c16..d033945e 100644 --- a/_G/db/Units/Cars/Car/RPC_5N62V.lua +++ b/_G/db/Units/Cars/Car/RPC_5N62V.lua @@ -76,7 +76,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 0, 0 } }, maxTargetDetectionRange = 400000, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 1550000000, 3900000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", @@ -119,7 +120,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "RPC_5N62V", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.00026666666666667 } } + coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0.49, 0.005, 1.7 }, { 0.001, 0.17 }, { 0.2, 0.00026666666666667 } } }, fire_pos = { 0, 0.6, 0 }, fire_size = 0.5, diff --git a/_G/db/Units/Cars/Car/Roland ADS.lua b/_G/db/Units/Cars/Car/Roland ADS.lua index f08b4e12..cb98f700 100644 --- a/_G/db/Units/Cars/Car/Roland ADS.lua +++ b/_G/db/Units/Cars/Car/Roland ADS.lua @@ -54,7 +54,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 12000, radar_rotation_type = 1, - radar_type = 104 + radar_type = 104, + searchRadarFrequencies = { { 1000000000, 2000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { diff --git a/_G/db/Units/Cars/Car/Roland Radar.lua b/_G/db/Units/Cars/Car/Roland Radar.lua index 0394a087..9bc6efc6 100644 --- a/_G/db/Units/Cars/Car/Roland Radar.lua +++ b/_G/db/Units/Cars/Car/Roland Radar.lua @@ -167,7 +167,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 35000, radar_rotation_type = 0, - radar_type = 104 + radar_type = 104, + searchRadarFrequencies = { { 1000000000, 2000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { @@ -206,7 +207,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "Roland Radar", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0.00775, 0.00265 }, { 0, 0 }, { 0.001, 0.17 }, { 0.3, 0.00027272727272727 } } + coeffs = { { 0.031, 0.0022 }, { 0.00775, 0.00265 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.3, 0.00027272727272727 } } }, agony_explosion_size = 3, fire_pos = { -0.5, 1, 0 }, diff --git a/_G/db/Units/Cars/Car/S-300PS 40B6M tr.lua b/_G/db/Units/Cars/Car/S-300PS 40B6M tr.lua index 82f9dd89..af09f243 100644 --- a/_G/db/Units/Cars/Car/S-300PS 40B6M tr.lua +++ b/_G/db/Units/Cars/Car/S-300PS 40B6M tr.lua @@ -1,11 +1,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + Countries = { "USSR" }, CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 160000, - DisplayName = 'SAM SA-10 S-300 "Grumble" Flap Lid TR ', - DisplayNameShort = "SA-10 TR", + DisplayName = 'SAM SA-10 S-300 "Grumble" Flap Lid-A TR', + DisplayNameShort = "SA-10TR", IR_emission_coeff = 0.08, MaxSpeed = 0, - Name = 'SAM SA-10 S-300 "Grumble" Flap Lid TR ', + Name = 'SAM SA-10 S-300 "Grumble" Flap Lid-A TR', Rate = 20, Sensors = { RADAR = "S-300PS 40B6M tr" @@ -87,9 +88,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 0, 0 } }, maxTargetDetectionRange = 160000, - radar_type = 102 + radar_type = 102, + searchRadarFrequencies = { { 8000000000, 20000000000 } } }, Waypoint_Custom_Panel = true, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", animation_arguments = {}, armour_scheme = { hull_azimuth = { {} }, @@ -102,6 +106,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { chassis = { life = 4 }, + defaultStartAlarmState = 2, enablePlayerCanDrive = false, mapclasskey = "P0091000083", sensor = { @@ -110,6 +115,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { max_range_finding_target = 160000, min_range_finding_target = 2000 }, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "s-300_40v6m_rpn_p_1", + file = "s-300_40v6m_rpn", + life = 5, + name = "s-300_40v6m_rpn", + positioning = "BYNORMAL", + username = "S-300PS 40B6M tr" + }, { + file = "s-300_40v6m_rpn_p_1", + name = "s-300_40v6m_rpn_p_1" + } }, snd = { radarRotation = "GndTech/RadarRotation" }, @@ -118,7 +135,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "S-300PS 40B6M tr", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.49, 0.005, 1.7 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } }, agony_explosion_size = 1, fire_pos = { @@ -127,7 +144,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { fire_size = 0, fire_time = 0, max_time_agony = -1, - shape = "40b6m", - shape_dstr = "Auto-crush" + shape = "s-300_40v6m_rpn", + shape_dstr = "s-300_40v6m_rpn_p_1" } } \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/S-300PS 40B6MD sr.lua b/_G/db/Units/Cars/Car/S-300PS 40B6MD sr.lua index 95827196..03ec4d0b 100644 --- a/_G/db/Units/Cars/Car/S-300PS 40B6MD sr.lua +++ b/_G/db/Units/Cars/Car/S-300PS 40B6MD sr.lua @@ -1,11 +1,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + Countries = { "USSR" }, CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 60000, - DisplayName = "SAM SA-10 S-300PS Low Alt SR 5N66M", - DisplayNameShort = "SA-10 SR(L)", + DisplayName = 'SAM SA-10 S-300 "Grumble" Clam Shell SR', + DisplayNameShort = "SA-10SR(L)", IR_emission_coeff = 0.08, MaxSpeed = 60.00012, - Name = "SAM SA-10 S-300PS Low Alt SR 5N66M", + Name = 'SAM SA-10 S-300 "Grumble" Clam Shell SR', Rate = 20, Sensors = { RADAR = "S-300PS 40B6MD sr" @@ -224,9 +225,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 60000, radar_rotation_type = 0, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 8000000000, 10000000000 } } }, Waypoint_Custom_Panel = true, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", animation_arguments = { locator_rotation = 0 }, @@ -239,6 +243,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 16, 101, "Redacted", "LR SAM", "SAM SR", "RADAR_BAND1_FOR_ARM", "CustomAimPoint", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements" }, category = "Air Defence", chassis = {}, + defaultStartAlarmState = 2, enablePlayerCanDrive = false, mapclasskey = "P0091000083", radar_rotation_period = 3, @@ -248,6 +253,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { max_range_finding_target = 60000, min_range_finding_target = 2000 }, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "s-300_40v6md_5n66m_nvo_p_1", + file = "s-300_40v6md_5n66m_nvo", + life = 5, + name = "s-300_40v6md_5n66m_nvo", + positioning = "BYNORMAL", + username = "S-300PS 40B6MD sr" + }, { + file = "s-300_40v6md_5n66m_nvo_p_1", + name = "s-300_40v6md_5n66m_nvo_p_1" + } }, snd = { radarRotation = "GndTech/RadarRotation" }, @@ -256,7 +273,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "S-300PS 40B6MD sr", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } }, agony_explosion_size = 1, fire_pos = { diff --git a/_G/db/Units/Cars/Car/S-300PS 40B6MD sr_19J6.lua b/_G/db/Units/Cars/Car/S-300PS 40B6MD sr_19J6.lua new file mode 100644 index 00000000..0095e7c7 --- /dev/null +++ b/_G/db/Units/Cars/Car/S-300PS 40B6MD sr_19J6.lua @@ -0,0 +1,559 @@ +_G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + Countries = { "USSR" }, + CustomAimPoint = { 0, 1.5, 0 }, + DetectionRange = 150000, + DisplayName = 'SAM SA-10 S-300 "Grumble" Tin Shield SR', + DisplayNameShort = "SA-10SR", + IR_emission_coeff = 0.08, + MaxSpeed = 60.00012, + Name = 'SAM SA-10 S-300 "Grumble" Tin Shield SR', + Rate = 20, + Sensors = { + RADAR = "RLS_19J6" + }, + ThreatRange = 0, + WS = { { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, { + LN = { { + ECM_K = 0.4, + distanceMax = 150000, + distanceMin = 2000, + max_trg_alt = 25000, + min_trg_alt = 100, + reactionTime = 4, + reflection_limit = 0.049, + type = 101 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.26179938779915, 0.78539816339745 } }, + center = "CENTER_TOWER", + omegaY = 3, + omegaZ = 3 + }, + maxTargetDetectionRange = 150000, + radar_rotation_type = 0, + radar_type = 103, + searchRadarFrequencies = { { 2850000000, 3200000000 } }, + searchRadarMaxElevation = 0.78539816339745 + }, + Waypoint_Custom_Panel = true, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", + animation_arguments = { + locator_rotation = 0 + }, + armour_scheme = { + hull_azimuth = { {} }, + hull_elevation = { {} }, + turret_azimuth = { {} }, + turret_elevation = { {} } + }, + attribute = { 2, 16, 101, "Redacted", "LR SAM", "SAM SR", "RADAR_BAND1_FOR_ARM", "CustomAimPoint", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements" }, + category = "Air Defence", + chassis = {}, + defaultStartAlarmState = 2, + enablePlayerCanDrive = false, + mapclasskey = "P0091000083", + radar_rotation_period = 10, + sensor = { + height = 24.65, + max_alt_finding_target = 25000, + max_range_finding_target = 150000, + min_range_finding_target = 2000 + }, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "s-300_40v6m_19j6_p_1", + file = "s-300_40v6m_19j6", + life = 5, + name = "s-300_40v6m_19j6", + positioning = "BYNORMAL", + username = "S-300PS 40B6MD sr_19J6" + }, { + file = "s-300_40v6m_19j6_p_1", + name = "s-300_40v6m_19j6_p_1" + } }, + snd = { + radarRotation = "GndTech/RadarRotation" + }, + swapped_names = true, + tags = { "Air Defence", "Search Radar" }, + type = "S-300PS 40B6MD sr_19J6", + visual = { + IR = { + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.31, 0.0044, 1.425 }, { 0.001, 0.17 }, { 0.2, 0.0002, 1, 0.2 } } + }, + agony_explosion_size = 1, + fire_pos = { + [2] = 1 + }, + fire_size = 0, + fire_time = 0, + max_time_agony = -1, + shape = "s-300_40v6m_19j6", + shape_dstr = "s-300_40v6m_19j6_p_1" + } +} \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/S-300PS 54K6 cp.lua b/_G/db/Units/Cars/Car/S-300PS 54K6 cp.lua index ffbc75ef..d5079a37 100644 --- a/_G/db/Units/Cars/Car/S-300PS 54K6 cp.lua +++ b/_G/db/Units/Cars/Car/S-300PS 54K6 cp.lua @@ -1,19 +1,21 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + CanopyGeometry = { + azimuth = {}, + elevation = {} + }, + Countries = { "USSR" }, CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 0, - DisplayName = 'SAM SA-10 S-300 "Grumble" C2 ', - DisplayNameShort = "SA-10 CP", + DisplayName = 'SAM SA-10 S-300 "Grumble" C2', + DisplayNameShort = "SA-10C2", IR_emission_coeff = 0.05, MaxSpeed = 60.00012, - Name = 'SAM SA-10 S-300 "Grumble" C2 ', + Name = 'SAM SA-10 S-300 "Grumble" C2', Rate = 20, - Sensors = { - RADAR = { "S-300PS 40B6M tr" } - }, ThreatRange = 0, WS = { { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -28,7 +30,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -43,7 +45,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -58,7 +60,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -73,7 +75,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -88,7 +90,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -103,7 +105,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -118,7 +120,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -133,7 +135,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -148,7 +150,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -163,7 +165,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -178,7 +180,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -193,7 +195,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -208,7 +210,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -223,7 +225,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 3, 0 } }, { LN = { { - depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } } }, + depends_on_unit = { { { "S-300PS 40B6MD sr" } }, { { "S-300PS 64H6E sr" } }, { { "S-300PS 40B6MD sr_19J6" } } }, distanceMax = 160000, distanceMin = 2000, max_trg_alt = 27000, @@ -237,9 +239,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { omegaZ = 3, pos = { 0, 3, 0 } }, + fire_on_march = false, maxTargetDetectionRange = 160000 }, Waypoint_Custom_Panel = true, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", animation_arguments = {}, armour_scheme = { hull_azimuth = { {} }, @@ -250,7 +255,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 16, 25, "Redacted", "SAM CC", "CustomAimPoint", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements" }, category = "Air Defence", chassis = {}, + defaultStartAlarmState = 2, enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { + [3] = 1 + } + }, mapclasskey = "P0091000046", sensor = { height = 8.68, @@ -258,14 +269,33 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { max_range_finding_target = 160000, min_range_finding_target = 2000 }, - snd = {}, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "S-300_PBU_54K6_p_1", + file = "S-300_PBU_54K6", + life = 5, + name = "S-300_PBU_54K6", + positioning = "BYNORMAL", + username = "S-300PS 54K6 cp" + }, { + file = "S-300_PBU_54K6_p_1", + name = "S-300_PBU_54K6_p_1" + } }, + snd = { + engine_pitch = { {}, {}, {} }, + engine_vol_a = { {}, {}, {} }, + engine_vol_v = { {}, {}, {} }, + move_pitch = { {}, {} }, + move_vol = { {}, {}, {} } + }, swapped_names = true, swing_on_run = false, tags = { "Air Defence", "Command & Control" }, + toggle_alarm_state_interval = 60, type = "S-300PS 54K6 cp", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.00036363636363636 } } + coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0.035, 0.0012 }, { 0.001, 0.17 }, { 0.2, 0.00036363636363636 } } }, agony_explosion_size = 2, fire_pos = { 0.9, 1.1, 0 }, @@ -273,7 +303,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { fire_time = 500, max_time_agony = 80, min_time_agony = 10, - shape = "54k6", - shape_dstr = "54k6_p_1" + shape = "S-300_PBU_54K6", + shape_dstr = "S-300_PBU_54K6_p_1" } } \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/S-300PS 5H63C 30H6_tr.lua b/_G/db/Units/Cars/Car/S-300PS 5H63C 30H6_tr.lua new file mode 100644 index 00000000..e0643c34 --- /dev/null +++ b/_G/db/Units/Cars/Car/S-300PS 5H63C 30H6_tr.lua @@ -0,0 +1,208 @@ +_G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + CanopyGeometry = { + azimuth = {}, + elevation = {} + }, + Countries = { "USSR" }, + CustomAimPoint = { 0, 1.5, 0 }, + DetectionRange = 120000, + DisplayName = 'SAM SA-10 S-300 "Grumble" Flap Lid-B TR', + DisplayNameShort = "SA-10TR", + IR_emission_coeff = 0.05, + MaxSpeed = 60.00012, + Name = 'SAM SA-10 S-300 "Grumble" Flap Lid-B TR', + Rate = 20, + Sensors = { + RADAR = { "S-300PS 40B6M tr" } + }, + ThreatRange = 0, + WS = { { + LN = { { + ECM_K = 0.4, + beamWidth = 1.5707963267949, + depends_on_unit = { { { "S-300PS 54K6 cp" } } }, + distanceMax = 120000, + distanceMin = 2000, + max_number_of_missiles_channels = 2, + max_trg_alt = 27000, + min_trg_alt = 25, + reactionTime = 6, + reflection_limit = 0.049, + type = 102 + } }, + angles = { { 3.1415926535898, -3.1415926535898, -0.17453292519943, 1.3962634015955 } }, + drawArgument1 = 0, + omegaY = 0.174533, + omegaZ = 0.174533, + pidY = { + d = 4, + i = 0.1, + p = 10 + }, + pidZ = { + d = 4, + i = 0.1, + p = 10 + }, + pos = { -3.1, 1.94, 0 }, + reference_angle_Y = 3.1415926535898 + }, { + LN = { { + depends_on_unit = { { {} } } + } }, + angles = { { 0.78539816339745, -0.78539816339745, -0.17453292519943, 1.3962634015955 } }, + base = 1, + omegaY = 3, + omegaZ = 3, + pos = { 0, 0, 0 } + }, { + LN = { { + depends_on_unit = { { {} } } + } }, + angles = { { 0.78539816339745, -0.78539816339745, -0.17453292519943, 1.3962634015955 } }, + base = 1, + omegaY = 3, + omegaZ = 3, + pos = { 0, 0, 0 } + }, { + LN = { { + depends_on_unit = { { {} } } + } }, + angles = { { 0.78539816339745, -0.78539816339745, -0.17453292519943, 1.3962634015955 } }, + base = 1, + omegaY = 3, + omegaZ = 3, + pos = { 0, 0, 0 } + }, { + LN = { { + depends_on_unit = { { {} } } + } }, + angles = { { 0.78539816339745, -0.78539816339745, -0.17453292519943, 1.3962634015955 } }, + base = 1, + omegaY = 3, + omegaZ = 3, + pos = { 0, 0, 0 } + }, { + LN = { { + depends_on_unit = { { {} } } + } }, + angles = { { 0.78539816339745, -0.78539816339745, -0.17453292519943, 1.3962634015955 } }, + base = 1, + omegaY = 3, + omegaZ = 3, + pos = { 0, 0, 0 } + }, + fire_on_march = false, + maxTargetDetectionRange = 160000, + radar_type = 102, + searchRadarFrequencies = { { 8000000000, 20000000000 } } + }, + Waypoint_Custom_Panel = true, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", + animation_arguments = { + alarm_state_sequence = { { 2, { { + endTime = 20, + startTime = 0 + }, { + endTime = 90, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, { 3, { { + endTime = 25, + endVal = 0, + startTime = 0, + startVal = 0 + }, { + endTime = 85, + endVal = 1, + startTime = 25, + startVal = 0 + }, { + endTime = 90, + endVal = 1, + startTime = 85, + startVal = 1 + } } }, { 4, { { + endTime = 10, + startTime = 0 + }, { + endTime = 20, + leveling = true, + startTime = 10 + }, { + endTime = 90, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, + totalDuration = 90 + } + }, + armour_scheme = { + hull_azimuth = { {} }, + hull_elevation = { {} }, + turret_azimuth = { {} }, + turret_elevation = { {} } + }, + attribute = { 2, 16, 25, "Redacted", "LR SAM", "RADAR_BAND1_FOR_ARM", "SAM TR", "CustomAimPoint", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements" }, + category = "Air Defence", + chassis = {}, + defaultStartAlarmState = 2, + enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { + [0] = 0.145, + [2] = 1, + [3] = 1 + } + }, + mapclasskey = "P0091000083", + maxVerticalDeviationAngle = 0.087266462599716, + sensor = { + height = 2, + max_alt_finding_target = 27000, + max_range_finding_target = 120000, + min_range_finding_target = 2000 + }, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "S-300_rpn_5n63s_p_1", + file = "S-300_rpn_5n63s", + life = 5, + name = "S-300_rpn_5n63s", + positioning = "BYNORMAL", + username = "S-300PS 5H63C 30H6_tr" + }, { + file = "S-300_rpn_5n63s_p_1", + name = "S-300_rpn_5n63s_p_1" + } }, + snd = { + engine_pitch = { {}, {}, {} }, + engine_vol_a = { {}, {}, {} }, + engine_vol_v = { {}, {}, {} }, + move_pitch = { {}, {} }, + move_vol = { {}, {}, {} }, + radarRotation = "GndTech/RadarRotation" + }, + swapped_names = true, + swing_on_run = false, + tags = { "Air Defence", "Tracking Radar" }, + toggle_alarm_state_interval = 60, + type = "S-300PS 5H63C 30H6_tr", + verticalDeviationCompensationPeriod = 10, + visual = { + IR = { + coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0.49, 0.005, 1.7 }, { 0.001, 0.17 }, { 0.2, 0.00036363636363636 } } + }, + agony_explosion_size = 2, + fire_pos = { -0.6, 1.1, 0 }, + fire_size = 0.8, + fire_time = 500, + max_time_agony = 80, + min_time_agony = 10, + shape = "S-300_rpn_5n63s", + shape_dstr = "S-300_rpn_5n63s_p_1" + } +} \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/S-300PS 5P85C ln.lua b/_G/db/Units/Cars/Car/S-300PS 5P85C ln.lua index 5200bba6..73150811 100644 --- a/_G/db/Units/Cars/Car/S-300PS 5P85C ln.lua +++ b/_G/db/Units/Cars/Car/S-300PS 5P85C ln.lua @@ -1,26 +1,43 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + CanopyGeometry = { + azimuth = {}, + elevation = {} + }, + Countries = { "USSR" }, DetectionRange = 0, - DisplayName = 'SAM SA-10 S-300 "Grumble" TEL D', - DisplayNameShort = "SA-10c", + DisplayName = 'SAM SA-10 S-300 "Grumble" TEL C', + DisplayNameShort = "SA-10LN", IR_emission_coeff = 0.08, MaxSpeed = 60.00012, - Name = 'SAM SA-10 S-300 "Grumble" TEL D', + Name = 'SAM SA-10 S-300 "Grumble" TEL C', Rate = 10, ThreatRange = 120000, WS = { { LN = { { BR = { { - drawArgument = 4, - pos = { 10.05, 0.216, -1.045 } + alternativeRecoil = true, + connector_name = "POINT_R0CKET_01", + recoilArgument = 4, + recoilTime = 5.2, + stopRecoilOnFinish = true }, { - drawArgument = 5, - pos = { 10.05, 1.204, -0.614 } + alternativeRecoil = true, + connector_name = "POINT_R0CKET_02", + recoilArgument = 5, + recoilTime = 5.2, + stopRecoilOnFinish = true }, { - drawArgument = 6, - pos = { 10.05, 1.204, 0.614 } + alternativeRecoil = true, + connector_name = "POINT_R0CKET_03", + recoilArgument = 6, + recoilTime = 5.2, + stopRecoilOnFinish = true }, { - drawArgument = 7, - pos = { 10.05, 0.216, 1.045 } + alternativeRecoil = true, + connector_name = "POINT_R0CKET_04", + recoilArgument = 7, + recoilTime = 5.2, + stopRecoilOnFinish = true } }, ECM_K = -1, PL = { { @@ -29,19 +46,61 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shot_delay = 0.1, type_ammunition = {} } }, - barrels_reload_type = 3, beamWidth = 0, - depends_on_unit = { { { "S-300PS 40B6M tr" } } }, + depends_on_unit = { { { "S-300PS 40B6M tr" } }, { { "S-300PS 5H63C 30H6_tr" } } }, reactionTime = 0.1, - sensor = {} + sensor = {}, + show_external_missile = true } }, angles = { {} }, pos = { -4.915, 2.036, 0 } }, + fire_on_march = false, maxTargetDetectionRange = 250000 }, Waypoint_Custom_Panel = true, - animation_arguments = {}, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", + animation_arguments = { + alarm_state_sequence = { { 2, { { + endTime = 20, + startTime = 0 + }, { + endTime = 90, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, { 3, { { + endTime = 25, + endVal = 0, + startTime = 0, + startVal = 0 + }, { + endTime = 85, + endVal = 1, + startTime = 25, + startVal = 0 + }, { + endTime = 90, + endVal = 1, + startTime = 85, + startVal = 1 + } } }, { 11, { { + endTime = 10, + startTime = 0 + }, { + endTime = 20, + leveling = true, + startTime = 10 + }, { + endTime = 90, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, + totalDuration = 90 + } + }, armour_scheme = { hull_azimuth = { {} }, hull_elevation = { {} }, @@ -51,18 +110,45 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 16, 27, "Redacted", "AA_missile", "SAM LL", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements", "Armed Air Defence" }, category = "Air Defence", chassis = {}, + defaultStartAlarmState = 2, enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { + [2] = 1, + [3] = 1 + } + }, mapclasskey = "P0091000079", + maxVerticalDeviationAngle = 0.087266462599716, sensor = { height = 8.225 }, - snd = {}, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "S-300_5P85C_p_1", + file = "S-300_5P85C", + life = 5, + name = "S-300_5P85C", + positioning = "BYNORMAL", + username = "S-300PS 5P85C ln" + }, { + file = "S-300_5P85C_p_1", + name = "S-300_5P85C_p_1" + } }, + snd = { + engine_pitch = { {}, {}, {} }, + engine_vol_a = { {}, {}, {} }, + engine_vol_v = { {}, {}, {} }, + move_pitch = { {}, {} }, + move_vol = { {}, {}, {} } + }, swapped_names = true, tags = { "Air Defence", "Launcher" }, type = "S-300PS 5P85C ln", + verticalDeviationCompensationPeriod = 10, visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0.04, 0.007 }, { 0.001, 0.17 }, { 0.2, 0.00016666666666667 } } + coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0.011, 0.005 }, { 0.001, 0.17 }, { 0.2, 0.00016666666666667 } } }, agony_explosion_size = 2, fire_pos = { 3.9, 1.1, 0 }, @@ -70,7 +156,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { fire_time = 500, max_time_agony = 80, min_time_agony = 10, - shape = "5p85c", - shape_dstr = "5p85c_p_1" + shape = "S-300_5P85C", + shape_dstr = "S-300_5P85C_p_1" } } \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/S-300PS 5P85D ln.lua b/_G/db/Units/Cars/Car/S-300PS 5P85D ln.lua index 677ac80d..f64e3224 100644 --- a/_G/db/Units/Cars/Car/S-300PS 5P85D ln.lua +++ b/_G/db/Units/Cars/Car/S-300PS 5P85D ln.lua @@ -1,26 +1,43 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + CanopyGeometry = { + azimuth = {}, + elevation = {} + }, + Countries = { "USSR" }, DetectionRange = 0, - DisplayName = 'SAM SA-10 S-300 "Grumble" TEL C', - DisplayNameShort = "SA-10d", + DisplayName = 'SAM SA-10 S-300 "Grumble" TEL D', + DisplayNameShort = "SA-10LN", IR_emission_coeff = 0.08, MaxSpeed = 60.00012, - Name = 'SAM SA-10 S-300 "Grumble" TEL C', + Name = 'SAM SA-10 S-300 "Grumble" TEL D', Rate = 10, ThreatRange = 120000, WS = { { LN = { { BR = { { - drawArgument = 4, - pos = { 10.05, 0.216, -1.045 } + alternativeRecoil = true, + connector_name = "POINT_R0CKET_01", + recoilArgument = 4, + recoilTime = 5.2, + stopRecoilOnFinish = true }, { - drawArgument = 5, - pos = { 10.05, 1.204, -0.614 } + alternativeRecoil = true, + connector_name = "POINT_R0CKET_02", + recoilArgument = 5, + recoilTime = 5.2, + stopRecoilOnFinish = true }, { - drawArgument = 6, - pos = { 10.05, 1.204, 0.614 } + alternativeRecoil = true, + connector_name = "POINT_R0CKET_03", + recoilArgument = 6, + recoilTime = 5.2, + stopRecoilOnFinish = true }, { - drawArgument = 7, - pos = { 10.05, 0.216, 1.045 } + alternativeRecoil = true, + connector_name = "POINT_R0CKET_04", + recoilArgument = 7, + recoilTime = 5.2, + stopRecoilOnFinish = true } }, ECM_K = -1, PL = { { @@ -29,19 +46,61 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shot_delay = 0.1, type_ammunition = {} } }, - barrels_reload_type = 3, beamWidth = 0, - depends_on_unit = { { { "S-300PS 40B6M tr" } } }, + depends_on_unit = { { { "S-300PS 40B6M tr" } }, { { "S-300PS 5H63C 30H6_tr" } } }, reactionTime = 0.1, - sensor = {} + sensor = {}, + show_external_missile = true } }, angles = { {} }, pos = { -4.915, 2.036, 0 } }, + fire_on_march = false, maxTargetDetectionRange = 250000 }, Waypoint_Custom_Panel = true, - animation_arguments = {}, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", + animation_arguments = { + alarm_state_sequence = { { 2, { { + endTime = 20, + startTime = 0 + }, { + endTime = 90, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, { 3, { { + endTime = 25, + endVal = 0, + startTime = 0, + startVal = 0 + }, { + endTime = 85, + endVal = 1, + startTime = 25, + startVal = 0 + }, { + endTime = 90, + endVal = 1, + startTime = 85, + startVal = 1 + } } }, { 11, { { + endTime = 10, + startTime = 0 + }, { + endTime = 20, + leveling = true, + startTime = 10 + }, { + endTime = 90, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, + totalDuration = 90 + } + }, armour_scheme = { hull_azimuth = { {} }, hull_elevation = { {} }, @@ -51,18 +110,45 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 16, 27, "Redacted", "AA_missile", "SAM LL", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements", "Armed Air Defence" }, category = "Air Defence", chassis = {}, + defaultStartAlarmState = 2, enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { + [2] = 1, + [3] = 1 + } + }, mapclasskey = "P0091000079", + maxVerticalDeviationAngle = 0.087266462599716, sensor = { height = 8.225 }, - snd = {}, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "S-300_5P85D_p_1", + file = "S-300_5P85D", + life = 5, + name = "S-300_5P85D", + positioning = "BYNORMAL", + username = "S-300PS 5P85D ln" + }, { + file = "S-300_5P85D_p_1", + name = "S-300_5P85D_p_1" + } }, + snd = { + engine_pitch = { {}, {}, {} }, + engine_vol_a = { {}, {}, {} }, + engine_vol_v = { {}, {}, {} }, + move_pitch = { {}, {} }, + move_vol = { {}, {}, {} } + }, swapped_names = true, tags = { "Air Defence", "Launcher" }, type = "S-300PS 5P85D ln", + verticalDeviationCompensationPeriod = 10, visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0.04, 0.007 }, { 0.001, 0.17 }, { 0.2, 0.00016666666666667 } } + coeffs = { { 0.031, 0.0022 }, { 0.0069, 0.0036 }, { 0.011, 0.005 }, { 0.001, 0.17 }, { 0.2, 0.00016666666666667 } } }, agony_explosion_size = 2, fire_pos = { 3.9, 1.1, 0 }, @@ -70,7 +156,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { fire_time = 500, max_time_agony = 80, min_time_agony = 10, - shape = "5p85d", - shape_dstr = "5p85d_p_1" + shape = "S-300_5P85D", + shape_dstr = "S-300_5P85D_p_1" } } \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/S-300PS 64H6E sr.lua b/_G/db/Units/Cars/Car/S-300PS 64H6E sr.lua index a25c4b96..8069a832 100644 --- a/_G/db/Units/Cars/Car/S-300PS 64H6E sr.lua +++ b/_G/db/Units/Cars/Car/S-300PS 64H6E sr.lua @@ -1,14 +1,15 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { + Countries = { "USSR" }, CustomAimPoint = { 0, 1.5, 0 }, DetectionRange = 160000, - DisplayName = 'SAM SA-10 S-300 "Grumble" Big Bird SR ', - DisplayNameShort = "SA-10 SR", + DisplayName = 'SAM SA-10 S-300 "Grumble" Big Bird SR', + DisplayNameShort = "SA-10SR", IR_emission_coeff = 0.08, MaxSpeed = 60.00012, - Name = 'SAM SA-10 S-300 "Grumble" Big Bird SR ', + Name = 'SAM SA-10 S-300 "Grumble" Big Bird SR', Rate = 20, Sensors = { - RADAR = "S-300PS 64H6E sr" + RADAR = "S-300PS 40B6MD sr" }, ThreatRange = 0, WS = { { @@ -237,13 +238,55 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { omegaZ = 3, pos = { 0, 5, 0 } }, + fire_on_march = false, maxTargetDetectionRange = 160000, - radar_rotation_type = 0, - radar_type = 102 + radar_rotation_type = 1, + radar_type = 102, + searchRadarFrequencies = { { 2900000000, 3300000000 } } }, Waypoint_Custom_Panel = true, + _file = "./CoreMods/tech/HeavyMetalCore/Database/db_units_cars.lua", + _origin = "HeavyMetalCore", animation_arguments = { - locator_rotation = 11 + alarm_state_sequence = { { 2, { { + endTime = 20, + startTime = 0 + }, { + endTime = 90, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, { 3, { { + endTime = 25, + endVal = 0, + startTime = 0, + startVal = 0 + }, { + endTime = 85, + endVal = 1, + startTime = 25, + startVal = 0 + }, { + endTime = 90, + endVal = 1, + startTime = 85, + startVal = 1 + } } }, { 4, { { + endTime = 10, + startTime = 0 + }, { + endTime = 20, + leveling = true, + startTime = 10 + }, { + endTime = 90, + endVal = 1, + startTime = 20, + startVal = 1 + } } }, + totalDuration = 90 + }, + locator_rotation = 0 }, armour_scheme = { hull_azimuth = { {} }, @@ -254,8 +297,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 16, 101, "Redacted", "LR SAM", "SAM SR", "RADAR_BAND1_FOR_ARM", "CustomAimPoint", "All", "Ground Units", "Vehicles", "Ground vehicles", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "SAM related", "SAM elements" }, category = "Air Defence", chassis = {}, + defaultStartAlarmState = 2, enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { + [0] = 0.216, + [2] = 1, + [3] = 1, + [10] = 0.004 + } + }, mapclasskey = "P0091000083", + maxVerticalDeviationAngle = 0.087266462599716, radar_rotation_period = 12, sensor = { height = 8.68, @@ -263,23 +316,36 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { max_range_finding_target = 160000, min_range_finding_target = 2000 }, + shape_table_data = { { + classname = "lLandVehicle", + desrt = "S-300_5n64k_ewr_p_1", + file = "S-300_5n64k_ewr", + life = 5, + name = "S-300_5n64k_ewr", + positioning = "BYNORMAL", + username = "S-300PS 64H6E sr" + }, { + file = "S-300_5n64k_ewr_p_1", + name = "S-300_5n64k_ewr_p_1" + } }, snd = { radarRotation = "GndTech/RadarRotation" }, swapped_names = true, tags = { "Air Defence", "Search Radar" }, type = "S-300PS 64H6E sr", + verticalDeviationCompensationPeriod = 10, visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.31, 0.0044, 1.425 }, { 0.001, 0.17 }, { 0.2, 0.0002, 1, 0.2 } } }, agony_explosion_size = 2, fire_pos = { -3.2, 1.1, 0 }, - fire_size = 0.65, + fire_size = 0.95, fire_time = 300, max_time_agony = 90, min_time_agony = 10, - shape = "64H6E", - shape_dstr = "64h6e_p_1" + shape = "S-300_5n64k_ewr", + shape_dstr = "S-300_5n64k_ewr_p_1" } } \ No newline at end of file diff --git a/_G/db/Units/Cars/Car/S-60_Type59_Artillery.lua b/_G/db/Units/Cars/Car/S-60_Type59_Artillery.lua index 5152e1cc..79da9c4a 100644 --- a/_G/db/Units/Cars/Car/S-60_Type59_Artillery.lua +++ b/_G/db/Units/Cars/Car/S-60_Type59_Artillery.lua @@ -104,8 +104,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, { shell_name = {} } }, - depends_on_unit = { { { "SON_9", 4 } }, { { "none" } } }, - sensor = {} + depends_on_unit = { { { "SON_9", 3 } }, { { "none" } } }, + reloadSound = { + onEmptyFeeder = true + }, + sensor = {}, + sightIndicationMode = 1, + sightMasterMode = 1 } }, angles = { { 3.1415926535898, -3.1415926535898, -0.17453292519943, 1.535889741755 } }, center = "CENTER_POINT", diff --git a/_G/db/Units/Cars/Car/SA-11 Buk CC 9S470M1.lua b/_G/db/Units/Cars/Car/SA-11 Buk CC 9S470M1.lua index 0f8063c6..d9ccc341 100644 --- a/_G/db/Units/Cars/Car/SA-11 Buk CC 9S470M1.lua +++ b/_G/db/Units/Cars/Car/SA-11 Buk CC 9S470M1.lua @@ -197,6 +197,11 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Air Defence", chassis = {}, enablePlayerCanDrive = false, + encyclopediaAnimation = { + args = { + [3] = 1 + } + }, mapclasskey = "P0091000046", sensor = { height = 7.534, diff --git a/_G/db/Units/Cars/Car/SA-11 Buk LN 9A310M1.lua b/_G/db/Units/Cars/Car/SA-11 Buk LN 9A310M1.lua index bfec6d9d..f13a7132 100644 --- a/_G/db/Units/Cars/Car/SA-11 Buk LN 9A310M1.lua +++ b/_G/db/Units/Cars/Car/SA-11 Buk LN 9A310M1.lua @@ -167,7 +167,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, fire_on_march = false, maxTargetDetectionRange = 60000, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 6000000000, 10000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = {}, diff --git a/_G/db/Units/Cars/Car/SA-11 Buk SR 9S18M1.lua b/_G/db/Units/Cars/Car/SA-11 Buk SR 9S18M1.lua index e534c697..fb55c171 100644 --- a/_G/db/Units/Cars/Car/SA-11 Buk SR 9S18M1.lua +++ b/_G/db/Units/Cars/Car/SA-11 Buk SR 9S18M1.lua @@ -308,7 +308,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { fire_on_march = false, maxTargetDetectionRange = 120000, radar_rotation_type = 1, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 6000000000, 10000000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { @@ -353,7 +354,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "SA-11 Buk SR 9S18M1", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.00775, 0.00265 }, { 0, 0 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } + coeffs = { { 0.035, 0.0012 }, { 0.00775, 0.00265 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.2, 0.0002 } } }, agony_explosion_size = 2, fire_pos = { 1.6, 0.85, 0 }, diff --git a/_G/db/Units/Cars/Car/SA-18 Igla manpad.lua b/_G/db/Units/Cars/Car/SA-18 Igla manpad.lua index 76a09bfe..8fe48167 100644 --- a/_G/db/Units/Cars/Car/SA-18 Igla manpad.lua +++ b/_G/db/Units/Cars/Car/SA-18 Igla manpad.lua @@ -8,7 +8,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 5, ThreatRange = 5200, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/SA-18 Igla-S manpad.lua b/_G/db/Units/Cars/Car/SA-18 Igla-S manpad.lua index 50754d43..135520fe 100644 --- a/_G/db/Units/Cars/Car/SA-18 Igla-S manpad.lua +++ b/_G/db/Units/Cars/Car/SA-18 Igla-S manpad.lua @@ -8,7 +8,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 5, ThreatRange = 5200, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/SAU 2-C9.lua b/_G/db/Units/Cars/Car/SAU 2-C9.lua index 34f2cee8..603fcd20 100644 --- a/_G/db/Units/Cars/Car/SAU 2-C9.lua +++ b/_G/db/Units/Cars/Car/SAU 2-C9.lua @@ -68,6 +68,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = "DRIVER_POINT", enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.522, + [0] = 0.129, + [3] = 1 + } + }, mapclasskey = "P0091000006", sensor = { height = 2.3 diff --git a/_G/db/Units/Cars/Car/SAU Akatsia.lua b/_G/db/Units/Cars/Car/SAU Akatsia.lua index 0c2853f0..db174cbf 100644 --- a/_G/db/Units/Cars/Car/SAU Akatsia.lua +++ b/_G/db/Units/Cars/Car/SAU Akatsia.lua @@ -69,11 +69,19 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "Artillery", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "Indirect fire", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Artillery", chassis = {}, + crew_locale = "RUS", + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.431, + [0] = 0.118, + [3] = 1 + } + }, mapclasskey = "P0091000006", sensor = { height = 3.05 diff --git a/_G/db/Units/Cars/Car/SAU Gvozdika.lua b/_G/db/Units/Cars/Car/SAU Gvozdika.lua index f5c548b8..4df0a841 100644 --- a/_G/db/Units/Cars/Car/SAU Gvozdika.lua +++ b/_G/db/Units/Cars/Car/SAU Gvozdika.lua @@ -73,11 +73,19 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { armour_thickness = 0.022, life = 4 }, + crew_locale = "RUS", + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0.03, 0 } }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.157, + [0] = -0.09, + [3] = 1 + } + }, mapclasskey = "P0091000006", sensor = { height = 2.373 diff --git a/_G/db/Units/Cars/Car/SAU Msta.lua b/_G/db/Units/Cars/Car/SAU Msta.lua index ed99f775..6a81f721 100644 --- a/_G/db/Units/Cars/Car/SAU Msta.lua +++ b/_G/db/Units/Cars/Car/SAU Msta.lua @@ -123,11 +123,19 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { life = 4, r_max = 0.44 }, + crew_locale = "RUS", + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.247, + [0] = 0.2, + [3] = 1 + } + }, mapclasskey = "P0091000006", sensor = { height = 2.985 diff --git a/_G/db/Units/Cars/Car/SNR_75V.lua b/_G/db/Units/Cars/Car/SNR_75V.lua index b806ffdb..bc551cfb 100644 --- a/_G/db/Units/Cars/Car/SNR_75V.lua +++ b/_G/db/Units/Cars/Car/SNR_75V.lua @@ -77,7 +77,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { pos = { 0, 0, 0 } }, maxTargetDetectionRange = 100000, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 4910000000, 4990000000 }, { 5010000000, 5090000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", @@ -120,7 +121,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "SNR_75V", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.00026666666666667 } } + coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0.49, 0.005, 1.7 }, { 0.001, 0.17 }, { 0.2, 0.00026666666666667 } } }, agony_explosion_size = 5, fire_pos = { 0, 1.5, 0 }, diff --git a/_G/db/Units/Cars/Car/SON_9.lua b/_G/db/Units/Cars/Car/SON_9.lua index a5637b78..a9f6b40f 100644 --- a/_G/db/Units/Cars/Car/SON_9.lua +++ b/_G/db/Units/Cars/Car/SON_9.lua @@ -20,7 +20,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { max_trg_alt = 14000, min_trg_alt = 25, reactionTime = 1, - reflection_limit = 0.01, + reflection_limit = 0.04, type = 103 } }, angles = { { 3.1415926535898, -3.1415926535898, -0.087266462599716, 1.5707963267949 } }, @@ -166,7 +166,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { sensor = { Tau = 0.1, deviation_error_azimuth = 0.0004, - deviation_error_distance = 0.01, + deviation_error_distance = 0.001, deviation_error_elevation = 0.0004, deviation_error_speed_sensor = 0.005, deviation_error_stability = 0.01, @@ -181,7 +181,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 55000, radar_rotation_type = 2, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 2700000000, 2900000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", @@ -232,7 +233,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "SON_9", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.2, 0.00026666666666667 } } + coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.2, 0.00026666666666667 } } }, agony_explosion_size = 5, fire_pos = { 0, 1.5, 0 }, diff --git a/_G/db/Units/Cars/Car/S_75_ZIL.lua b/_G/db/Units/Cars/Car/S_75_ZIL.lua index a15af561..9e5f1ae7 100644 --- a/_G/db/Units/Cars/Car/S_75_ZIL.lua +++ b/_G/db/Units/Cars/Car/S_75_ZIL.lua @@ -23,7 +23,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { turret_elevation = { {} } }, attribute = { 2, 17, 25, "Redacted", "Trucks", "All", "Ground Units", "Vehicles", "Ground vehicles", "Ground Units Non Airdefence", "NonAndLightArmoredUnits", "NonArmoredUnits", "Unarmed vehicles" }, - canTow = { "Saddle" }, + canTow = { "Saddle", "Saddle22" }, category = "Unarmed", chassis = {}, driverViewPoint = { 1.593, 2.151, -0.47 }, diff --git a/_G/db/Units/Cars/Car/Scud_B.lua b/_G/db/Units/Cars/Car/Scud_B.lua index 6f9628fe..e63c051b 100644 --- a/_G/db/Units/Cars/Car/Scud_B.lua +++ b/_G/db/Units/Cars/Car/Scud_B.lua @@ -11,7 +11,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { MaxSpeed = 60.00012, Name = "SSM SS-1C Scud-B", Rate = 20, - ThreatRange = 320000, + ThreatRange = 285000, ThreatRangeMin = 50000, WS = { { LN = { { @@ -26,7 +26,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shot_delay = 10, type_ammunition = { 4, 4, 11, "Redacted" } } }, - distanceMax = 320000, + distanceMax = 285000, distanceMin = 50000, external_tracking_awacs = true, max_number_of_missiles_channels = 1, diff --git a/_G/db/Units/Cars/Car/Sd_Kfz_234_2_Puma.lua b/_G/db/Units/Cars/Car/Sd_Kfz_234_2_Puma.lua index 97c23915..22fb7c78 100644 --- a/_G/db/Units/Cars/Car/Sd_Kfz_234_2_Puma.lua +++ b/_G/db/Units/Cars/Car/Sd_Kfz_234_2_Puma.lua @@ -156,12 +156,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 12, - reload_time = 180, - shell_name = {} + portion_reload_time = 15, + shell_name = {}, + virtualStwID = 1 }, { ammo_capacity = 31, automaticLoader = false, - reload_time = 465, + portion_reload_time = 15, shell_name = { "Pzgr_39_5cm" }, shot_delay = 13, virtualStwID = 2 @@ -174,11 +175,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 4, - reload_time = 60, shell_name = { "Sprgr_38" } }, { ammo_capacity = 8, - reload_time = 120, shell_name = { "Sprgr_38" }, shot_delay = 13 } }, diff --git a/_G/db/Units/Cars/Car/Smerch.lua b/_G/db/Units/Cars/Car/Smerch.lua index 06762dd9..ecabaf31 100644 --- a/_G/db/Units/Cars/Car/Smerch.lua +++ b/_G/db/Units/Cars/Car/Smerch.lua @@ -42,9 +42,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { PL = { { ammo_capacity = 12, reload_time = 2160, - rocket_name = "weapons.nurs.SMERCH_9M55K", shot_delay = 0.1, - type_ammunition = { 4, 7, 33, "Redacted" } + type_ammunition = "weapons.nurs.SMERCH_9M55K" } }, barrels_reload_type = 3, distanceMax = 70000, @@ -104,6 +103,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { driverCockpit = "DriverCockpit/DriverCockpitWithLLTV", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.396, + [0] = 0.125, + [3] = 1, + [9] = 0.98 + } + }, mapclasskey = "P0091000209", sensor = { height = 3.05 diff --git a/_G/db/Units/Cars/Car/Smerch_HE.lua b/_G/db/Units/Cars/Car/Smerch_HE.lua index efed5221..cee2b5ac 100644 --- a/_G/db/Units/Cars/Car/Smerch_HE.lua +++ b/_G/db/Units/Cars/Car/Smerch_HE.lua @@ -42,9 +42,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { PL = { { ammo_capacity = 12, reload_time = 2160, - rocket_name = "weapons.nurs.SMERCH_9M55F", shot_delay = 0.1, - type_ammunition = { 4, 7, 33, "Redacted" } + type_ammunition = "weapons.nurs.SMERCH_9M55F" } }, barrels_reload_type = 3, distanceMax = 70000, @@ -104,6 +103,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { driverCockpit = "DriverCockpit/DriverCockpitWithLLTV", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.396, + [0] = 0.125, + [3] = 1, + [9] = 0.98 + } + }, mapclasskey = "P0091000209", sensor = { height = 3.05 diff --git a/_G/db/Units/Cars/Car/Soldier AK.lua b/_G/db/Units/Cars/Car/Soldier AK.lua index f71d3f7a..2fc95da9 100644 --- a/_G/db/Units/Cars/Car/Soldier AK.lua +++ b/_G/db/Units/Cars/Car/Soldier AK.lua @@ -9,7 +9,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Soldier M249.lua b/_G/db/Units/Cars/Car/Soldier M249.lua index 1191699b..f27ce98c 100644 --- a/_G/db/Units/Cars/Car/Soldier M249.lua +++ b/_G/db/Units/Cars/Car/Soldier M249.lua @@ -9,7 +9,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 700, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Soldier M4 GRG.lua b/_G/db/Units/Cars/Car/Soldier M4 GRG.lua index aefd427a..1bff553c 100644 --- a/_G/db/Units/Cars/Car/Soldier M4 GRG.lua +++ b/_G/db/Units/Cars/Car/Soldier M4 GRG.lua @@ -9,7 +9,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Soldier M4.lua b/_G/db/Units/Cars/Car/Soldier M4.lua index fae46e14..276468fd 100644 --- a/_G/db/Units/Cars/Car/Soldier M4.lua +++ b/_G/db/Units/Cars/Car/Soldier M4.lua @@ -9,7 +9,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Soldier RPG.lua b/_G/db/Units/Cars/Car/Soldier RPG.lua index c89e53a8..da2bd3bd 100644 --- a/_G/db/Units/Cars/Car/Soldier RPG.lua +++ b/_G/db/Units/Cars/Car/Soldier RPG.lua @@ -9,7 +9,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/Soldier stinger.lua b/_G/db/Units/Cars/Car/Soldier stinger.lua index 4ccf5d32..1a232def 100644 --- a/_G/db/Units/Cars/Car/Soldier stinger.lua +++ b/_G/db/Units/Cars/Car/Soldier stinger.lua @@ -8,7 +8,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 5, ThreatRange = 4500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/SpGH_Dana.lua b/_G/db/Units/Cars/Car/SpGH_Dana.lua index e015ff57..d8a56aaf 100644 --- a/_G/db/Units/Cars/Car/SpGH_Dana.lua +++ b/_G/db/Units/Cars/Car/SpGH_Dana.lua @@ -68,11 +68,19 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { attribute = { 2, 17, 26, "Redacted", "Artillery", "All", "Ground Units", "Ground Units Non Airdefence", "Armed ground units", "Vehicles", "Ground vehicles", "Armed vehicles", "Indirect fire", "NonAndLightArmoredUnits", "LightArmoredUnits" }, category = "Artillery", chassis = {}, + crew_locale = "ENG", + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpit", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.317, + [0] = 0.333, + [3] = 1 + } + }, mapclasskey = "P0091000006", sensor = { height = 3.5 diff --git a/_G/db/Units/Cars/Car/Strela-1 9P31.lua b/_G/db/Units/Cars/Car/Strela-1 9P31.lua index ef00f8ac..906544fc 100644 --- a/_G/db/Units/Cars/Car/Strela-1 9P31.lua +++ b/_G/db/Units/Cars/Car/Strela-1 9P31.lua @@ -64,6 +64,17 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { offset = { 0.1, 0, 0 } }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.412, + [0] = 0.22, + [3] = 1, + [4] = 1, + [5] = 1, + [6] = 1, + [7] = 1, + [9] = 1 + } + }, mapclasskey = "P0091000085", sensor = { height = 3.277 diff --git a/_G/db/Units/Cars/Car/Strela-10M3.lua b/_G/db/Units/Cars/Car/Strela-10M3.lua index f0ac0916..a4639345 100644 --- a/_G/db/Units/Cars/Car/Strela-10M3.lua +++ b/_G/db/Units/Cars/Car/Strela-10M3.lua @@ -132,6 +132,16 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { offset = { 0.05, 0, 0 } }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.349, + [0] = 0.317, + [3] = 1, + [4] = 1, + [5] = 1, + [6] = 1, + [7] = 1 + } + }, mapclasskey = "P0091000086", sensor = { height = 3.548, diff --git a/_G/db/Units/Cars/Car/Stug_III.lua b/_G/db/Units/Cars/Car/Stug_III.lua index 28ff27ac..84c86c23 100644 --- a/_G/db/Units/Cars/Car/Stug_III.lua +++ b/_G/db/Units/Cars/Car/Stug_III.lua @@ -186,14 +186,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 10, - reload_time = 150, + portion_reload_time = 15, shell_name = {}, shot_delay = 7, virtualStwID = 1 }, { ammo_capacity = 23, automaticLoader = false, - reload_time = 345, + portion_reload_time = 15, shell_name = { "Pzgr_39/40" }, shot_delay = 16, virtualStwID = 2 @@ -206,14 +206,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 5, - reload_time = 75, - shell_name = { "Sprgr_34_L48" }, - virtualStwID = 1 + shell_name = { "Sprgr_34_L48" } }, { ammo_capacity = 16, - reload_time = 240, - shell_name = { "Sprgr_34_L48" }, - virtualStwID = 2 + shell_name = { "Sprgr_34_L48" } } }, distanceMax = 6000, distanceMin = 300, diff --git a/_G/db/Units/Cars/Car/Stug_IV.lua b/_G/db/Units/Cars/Car/Stug_IV.lua index e76e4692..56b95b7b 100644 --- a/_G/db/Units/Cars/Car/Stug_IV.lua +++ b/_G/db/Units/Cars/Car/Stug_IV.lua @@ -161,14 +161,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 30, - reload_time = 450, + portion_reload_time = 15, shell_name = {}, shot_delay = 7, virtualStwID = 1 }, { ammo_capacity = 30, automaticLoader = false, - reload_time = 420, + portion_reload_time = 15, shell_name = { "Pzgr_39/40" }, shot_delay = 15, virtualStwID = 2 @@ -181,14 +181,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 8, - reload_time = 120, - shell_name = { "Sprgr_34_L48" }, - virtualStwID = 1 + shell_name = { "Sprgr_34_L48" } }, { ammo_capacity = 16, - reload_time = 240, - shell_name = { "Sprgr_34_L48" }, - virtualStwID = 2 + shell_name = { "Sprgr_34_L48" } } }, distanceMax = 6000, distanceMin = 300, diff --git a/_G/db/Units/Cars/Car/SturmPzIV.lua b/_G/db/Units/Cars/Car/SturmPzIV.lua index 1ea698b0..0b203a45 100644 --- a/_G/db/Units/Cars/Car/SturmPzIV.lua +++ b/_G/db/Units/Cars/Car/SturmPzIV.lua @@ -206,17 +206,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.4 } }, PL = { { - ammo_capacity = 19, - reload_time = 2280, - shell_name = {}, - virtualStwID = 1 + shell_name = {} }, { - ammo_capacity = 19, - automaticLoader = false, - reload_time = 2280, - shell_name = { "I_Gr_33" }, - shot_delay = 33, - virtualStwID = 2 + shell_name = {} } }, sensor = {}, sightIndicationMode = 1, diff --git a/_G/db/Units/Cars/Car/T-55.lua b/_G/db/Units/Cars/Car/T-55.lua index 762821cf..1234a4c1 100644 --- a/_G/db/Units/Cars/Car/T-55.lua +++ b/_G/db/Units/Cars/Car/T-55.lua @@ -23,14 +23,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 6, - reload_time = 90, shell_name = { "3UBM11_100mm_AP" }, - shot_delay = 8.5, - virtualStwID = 1 + shot_delay = 8.5 }, { ammo_capacity = 26, automaticLoader = false, - reload_time = 390, + portion_reload_time = 15, shell_name = { "3UBM11_100mm_AP" }, shot_delay = 13.5, virtualStwID = 2 @@ -42,16 +40,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 2, - reload_time = 30, - shell_name = { "UOF412_100HE" }, - shot_delay = 8.5, - virtualStwID = 1 + shell_name = { "UOF412_100HE" } }, { ammo_capacity = 9, - reload_time = 135, - shell_name = { "UOF412_100HE" }, - shot_delay = 13.5, - virtualStwID = 2 + shell_name = { "UOF412_100HE" } } }, distanceMax = 8000, distanceMin = 20, @@ -98,6 +90,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { drawArgument2 = 1, omegaY = 0.29670597283904, omegaZ = 0.17453292519943, + pidY = { + d = 4, + i = 2, + inn = 0.2, + p = 10 + }, + pidZ = { + d = 4, + i = 2, + inn = 0.2, + p = 10 + }, pointer = "POINT_SIGHT_01", stabilizer = true }, { @@ -119,14 +123,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, { shell_name = {} } }, - customViewPoint = { "genericAAA", { -2, 0.2, 0 } }, fireAnimationArgument = 44, sensor = {}, + sightIndicationMode = 1, + sightMasterMode = 1, type = 10 } }, angles = { { 3.1415926535898, 1.5009831567151, -0.13962634015955, 0.69813170079773 }, { 1.5009831567151, 1.0297442586767, 0.34906585039887, 0.69813170079773 }, { 1.0297442586767, -3.1415926535898, -0.13962634015955, 0.69813170079773 } }, base = 1, center = "CENTER_MGUN", + cockpit = { "genericAAA", { -2, 0.2, 0 }, + open = true + }, drawArgument1 = 25, drawArgument2 = 26, omegaY = 0.69813170079773, @@ -160,7 +168,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Armor", chassis = {}, crew_locale = "RUS", - crew_members = { "gunner" }, + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/T-72B.lua b/_G/db/Units/Cars/Car/T-72B.lua index ba18e77b..94c6e5ff 100644 --- a/_G/db/Units/Cars/Car/T-72B.lua +++ b/_G/db/Units/Cars/Car/T-72B.lua @@ -23,11 +23,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - shell_name = {}, - virtualStwID = 1 + shell_name = {} }, { - shell_name = {}, - virtualStwID = 2 + shell_name = {} } }, beamWidth = 0.017453292519943, sensor = { @@ -43,15 +41,11 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 7, - reload_time = 140, - shell_name = { "2A46M_125_HE" }, - virtualStwID = 1 + shell_name = { "2A46M_125_HE" } }, { ammo_capacity = 10, - reload_time = 150, shell_name = { "2A46M_125_HE" }, - shot_delay = 30, - virtualStwID = 2 + shot_delay = 30 } }, distanceMax = 8000, distanceMin = 20, @@ -66,11 +60,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - type_ammunition = {}, - virtualStwID = 1 + type_ammunition = {} }, { - type_ammunition = {}, - virtualStwID = 2 + type_ammunition = {} } }, sensor = {}, sightIndicationMode = 4, @@ -110,6 +102,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { laser = true, omegaY = 0.34906585039887, omegaZ = 0.20943951023932, + pidY = { + d = 22, + i = 10, + inn = 0.4, + p = 60 + }, + pidZ = { + d = 22, + i = 10, + inn = 0.4, + p = 60 + }, pointer = "POINT_SIGHT_01", stabilizer = true }, { @@ -175,7 +179,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { gearRatios = {} }, crew_locale = "RUS", - crew_members = { "gunner" }, + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, diff --git a/_G/db/Units/Cars/Car/T-72B3.lua b/_G/db/Units/Cars/Car/T-72B3.lua index e4a5cd7b..ca0bd703 100644 --- a/_G/db/Units/Cars/Car/T-72B3.lua +++ b/_G/db/Units/Cars/Car/T-72B3.lua @@ -115,11 +115,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.3 } }, PL = { { - shell_name = { "3BM59_125_AP" }, - virtualStwID = 1 + shell_name = { "3BM59_125_AP" } }, { - shell_name = { "3BM59_125_AP" }, - virtualStwID = 2 + shell_name = { "3BM59_125_AP" } } }, beamWidth = 0.017453292519943, sensor = {} @@ -127,15 +125,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 7, - reload_time = 140, - shell_name = { "2A46M_125_HE" }, - virtualStwID = 1 + shell_name = { "2A46M_125_HE" } }, { ammo_capacity = 10, - reload_time = 150, - shell_name = { "2A46M_125_HE" }, - shot_delay = 30, - virtualStwID = 2 + shell_name = { "2A46M_125_HE" } } }, distanceMax = 8000, distanceMin = 20, @@ -148,11 +141,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.3 } }, PL = { { - type_ammunition = {}, - virtualStwID = 1 + type_ammunition = {} }, { - type_ammunition = {}, - virtualStwID = 2 + type_ammunition = {} } }, sensor = {} }, { diff --git a/_G/db/Units/Cars/Car/T-80UD.lua b/_G/db/Units/Cars/Car/T-80UD.lua index 46cd066a..dc997443 100644 --- a/_G/db/Units/Cars/Car/T-80UD.lua +++ b/_G/db/Units/Cars/Car/T-80UD.lua @@ -22,11 +22,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - shell_name = {}, - virtualStwID = 1 + shell_name = {} }, { - shell_name = {}, - virtualStwID = 2 + shell_name = {} } }, beamWidth = 0.017453292519943, sensor = {}, @@ -36,15 +34,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 7, - reload_time = 140, - shell_name = { "2A46M_125_HE" }, - virtualStwID = 1 + shell_name = { "2A46M_125_HE" } }, { ammo_capacity = 10, - reload_time = 150, - shell_name = { "2A46M_125_HE" }, - shot_delay = 30, - virtualStwID = 2 + shell_name = { "2A46M_125_HE" } } }, distanceMax = 8000, distanceMin = 20, @@ -59,11 +52,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - type_ammunition = {}, - virtualStwID = 1 + type_ammunition = {} }, { - type_ammunition = {}, - virtualStwID = 2 + type_ammunition = {} } }, sensor = {}, sightIndicationMode = 4, @@ -168,7 +159,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { gearRatios = {} }, crew_locale = "RUS", - crew_members = { "gunner" }, + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewPoint = { 1.885, 1.36, 0 }, enablePlayerCanDrive = true, diff --git a/_G/db/Units/Cars/Car/T-90.lua b/_G/db/Units/Cars/Car/T-90.lua index d949ecf1..bc66cde9 100644 --- a/_G/db/Units/Cars/Car/T-90.lua +++ b/_G/db/Units/Cars/Car/T-90.lua @@ -23,11 +23,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - shell_name = {}, - virtualStwID = 1 + shell_name = {} }, { - shell_name = {}, - virtualStwID = 2 + shell_name = {} } }, beamWidth = 0.017453292519943, sensor = {}, @@ -37,15 +35,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 7, - reload_time = 140, - shell_name = { "2A46M_125_HE" }, - virtualStwID = 1 + shell_name = { "2A46M_125_HE" } }, { ammo_capacity = 10, - reload_time = 150, - shell_name = { "2A46M_125_HE" }, - shot_delay = 30, - virtualStwID = 2 + shell_name = { "2A46M_125_HE" } } }, distanceMax = 8000, distanceMin = 20, @@ -60,11 +53,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - type_ammunition = {}, - virtualStwID = 1 + type_ammunition = {} }, { - type_ammunition = {}, - virtualStwID = 2 + type_ammunition = {} } }, sensor = {}, sightIndicationMode = 4, @@ -171,7 +162,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { turbine = true }, crew_locale = "RUS", - crew_members = { "gunner" }, + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0, 0, 0 } diff --git a/_G/db/Units/Cars/Car/T155_Firtina.lua b/_G/db/Units/Cars/Car/T155_Firtina.lua index df9bae92..00557c60 100644 --- a/_G/db/Units/Cars/Car/T155_Firtina.lua +++ b/_G/db/Units/Cars/Car/T155_Firtina.lua @@ -164,6 +164,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { drawArgument2 = 25, omegaY = 0.87266462599716, omegaZ = 0.87266462599716, + pidY = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, + pidZ = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, pointer = "POINT_SIGHT_02" }, fire_on_march = false, @@ -185,6 +197,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT" }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.267, + [0] = 0.067, + [3] = 1 + } + }, mapclasskey = "P0091000006", sensor = { height = 2.8 diff --git a/_G/db/Units/Cars/Car/TYPE-59.lua b/_G/db/Units/Cars/Car/TYPE-59.lua index 13e9691c..48040292 100644 --- a/_G/db/Units/Cars/Car/TYPE-59.lua +++ b/_G/db/Units/Cars/Car/TYPE-59.lua @@ -24,17 +24,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 6, - reload_time = 90, shell_name = { "3UBM11_100mm_AP" }, - shot_delay = 8.5, - virtualStwID = 1 + shot_delay = 8.5 }, { ammo_capacity = 26, automaticLoader = false, - reload_time = 390, + portion_reload_time = 15, shell_name = { "3UBM11_100mm_AP" }, - shot_delay = 13.5, - virtualStwID = 2 + shot_delay = 13.5 } }, sensor = {}, sightIndicationMode = 1, @@ -43,16 +40,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 2, - reload_time = 30, shell_name = { "UOF412_100HE" }, - shot_delay = 8.5, - virtualStwID = 1 + shot_delay = 8.5 }, { ammo_capacity = 9, - reload_time = 135, shell_name = { "UOF412_100HE" }, - shot_delay = 13.5, - virtualStwID = 2 + shot_delay = 13.5 } }, distanceMax = 8000, distanceMin = 20, @@ -163,7 +156,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Armor", chassis = {}, crew_locale = "CHN", - crew_members = { "gunner" }, + crew_members = { "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "PNT_DRIVER", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/Tetrarch.lua b/_G/db/Units/Cars/Car/Tetrarch.lua index 7e00bede..e963bd06 100644 --- a/_G/db/Units/Cars/Car/Tetrarch.lua +++ b/_G/db/Units/Cars/Car/Tetrarch.lua @@ -22,11 +22,11 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 10, - reload_time = 50, + portion_reload_time = 5, shell_name = {} }, { ammo_capacity = 31, - reload_time = 217, + portion_reload_time = 7, shell_name = {}, shot_delay = 5, virtualStwID = 2 @@ -39,13 +39,10 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 30, shell_name = { "HE_T_MkII_40mm" } }, { ammo_capacity = 28, - reload_time = 196, - shell_name = {}, - shot_delay = 5 + shell_name = { "HE_T_MkII_40mm" } } }, distanceMax = 2000, distanceMin = 20, diff --git a/_G/db/Units/Cars/Car/Tiger_I.lua b/_G/db/Units/Cars/Car/Tiger_I.lua index 51e7ea8e..c507bed8 100644 --- a/_G/db/Units/Cars/Car/Tiger_I.lua +++ b/_G/db/Units/Cars/Car/Tiger_I.lua @@ -147,14 +147,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 10, - reload_time = 80, + portion_reload_time = 8, shell_name = {}, shot_delay = 7.5, virtualStwID = 1 }, { ammo_capacity = 50, automaticLoader = false, - reload_time = 500, + portion_reload_time = 10, shell_name = { "Pzgr_39" }, shot_delay = 14, virtualStwID = 2 @@ -167,11 +167,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 48, shell_name = { "Sprgr_39" } }, { ammo_capacity = 26, - reload_time = 260, shell_name = { "Sprgr_39" } } }, distanceMax = 4000, diff --git a/_G/db/Units/Cars/Car/Tiger_II_H.lua b/_G/db/Units/Cars/Car/Tiger_II_H.lua index 7ac8acca..f7f108e4 100644 --- a/_G/db/Units/Cars/Car/Tiger_II_H.lua +++ b/_G/db/Units/Cars/Car/Tiger_II_H.lua @@ -207,14 +207,14 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 25, - reload_time = 64, + portion_reload_time = 8, shell_name = {}, shot_delay = 7.5, virtualStwID = 1 }, { ammo_capacity = 33, automaticLoader = false, - reload_time = 330, + portion_reload_time = 10, shell_name = { "Pzgr_39/43" }, shot_delay = 12, virtualStwID = 2 @@ -227,11 +227,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 8, - reload_time = 64, shell_name = { "Sprgr_43_L71" } }, { ammo_capacity = 20, - reload_time = 200, shell_name = { "Sprgr_43_L71" } } }, distanceMax = 6000, diff --git a/_G/db/Units/Cars/Car/Tor 9A331.lua b/_G/db/Units/Cars/Car/Tor 9A331.lua index 693b4762..8ac42703 100644 --- a/_G/db/Units/Cars/Car/Tor 9A331.lua +++ b/_G/db/Units/Cars/Car/Tor 9A331.lua @@ -75,6 +75,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { maxTargetDetectionRange = 25000, radar_rotation_type = 1, radar_type = 104, + searchRadarFrequencies = { { 4000000000, 8000000000 } }, searchRadarMaxElevation = 0.78539816339745 }, Waypoint_Custom_Panel = true, @@ -95,6 +96,27 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { offset = { 0.1, 0, 0 } }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.174, + [0] = 0.18, + [3] = 1, + [4] = 0.268, + [5] = 0.539, + [6] = 0.615, + [7] = 0.615, + [11] = -0.823, + [14] = 0.464, + [18] = 1, + [19] = 1, + [20] = 0.174, + [21] = 0.123, + [22] = -0.022, + [27] = 1, + [28] = -0.098, + [49] = 0.186, + [50] = 0.565 + } + }, mapclasskey = "P0091000087", radar_rotation_period = 1, sensor = { diff --git a/_G/db/Units/Cars/Car/Uragan_BM-27.lua b/_G/db/Units/Cars/Car/Uragan_BM-27.lua index 84ba4009..8e5e5339 100644 --- a/_G/db/Units/Cars/Car/Uragan_BM-27.lua +++ b/_G/db/Units/Cars/Car/Uragan_BM-27.lua @@ -51,9 +51,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ammo_capacity = 16, name_ammunition = "9M27F", reload_time = 840, - rocket_name = "weapons.nurs.URAGAN_9M27F", shot_delay = 0.1, - type_ammunition = { 4, 7, 33, "Redacted" } + type_ammunition = "weapons.nurs.URAGAN_9M27F" } }, barrels_reload_type = 3, customViewPoint = { "genericMLRS", { -3, 0.3, -2 }, @@ -110,6 +109,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, driverViewPoint = { 3.33, 2.3, -0.74 }, enablePlayerCanDrive = true, + encyclopediaAnimation = { + args = { 0.459, 1, 1, + [0] = 0.149, + [100] = 1 + } + }, mapclasskey = "P0091000209", sensor = { height = 3.05 diff --git a/_G/db/Units/Cars/Car/ZBD04A.lua b/_G/db/Units/Cars/Car/ZBD04A.lua index f7a2c481..6db2ef58 100644 --- a/_G/db/Units/Cars/Car/ZBD04A.lua +++ b/_G/db/Units/Cars/Car/ZBD04A.lua @@ -22,23 +22,6 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { ThreatRange = 4800, WS = { { LN = { { - BR = { { - connector_name = "POINT_MGUN_01", - pos = {} - } }, - PL = { { - ammo_capacity = 2000, - portionAmmoCapacity = 2000, - reload_time = 600, - shell_name = {}, - switch_on_delay = 0.1 - } }, - beamWidth = 0.017453292519943, - distanceMaxForFCS = 2000, - fireAnimationArgument = 45, - secondary = true, - sensor = {} - }, { BR = { { connector_name = "POINT_GUN_01", recoilArgument = 26, @@ -57,6 +40,23 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { sensor = {}, sightIndicationMode = 1, sightMasterMode = 1 + }, { + BR = { { + connector_name = "POINT_MGUN_01", + pos = {} + } }, + PL = { { + ammo_capacity = 2000, + portionAmmoCapacity = 2000, + reload_time = 600, + shell_name = {}, + switch_on_delay = 0.1 + } }, + beamWidth = 0.017453292519943, + distanceMaxForFCS = 2000, + fireAnimationArgument = 45, + secondary = true, + sensor = {} }, { BR = { { connector_name = "POINT_GUN", diff --git a/_G/db/Units/Cars/Car/ZSU-23-4 Shilka.lua b/_G/db/Units/Cars/Car/ZSU-23-4 Shilka.lua index b8856cec..c22e0023 100644 --- a/_G/db/Units/Cars/Car/ZSU-23-4 Shilka.lua +++ b/_G/db/Units/Cars/Car/ZSU-23-4 Shilka.lua @@ -36,7 +36,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { name = "2A14_4", reactionTime = 6, reflection_limit = 0.15, - sensor = {} + sensor = {}, + useTargetAccelInSight = true } }, angles = { { 2.6179938779915, -2.6179938779915, -0.1, 1.48 }, { -2.6179938779915, 2.6179938779915, -0.078539816339745, 1.48 } }, center = "CENTER_TOWER", diff --git a/_G/db/Units/Cars/Car/ZTZ96B.lua b/_G/db/Units/Cars/Car/ZTZ96B.lua index e62d9c87..3b902af3 100644 --- a/_G/db/Units/Cars/Car/ZTZ96B.lua +++ b/_G/db/Units/Cars/Car/ZTZ96B.lua @@ -170,11 +170,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - shell_name = { "ZTZ_125_AP" }, - virtualStwID = 1 + shell_name = { "ZTZ_125_AP" } }, { - shell_name = { "ZTZ_125_AP" }, - virtualStwID = 2 + shell_name = { "ZTZ_125_AP" } } }, beamWidth = 0.017453292519943, combatRange = 1200, @@ -186,16 +184,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 7, - reload_time = 140, shell_name = { "ZTZ_125_HE" }, - shot_delay = 6, - virtualStwID = 1 + shot_delay = 6 }, { ammo_capacity = 10, - reload_time = 150, shell_name = { "ZTZ_125_HE" }, - shot_delay = 30, - virtualStwID = 2 + shot_delay = 30 } }, combatRange = 800, distanceMax = 4000, @@ -212,11 +206,9 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { recoilTime = 0.5 } }, PL = { { - type_ammunition = {}, - virtualStwID = 1 + type_ammunition = {} }, { - type_ammunition = {}, - virtualStwID = 2 + type_ammunition = {} } }, sensor = {}, sightIndicationMode = 4, @@ -345,7 +337,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { category = "Armor", chassis = {}, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIRandLLTV", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/generator_5i57.lua b/_G/db/Units/Cars/Car/generator_5i57.lua index d8081393..ea81460f 100644 --- a/_G/db/Units/Cars/Car/generator_5i57.lua +++ b/_G/db/Units/Cars/Car/generator_5i57.lua @@ -20,7 +20,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { turret_azimuth = { {} }, turret_elevation = { {} } }, - attribute = { 2, 17, 25, "Redacted", "AD Auxillary Equipment", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "All", "Ground Units", "Vehicles", "Ground vehicles", "Air Defence vehicles" }, + attribute = { 2, 9, 25, "Redacted", "AD Auxillary Equipment", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air Defence", "All", "Ground Units", "Vehicles", "Ground vehicles", "Air Defence vehicles" }, category = "Air Defence", chassis = { life = 3, diff --git a/_G/db/Units/Cars/Car/leopard-2A4.lua b/_G/db/Units/Cars/Car/leopard-2A4.lua index c74cf768..4e2c7d5b 100644 --- a/_G/db/Units/Cars/Car/leopard-2A4.lua +++ b/_G/db/Units/Cars/Car/leopard-2A4.lua @@ -190,13 +190,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 9, - reload_time = 135, + portion_reload_time = 15, shell_name = { "DM33_120_AP" }, shot_delay = 6, virtualStwID = 1 }, { ammo_capacity = 16, - reload_time = 240, + portion_reload_time = 15, shell_name = { "DM33_120_AP" }, shot_delay = 10, virtualStwID = 2 @@ -211,16 +211,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 90, shell_name = { "DM12_120mm_HEAT_MP_T" }, - shot_delay = 6, - virtualStwID = 1 + shot_delay = 6 }, { ammo_capacity = 11, - reload_time = 165, shell_name = { "DM12_120mm_HEAT_MP_T" }, - shot_delay = 10, - virtualStwID = 2 + shot_delay = 10 } }, combatRange = 800, distanceMax = 8000, @@ -325,6 +321,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { drawArgument2 = 25, omegaY = 1.0471975511966, omegaZ = 1.0471975511966, + pidY = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, + pidZ = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, pointer = "POINT_SIGHT_02" }, maxTargetDetectionRange = 6000, @@ -347,7 +355,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { gearRatios = {} }, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/leopard-2A4_trs.lua b/_G/db/Units/Cars/Car/leopard-2A4_trs.lua index 734a1e6d..f0920209 100644 --- a/_G/db/Units/Cars/Car/leopard-2A4_trs.lua +++ b/_G/db/Units/Cars/Car/leopard-2A4_trs.lua @@ -190,13 +190,13 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { } }, PL = { { ammo_capacity = 9, - reload_time = 135, + portion_reload_time = 15, shell_name = { "DM33_120_AP" }, shot_delay = 6, virtualStwID = 1 }, { ammo_capacity = 16, - reload_time = 240, + portion_reload_time = 15, shell_name = { "DM33_120_AP" }, shot_delay = 10, virtualStwID = 2 @@ -211,16 +211,12 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { BR = { {} }, PL = { { ammo_capacity = 6, - reload_time = 90, shell_name = { "DM12_120mm_HEAT_MP_T" }, - shot_delay = 6, - virtualStwID = 1 + shot_delay = 6 }, { ammo_capacity = 11, - reload_time = 165, shell_name = { "DM12_120mm_HEAT_MP_T" }, - shot_delay = 10, - virtualStwID = 2 + shot_delay = 10 } }, combatRange = 800, distanceMax = 8000, @@ -326,6 +322,18 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { drawArgument2 = 25, omegaY = 1.0471975511966, omegaZ = 1.0471975511966, + pidY = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, + pidZ = { + d = 15, + i = 20, + inn = 10, + p = 100 + }, pointer = "POINT_SIGHT_02" }, maxTargetDetectionRange = 6000, @@ -348,7 +356,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { gearRatios = {} }, crew_locale = "ENG", - crew_members = { "commander", "gunner" }, + crew_members = { "commander", "gunner", "loader" }, driverCockpit = "DriverCockpit/DriverCockpitWithIR", driverViewConnectorName = { "DRIVER_POINT", offset = { 0.05, 0, 0 } diff --git a/_G/db/Units/Cars/Car/p-19 s-125 sr.lua b/_G/db/Units/Cars/Car/p-19 s-125 sr.lua index 73990f38..42ebdb78 100644 --- a/_G/db/Units/Cars/Car/p-19 s-125 sr.lua +++ b/_G/db/Units/Cars/Car/p-19 s-125 sr.lua @@ -163,7 +163,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, maxTargetDetectionRange = 160000, radar_rotation_type = 0, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 830000000, 882000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = { @@ -195,7 +196,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "p-19 s-125 sr", visual = { IR = { - coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0, 0 }, { 0.001, 0.17 }, { 0.25, 0.00027777777777778 } } + coeffs = { { 0.035, 0.0012 }, { 0.0069, 0.0036 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.25, 0.00027777777777778 } } }, agony_explosion_size = 2, fire_pos = { 0, 0.8, 0 }, diff --git a/_G/db/Units/Cars/Car/rapier_fsa_blindfire_radar.lua b/_G/db/Units/Cars/Car/rapier_fsa_blindfire_radar.lua index da653bef..87527b91 100644 --- a/_G/db/Units/Cars/Car/rapier_fsa_blindfire_radar.lua +++ b/_G/db/Units/Cars/Car/rapier_fsa_blindfire_radar.lua @@ -45,7 +45,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { reference_angle_Y = 3.1415926535898 }, maxTargetDetectionRange = 30000, - radar_type = 104 + radar_type = 104, + searchRadarFrequencies = { { 10000000000, 20000000000 } } }, Waypoint_Custom_Panel = true, _file = "./CoreMods/tech/TechWeaponPack/Database/db_units_cars.lua", @@ -91,7 +92,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "rapier_fsa_blindfire_radar", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0.003, 0.0031 }, { 0, 0 }, { 0, 0 }, { 0.15, 0.00027272727272727 } } + coeffs = { { 0.031, 0.0022 }, { 0.003, 0.0031 }, { 0.205, 0.005, 2 }, { 0.001, 0.17 }, { 0.15, 0.00027272727272727 } } }, agony_explosion_size = 0, fire_pos = {}, diff --git a/_G/db/Units/Cars/Car/snr s-125 tr.lua b/_G/db/Units/Cars/Car/snr s-125 tr.lua index 5c3925d9..7c728881 100644 --- a/_G/db/Units/Cars/Car/snr s-125 tr.lua +++ b/_G/db/Units/Cars/Car/snr s-125 tr.lua @@ -104,7 +104,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { }, isDetector = true, maxTargetDetectionRange = 100000, - radar_type = 103 + radar_type = 103, + searchRadarFrequencies = { { 9000000000, 9400000000 } } }, Waypoint_Custom_Panel = true, animation_arguments = {}, @@ -133,7 +134,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { type = "snr s-125 tr", visual = { IR = { - coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0.15, 0.000375 } } + coeffs = { { 0.031, 0.0022 }, { 0, 0 }, { 0.49, 0.005, 1.7 }, { 0.001, 0.17 }, { 0.15, 0.000375 } } }, agony_explosion_size = 0, fire_pos = {}, diff --git a/_G/db/Units/Cars/Car/soldier_mauser98.lua b/_G/db/Units/Cars/Car/soldier_mauser98.lua index 39c49da1..609e1cd0 100644 --- a/_G/db/Units/Cars/Car/soldier_mauser98.lua +++ b/_G/db/Units/Cars/Car/soldier_mauser98.lua @@ -10,7 +10,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua b/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua index fe41a254..37bae8ac 100644 --- a/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua +++ b/_G/db/Units/Cars/Car/soldier_wwii_br_01.lua @@ -10,7 +10,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/soldier_wwii_us.lua b/_G/db/Units/Cars/Car/soldier_wwii_us.lua index ad6b02d6..8fec3df2 100644 --- a/_G/db/Units/Cars/Car/soldier_wwii_us.lua +++ b/_G/db/Units/Cars/Car/soldier_wwii_us.lua @@ -10,7 +10,8 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { Rate = 1, ThreatRange = 500, Transportable = { - size = 100 + size = 100, + valide = true }, WS = { { LN = { { diff --git a/_G/db/Units/Cars/Car/tt_DSHK.lua b/_G/db/Units/Cars/Car/tt_DSHK.lua index cc20414c..745c9cc5 100644 --- a/_G/db/Units/Cars/Car/tt_DSHK.lua +++ b/_G/db/Units/Cars/Car/tt_DSHK.lua @@ -33,6 +33,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = -1, + machineGunBeltArgument = 90, reactionTime = 0.5, sensor = {}, sightIndicationMode = 1, diff --git a/_G/db/Units/Cars/Car/tt_KORD.lua b/_G/db/Units/Cars/Car/tt_KORD.lua index c2890426..67ed12b8 100644 --- a/_G/db/Units/Cars/Car/tt_KORD.lua +++ b/_G/db/Units/Cars/Car/tt_KORD.lua @@ -33,6 +33,7 @@ _G["db"]["Units"]["Cars"]["Car"]["#Index"] = { shell_name = {} } }, fireAnimationArgument = -1, + machineGunBeltArgument = 90, reactionTime = 0.5, sensor = {}, sightIndicationMode = 1, diff --git a/_G/db/Units/Fortifications/Fortification/FlagPole.lua b/_G/db/Units/Fortifications/Fortification/FlagPole.lua index 9670e2a5..ae74731a 100644 --- a/_G/db/Units/Fortifications/Fortification/FlagPole.lua +++ b/_G/db/Units/Fortifications/Fortification/FlagPole.lua @@ -3,30 +3,29 @@ _G["db"]["Units"]["Fortifications"]["Fortification"]["#Index"] = { Life = 4, Name = "Flag Pole", Rate = 1, - ShapeName = "FlagPole", - ShapeNameDestr = "self", + ShapeName = "FlagPoleStatic", _file = "./CoreMods/tech/TechWeaponPack/Database/db_ground_objects.lua", _origin = "TechWeaponPack", attribute = { 5, 9 }, category = "Fortification", - classname = "lWindmill", enablePlayerCanDrive = false, mapclasskey = "P0091000076", - positioning = "ONLYHEIGTH", shape_table_data = { { classname = "lWindmill", desrt = "self", file = "FlagPole", life = 4, - name = "FlagPole", + name = "FlagPoleStatic", positioning = "ONLYHEIGTH", - username = "FlagPole" + username = "Flag Pole" }, { - expMass = 0, - file = "self", - fire = { 0, 1 }, - iscrashmodel = true, - name = "self" + classname = "lWindmill", + desrt = "self", + file = "FlagPole", + life = 4, + name = "FlagPole", + positioning = "ONLYHEIGTH", + username = "Flag Pole" } }, swapped_names = true, type = "FlagPole" diff --git a/_G/db/Units/GT_t/LN_t/AK12.lua b/_G/db/Units/GT_t/LN_t/AK12.lua new file mode 100644 index 00000000..fb149c06 --- /dev/null +++ b/_G/db/Units/GT_t/LN_t/AK12.lua @@ -0,0 +1,53 @@ +_G["db"]["Units"]["GT_t"]["LN_t"]["AK12"] = { + BR = { { + display_name = "AK-12", + name = "rifle", + pos = { 1.2, 0, 0 }, + reloadDuration = 6 + }, { + display_name = "GP-30M", + name = "support_granade", + pos = { 1, -0.1, 0 }, + reloadDuration = 8 + } }, + PL = { { + ammo_capacity = 30, + name = "rifle", + portionAmmoCapacity = 30, + reload_time = 5, + shell_name = { "5_45x39", "5_45x39_NOtr", "5_45x39_NOtr" }, + shot_delay = 0.085714285714286, + switch_on_delay = 3 + }, { + ammo_capacity = 1, + name = "support_granade", + portionAmmoCapacity = 1, + reload_time = 10, + shell_name = { "M383" }, + shot_delay = 6, + switch_on_delay = 3 + } }, + additionalShotDispersion = { + azimuth = -0.0068722339297277, + compensationK = 5, + elevation = 0 + }, + ammoAnimationArgument = 1, + bone_attach = "typeV_Spine2", + bone_attach_offset = { 3.1415926535898, 0, 1.5707963267949, 0.1, -0.18, -0.19 }, + bone_use = "__conn_hand_R", + bone_use_offset = { 0, 1.5707963267949, 1.5707963267949, 0.01, 0, -0.01 }, + display_name = "AK-12", + distanceMax = 500, + fireAnimationArgument = 4, + fire_animation = "shoot_callback", + gunsightAnimationArgument = 2, + max_trg_alt = 300, + name = "AK-12", + reload_animation = "reload_ak12", + sensor = {}, + shape = "rifle_ak12", + sidearm_type = "rifle", + silencerAnimationArgument = 3, + take_animation = "take_weapon_right" +} \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/Bofors_40mm.lua b/_G/db/Units/GT_t/LN_t/Bofors_40mm.lua index 6bfbfd21..b2eef046 100644 --- a/_G/db/Units/GT_t/LN_t/Bofors_40mm.lua +++ b/_G/db/Units/GT_t/LN_t/Bofors_40mm.lua @@ -10,7 +10,8 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["Bofors_40mm"] = { shell_display_name = "Bofors 40mm HE", shell_name = { "Bofors_40mm_HE" }, shot_delay = 0.5, - switch_on_delay = 1 + switch_on_delay = 1, + virtualStwID = 1 } }, distanceMax = 4000, max_trg_alt = 3000, diff --git a/_G/db/Units/GT_t/LN_t/D56T.lua b/_G/db/Units/GT_t/LN_t/D56T.lua index f5bca3d7..f5b6d4db 100644 --- a/_G/db/Units/GT_t/LN_t/D56T.lua +++ b/_G/db/Units/GT_t/LN_t/D56T.lua @@ -1,7 +1,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["D56T"] = { PL = { { ammo_capacity = 20, - reload_time = 200, + portion_reload_time = 10, shell_name = { "BR_354N" }, shot_delay = 5 } }, diff --git a/_G/db/Units/GT_t/LN_t/DANA_howitzer.lua b/_G/db/Units/GT_t/LN_t/DANA_howitzer.lua index a9f5d1b0..04e30f17 100644 --- a/_G/db/Units/GT_t/LN_t/DANA_howitzer.lua +++ b/_G/db/Units/GT_t/LN_t/DANA_howitzer.lua @@ -4,15 +4,17 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["DANA_howitzer"] = { } }, PL = { { ammo_capacity = 36, - automaticLoader = true, - reload_time = 1008, + portion_reload_time = 28, shell_name = { "DANA_152" }, - shot_delay = 20 + shot_delay = 20, + virtualStwID = 1 }, { ammo_capacity = 24, - reload_time = 480, + automaticLoader = false, + portion_reload_time = 20, shell_name = { "DANA_152" }, - shot_delay = 40 + shot_delay = 40, + virtualStwID = 2 } }, distanceMax = 18500, distanceMin = 30, diff --git a/_G/db/Units/GT_t/LN_t/Fagot.lua b/_G/db/Units/GT_t/LN_t/Fagot.lua index 31164d7d..951e88a9 100644 --- a/_G/db/Units/GT_t/LN_t/Fagot.lua +++ b/_G/db/Units/GT_t/LN_t/Fagot.lua @@ -18,6 +18,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["Fagot"] = { inclination_correction_bias = 0.0069813170079773, inclination_correction_upper_limit = 0.78539816339745, launch_delay = 20, + launch_delay_human = 0.4, maxShootingSpeed = 0, max_trg_alt = 3000, missileControlInterval = 0.16, diff --git a/_G/db/Units/GT_t/LN_t/Flak18.lua b/_G/db/Units/GT_t/LN_t/Flak18.lua index 95078e6a..232ea1fd 100644 --- a/_G/db/Units/GT_t/LN_t/Flak18.lua +++ b/_G/db/Units/GT_t/LN_t/Flak18.lua @@ -4,7 +4,8 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["Flak18"] = { automaticLoader = false, portionAmmoCapacity = 200, shell_name = { "Flak18_Sprgr_39" }, - shot_delay = 4 + shot_delay = 4, + virtualStwID = 1 } }, distanceMax = 5000, distanceMin = 10, diff --git a/_G/db/Units/GT_t/LN_t/Flak41.lua b/_G/db/Units/GT_t/LN_t/Flak41.lua index db099287..b8557065 100644 --- a/_G/db/Units/GT_t/LN_t/Flak41.lua +++ b/_G/db/Units/GT_t/LN_t/Flak41.lua @@ -4,7 +4,8 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["Flak41"] = { automaticLoader = false, portionAmmoCapacity = 200, shell_name = { "Flak41_Sprgr_39" }, - shot_delay = 4 + shot_delay = 4, + virtualStwID = 1 } }, distanceMax = 5000, distanceMin = 10, diff --git a/_G/db/Units/GT_t/LN_t/GSH_6_30K.lua b/_G/db/Units/GT_t/LN_t/GSH_6_30K.lua index e741f521..f087b530 100644 --- a/_G/db/Units/GT_t/LN_t/GSH_6_30K.lua +++ b/_G/db/Units/GT_t/LN_t/GSH_6_30K.lua @@ -36,5 +36,6 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["GSH_6_30K"] = { reactionTime = 3, reflection_limit = 0.05, sensor = {}, - type = 3 + type = 3, + useTargetAccelInSight = true } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/HOT2.lua b/_G/db/Units/GT_t/LN_t/HOT2.lua index c95c2539..b9d1a228 100644 --- a/_G/db/Units/GT_t/LN_t/HOT2.lua +++ b/_G/db/Units/GT_t/LN_t/HOT2.lua @@ -6,7 +6,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["HOT2"] = { ammo_capacity = 12, automaticLoader = true, name_ammunition = "HOT2", - reload_time = 180, + portion_reload_time = 15, shot_delay = 10, type_ammunition = { 4, 4, 8, "Redacted" } } }, diff --git a/_G/db/Units/GT_t/LN_t/M1917_155.lua b/_G/db/Units/GT_t/LN_t/M1917_155.lua index 3f634a5f..f85f0421 100644 --- a/_G/db/Units/GT_t/LN_t/M1917_155.lua +++ b/_G/db/Units/GT_t/LN_t/M1917_155.lua @@ -5,7 +5,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["M1917_155"] = { PL = { { ammo_capacity = 50, automaticLoader = false, - reloadTime = 1500, + portion_reload_time = 30, shell_name = { "M101" }, shot_delay = 30 } }, diff --git a/_G/db/Units/GT_t/LN_t/M2A1.lua b/_G/db/Units/GT_t/LN_t/M2A1.lua index 77ac81a4..2d712268 100644 --- a/_G/db/Units/GT_t/LN_t/M2A1.lua +++ b/_G/db/Units/GT_t/LN_t/M2A1.lua @@ -5,7 +5,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["M2A1"] = { PL = { { ammo_capacity = 40, automaticLoader = false, - reload_time = 400, + portion_reload_time = 10, shell_name = { "HE_M1_Shell" }, shot_delay = 12, virtualStwID = 1 diff --git a/_G/db/Units/GT_t/LN_t/NASAMS.lua b/_G/db/Units/GT_t/LN_t/NASAMS.lua index a42e6344..021e0e71 100644 --- a/_G/db/Units/GT_t/LN_t/NASAMS.lua +++ b/_G/db/Units/GT_t/LN_t/NASAMS.lua @@ -5,7 +5,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["NASAMS"] = { ammo_capacity = 6, automaticLoader = false, name_ammunition = "AIM-120B", - reload_time = 2520, + portion_reload_time = 420, shot_delay = 0.1, type_ammunition = { 4, 4, 7, "Redacted" } } }, diff --git a/_G/db/Units/GT_t/LN_t/QF_2_40mm.lua b/_G/db/Units/GT_t/LN_t/QF_2_40mm.lua index 30279a76..642249f0 100644 --- a/_G/db/Units/GT_t/LN_t/QF_2_40mm.lua +++ b/_G/db/Units/GT_t/LN_t/QF_2_40mm.lua @@ -5,7 +5,8 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["QF_2_40mm"] = { PL = { { automaticLoader = false, shell_name = { "AP_T_MkI_40mm" }, - shot_delay = 2.9 + shot_delay = 2.9, + virtualStwID = 1 } }, distanceMax = 2000, distanceMin = 10, diff --git a/_G/db/Units/GT_t/LN_t/RM_15cm_SK_C28.lua b/_G/db/Units/GT_t/LN_t/RM_15cm_SK_C28.lua index eeb03aa3..4779e8ba 100644 --- a/_G/db/Units/GT_t/LN_t/RM_15cm_SK_C28.lua +++ b/_G/db/Units/GT_t/LN_t/RM_15cm_SK_C28.lua @@ -5,7 +5,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["RM_15cm_SK_C28"] = { PL = { { ammo_capacity = 200, automaticLoader = false, - reloadTime = 4000, + portion_reload_time = 20, shell_name = { "RM_15cm_HE" }, shot_delay = 8.5714285714286 } }, diff --git a/_G/db/Units/GT_t/LN_t/Reflex.lua b/_G/db/Units/GT_t/LN_t/Reflex.lua index 81ef2038..269db367 100644 --- a/_G/db/Units/GT_t/LN_t/Reflex.lua +++ b/_G/db/Units/GT_t/LN_t/Reflex.lua @@ -5,16 +5,18 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["Reflex"] = { PL = { { ammo_capacity = 3, name_ammunition = "9M119", - reload_time = 60, + portion_reload_time = 20, shot_delay = 8, - type_ammunition = { 4, 4, 11, "Redacted" } + type_ammunition = { 4, 4, 11, "Redacted" }, + virtualStwID = 1 }, { ammo_capacity = 3, automaticLoader = false, name_ammunition = "9M119", - reload_time = 50, + portion_reload_time = 15, shot_delay = 30, - type_ammunition = { 4, 4, 11, "Redacted" } + type_ammunition = { 4, 4, 11, "Redacted" }, + virtualStwID = 2 } }, beamWidth = 0.017453292519943, dispertionReductionFactor = 0.985, diff --git a/_G/db/Units/GT_t/LN_t/StuH_43.lua b/_G/db/Units/GT_t/LN_t/StuH_43.lua index 90b177a4..986fd366 100644 --- a/_G/db/Units/GT_t/LN_t/StuH_43.lua +++ b/_G/db/Units/GT_t/LN_t/StuH_43.lua @@ -3,9 +3,19 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["StuH_43"] = { pos = { 5.2, 0, 0 } } }, PL = { { + ammo_capacity = 19, automaticLoader = false, + portion_reload_time = 120, shell_name = { "I_Gr_33" }, - shot_delay = 22 + shot_delay = 22, + virtualStwID = 1 + }, { + ammo_capacity = 19, + automaticLoader = false, + portion_reload_time = 120, + shell_name = { "I_Gr_33" }, + shot_delay = 33, + virtualStwID = 2 } }, distanceMax = 4500, distanceMin = 10, diff --git a/_G/db/Units/GT_t/LN_t/Svir.lua b/_G/db/Units/GT_t/LN_t/Svir.lua index cff1f951..9da38687 100644 --- a/_G/db/Units/GT_t/LN_t/Svir.lua +++ b/_G/db/Units/GT_t/LN_t/Svir.lua @@ -8,13 +8,15 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["Svir"] = { name_ammunition = "9M119", reload_time = 60, shot_delay = 8, - type_ammunition = { 4, 4, 11, "Redacted" } + type_ammunition = { 4, 4, 11, "Redacted" }, + virtualStwID = 1 }, { ammo_capacity = 3, name_ammunition = "9M119", reload_time = 50, shot_delay = 30, - type_ammunition = { 4, 4, 11, "Redacted" } + type_ammunition = { 4, 4, 11, "Redacted" }, + virtualStwID = 2 } }, beamWidth = 0.017453292519943, dispertionReductionFactor = 0.985, diff --git a/_G/db/Units/GT_t/LN_t/TOW.lua b/_G/db/Units/GT_t/LN_t/TOW.lua index 3e5749ad..fd8809d2 100644 --- a/_G/db/Units/GT_t/LN_t/TOW.lua +++ b/_G/db/Units/GT_t/LN_t/TOW.lua @@ -18,6 +18,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["TOW"] = { inclination_correction_bias = 0.019198621771938, inclination_correction_upper_limit = 0.78539816339745, launch_delay = 2, + launch_delay_human = 1.5, maxShootingSpeed = 0, max_trg_alt = 3000, missileControlInterval = 0.1, diff --git a/_G/db/Units/GT_t/LN_t/_9A310M1.lua b/_G/db/Units/GT_t/LN_t/_9A310M1.lua index 556ca70d..524c97ce 100644 --- a/_G/db/Units/GT_t/LN_t/_9A310M1.lua +++ b/_G/db/Units/GT_t/LN_t/_9A310M1.lua @@ -26,7 +26,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["_9A310M1"] = { launch_delay = 2, maxShootingSpeed = 0, reactionTime = 1, - reflection_limit = 0.02, + reflection_limit = 0.04, sensor = {}, show_external_missile = true, type = 4 diff --git a/_G/db/Units/GT_t/LN_t/_9A330.lua b/_G/db/Units/GT_t/LN_t/_9A330.lua index df694ef2..a785b61d 100644 --- a/_G/db/Units/GT_t/LN_t/_9A330.lua +++ b/_G/db/Units/GT_t/LN_t/_9A330.lua @@ -18,7 +18,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["_9A330"] = { maxShootingSpeed = 0, max_number_of_missiles_channels = 2, reactionTime = 6, - reflection_limit = 0.02, + reflection_limit = 0.04, sensor = {}, type = 4 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/automatic_gun_2A38.lua b/_G/db/Units/GT_t/LN_t/automatic_gun_2A38.lua index fd06a2b7..70d4c216 100644 --- a/_G/db/Units/GT_t/LN_t/automatic_gun_2A38.lua +++ b/_G/db/Units/GT_t/LN_t/automatic_gun_2A38.lua @@ -20,5 +20,6 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["automatic_gun_2A38"] = { reactionTime = 3, reflection_limit = 0.1, sensor = {}, - type = 3 + type = 3, + useTargetAccelInSight = true } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/automatic_gun_2A42.lua b/_G/db/Units/GT_t/LN_t/automatic_gun_2A42.lua index 7aec141d..f6ecf319 100644 --- a/_G/db/Units/GT_t/LN_t/automatic_gun_2A42.lua +++ b/_G/db/Units/GT_t/LN_t/automatic_gun_2A42.lua @@ -6,12 +6,14 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["automatic_gun_2A42"] = { shell_name = { "2A42_30_HE" }, shot_delay = 0.109, shot_delay_lofi = 0.2, - switch_on_delay = 0.5 + switch_on_delay = 0.5, + virtualStwID = 1 }, { ammo_capacity = 160, portionAmmoCapacity = 160, reload_time = 600, - shell_name = { "2A42_30_AP" } + shell_name = { "2A42_30_AP" }, + virtualStwID = 1 } }, display_name = "2A42", distanceMax = 2000, diff --git a/_G/db/Units/GT_t/LN_t/automatic_gun_KDA.lua b/_G/db/Units/GT_t/LN_t/automatic_gun_KDA.lua index 1a272d0e..bfb9dc62 100644 --- a/_G/db/Units/GT_t/LN_t/automatic_gun_KDA.lua +++ b/_G/db/Units/GT_t/LN_t/automatic_gun_KDA.lua @@ -13,5 +13,6 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["automatic_gun_KDA"] = { reactionTime = 3, reflection_limit = 0.1, sensor = {}, - type = 3 + type = 3, + useTargetAccelInSight = true } \ No newline at end of file diff --git a/_G/db/Units/GT_t/LN_t/gun_2A70.lua b/_G/db/Units/GT_t/LN_t/gun_2A70.lua index ea70b24a..fbbd7fd6 100644 --- a/_G/db/Units/GT_t/LN_t/gun_2A70.lua +++ b/_G/db/Units/GT_t/LN_t/gun_2A70.lua @@ -4,13 +4,13 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["gun_2A70"] = { } }, PL = { { ammo_capacity = 22, - reload_time = 440, + portion_reload_time = 20, shell_name = { "UOF_17_100HE" }, shot_delay = 6 }, { ammo_capacity = 18, automaticLoader = false, - reload_time = 270, + portion_reload_time = 15, shell_name = { "UOF_17_100HE" }, shot_delay = 12 } }, diff --git a/_G/db/Units/GT_t/LN_t/howitzer_2A18.lua b/_G/db/Units/GT_t/LN_t/howitzer_2A18.lua index 40ae213f..8c6bcd06 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_2A18.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_2A18.lua @@ -5,14 +5,14 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_2A18"] = { PL = { { ammo_capacity = 12, automaticLoader = false, - reload_time = 240, + portion_reload_time = 20, shell_name = { "2A18_122" }, shot_delay = 13, virtualStwID = 1 }, { ammo_capacity = 28, automaticLoader = false, - reload_time = 700, + portion_reload_time = 25, shell_name = { "2A18_122" }, shot_delay = 20, virtualStwID = 2 diff --git a/_G/db/Units/GT_t/LN_t/howitzer_2A33.lua b/_G/db/Units/GT_t/LN_t/howitzer_2A33.lua index 7b9da3ad..b70673a5 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_2A33.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_2A33.lua @@ -5,15 +5,17 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_2A33"] = { PL = { { ammo_capacity = 12, automaticLoader = false, - reload_time = 336, + portion_reload_time = 28, shell_name = { "2A33_152" }, - shot_delay = 18 + shot_delay = 18, + virtualStwID = 1 }, { ammo_capacity = 34, automaticLoader = false, - reload_time = 850, + portion_reload_time = 25, shell_name = { "2A33_152" }, - shot_delay = 23 + shot_delay = 23, + virtualStwID = 2 } }, distanceMin = 30, maxShootingSpeed = 0, diff --git a/_G/db/Units/GT_t/LN_t/howitzer_2A60.lua b/_G/db/Units/GT_t/LN_t/howitzer_2A60.lua index eaa524d1..23a87b52 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_2A60.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_2A60.lua @@ -4,9 +4,10 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_2A60"] = { } }, PL = { { ammo_capacity = 25, - reload_time = 500, + portion_reload_time = 20, shell_name = { "2A60_120" }, - shot_delay = 4.3 + shot_delay = 4.3, + virtualStwID = 1 } }, distanceMin = 30, maxShootingSpeed = 0, diff --git a/_G/db/Units/GT_t/LN_t/howitzer_2A64.lua b/_G/db/Units/GT_t/LN_t/howitzer_2A64.lua index dec0a1de..c1c7d50d 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_2A64.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_2A64.lua @@ -5,15 +5,17 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_2A64"] = { PL = { { ammo_capacity = 20, automaticLoader = false, - reload_time = 480, + portion_reload_time = 24, shell_name = { "2A64_152" }, - shot_delay = 8 + shot_delay = 8, + virtualStwID = 1 }, { ammo_capacity = 30, automaticLoader = false, - reload_time = 600, + portion_reload_time = 20, shell_name = { "2A64_152" }, - shot_delay = 10 + shot_delay = 10, + virtualStwID = 2 } }, distanceMin = 30, maxShootingSpeed = 0, diff --git a/_G/db/Units/GT_t/LN_t/howitzer_M185.lua b/_G/db/Units/GT_t/LN_t/howitzer_M185.lua index 49e6e4ed..89ba3f76 100644 --- a/_G/db/Units/GT_t/LN_t/howitzer_M185.lua +++ b/_G/db/Units/GT_t/LN_t/howitzer_M185.lua @@ -5,9 +5,10 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["howitzer_M185"] = { PL = { { ammo_capacity = 39, automaticLoader = false, - reload_time = 936, + portion_reload_time = 15, shell_name = { "M185_155" }, - shot_delay = 15 + shot_delay = 15, + virtualStwID = 1 } }, distanceMin = 30, maxShootingSpeed = 0, diff --git a/_G/db/Units/GT_t/LN_t/leFH18_2_L_28.lua b/_G/db/Units/GT_t/LN_t/leFH18_2_L_28.lua index a2731b4c..95dd7c55 100644 --- a/_G/db/Units/GT_t/LN_t/leFH18_2_L_28.lua +++ b/_G/db/Units/GT_t/LN_t/leFH18_2_L_28.lua @@ -5,7 +5,7 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["leFH18_2_L_28"] = { PL = { { ammo_capacity = 40, automaticLoader = false, - reload_time = 400, + portion_reload_time = 10, shell_name = { "leFH18_105HE" }, shot_delay = 10, virtualStwID = 1 diff --git a/_G/db/Units/GT_t/LN_t/tank_gun_105mm.lua b/_G/db/Units/GT_t/LN_t/tank_gun_105mm.lua index 9406911f..d4ac945e 100644 --- a/_G/db/Units/GT_t/LN_t/tank_gun_105mm.lua +++ b/_G/db/Units/GT_t/LN_t/tank_gun_105mm.lua @@ -4,8 +4,10 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["tank_gun_105mm"] = { } }, PL = { { automaticLoader = false, + portion_reload_time = 15, shell_name = { "M68_105_AP" }, - shot_delay = 10 + shot_delay = 10, + virtualStwID = 1 } }, distanceMax = 2500, distanceMin = 10, diff --git a/_G/db/Units/GT_t/LN_t/tank_gun_120mm.lua b/_G/db/Units/GT_t/LN_t/tank_gun_120mm.lua index 87f6d562..3a2b384f 100644 --- a/_G/db/Units/GT_t/LN_t/tank_gun_120mm.lua +++ b/_G/db/Units/GT_t/LN_t/tank_gun_120mm.lua @@ -6,12 +6,14 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["tank_gun_120mm"] = { ammo_capacity = 2, automaticLoader = false, shell_name = { "M256_120_AP" }, - shot_delay = 6 + shot_delay = 6, + virtualStwID = 1 }, { ammo_capacity = 14, automaticLoader = false, shell_name = { "M256_120_AP" }, - shot_delay = 9 + shot_delay = 9, + virtualStwID = 2 } }, distanceMax = 3500, distanceMin = 10, diff --git a/_G/db/Units/GT_t/LN_t/tank_gun_2A28.lua b/_G/db/Units/GT_t/LN_t/tank_gun_2A28.lua index 3c8ef796..5a302414 100644 --- a/_G/db/Units/GT_t/LN_t/tank_gun_2A28.lua +++ b/_G/db/Units/GT_t/LN_t/tank_gun_2A28.lua @@ -6,7 +6,8 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["tank_gun_2A28"] = { ammo_capacity = 40, reload_time = 600, shell_name = { "2A28_73" }, - shot_delay = 7 + shot_delay = 7, + virtualStwID = 1 } }, distanceMax = 600, distanceMin = 10, diff --git a/_G/db/Units/GT_t/LN_t/tank_gun_2A46.lua b/_G/db/Units/GT_t/LN_t/tank_gun_2A46.lua index 963c5c9a..b42599a1 100644 --- a/_G/db/Units/GT_t/LN_t/tank_gun_2A46.lua +++ b/_G/db/Units/GT_t/LN_t/tank_gun_2A46.lua @@ -4,15 +4,17 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["tank_gun_2A46"] = { } }, PL = { { ammo_capacity = 12, - reload_time = 240, + portion_reload_time = 20, shell_name = { "2A46M_125_AP" }, - shot_delay = 8 + shot_delay = 8, + virtualStwID = 1 }, { ammo_capacity = 10, automaticLoader = false, - reload_time = 150, + portion_reload_time = 15, shell_name = { "2A46M_125_AP" }, - shot_delay = 30 + shot_delay = 30, + virtualStwID = 2 } }, distanceMax = 3500, distanceMin = 10, diff --git a/_G/db/Units/GT_t/LN_t/tank_gun_CN_120_26.lua b/_G/db/Units/GT_t/LN_t/tank_gun_CN_120_26.lua index 9abc7785..a329c90e 100644 --- a/_G/db/Units/GT_t/LN_t/tank_gun_CN_120_26.lua +++ b/_G/db/Units/GT_t/LN_t/tank_gun_CN_120_26.lua @@ -4,14 +4,16 @@ _G["db"]["Units"]["GT_t"]["LN_t"]["tank_gun_CN_120_26"] = { } }, PL = { { ammo_capacity = 16, - reload_time = 320, + portion_reload_time = 20, shell_name = { "OFL_120F2_AP" }, - shot_delay = 5 + shot_delay = 5, + virtualStwID = 1 }, { ammo_capacity = 12, - reload_time = 180, + portion_reload_time = 15, shell_name = { "OFL_120F2_AP" }, - shot_delay = 15 + shot_delay = 15, + virtualStwID = 1 } }, distanceMax = 3500, distanceMin = 10, diff --git a/_G/db/Units/GT_t/WSN_t/5.lua b/_G/db/Units/GT_t/WSN_t/5.lua index b4c1a544..c7610bfe 100644 --- a/_G/db/Units/GT_t/WSN_t/5.lua +++ b/_G/db/Units/GT_t/WSN_t/5.lua @@ -1,7 +1,7 @@ _G["db"]["Units"]["GT_t"]["WSN_t"]["#Index"] = { Tau = 0.1, deviation_error_azimuth = 0.0004, - deviation_error_distance = 0.01, + deviation_error_distance = 0.001, deviation_error_elevation = 0.0004, deviation_error_speed_sensor = 0.005, deviation_error_stability = 0.01, diff --git a/_G/db/Units/GT_t/WS_t/MLRS_B8N1/LN/1.lua b/_G/db/Units/GT_t/WS_t/MLRS_B8N1/LN/1.lua index d8094c2c..18bd36cc 100644 --- a/_G/db/Units/GT_t/WS_t/MLRS_B8N1/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/MLRS_B8N1/LN/1.lua @@ -2,8 +2,8 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["MLRS_B8N1"]["LN"]["#Index"] = { PL = { { ammo_capacity = 20, reload_time = 420, - rocket_name = "weapons.nurs.C_8OFP2", - shot_delay = 0.01 + shot_delay = 0.01, + type_ammunition = "weapons.nurs.C_8OFP2" } }, barrels_reload_type = 3, connectorFire = false, diff --git a/_G/db/Units/GT_t/WS_t/phalanx/LN/1.lua b/_G/db/Units/GT_t/WS_t/phalanx/LN/1.lua index 1315925c..0b30f397 100644 --- a/_G/db/Units/GT_t/WS_t/phalanx/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/phalanx/LN/1.lua @@ -6,7 +6,7 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["phalanx"]["LN"]["#Index"] = { ammo_capacity = 1550, reload_time = 1000000, shell_display_name = "20mm AP+HE", - shell_name = { "M61_20_AP_gr", "M61_20_HE_gr", "M61_20_HE_gr", "M61_20_HE_gr" }, + shell_name = { "M61_20_HE_gr", "M61_20_HE_gr", "M61_20_HE_gr", "M61_20_AP_gr" }, shot_delay = 0.013333333333333, switch_on_delay = 300 }, { @@ -29,11 +29,12 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["phalanx"]["LN"]["#Index"] = { shell_name = {} } }, beamWidth = 1.5707963267949, - distanceMax = 3000, + distanceMax = 2000, distanceMin = 0, max_trg_alt = 2000, reactionTime = 0.3, reflection_limit = 0.049, sensor = {}, - type = 3 + type = 3, + useTargetAccelInSight = true } \ No newline at end of file diff --git a/_G/db/Units/GT_t/WS_t/seasparrow/LN/1.lua b/_G/db/Units/GT_t/WS_t/seasparrow/LN/1.lua index 3bbcdeb9..abb4f1d6 100644 --- a/_G/db/Units/GT_t/WS_t/seasparrow/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/seasparrow/LN/1.lua @@ -14,7 +14,7 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["seasparrow"]["LN"]["#Index"] = { launch_delay = 2, min_launch_angle = 0.26179938779915, reactionTime = 3, - reflection_limit = 0.02, + reflection_limit = 0.04, sensor = {}, type = 4 } \ No newline at end of file diff --git a/_G/db/Units/GT_t/WS_t/ship_klinok/LN/1.lua b/_G/db/Units/GT_t/WS_t/ship_klinok/LN/1.lua index d0a304e8..f1315975 100644 --- a/_G/db/Units/GT_t/WS_t/ship_klinok/LN/1.lua +++ b/_G/db/Units/GT_t/WS_t/ship_klinok/LN/1.lua @@ -15,7 +15,7 @@ _G["db"]["Units"]["GT_t"]["WS_t"]["ship_klinok"]["LN"]["#Index"] = { launch_delay = 3, max_number_of_missiles_channels = 2, reactionTime = 6, - reflection_limit = 0.02, + reflection_limit = 0.04, sensor = {}, type = 4 } \ No newline at end of file diff --git a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua index cca03301..56a52095 100644 --- a/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua +++ b/_G/db/Units/Helicopters/Helicopter/AH-64D_BLK_II.lua @@ -202,6 +202,25 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { id = "HumanOrchestra", label = "Disable Multicrew", playerOnly = true + }, { + control = "label", + id = "dataluink_Label", + label = "DATALINK", + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "TN_IDM_LB", + label = "Datalink Originator ID", + onChange = , + onFocus = + }, { + control = "editbox", + getDefault = , + id = "OwnshipCallSign", + label = "Ownship CallSign", + onChange = , + onFocus = } }, AmmoWeight = 411.6, CanopyGeometry = { -0.93969262078591, -0.95280922353749, -0.96592582628907, -0.049950211252315, 0.86602540378444 }, @@ -600,8 +619,8 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { short_name = "M_230_new", supply = { count = 1200, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 } }, shells = { { AP_cap_caliber = 30, @@ -880,6 +899,8 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { altHold_alt_loss = 5, altHold_pitchRefAdd_max = 0, altInt = 0.014, + attHold_cyclicStickPitch_threshold = 2.5, + attHold_cyclicStickRoll_threshold = 2.25, balancing = { { 0, -0.024, 0.054, -0.241, 11.9 }, { 6.64, 0.053, 0.011, -0.189, 11.1 }, { 8.795, 0.074, 0.008, -0.175, 10.9 }, { 13.5, 0.064, 0, -0.083, 10.5 }, { 22.4, 0.052, -0.044, 0.022, 9.94 }, { 29.5, 0.036, -0.1, 0.064, 9.6 }, { 31.3, 0.027, -0.119, 0.097, 9.7 }, { 38.3, 0.012, -0.186, 0.089, 10 }, { 47.5, 0, -0.289, 0.064, 10.9 }, { 54.25, 0, -0.387, 0.03, 12.1 }, { 56.85, -0.01, -0.432, 0.014, 12.6 }, { 61.5, -0.008, -0.506, -0.047, 13.85 }, { 66.3, -0.008, -0.565, -0.131, 15.3 }, { 68.8, 0.016, -0.619, -0.24, 16.1 }, { 70.8, -0.022, -0.657, -0.075, 17.8 } }, betaDotGain = 1.5, betaGain = 6, @@ -1072,6 +1093,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { thrust_function = { { 40, 0 }, { 440, 0.8 }, { 462, 0.805 }, { 484, 0.81 }, { 506, 0.815 }, { 528, 0.82 }, { 550, 0.825 }, { 572, 0.83 }, { 594, 0.835 }, { 616, 0.84 }, { 638, 0.845 }, { 660, 0.852 }, { 682, 0.863 }, { 704, 0.877 }, { 726, 0.89 }, { 748, 0.906 }, { 770, 0.923 }, { 792, 0.942 }, { 814, 0.957 }, { 836, 0.975 }, { 858, 0.99 }, { 880, 1 } }, totalTransmissionInertiaMoment = 7909.0362, user_options = "AH-64D_BLK_II", + velHold_K_int = 1, velHold_K_vx = 2.5, velHold_K_vz = 2.5, vyDamp = 0, @@ -1909,7 +1931,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { air_refuel_receptacle_pos = { -0.051, 0.911, 0 }, ammo_type = { "M789 HEDP", "M788 TP" }, ammo_type_default = 1, - attribute = { 1, 2, 6, "Redacted", "Attack helicopters", "Refuelable", "DataLink", "AFAPD", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Helicopters" }, + attribute = { 1, 2, 6, "Redacted", "Attack helicopters", "Refuelable", "Datalink", "AFAPD", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Helicopters" }, blade_area = 3.39, blade_chord = 0.53, blades_number = 4, @@ -1924,6 +1946,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { dir = { -0.484, 0.75, -0.451 }, pos = { -7.339, -0.169, -0.456 } } }, + connectDatalinks = { "IDM" }, country_of_origin = "USA", crew_members = { { can_be_playable = true, @@ -1948,9 +1971,11 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } }, crew_size = 2, crew_stations = "HumanOrchestra", + datalinks = { + IDM = "CoreMods\\aircraft\\AH-64D\\Datalinks\\IDM.lua" + }, detection_range_max = 0, doors_movement = 2, - effects_presets = {}, encyclopediaAnimation = { args = { [507] = 1, diff --git a/_G/db/Units/Helicopters/Helicopter/CH-47D.lua b/_G/db/Units/Helicopters/Helicopter/CH-47D.lua index 1afb21fc..c9c1b8ae 100644 --- a/_G/db/Units/Helicopters/Helicopter/CH-47D.lua +++ b/_G/db/Units/Helicopters/Helicopter/CH-47D.lua @@ -143,7 +143,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { blade_chord = 0.883, blades_number = 3, cannon_sight_type = 0, - centering = -6.328, + centering = -6.15328, country_of_origin = "USA", crew_members = { { drop_canopy_name = 0, diff --git a/_G/db/Units/Helicopters/Helicopter/CH-53E.lua b/_G/db/Units/Helicopters/Helicopter/CH-53E.lua index 74c20e97..c462edbe 100644 --- a/_G/db/Units/Helicopters/Helicopter/CH-53E.lua +++ b/_G/db/Units/Helicopters/Helicopter/CH-53E.lua @@ -165,7 +165,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { -2.271, -2.169, 1.76 }, + main_gear_pos = { -2.271, -2.3, 1.76 }, mapclasskey = "P0091000020", mechanimations = { Door0 = { { @@ -190,7 +190,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DuplicateOf = "Door0" } }, - nose_gear_pos = { 5.217, -2.169, 0 }, + nose_gear_pos = { 5.217, -2.3, 0 }, passivCounterm = { CMDS_Edit = true, SingleChargeTotal = 120, diff --git a/_G/db/Units/Helicopters/Helicopter/Ka-27.lua b/_G/db/Units/Helicopters/Helicopter/Ka-27.lua index bdbc387d..47214d5d 100644 --- a/_G/db/Units/Helicopters/Helicopter/Ka-27.lua +++ b/_G/db/Units/Helicopters/Helicopter/Ka-27.lua @@ -40,36 +40,13 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { args = { 161 }, critical_damage = 1 }, - [39] = { - args = { 244 }, - critical_damage = 3 - }, - [40] = { - args = { 241 }, - critical_damage = 3 - }, - [45] = { - args = { 235 }, - critical_damage = 3, - deps_cells = { 39 } - }, - [46] = { - args = { 233 }, - critical_damage = 3, - deps_cells = { 40 } - }, - [53] = { - args = { 248 }, - critical_damage = 3 - }, - [54] = { - args = { 247 }, - critical_damage = 3 + [57] = { + args = { 158 }, + critical_damage = 5 }, - [55] = { - args = { 159 }, - critical_damage = 4, - deps_cells = { 54 } + [58] = { + args = { 156 }, + critical_damage = 5 }, [59] = { args = { 148 }, diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua b/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua index c2a583ce..07beab10 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-24P.lua @@ -30,7 +30,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { control = "checkbox", defValue = true, id = "NS430allow", - label = "NS 430 allow", + label = "Allow N430 nav device", playerOnly = true }, { control = "checkbox", @@ -234,11 +234,13 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, [39] = { args = { 61 }, - critical_damage = 5 + critical_damage = 5, + deps_cells = { 40 } }, [40] = { args = { 62 }, - critical_damage = 5 + critical_damage = 5, + deps_cells = { 136 } }, [41] = { args = { 245 }, @@ -264,14 +266,10 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { args = { 234 }, critical_damage = 5 }, - [54] = { - args = { 54 }, - critical_damage = 5 - }, [55] = { args = { 81 }, critical_damage = 8, - deps_cells = { 39, 40, 41, 42, 43, 44, 47, 48, 54 } + deps_cells = { 39, 41, 42, 43, 44, 47, 48 } }, [56] = { args = { 235 }, @@ -443,6 +441,11 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { [100] = { args = { 303 }, critical_damage = 5 + }, + [136] = { + args = { 54 }, + critical_damage = 5, + droppable = true } }, DamageParts = { "mi-24p_wing_r", "mi-24p_wing_l", diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-24V.lua b/_G/db/Units/Helicopters/Helicopter/Mi-24V.lua index 2d84e76d..3606ad25 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-24V.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-24V.lua @@ -748,7 +748,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { -1.105, -1.8, 1.3 }, + main_gear_pos = { -1.105, -1.69, 1.3 }, mapclasskey = "P0091000021", mechanimations = { Door0 = { { @@ -785,7 +785,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } } }, net_animation = { 336 }, - nose_gear_pos = { 3.3, -2.02, 0 }, + nose_gear_pos = { 3.3, -1.92, 0 }, passivCounterm = { CMDS_Edit = true, ChaffNoEdit = true, diff --git a/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua b/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua index 1a376df3..fd13986c 100644 --- a/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua +++ b/_G/db/Units/Helicopters/Helicopter/Mi-8MT.lua @@ -80,7 +80,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { control = "checkbox", defValue = true, id = "NS430allow", - label = "NS 430 allow" + label = "Allow N430 nav device" } }, AmmoWeight = 0, Cannon = "yes", @@ -1634,8 +1634,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } } }, { CLSID = "", - arg = 1000, - arg_value = 2, required = { { loadout = { "" }, station = 2 @@ -1987,8 +1985,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } } }, { CLSID = "", - arg = 1000, - arg_value = 2, required = { { loadout = { "" }, station = 1 @@ -2549,8 +2545,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } } }, { CLSID = "", - arg = 1000, - arg_value = 2, required = { { loadout = { "" }, station = 1 @@ -2902,8 +2896,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } } }, { CLSID = "", - arg = 1000, - arg_value = 2, required = { { loadout = { "" }, station = 1 @@ -3201,8 +3193,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { } } }, { CLSID = "", - arg = 1000, - arg_value = 2, required = { { loadout = { "" }, station = 1 @@ -4073,7 +4063,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { Door0 = { { Flags = { "Reversible" }, Sequence = { { - C = { { "Arg", 133, "to", 0.64, "in", 1 } } + C = { { "Arg", 133, "to", 1, "in", 1 } } } }, Transition = { "Close", "Open" } }, { @@ -4086,7 +4076,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { Door1 = { { Flags = { "Reversible" }, Sequence = { { - C = { { "Arg", 131, "to", 0.64, "in", 2 } } + C = { { "Arg", 131, "to", 1, "in", 2 } } } }, Transition = { "Close", "Open" } }, { @@ -4382,7 +4372,6 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { rotor_pos = { 0.206, 2.575, 0 }, scheme = 0, sound_name = "Aircrafts/Engines/RotorMi8", - sounderName = "Aircraft/Helicopters/Mi-8MT", stores_number = 0, swapped_names = true, tail_fin_area = 1.38, diff --git a/_G/db/Units/Helicopters/Helicopter/SA342L.lua b/_G/db/Units/Helicopters/Helicopter/SA342L.lua index c36b7f0a..b4021a70 100644 --- a/_G/db/Units/Helicopters/Helicopter/SA342L.lua +++ b/_G/db/Units/Helicopters/Helicopter/SA342L.lua @@ -903,7 +903,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DuplicateOf = "Door0" } }, - net_animation = { 11, 15, 17, 13, 14, 34, 38, 36, 37, 40, 69, 196, 274, 276, 277, 280, 281, 282, 283, 284, 285, 209, 210, 211, 212, 213, 215, 216, 300, 301, 302, 306, 337, 399, 400, 401, 420, 506, 507, 526, 527, 508, 528, 1338, 1401 }, + net_animation = { 11, 15, 17, 13, 14, 34, 38, 69, 196, 274, 276, 277, 280, 281, 282, 283, 284, 285, 209, 210, 211, 212, 213, 215, 216, 300, 301, 302, 306, 337, 399, 400, 401, 420, 506, 507, 526, 527, 508, 528, 1338, 1401 }, nose_gear_pos = { 0.835, -0.966, 0 }, panelRadio = { { channels = { { diff --git a/_G/db/Units/Helicopters/Helicopter/SA342M.lua b/_G/db/Units/Helicopters/Helicopter/SA342M.lua index b585de80..a9dbd496 100644 --- a/_G/db/Units/Helicopters/Helicopter/SA342M.lua +++ b/_G/db/Units/Helicopters/Helicopter/SA342M.lua @@ -550,7 +550,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DuplicateOf = "Door0" } }, - net_animation = { 11, 15, 17, 13, 14, 34, 38, 36, 37, 40, 69, 196, 274, 276, 277, 280, 281, 282, 283, 284, 285, 209, 210, 211, 212, 213, 215, 216, 300, 301, 302, 306, 337, 399, 400, 401, 420, 506, 507, 526, 527, 508, 528, 1338, 1401 }, + net_animation = { 11, 15, 17, 13, 14, 34, 38, 69, 196, 274, 276, 277, 280, 281, 282, 283, 284, 285, 209, 210, 211, 212, 213, 215, 216, 300, 301, 302, 306, 337, 399, 400, 401, 420, 506, 507, 526, 527, 508, 528, 1338, 1401 }, nose_gear_pos = { 0.835, -0.966, 0 }, panelRadio = { { channels = { { diff --git a/_G/db/Units/Helicopters/Helicopter/SA342Minigun.lua b/_G/db/Units/Helicopters/Helicopter/SA342Minigun.lua index b598049a..247ba899 100644 --- a/_G/db/Units/Helicopters/Helicopter/SA342Minigun.lua +++ b/_G/db/Units/Helicopters/Helicopter/SA342Minigun.lua @@ -648,7 +648,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DuplicateOf = "Door0" } }, - net_animation = { 11, 15, 17, 13, 14, 34, 38, 36, 37, 40, 69, 196, 274, 276, 277, 280, 281, 282, 283, 284, 285, 209, 210, 211, 212, 213, 215, 216, 300, 301, 302, 306, 337, 399, 400, 401, 420, 506, 507, 526, 527, 508, 528, 1338, 1401 }, + net_animation = { 11, 15, 17, 13, 14, 34, 38, 69, 196, 274, 276, 277, 280, 281, 282, 283, 284, 285, 209, 210, 211, 212, 213, 215, 216, 300, 301, 302, 306, 337, 399, 400, 401, 420, 506, 507, 526, 527, 508, 528, 1338, 1401 }, nose_gear_pos = { 0.835, -0.966, 0 }, panelRadio = { { channels = { { diff --git a/_G/db/Units/Helicopters/Helicopter/SA342Mistral.lua b/_G/db/Units/Helicopters/Helicopter/SA342Mistral.lua index b05ab5d8..aabd7b79 100644 --- a/_G/db/Units/Helicopters/Helicopter/SA342Mistral.lua +++ b/_G/db/Units/Helicopters/Helicopter/SA342Mistral.lua @@ -464,7 +464,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DuplicateOf = "Door0" } }, - net_animation = { 11, 15, 17, 13, 14, 34, 38, 36, 37, 40, 69, 196, 274, 276, 277, 280, 281, 282, 283, 284, 285, 209, 210, 211, 212, 213, 215, 216, 300, 301, 302, 306, 337, 399, 400, 401, 420, 506, 507, 526, 527, 508, 528, 1338, 1401 }, + net_animation = { 11, 15, 17, 13, 14, 34, 38, 69, 196, 274, 276, 277, 280, 281, 282, 283, 284, 285, 209, 210, 211, 212, 213, 215, 216, 300, 301, 302, 306, 337, 399, 400, 401, 420, 506, 507, 526, 527, 508, 528, 1338, 1401 }, nose_gear_pos = { 0.835, -0.966, 0 }, panelRadio = { { channels = { { diff --git a/_G/db/Units/Helicopters/Helicopter/SH-60B.lua b/_G/db/Units/Helicopters/Helicopter/SH-60B.lua index 57caea04..845cb475 100644 --- a/_G/db/Units/Helicopters/Helicopter/SH-60B.lua +++ b/_G/db/Units/Helicopters/Helicopter/SH-60B.lua @@ -185,7 +185,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { 1.081, -1.484, 1.288 }, + main_gear_pos = { 1.081, -1.55, 1.288 }, mapclasskey = "P0091000062", mechanimations = { Door0 = { { @@ -210,7 +210,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { DuplicateOf = "Door0" } }, - nose_gear_pos = { -3.566, -1.488, 0 }, + nose_gear_pos = { -3.566, -1.57, 0 }, passivCounterm = { CMDS_Edit = true, SingleChargeTotal = 60, diff --git a/_G/db/Units/Helicopters/Helicopter/UH-1H.lua b/_G/db/Units/Helicopters/Helicopter/UH-1H.lua index 513a2527..2da9fc4c 100644 --- a/_G/db/Units/Helicopters/Helicopter/UH-1H.lua +++ b/_G/db/Units/Helicopters/Helicopter/UH-1H.lua @@ -1485,6 +1485,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { can_be_playable = true, canopy_arg = 45, canopy_args = { 38, 0.8, 43, 5, 44, 5, 45, 1, 459, 10, 460, 1, 457, 0.1, 458, 0.1, 453, 0.5, 454, 0.5, 146, 1 }, + ejection_seat_name = 0, pilot_body_arg = 50, pos = { 2.3, 0, 0.5 }, role = "pilot", @@ -1493,6 +1494,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { can_be_playable = true, canopy_arg = 38, canopy_args = { 38, 1, 43, 5, 44, 5, 45, 0.8, 459, 1, 460, 10, 457, 0.1, 458, 0.1, 453, 0.5, 454, 0.5, 146, 1 }, + ejection_seat_name = 0, pilot_body_arg = 365, pos = { 2.3, 0, -0.5 }, role = "copilot", @@ -1501,6 +1503,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { can_be_playable = true, canopy_arg = 44, canopy_args = { 38, 0.5, 43, 5, 44, 5, 45, 0.5, 459, 10, 460, 1, 457, 0.1, 458, 0.1, 453, 0.5, 454, 0.5, 146, 1 }, + ejection_seat_name = 0, pilot_body_arg = 0, pos = { -0.121463, 0.19, -1.39 }, role = "gunner", @@ -1509,6 +1512,7 @@ _G["db"]["Units"]["Helicopters"]["Helicopter"]["#Index"] = { can_be_playable = true, canopy_arg = 43, canopy_args = { 38, 0.5, 43, 5, 44, 5, 45, 0.5, 459, 1, 460, 10, 457, 0.1, 458, 0.1, 453, 0.5, 454, 0.5, 146, 1 }, + ejection_seat_name = 0, pilot_body_arg = 0, pos = { -0.121463, 0.19, 1.39 }, role = "gunner", diff --git a/_G/db/Units/Planes/Plane/A-10A.lua b/_G/db/Units/Planes/Plane/A-10A.lua index 177ee229..a5811d90 100644 --- a/_G/db/Units/Planes/Plane/A-10A.lua +++ b/_G/db/Units/Planes/Plane/A-10A.lua @@ -912,23 +912,35 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { FiZ = -4, Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required = <6>{ { + loadout = { "" }, + station = 6 + } } }, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required = }, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}" + CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + required =
} }, Number = 5, Order = 5, @@ -939,25 +951,41 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { FiZ = -4, Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required = <7>{ { + loadout = { "" }, + station = 5 + }, { + loadout = { "" }, + station = 7 + } } }, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required =
}, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "Fuel_Tank_FT600" + CLSID = "Fuel_Tank_FT600", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}" + CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + required =
} }, Number = 6, Order = 6, @@ -968,23 +996,32 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { FiZ = -4, Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required =
}, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required =
}, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}" + CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + required =
} }, Number = 7, Order = 7, @@ -1387,7 +1424,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 223, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto = <6>{ + proto = <8>{ angle_max = 3.1415926535898, angle_min = 0.5235987755983, color = { 0.92, 0.92, 1, 0.20784609690827 }, @@ -1402,7 +1439,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 223, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -1420,7 +1457,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 213, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, typename = "Spot" }, { connector = "WHITE_BEACON R", @@ -1428,7 +1465,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 213, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -1446,7 +1483,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 81, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, typename = "Spot" }, { connector = "BANO_0_BACK", @@ -1454,7 +1491,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 81, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -1471,7 +1508,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto = <7>{ + proto = <9>{ angle_change_rate = 0.047996554429844, angle_max = 0.19198621771938, angle_min = 0.1221730476396, @@ -1486,7 +1523,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "MAIN_SPOT_PTR_02", exposure = { { 0, 0.9, 1 } }, movable = true, - proto =
, + proto =
, range = 16, typename = "spotlight" } }, @@ -1500,7 +1537,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto = <8>{ + proto = <10>{ angle_change_rate = -0.19198621771938, angle_max = 0.7679448708775, angle_min = 0.614355896702, @@ -1514,7 +1551,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 0, 0.9, 1 } }, movable = true, pos_correction = { 0.5, 0, 0 }, - proto =
, + proto =
, range = 8, typename = "omnilight" } }, @@ -1612,7 +1649,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.05235987755983 }, pos_correction = { 0, 0.1, 0 }, - proto = <9>{ + proto = <11>{ angle_max = 0.48869219055841, color = { 255, 201, 125, 0.12792304845413 }, range = 66 @@ -1627,7 +1664,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = -0.05235987755983 }, pos_correction = { 0, -0.1, 0 }, - proto =
, + proto =
, typename = "spotlight" }, { argument = 200, @@ -1644,7 +1681,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.087266462599716 }, position = { 0.5, 1.2, 0 }, - proto =
, + proto =
, typename = "spotlight" }, { angle_max = 0.48869219055841, @@ -1653,7 +1690,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.087266462599716 }, position = { 0.5, 1.2, 0 }, - proto =
, + proto =
, typename = "spotlight" } }, typename = "collection" @@ -1669,14 +1706,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto =
, + proto =
, typename = "spotlight" }, { connector = "MAIN_SPOT_PTR_01", exposure = { { 0, 0.9, 1 } }, movable = true, pos_correction = { 0.5, 0, 0 }, - proto =
, + proto =
, range = 8, typename = "omnilight" } }, @@ -1714,7 +1751,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { azimuth = 0.78539816339745 }, position = { 0, -0.3, -5.8 }, - proto =
, + proto =
, typename = "spotlight" }, { angle_max = 0.48869219055841, @@ -1723,7 +1760,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { azimuth = -0.78539816339745 }, position = { 0, -0.3, 5.8 }, - proto =
, + proto =
, typename = "spotlight" } }, typename = "collection" diff --git a/_G/db/Units/Planes/Plane/A-10C.lua b/_G/db/Units/Planes/Plane/A-10C.lua index c72c3bf3..89c7c2ff 100644 --- a/_G/db/Units/Planes/Plane/A-10C.lua +++ b/_G/db/Units/Planes/Plane/A-10C.lua @@ -1,6 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.19, - AddPropAircraft = {}, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "SADL_TN", + label = "TN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 805, CAS_min = 58, CanopyGeometry = { -0.34202014332567, -0.64085638205579, -0.93969262078591, -0.29883623873012, 0.34202014332567 }, @@ -703,8 +731,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "GAU_8", supply = { count = 1150, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1, 1, 1, 1, 2 }, { 2 }, { 3 } }, shells = { { AP_cap_caliber = 15, @@ -1484,45 +1512,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required = <6>{ { + loadout = { "" }, + station = 6 + } } }, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required =
}, { - CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}" + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + required =
}, { - CLSID = "{GBU-31}" + CLSID = "{GBU-31}", + required =
}, { - CLSID = "{GBU-31V3B}" + CLSID = "{GBU-31V3B}", + required =
}, { - CLSID = "{GBU-38}" + CLSID = "{GBU-38}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "MXU-648-TP" + CLSID = "MXU-648-TP", + required =
}, { - CLSID = "BRU-42_LS" + CLSID = "BRU-42_LS", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{CBU_105}" + CLSID = "{CBU_105}", + required =
}, { - CLSID = "{CBU_103}" + CLSID = "{CBU_103}", + required =
}, { - CLSID = "{BDU-50LGB}" + CLSID = "{BDU-50LGB}", + required =
}, { - CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}" + CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}", + required =
}, { - CLSID = "{BRU-42_3*Mk-82AIR}" + CLSID = "{BRU-42_3*Mk-82AIR}", + required =
} }, Number = 5, Order = 5, @@ -1533,33 +1584,53 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required = <7>{ { + loadout = { "" }, + station = 5 + }, { + loadout = { "" }, + station = 7 + } } }, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required =
}, { - CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}" + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "MXU-648-TP" + CLSID = "MXU-648-TP", + required =
}, { - CLSID = "BRU-42_LS" + CLSID = "BRU-42_LS", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{BDU-50LGB}" + CLSID = "{BDU-50LGB}", + required =
}, { - CLSID = "Fuel_Tank_FT600" + CLSID = "Fuel_Tank_FT600", + required =
} }, Number = 6, Order = 6, @@ -1570,45 +1641,65 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required =
}, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required =
}, { - CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}" + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + required =
}, { - CLSID = "{GBU-31}" + CLSID = "{GBU-31}", + required =
}, { - CLSID = "{GBU-31V3B}" + CLSID = "{GBU-31V3B}", + required =
}, { - CLSID = "{GBU-38}" + CLSID = "{GBU-38}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "MXU-648-TP" + CLSID = "MXU-648-TP", + required =
}, { - CLSID = "BRU-42_LS" + CLSID = "BRU-42_LS", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{CBU_105}" + CLSID = "{CBU_105}", + required =
}, { - CLSID = "{CBU_103}" + CLSID = "{CBU_103}", + required =
}, { - CLSID = "{BDU-50LGB}" + CLSID = "{BDU-50LGB}", + required =
}, { - CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}" + CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}", + required =
}, { - CLSID = "{BRU-42_3*Mk-82AIR}" + CLSID = "{BRU-42_3*Mk-82AIR}", + required =
} }, Number = 7, Order = 7, @@ -2315,7 +2406,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 223, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto = <6>{ + proto = <8>{ angle_max = 3.1415926535898, angle_min = 0.5235987755983, color = { 0.92, 0.92, 1, 0.20784609690827 }, @@ -2330,7 +2421,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 223, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -2348,7 +2439,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 213, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, typename = "Spot" }, { connector = "WHITE_BEACON R", @@ -2356,7 +2447,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 213, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -2374,7 +2465,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 81, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, typename = "Spot" }, { connector = "BANO_0_BACK", @@ -2382,7 +2473,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 81, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -2399,7 +2490,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto = <7>{ + proto = <9>{ angle_change_rate = 0.047996554429844, angle_max = 0.19198621771938, angle_min = 0.1221730476396, @@ -2414,7 +2505,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "MAIN_SPOT_PTR_02", exposure = { { 0, 0.9, 1 } }, movable = true, - proto =
, + proto =
, range = 16, typename = "spotlight" } }, @@ -2428,7 +2519,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto = <8>{ + proto = <10>{ angle_change_rate = -0.19198621771938, angle_max = 0.7679448708775, angle_min = 0.614355896702, @@ -2442,7 +2533,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 0, 0.9, 1 } }, movable = true, pos_correction = { 0.5, 0, 0 }, - proto =
, + proto =
, range = 8, typename = "omnilight" } }, @@ -2540,7 +2631,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.05235987755983 }, pos_correction = { 0, 0.1, 0 }, - proto = <9>{ + proto = <11>{ angle_max = 0.48869219055841, color = { 255, 201, 125, 0.12792304845413 }, range = 66 @@ -2555,7 +2646,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = -0.05235987755983 }, pos_correction = { 0, -0.1, 0 }, - proto =
, + proto =
, typename = "spotlight" }, { argument = 200, @@ -2572,7 +2663,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.087266462599716 }, position = { 0.5, 1.2, 0 }, - proto =
, + proto =
, typename = "spotlight" }, { angle_max = 0.48869219055841, @@ -2581,7 +2672,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.087266462599716 }, position = { 0.5, 1.2, 0 }, - proto =
, + proto =
, typename = "spotlight" } }, typename = "collection" @@ -2597,14 +2688,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto =
, + proto =
, typename = "spotlight" }, { connector = "MAIN_SPOT_PTR_01", exposure = { { 0, 0.9, 1 } }, movable = true, pos_correction = { 0.5, 0, 0 }, - proto =
, + proto =
, range = 8, typename = "omnilight" } }, @@ -2642,7 +2733,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { azimuth = 0.78539816339745 }, position = { 0, -0.3, -5.8 }, - proto =
, + proto =
, typename = "spotlight" }, { angle_max = 0.48869219055841, @@ -2651,7 +2742,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { azimuth = -0.78539816339745 }, position = { 0, -0.3, 5.8 }, - proto =
, + proto =
, typename = "spotlight" } }, typename = "collection" diff --git a/_G/db/Units/Planes/Plane/A-10C_2.lua b/_G/db/Units/Planes/Plane/A-10C_2.lua index 36760a72..71f09e75 100644 --- a/_G/db/Units/Planes/Plane/A-10C_2.lua +++ b/_G/db/Units/Planes/Plane/A-10C_2.lua @@ -1,6 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.19, - AddPropAircraft = {}, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "SADL_TN", + label = "TN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 805, CAS_min = 58, CanopyGeometry = { -0.34202014332567, -0.64085638205579, -0.93969262078591, -0.29883623873012, 0.34202014332567 }, @@ -703,8 +731,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "GAU_8", supply = { count = 1150, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1, 1, 1, 1, 2 }, { 2 }, { 3 } }, shells = { { AP_cap_caliber = 15, @@ -1520,47 +1548,71 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required = <6>{ { + loadout = { "" }, + station = 6 + } } }, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required =
}, { - CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}" + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + required =
}, { - CLSID = "{GBU-31}" + CLSID = "{GBU-31}", + required =
}, { - CLSID = "{GBU-31V3B}" + CLSID = "{GBU-31V3B}", + required =
}, { - CLSID = "{GBU-38}" + CLSID = "{GBU-38}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "MXU-648-TP" + CLSID = "MXU-648-TP", + required =
}, { - CLSID = "BRU-42_LS" + CLSID = "BRU-42_LS", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{CBU_105}" + CLSID = "{CBU_105}", + required =
}, { - CLSID = "{CBU_103}" + CLSID = "{CBU_103}", + required =
}, { - CLSID = "{BDU-50LGB}" + CLSID = "{BDU-50LGB}", + required =
}, { - CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}" + CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}", + required =
}, { - CLSID = "{BRU-42_3*Mk-82AIR}" + CLSID = "{BRU-42_3*Mk-82AIR}", + required =
}, { - CLSID = "{GBU_54_V_1B}" + CLSID = "{GBU_54_V_1B}", + required =
} }, Number = 5, Order = 5, @@ -1571,33 +1623,53 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required = <7>{ { + loadout = { "" }, + station = 5 + }, { + loadout = { "" }, + station = 7 + } } }, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required =
}, { - CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}" + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "MXU-648-TP" + CLSID = "MXU-648-TP", + required =
}, { - CLSID = "BRU-42_LS" + CLSID = "BRU-42_LS", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{BDU-50LGB}" + CLSID = "{BDU-50LGB}", + required =
}, { - CLSID = "Fuel_Tank_FT600" + CLSID = "Fuel_Tank_FT600", + required =
} }, Number = 6, Order = 6, @@ -1608,47 +1680,68 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" + CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + required =
}, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" + CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", + required =
}, { - CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}" + CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", + required =
}, { - CLSID = "{BDU-50LD}" + CLSID = "{BDU-50LD}", + required =
}, { - CLSID = "{BDU-50HD}" + CLSID = "{BDU-50HD}", + required =
}, { - CLSID = "{Mk82AIR}" + CLSID = "{Mk82AIR}", + required =
}, { - CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}" + CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", + required =
}, { - CLSID = "{GBU-31}" + CLSID = "{GBU-31}", + required =
}, { - CLSID = "{GBU-31V3B}" + CLSID = "{GBU-31V3B}", + required =
}, { - CLSID = "{GBU-38}" + CLSID = "{GBU-38}", + required =
}, { - CLSID = "{CBU-87}" + CLSID = "{CBU-87}", + required =
}, { - CLSID = "MXU-648-TP" + CLSID = "MXU-648-TP", + required =
}, { - CLSID = "BRU-42_LS" + CLSID = "BRU-42_LS", + required =
}, { - CLSID = "BRU-42_3*BDU-33" + CLSID = "BRU-42_3*BDU-33", + required =
}, { - CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}" + CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", + required =
}, { - CLSID = "{CBU_105}" + CLSID = "{CBU_105}", + required =
}, { - CLSID = "{CBU_103}" + CLSID = "{CBU_103}", + required =
}, { - CLSID = "{BDU-50LGB}" + CLSID = "{BDU-50LGB}", + required =
}, { - CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}" + CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}", + required =
}, { - CLSID = "{BRU-42_3*Mk-82AIR}" + CLSID = "{BRU-42_3*Mk-82AIR}", + required =
}, { - CLSID = "{GBU_54_V_1B}" + CLSID = "{GBU_54_V_1B}", + required =
} }, Number = 7, Order = 7, @@ -2331,6 +2424,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir = { 0, 0, 0 }, pos = { -6, 0, 8.5 } } }, + connectDatalinks = { "SADL" }, country_of_origin = "USA", crew_members = { { boarding_arg = 323, @@ -2340,6 +2434,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role = "pilot", role_display_name = "Pilot" } }, + datalinks = { + SADL = "CoreMods\\aircraft\\A-10\\Datalinks\\SADL.lua" + }, detection_range_max = 0, effects_presets = { { effect = "OVERWING_VAPOR", @@ -2382,7 +2479,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 223, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto = <6>{ + proto = <8>{ angle_max = 3.1415926535898, angle_min = 0.5235987755983, color = { 0.92, 0.92, 1, 0.20784609690827 }, @@ -2397,7 +2494,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 223, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -2415,7 +2512,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 213, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, typename = "Spot" }, { connector = "WHITE_BEACON R", @@ -2423,7 +2520,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 213, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -2441,7 +2538,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 81, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, typename = "Spot" }, { connector = "BANO_0_BACK", @@ -2449,7 +2546,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 81, 0.245, 0.255, 1, 0 } }, movable = true, period = 1.2, - proto =
, + proto =
, range = 18.2, typename = "Omni" } }, @@ -2466,7 +2563,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto = <7>{ + proto = <9>{ angle_change_rate = 0.047996554429844, angle_max = 0.19198621771938, angle_min = 0.1221730476396, @@ -2481,7 +2578,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "MAIN_SPOT_PTR_02", exposure = { { 0, 0.9, 1 } }, movable = true, - proto =
, + proto =
, range = 16, typename = "spotlight" } }, @@ -2495,7 +2592,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto = <8>{ + proto = <10>{ angle_change_rate = -0.19198621771938, angle_max = 0.7679448708775, angle_min = 0.614355896702, @@ -2509,7 +2606,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 0, 0.9, 1 } }, movable = true, pos_correction = { 0.5, 0, 0 }, - proto =
, + proto =
, range = 8, typename = "omnilight" } }, @@ -2607,7 +2704,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.05235987755983 }, pos_correction = { 0, 0.1, 0 }, - proto = <9>{ + proto = <11>{ angle_max = 0.48869219055841, color = { 255, 201, 125, 0.12792304845413 }, range = 66 @@ -2622,7 +2719,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = -0.05235987755983 }, pos_correction = { 0, -0.1, 0 }, - proto =
, + proto =
, typename = "spotlight" }, { argument = 200, @@ -2639,7 +2736,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.087266462599716 }, position = { 0.5, 1.2, 0 }, - proto =
, + proto =
, typename = "spotlight" }, { angle_max = 0.48869219055841, @@ -2648,7 +2745,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = 0.087266462599716 }, position = { 0.5, 1.2, 0 }, - proto =
, + proto =
, typename = "spotlight" } }, typename = "collection" @@ -2664,14 +2761,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, exposure = { { 0, 0.9, 1 } }, movable = true, - proto =
, + proto =
, typename = "spotlight" }, { connector = "MAIN_SPOT_PTR_01", exposure = { { 0, 0.9, 1 } }, movable = true, pos_correction = { 0.5, 0, 0 }, - proto =
, + proto =
, range = 8, typename = "omnilight" } }, @@ -2709,7 +2806,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { azimuth = 0.78539816339745 }, position = { 0, -0.3, -5.8 }, - proto =
, + proto =
, typename = "spotlight" }, { angle_max = 0.48869219055841, @@ -2718,7 +2815,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { azimuth = -0.78539816339745 }, position = { 0, -0.3, 5.8 }, - proto =
, + proto =
, typename = "spotlight" } }, typename = "collection" diff --git a/_G/db/Units/Planes/Plane/AJS37.lua b/_G/db/Units/Planes/Plane/AJS37.lua index be688ec0..11e20e6c 100644 --- a/_G/db/Units/Planes/Plane/AJS37.lua +++ b/_G/db/Units/Planes/Plane/AJS37.lua @@ -1144,9 +1144,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Picture = "AJS37.png", Pylons = { { Launchers = { { - CLSID = "{Robot24J}" + CLSID = "{Robot24J}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24}" + CLSID = "{Robot24}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 } }, Number = 1, Order = 1, @@ -1157,11 +1161,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{Robot74}" + CLSID = "{Robot74}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24J}" + CLSID = "{Robot24J}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24}" + CLSID = "{Robot24}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { CLSID = "{BK90}", Type = 1 @@ -1219,11 +1229,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{Robot74}" + CLSID = "{Robot74}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24J}" + CLSID = "{Robot24J}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24}" + CLSID = "{Robot24}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { CLSID = "{BK90}", Type = 1 @@ -1275,11 +1291,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{Robot74}" + CLSID = "{Robot74}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24J}" + CLSID = "{Robot24J}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24}" + CLSID = "{Robot24}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { CLSID = "{BK90}", Type = 1 @@ -1319,11 +1341,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{Robot74}" + CLSID = "{Robot74}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24J}" + CLSID = "{Robot24J}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24}" + CLSID = "{Robot24}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { CLSID = "{BK90}", Type = 1 @@ -1385,9 +1413,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "{Robot24J}" + CLSID = "{Robot24J}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 }, { - CLSID = "{Robot24}" + CLSID = "{Robot24}", + Cx_gain_empty = 0.8, + Cx_gain_item = 0.24 } }, Number = 7, Order = 7, diff --git a/_G/db/Units/Planes/Plane/An-26B.lua b/_G/db/Units/Planes/Plane/An-26B.lua index 5e69f68c..fb9abaf9 100644 --- a/_G/db/Units/Planes/Plane/An-26B.lua +++ b/_G/db/Units/Planes/Plane/An-26B.lua @@ -161,9 +161,24 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { IR_emission_coeff = 0.5, IR_emission_coeff_ab = 0, InternalCargo = { - area = { 11.1, 2.25, 1.91 }, + area = { 11.4, 1.7, 1.91 }, + far_wall_pos = { 4.8, -1.176, 0 }, maximalCapacity = 5500, nominalCapacity = 5500, + out_door = { + rampa_left = { + heading = 2.7925268031909, + large = false, + x = -10, + z = -1 + }, + rampa_right = { + heading = -2.7925268031909, + large = false, + x = -10, + z = 1 + } + }, para_unit_point = 30, unit_block = { 0.73, 1.1 }, unit_point = 39 @@ -370,7 +385,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { main_gear_amortizer_direct_stroke = 0, main_gear_amortizer_normal_weight_stroke = -0.1, main_gear_amortizer_reversal_stroke = -0.316, - main_gear_pos = { -0.6, -2.816, 3.87 }, + main_gear_pos = { -0.6, -2.78, 3.87 }, main_gear_wheel_diameter = 0.972, mapclasskey = "P0091000029", mechanimations = { @@ -426,15 +441,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Open", "Close" } } } }, - mechconnectors = { - Door11 = { { - shift_orient = { 0, 160, 0 }, - shift_pos = { -10, -1, -1 } - }, { - shift_orient = { 0, -160, 0 }, - shift_pos = { -10, -1, 1 } - } } - }, nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.01, nose_gear_amortizer_reversal_stroke = -0.23, diff --git a/_G/db/Units/Planes/Plane/An-30M.lua b/_G/db/Units/Planes/Plane/An-30M.lua index e489b1c5..fcf40b42 100644 --- a/_G/db/Units/Planes/Plane/An-30M.lua +++ b/_G/db/Units/Planes/Plane/An-30M.lua @@ -369,7 +369,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { main_gear_amortizer_direct_stroke = 0, main_gear_amortizer_normal_weight_stroke = -0.1, main_gear_amortizer_reversal_stroke = -0.316, - main_gear_pos = { -0.6, -2.816, 3.87 }, + main_gear_pos = { -0.6, -2.78, 3.87 }, main_gear_wheel_diameter = 0.972, mapclasskey = "P0091000026", mechanimations = { diff --git a/_G/db/Units/Planes/Plane/B-17G.lua b/_G/db/Units/Planes/Plane/B-17G.lua index a943dd97..f883f232 100644 --- a/_G/db/Units/Planes/Plane/B-17G.lua +++ b/_G/db/Units/Planes/Plane/B-17G.lua @@ -2090,7 +2090,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { crew_members = { { canopy_arg = 38, canopy_pos = { 4.361, -1.031, -0.473 }, - drop_canopy_name = 333, + drop_canopy_name = 336, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -0.5, -1, -2 }, ejection_order = 5, @@ -2103,7 +2103,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { 4.361, -1.031, -0.473 }, - drop_canopy_name = 333, + drop_canopy_name = 336, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -0.5, -1.5, -2.5 }, ejection_order = 4, @@ -2116,7 +2116,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { 4.361, -1.031, -0.473 }, - drop_canopy_name = 333, + drop_canopy_name = 336, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -0.5, -1.2, -2.2 }, ejection_order = 3, @@ -2129,7 +2129,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { 4.361, -1.031, -0.473 }, - drop_canopy_name = 333, + drop_canopy_name = 336, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -0.5, -1.5, -2.5 }, ejection_order = 2, @@ -2142,7 +2142,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { 4.361, -1.031, -0.473 }, - drop_canopy_name = 333, + drop_canopy_name = 336, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -10.3, -11.3, -21.1 }, ejection_order = 1, @@ -2155,7 +2155,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { -7.765, -0.089, 0.745 }, - drop_canopy_name = 332, + drop_canopy_name = 335, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -10.7, -11.5, -11.5 }, ejection_order = 2, @@ -2168,7 +2168,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { -7.765, -0.089, 0.745 }, - drop_canopy_name = 332, + drop_canopy_name = 335, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -10.6, -11.3, 11.2 }, ejection_order = 1, @@ -2181,7 +2181,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { -7.765, -0.089, 0.745 }, - drop_canopy_name = 332, + drop_canopy_name = 335, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -10.5, -11.5, 11 }, ejection_order = 3, @@ -2194,7 +2194,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { -7.765, -0.089, 0.745 }, - drop_canopy_name = 332, + drop_canopy_name = 335, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { -10.4, -10.5, 10.8 }, ejection_order = 4, @@ -2206,7 +2206,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { canopy_arg = 38, canopy_pos = { -11.536, -0.092, 0.402 }, - drop_canopy_name = 334, + drop_canopy_name = 337, drop_parachute_name = "pilot_raf_parachute", ejection_added_speed = { 10, -10, -150.1 }, ejection_order = 1, @@ -2417,7 +2417,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { main_gear_amortizer_direct_stroke = 0, main_gear_amortizer_normal_weight_stroke = -0.1, main_gear_amortizer_reversal_stroke = -0.275, - main_gear_pos = { 2.138, -2.88, 3.204 }, + main_gear_pos = { 2.138, -2.82, 3.204 }, main_gear_wheel_diameter = 1.427, mapclasskey = "P0091000027", mechanimations = { diff --git a/_G/db/Units/Planes/Plane/B-1B.lua b/_G/db/Units/Planes/Plane/B-1B.lua index 7870a7ad..45295f2d 100644 --- a/_G/db/Units/Planes/Plane/B-1B.lua +++ b/_G/db/Units/Planes/Plane/B-1B.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.14, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 0, CAS_min = 75, CanopyGeometry = { -0.087155742747658, -0.45315389351832, -0.81915204428899, -0.45315389351832, -0.087155742747658 }, @@ -7,101 +36,353 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Countermeasures = { ECM = "AN/ALQ-161" }, - Damage = { + Countries = {}, + Damage = { { + args = { 150 }, + critical_damage = 4 + }, { + args = { 149 }, + critical_damage = 4 + }, { + args = { 147 }, + critical_damage = 3 + }, [0] = { - args = { 82 }, - critical_damage = 5 + args = { 146 }, + critical_damage = 4 }, - [3] = { - args = { 65 }, + [8] = { + args = { -1 }, critical_damage = 10 }, - [8] = { + [9] = { + args = { 154 }, + critical_damage = 10 + }, + [10] = { + args = { 153 }, critical_damage = 10 }, [11] = { - critical_damage = 3 + args = { 166 }, + critical_damage = 4 }, [12] = { - critical_damage = 3 + args = { 166 }, + critical_damage = 4 }, [15] = { + args = { -1 }, critical_damage = 10 }, [16] = { + args = { -1 }, critical_damage = 10 }, [17] = { - critical_damage = 3 + args = { 169 }, + critical_damage = 4 }, [18] = { - critical_damage = 3 + args = { 169 }, + critical_damage = 4 + }, + [21] = { + args = { -1 }, + critical_damage = 4 + }, + [22] = { + args = { -1 }, + critical_damage = 4 + }, + [23] = { + args = { 223 }, + critical_damage = 4, + deps_cells = { 21 } + }, + [24] = { + args = { 213 }, + critical_damage = 4, + deps_cells = { 22 } }, [25] = { - args = { 53 }, - critical_damage = 5 + args = { -1 }, + critical_damage = 4 }, [26] = { - args = { 54 }, - critical_damage = 5 + args = { -1 }, + critical_damage = 4 + }, + [27] = { + args = { -1 }, + critical_damage = 4 + }, + [28] = { + args = { -1 }, + critical_damage = 4 + }, + [29] = { + args = { 224 }, + critical_damage = 4, + deps_cells = { 23, 27, 31, 25, 137 } + }, + [30] = { + args = { 214 }, + critical_damage = 4, + deps_cells = { 24, 28, 32, 26, 138 } + }, + [31] = { + args = { 228 }, + critical_damage = 4 + }, + [32] = { + args = { 218 }, + critical_damage = 4 + }, + [33] = { + args = { -1 }, + critical_damage = 4 + }, + [34] = { + args = { -1 }, + critical_damage = 4 }, [35] = { - args = { 67 }, - critical_damage = 20, - deps_cells = { 25, 37, 11, 17 } + args = { 225 }, + critical_damage = 5, + deps_cells = { 29, 37, 33 } }, [36] = { - args = { 68 }, - critical_damage = 20, - deps_cells = { 26, 38, 12, 18 } + args = { 215 }, + critical_damage = 5, + deps_cells = { 30, 38, 34 } }, [37] = { - args = { 55 }, + args = { 227 }, critical_damage = 4 }, [38] = { - args = { 56 }, + args = { 217 }, critical_damage = 4 }, - [43] = { - args = { 61 }, - critical_damage = 4, - deps_cells = { 53 } + [40] = { + args = { 241 }, + critical_damage = 4 }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } + [42] = { + args = { 242 }, + critical_damage = 5, + deps_cells = { 153 } + }, + [45] = { + args = { 239 }, + critical_damage = 4 + }, + [46] = { + args = { 237 }, + critical_damage = 4 }, [47] = { - args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + args = { 240 }, + critical_damage = 4, + deps_cells = { 45 } }, [48] = { - args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } + args = { 238 }, + critical_damage = 4, + deps_cells = { 46 } }, - [51] = { - args = { 59 }, - critical_damage = 2 + [55] = { + args = { 159 }, + critical_damage = 8, + deps_cells = { 152, 47, 48, 42 } }, - [52] = { - args = { 60 }, - critical_damage = 2 + [56] = { + args = { 158 }, + critical_damage = 8 }, - [53] = { - args = { 57 }, - critical_damage = 2 + [57] = { + args = { 157 }, + critical_damage = 8 }, - [54] = { - args = { 58 }, - critical_damage = 2 + [58] = { + args = { 156 }, + critical_damage = 8 }, - [55] = { - args = { 81 }, - critical_damage = 15 + [59] = { + args = { 148 }, + critical_damage = 4 + }, + [82] = { + args = { 152 }, + critical_damage = 10 + }, + [83] = { + args = { -1 }, + critical_damage = 3 + }, + [84] = { + args = { -1 }, + critical_damage = 3 + }, + [85] = { + args = { -1 }, + critical_damage = 3 + }, + [99] = { + args = { 151 }, + critical_damage = 10 + }, + [100] = { + args = { 155 }, + critical_damage = 8 + }, + [137] = { + args = { -1 }, + critical_damage = 4 + }, + [138] = { + args = { -1 }, + critical_damage = 4 + }, + [139] = { + args = { 267 }, + critical_damage = 4 + }, + [140] = { + args = { 266 }, + critical_damage = 4 + }, + [141] = { + args = { 167 }, + critical_damage = 4 + }, + [142] = { + args = { 167 }, + critical_damage = 4 + }, + [143] = { + args = { 148 }, + critical_damage = 4 + }, + [144] = { + args = { 148 }, + critical_damage = 4 + }, + [145] = { + args = { 148 }, + critical_damage = 4 + }, + [146] = { + args = { 0 }, + critical_damage = 4 + }, + [147] = { + args = { 147 }, + critical_damage = 4 + }, + [148] = { + args = { 147 }, + critical_damage = 4 + }, + [149] = { + args = { 152 }, + critical_damage = 4 + }, + [150] = { + args = { 152 }, + critical_damage = 4 + }, + [151] = { + args = { 147 }, + critical_damage = 4 + }, + [152] = { + args = { 247 }, + critical_damage = 4 + }, + [153] = { + args = { 247 }, + critical_damage = 4 + }, + [154] = { + args = { 150 }, + critical_damage = 3 + }, + [155] = { + args = { 149 }, + critical_damage = 3 + }, + cell_indices = { + AILERON_L = 25, + AILERON_L_OUT = 137, + AILERON_R = 26, + AILERON_R_OUT = 138, + COCKPIT = 3, + COWLING_L = 139, + COWLING_R = 140, + ENGINE_L = 11, + ENGINE_L_CENTER = 141, + ENGINE_L_IN = 11, + ENGINE_L_OUT = 17, + ENGINE_R = 12, + ENGINE_R_CENTER = 142, + ENGINE_R_IN = 12, + ENGINE_R_OUT = 18, + FLAP_L_IN = 37, + FLAP_L_OUT = 31, + FLAP_R_IN = 38, + FLAP_R_OUT = 32, + FUSELAGE_BOTTOM = 82, + FUSELAGE_LEFT_SIDE = 9, + FUSELAGE_RIGHT_SIDE = 10, + FUSELAGE_TOP = 99, + GEAR_F = 8, + GEAR_L = 15, + GEAR_R = 16, + HATCH_000 = 143, + HATCH_001 = 144, + HATCH_002 = 145, + HATCH_003 = 146, + HATCH_004 = 147, + HATCH_005 = 148, + HATCH_007 = 149, + HATCH_008 = 150, + KEEL_R_CENTER = 42, + KEEL_R_OUT = 40, + NOSE_BOTTOM = 59, + NOSE_CENTER = 0, + NOSE_LEFT_SIDE = 1, + NOSE_RIGHT_SIDE = 2, + NOSE_TOP = 151, + RUDDER_IN = 152, + RUDDER_OUT = 153, + STABILIZER_L_IN = 47, + STABILIZER_L_OUT = 45, + STABILIZER_R_IN = 48, + STABILIZER_R_OUT = 46, + TAIL = 55, + TAIL_BOTTOM = 58, + TAIL_LEFT_SIDE = 56, + TAIL_RIGHT_SIDE = 57, + TAIL_TOP = 100, + VANE_L = 154, + VANE_R = 155, + 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_L_PART_IN = 33, + WING_L_PART_OUT = 21, + WING_R_CENTER = 30, + WING_R_IN = 36, + WING_R_OUT = 24, + WING_R_PART_CENTER = 28, + WING_R_PART_IN = 34, + WING_R_PART_OUT = 22 } }, DamageParts = { "B-1B-OBLOMOK-WING-R", "B-1B-OBLOMOK-WING-L" }, @@ -112,7 +393,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, DisplayName = "B-1B", EPLRS = true, - EmptyWeight = "87090", + EmptyWeight = 82840, H_max = 15240, HumanCockpit = false, HumanRadio = { @@ -130,10 +411,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { M_max = 213192, M_nominal = 140000, Mach_max = 1.68, - MaxFuelWeight = "88450", - MaxHeight = "18000", - MaxSpeed = "1530", - MaxTakeOffWeight = "216360", + MaxFuelWeight = 88450, + MaxHeight = 15240, + MaxSpeed = 1329.84, + MaxTakeOffWeight = 213192, Name = "B-1B", Ny_max = 3.5, Ny_max_e = 2, @@ -164,25 +445,31 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Number = 1, Order = 1, Type = 2, - X = 8.843, - Y = 0.4, - Z = 0 + X = 9.122, + Y = 0.359, + Z = 0, + connector = "Pylon_1_Rotary", + use_full_connector_position = true }, { Launchers =
, Number = 2, Order = 2, Type = 2, - X = 3.977, - Y = 0.4, - Z = 0 + X = 4.134, + Y = 0.359, + Z = 0, + connector = "Pylon_2_Rotary", + use_full_connector_position = true }, { Launchers =
, Number = 3, Order = 3, Type = 2, - X = -6.25, - Y = 0.4, - Z = 0 + X = -6.24, + Y = 0.359, + Z = 0, + connector = "Pylon_3_Rotary", + use_full_connector_position = true } }, RCS = 5, Rate = "100", @@ -195,10 +482,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { cx_brk = 0.0275, cx_flap = 0.04, cx_gear = 0.015, - cy_flap = 0.8, + cy_flap = 0.94, kjx = 2.85, kjz = 0.00125, - table_data = { { 0, 0.0215, 0.07, 0.018, 0.025, 0.5, 30, 1.1 }, { 0.2, 0.0215, 0.07, 0.018, 0.025, 1.5, 30, 1.1 }, { 0.4, 0.0215, 0.07, 0.018, 0.025, 2.5, 30, 1.1 }, { 0.6, 0.0215, 0.073, 0.018, 0.025, 3.5, 30, 1.1 }, { 0.7, 0.0225, 0.076, 0.024, 0.05, 3.5, 28.666666666667, 1.0911111111111 }, { 0.8, 0.022, 0.079, 0.3, 0.052, 3.5, 27.333333333333, 1.0822222222222 }, { 0.9, 0.0235, 0.083, 0.324, 0.0536, 3.5, 26, 1.0733333333333 }, { 1, 0.03, 0.085, 0.348, 0.0552, 3.5, 24.666666666667, 1.0644444444444 }, { 1.05, 0.031, 0.0855, 0.36, 0.056, 3.5, 24, 1.06 }, { 1.1, 0.032, 0.086, 0.372, 0.0568, 3.15, 18, 1.04 }, { 1.2, 0.0325, 0.083, 0.396, 0.0584, 2.45, 17, 1.02 }, { 1.3, 0.032, 0.077, 0.42, 0.06, 1.75, 16, 1 }, { 1.5, 0.031, 0.062, 0.488571, 0.06, 1.5, 13, 0.9 }, { 1.7, 0.03, 0.051333333333333, 0.557143, 0.06, 0.9, 12, 0.7 }, { 1.8, 0.0295, 0.046, 0.591429, 0.06, 0.86, 11.4, 0.64 }, { 2, 0.029, 0.039, 0.66, 0.06, 0.78, 10.2, 0.52 }, { 2.2, 0.028, 0.034, 0.227, 3.2, 0.7, 9, 0.4 }, { 2.5, 0.027, 0.033, 0.25, 4.5, 0.7, 9, 0.4 }, { 3.9, 0.027, 0.033, 0.35, 6, 0.7, 9, 0.4 } } + table_data = { { 0, 0.0215, 0.082, 0.018, 0.025, 0.5, 30, 1.1 }, { 0.2, 0.0215, 0.082, 0.018, 0.025, 1.5, 30, 1.1 }, { 0.4, 0.0215, 0.081, 0.018, 0.025, 2.5, 30, 1.1 }, { 0.6, 0.0215, 0.079, 0.018, 0.025, 3.5, 30, 1.1 }, { 0.7, 0.0225, 0.079, 0.024, 0.05, 3.5, 28.666666666667, 1.0911111111111 }, { 0.8, 0.022, 0.079, 0.3, 0.052, 3.5, 27.333333333333, 1.0822222222222 }, { 0.9, 0.0235, 0.083, 0.324, 0.0536, 3.5, 26, 1.0733333333333 }, { 1, 0.03, 0.085, 0.348, 0.0552, 3.5, 24.666666666667, 1.0644444444444 }, { 1.05, 0.031, 0.0855, 0.36, 0.056, 3.5, 24, 1.06 }, { 1.1, 0.032, 0.086, 0.372, 0.0568, 3.15, 18, 1.04 }, { 1.2, 0.0325, 0.083, 0.396, 0.0584, 2.45, 17, 1.02 }, { 1.3, 0.032, 0.077, 0.42, 0.06, 1.75, 16, 1 }, { 1.5, 0.031, 0.062, 0.488571, 0.06, 1.5, 13, 0.9 }, { 1.7, 0.03, 0.051333333333333, 0.557143, 0.06, 0.9, 12, 0.7 }, { 1.8, 0.0295, 0.046, 0.591429, 0.06, 0.86, 11.4, 0.64 }, { 2, 0.029, 0.039, 0.66, 0.06, 0.78, 10.2, 0.52 }, { 2.2, 0.028, 0.034, 0.227, 3.2, 0.7, 9, 0.4 }, { 2.5, 0.027, 0.033, 0.25, 4.5, 0.7, 9, 0.4 }, { 3.9, 0.027, 0.033, 0.35, 6, 0.7, 9, 0.4 } } }, engine = { ForsRUD = 0.91, @@ -206,6 +493,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { MaxRUD = 1, MinRUD = 0, Nmg = 60.00001, + Shutdown_Duration = 50, + Startup_Duration = 50, + Startup_Prework = 40, cefor = 0.37, cemax = 0.37, dpdh_f = 16000, @@ -244,48 +534,89 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { V_take_off = 79, Vy_max = 70, Waypoint_Custom_Panel = true, - WingSpan = "41.67", + WingSpan = 41.67, WorldID = 19, - _file = "Scripts/Database/planes\\B-1B.lua", + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", air_refuel_receptacle_pos = { 20.237, 1.079, 0 }, attribute = { 1, 1, 2, "Redacted", "Strategic bombers", "Refuelable", "Datalink", "Link16", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes", "Battle airplanes", "Bombers" }, average_fuel_consumption = 0.2923, bank_angle_max = 45, bigParkingRamp = true, brakeshute_name = 0, + chaff_flare_dispenser = { { + dir = { 0, 1, 0 }, + pos = { 14.1, 3.45, 0.581 } + }, { + dir = { 0, 1, 0 }, + pos = { 14.1, 3.45, -0.581 } + }, { + dir = { 0, 1, 0 }, + pos = { 13.5, 3.65, 0.574 } + }, { + dir = { 0, 1, 0 }, + pos = { 13.5, 3.65, -0.574 } + } }, country_of_origin = "USA", crew_members = { { - bailout_arg = -1, + bailout_arg = 118, + boarding_arg = 323, drop_canopy_name = 0, + ejection_added_speed = { 20, 30, -1.5 }, ejection_seat_name = 17, - pos = { 17.034, 1.243, 0 }, + pos = { 17.7, 1.243, -0.58 }, role = "pilot", role_display_name = "Pilot in command" }, { - bailout_arg = -1, + bailout_arg = 118, + boarding_arg = 323, drop_canopy_name = 0, + ejection_added_speed = { 20, 30, 1.5 }, ejection_seat_name = 17, - pos = { 17.034, 1.243, 0 }, + pos = { 17.7, 1.243, 0.58 }, role = "copilot", role_display_name = "Copilot" }, { - bailout_arg = -1, + bailout_arg = 118, + boarding_arg = 323, drop_canopy_name = 0, + ejection_added_speed = { 0, 30, -10 }, ejection_seat_name = 17, - pos = { 17.034, 1.243, 0 }, + pos = { 14.82, 1.243, -0.58 }, role = "flight_officer", - role_display_name = "Flight officer" + role_display_name = "Flight Test Engineer" }, { - bailout_arg = -1, + bailout_arg = 118, + boarding_arg = 323, drop_canopy_name = 0, + ejection_added_speed = { 0, 30, 10 }, ejection_seat_name = 17, - pos = { 17.034, 1.243, 0 }, + pos = { 14.82, 1.243, 0.58 }, role = "flight_officer", - role_display_name = "Flight officer" + role_display_name = "Observer" } }, detection_range_max = 0, + effects_presets = { { + effect = "OVERWING_VAPOR", + file = "./CoreMods/tech/HeavyMetalCore/Effects/B_1b_overwingVapor.lua" + } }, + encyclopediaAnimation = { + args = { + [7] = 1, + [26] = 1, + [28] = 0.105, + [29] = 0.105, + [79] = 1, + [89] = 0.566, + [90] = 0.566 + } + }, engines_count = 4, engines_nozzles = { { + afterburner_circles_count = 11, + afterburner_circles_pos = { 0.2, 0.8 }, + afterburner_circles_scale = 1, + afterburner_effect_texture = "afterburner_b-1b", diameter = 1.068, elevation = 0, exhaust_length_ab = 10.977, @@ -293,13 +624,21 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -9.75, -1.249, -4.549 }, smokiness_level = 0.1 }, { + afterburner_circles_count = 11, + afterburner_circles_pos = { 0.2, 0.8 }, + afterburner_circles_scale = 1, + afterburner_effect_texture = "afterburner_b-1b", diameter = 1.068, elevation = 0, exhaust_length_ab = 10.977, exhaust_length_ab_K = 0.76, - pos = { -9.75, -1.249, -2.839 }, + pos = { -8.956, -1.4, -2.959 }, smokiness_level = 0.1 }, { + afterburner_circles_count = 11, + afterburner_circles_pos = { 0.2, 0.8 }, + afterburner_circles_scale = 1, + afterburner_effect_texture = "afterburner_b-1b", diameter = 1.068, elevation = 0, exhaust_length_ab = 10.977, @@ -307,6 +646,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -9.75, -1.249, 2.881 }, smokiness_level = 0.1 }, { + afterburner_circles_count = 11, + afterburner_circles_pos = { 0.2, 0.8 }, + afterburner_circles_scale = 1, + afterburner_effect_texture = "afterburner_b-1b", diameter = 1.068, elevation = 0, exhaust_length_ab = 10.977, @@ -314,22 +657,47 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -9.75, -1.249, 4.549 }, smokiness_level = 0.1 } }, + engines_startup_sequence = { 1, 3, 0, 2 }, fires_pos = { { 0.338, -0.815, 0 }, { -3.491, -0.153, 4.263 }, { -3.491, -0.153, -4.263 }, { -0.82, 0.265, 2.774 }, { -0.82, 0.265, -2.774 }, { -0.82, 0.255, 4.274 }, { -0.82, 0.255, -4.274 }, { -8.938, -1.237, 2.985 }, { -8.938, -1.237, -2.985 }, { -8.938, -1.154, 4.571 }, { -8.938, -1.154, -4.571 } }, flaps_maneuver = 1, has_afteburner = true, - has_speedbrake = false, + has_differential_stabilizer = true, + has_speedbrake = true, height = 10.36, length = 44.81, lights_data = { - lights = { - [2] = { + lights = { { + lights = { { + argument = 194, + controller = "Strobe", + period = 1, + phase_shift = 0, + typename = "argnatostrobelight" + }, { + argument = 195, + controller = "Strobe", + period = 1, + phase_shift = 0.05, + typename = "argnatostrobelight" + }, { + argument = 196, + controller = "Strobe", + period = 1, + phase_shift = 0.5, + typename = "argnatostrobelight" + } }, + typename = "collection" + }, { lights = { { lights = { { - angle_max = 0.20943951023932, - argument = 51, - exposure = { { 0, 0.8, 1 } }, + argument = 208, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 0.034906585039887, + elevation = 0.034906585039887 + }, + exposure = { { 5, 0.98, 1 } }, movable = true, - position = { 16.501, -2.354, 0.015 }, proto = <3>{ angle_change_rate = 0.05235987755983, angle_max = 0.20943951023932, @@ -340,89 +708,371 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "Spot" }, { - exposure = { { 0, 0.8, 1 } }, + argument = 209, + connector = "MAIN_SPOT_PTR_1", + dir_correction = { + azimuth = -0.05235987755983, + elevation = 0.069813170079773 + }, + exposure = { { 5, 0.98, 1 } }, movable = true, - position = { 18.001, -2.354, 0.015 }, proto =
, - range = 8, - typename = "Omni" + typename = "Spot" } }, typename = "collection" } }, typename = "collection" - }, - [3] = { - argument = 49, - typename = "argumentlight" + }, { + lights = { { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 190, + connector = "BANO_1", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + exposure = { { 7, 0.09, 0.1, 1, 0 } }, + movable = true, + proto = <4>{ + angle_max = 3.1415926535898, + color = { 1, 0.3, 0.1, 0.18 }, + range = 75 + }, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 191, + connector = "BANO_2", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + exposure = { { 7, 0.09, 0.1, 1, 0 } }, + movable = true, + proto = <5>{ + angle_max = 3.1415926535898, + color = { 0, 0.8, 0.6, 0.18 }, + range = 75 + }, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 193, + connector = "RESERV_BANO_1", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + exposure = { { 7, 0.09, 0.1, 0, 1 } }, + movable = true, + proto =
, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 193, + connector = "RESERV_BANO_2", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + exposure = { { 7, 0.09, 0.1, 0, 1 } }, + movable = true, + proto =
, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 192, + connector = "BANO_3", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + movable = true, + proto = { + angle_max = 3.1415926535898, + color = { 1, 1, 1, 0.155 }, + range = 30 + }, + range = 75, + typename = "Spot" + } }, + typename = "collection" }, [6] = { lights = { { lights = { { - angle_max = 0.41887902047864, - argument = 51, - position = { 16.501, -2.354, 0.015 }, - proto = <4>{ - angle_change_rate = -0.19198621771938, - angle_max = 0.7679448708775, - angle_min = 0.614355896702, - color = { 255, 201, 125, 0.2137366596101 }, - power_up_t = 1.55, - range = 612 + angle_max = 1.0471975511966, + angle_min = 0.48869219055841, + argument = 210, + connector = "MAIN_SPOT_PTR_3", + dir_correction = { + azimuth = 0, + elevation = 0.017453292519943 + }, + exposure = { { 5, 0.98, 1 } }, + movable = true, + proto = { + angle_change_rate = 0.047996554429844, + angle_max = 0.19198621771938, + angle_min = 0.1221730476396, + color = { 255, 201, 125, 0.27855844122716 }, + power_up_t = 1, + range = 3120 }, typename = "Spot" - }, { - position = { 18.001, -2.354, 0.015 }, - proto =
, - range = 8, - typename = "Omni" } }, typename = "collection" } }, typename = "collection" + }, + [8] = { + lights = { { + argument = 211, + exposure = { { 323, 0.9, 1 } }, + movable = true, + typename = "argumentlight" + } }, + typename = "collection" + }, + [9] = { + lights = { { + argument = 69, + typename = "argumentlight" + } }, + typename = "collection" + }, + [10] = { + lights = { { + argument = 212, + typename = "argumentlight" + }, { + angle_max = 0.59341194567807, + angle_min = 0.47472955654246, + argument = 212, + direction = { + azimuth = -2.4434609527921, + elevation = 0.069813170079773 + }, + exposure = { { 212, 0.9, 1, 1, 1 } }, + movable = true, + position = { 6.92, 1.179, -1.582 }, + proto = <6>{ + angle_change_rate = -0.11780972450962, + angle_max = 0.47123889803847, + angle_min = 0.37699111843078, + color = { 255, 201, 125, 0.18499689437998 }, + power_up_t = 0.9, + range = 300 + }, + typename = "Spot" + }, { + angle_max = 0.59341194567807, + angle_min = 0.47472955654246, + argument = 212, + direction = { + azimuth = 2.4434609527921, + elevation = 0.069813170079773 + }, + exposure = { { 212, 0.9, 1, 1, 1 } }, + movable = true, + position = { 6.92, 1.179, 1.382 }, + proto =
, + typename = "Spot" + } }, + typename = "collection" } }, typename = "collection" }, - main_gear_pos = { -2.821, -3.615, 2.681 }, - main_gear_wheel_diameter = 0.972, + main_gear_amortizer_direct_stroke = 0, + main_gear_amortizer_normal_weight_stroke = -0.207, + main_gear_amortizer_reversal_stroke = -0.384, + main_gear_pos = { -1.753, -3.926, 2.207 }, + main_gear_wheel_diameter = 1.13, mapclasskey = "P0091000027", mechanimations = { - Door0 = { { + CentralStrut = { { Flags = { "Reversible" }, Sequence = { { - C = { { "Arg", 38, "to", 0.9, "in", 9 } } + C = { { "VelType", 0 }, { "Arg", 0, "to", 0.45, "in", 4, "sign", 1 } }, + Width = { 0, 0.5 } + }, { + C = { { "VelType", 0 }, { "Arg", 0, "to", 1, "in", 6, "sign", 1 } }, + Width = { 0.5, 1 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "Sleep", "for", 2 } }, + Width = { 0.5, 0.75 } + }, { + C = { { "VelType", 1 }, { "Arg", 0, "to", 0.45, "in", 6, "sign", -1 } }, + Width = { 0, 0.5 } + }, { + C = { { "VelType", 2 }, { "Arg", 0, "to", 0, "in", 5, "sign", -1 } }, + Width = { 0.5, 1 } + } }, + Transition = { "Extend", "Retract" } + }, { + Sequence = { { + C = { { "PosType", 0 }, { "Arg", 0, "to", 0.441, "speed", 2, "sign", -1 } } + } }, + Transition = { "Any", "Collapse" } + } }, + Door0 = { { + Sequence = { { + C = { { "Sleep", "for", 0 } } } }, Transition = { "Close", "Open" } }, { - Flags = { "Reversible", "StepsBackwards" }, Sequence = { { - C = { { "Arg", 38, "to", 0, "in", 6 } } + C = { { "Sleep", "for", 0 } } } }, Transition = { "Open", "Close" } }, { Sequence = { { - C = { { "JettisonCanopy", 0 } } + C = { { "Sleep", "for", 50 } } + }, { + C = { { "Arg", 323, "to", 1, "in", 5 } } + } }, + Transition = { "Open", "Board" } + }, { + Sequence = { { + C = { { "Arg", 323, "to", 0, "in", 10 } } + } }, + Transition = { "Board", "Open" } + } }, + Door1 = { { + Sequence = { { + C = { { "Arg", 118, "to", 1, "in", 0.5 } } } }, Transition = { "Any", "Bailout" } } }, - Door1 = { - DuplicateOf = "Door0" - } + Door2 = { + DuplicateOf = "Door1" + }, + Door3 = { + DuplicateOf = "Door1" + }, + Door4 = { + DuplicateOf = "Door1" + }, + Door5 = { + DuplicateOf = "Door1" + }, + LeftStrut = { { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 1 }, { "Arg", 5, "to", 0.18, "in", 2, "sign", 1 } }, + Width = { 0, 0.2 } + }, { + C = { { "VelType", 1 }, { "Arg", 5, "to", 0.82, "in", 6, "sign", 1 } }, + Width = { 0.2, 0.8 } + }, { + C = { { "VelType", 1 }, { "Arg", 5, "to", 1, "in", 3, "sign", 1 } }, + Width = { 0.8, 1 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 0 }, { "Arg", 5, "to", 0.82, "in", 2, "sign", -1 } }, + Width = { 0, 0.2 } + }, { + C = { { "VelType", 1 }, { "Arg", 5, "to", 0.19, "in", 9, "sign", -1 } }, + Width = { 0.2, 0.6 } + }, { + C = { { "Sleep", "for", 2 } }, + Width = { 0.6, 0.8 } + }, { + C = { { "VelType", 0 }, { "Arg", 5, "to", 0, "in", 3, "sign", -1 } }, + Width = { 0.8, 1 } + } }, + Transition = { "Extend", "Retract" } + }, { + Sequence = { { + C = { { "PosType", 6 }, { "Arg", 5, "to", 0.5, "speed", 2, "sign", -1 } } + } }, + Transition = { "Any", "Collapse" } + } }, + RightStrut = { { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 1 }, { "Arg", 3, "to", 0.18, "in", 2, "sign", 1 } }, + Width = { 0, 0.2 } + }, { + C = { { "VelType", 1 }, { "Arg", 3, "to", 0.82, "in", 6, "sign", 1 } }, + Width = { 0.2, 0.8 } + }, { + C = { { "VelType", 1 }, { "Arg", 3, "to", 1, "in", 3, "sign", 1 } }, + Width = { 0.8, 1 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 0 }, { "Arg", 3, "to", 0.82, "in", 2, "sign", -1 } }, + Width = { 0, 0.2 } + }, { + C = { { "VelType", 1 }, { "Arg", 3, "to", 0.19, "in", 9, "sign", -1 } }, + Width = { 0.2, 0.6 } + }, { + C = { { "Sleep", "for", 2 } }, + Width = { 0.6, 0.8 } + }, { + C = { { "VelType", 0 }, { "Arg", 3, "to", 0, "in", 3, "sign", -1 } }, + Width = { 0.8, 1 } + } }, + Transition = { "Extend", "Retract" } + }, { + Sequence = { { + C = { { "PosType", 7 }, { "Arg", 3, "to", 0.5, "speed", 2, "sign", -1 } } + } }, + Transition = { "Any", "Collapse" } + } }, + ServiceHatches = { { + Sequence = { { + C = { { "PosType", 3 }, { "Sleep", "for", 30 } } + }, { + C = { { "Arg", 24, "set", 1 } } + }, { + C = { { "Arg", 428, "to", 1, "in", 2, "sign", 1 } } + } }, + Transition = { "Close", "Open" } + }, { + Sequence = { { + C = { { "PosType", 6 }, { "Sleep", "for", 5 } } + }, { + C = { { "Arg", 24, "set", 0 } } + }, { + C = { { "Arg", 428, "to", 0, "in", 2, "sign", -1 } } + } }, + Transition = { "Open", "Close" } + } } }, - nose_gear_pos = { 16.013, -3.615, 0 }, - nose_gear_wheel_diameter = 0.754, + nose_gear_amortizer_direct_stroke = 0, + nose_gear_amortizer_normal_weight_stroke = -0.418, + nose_gear_amortizer_reversal_stroke = -0.536, + nose_gear_pos = { 16.055, -4.135, 0 }, + nose_gear_wheel_diameter = 0.932, passivCounterm = { CMDS_Edit = true, - SingleChargeTotal = 120, + SingleChargeTotal = 960, chaff = { chargeSz = 1, - default = 60, - increment = 30 + default = 480, + increment = 120 }, flare = { - chargeSz = 2, - default = 30, - increment = 15 + chargeSz = 10, + default = 48, + increment = 12 } }, radar_can_see_ground = false, @@ -435,6 +1085,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { thrust_sum_ab = 130000, thrust_sum_max = 80000, type = "B-1B", + undercarriage_movement = 2, + undercarriage_transmission = "Hydraulic", wing_area = 181, wing_span = 41.67, wing_tip_pos = { -3.3, -1, 21.2 }, diff --git a/_G/db/Units/Planes/Plane/B-52H.lua b/_G/db/Units/Planes/Plane/B-52H.lua index 03b1758b..ecc5b4ba 100644 --- a/_G/db/Units/Planes/Plane/B-52H.lua +++ b/_G/db/Units/Planes/Plane/B-52H.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 0, CAS_min = 62, CanopyGeometry = { -0.17364817766693, -0.49640011097796, -0.81915204428899, 0.023436679747723, 0.86602540378444 }, @@ -7,104 +36,272 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Countermeasures = { ECM = "AN/ALQ-172" }, - Damage = { + Countries = {}, + Damage = { { + args = { 150 }, + critical_damage = 3 + }, { + args = { 149 }, + critical_damage = 3 + }, { + args = { -1 }, + critical_damage = 10 + }, [0] = { - args = { 82 }, - critical_damage = 5 + args = { 146 }, + critical_damage = 3 }, - [3] = { - args = { 65 }, - critical_damage = 10 + [9] = { + args = { 154 }, + critical_damage = 5 }, - [8] = { - critical_damage = 10 + [10] = { + args = { 153 }, + critical_damage = 5 }, [11] = { - critical_damage = 3 + args = { -1 }, + critical_damage = 2 }, [12] = { - critical_damage = 3 - }, - [15] = { - critical_damage = 10 - }, - [16] = { - critical_damage = 10 + args = { -1 }, + critical_damage = 2 }, [17] = { - critical_damage = 3 + args = { -1 }, + critical_damage = 2 }, [18] = { - critical_damage = 3 + args = { -1 }, + critical_damage = 2 }, - [25] = { - args = { 53 }, - critical_damage = 5 + [21] = { + args = { -1 }, + critical_damage = 2 }, - [26] = { - args = { 54 }, - critical_damage = 5 + [22] = { + args = { -1 }, + critical_damage = 2 + }, + [23] = { + args = { 223 }, + critical_damage = 4, + deps_cells = { 21 } + }, + [24] = { + args = { 213 }, + critical_damage = 4, + deps_cells = { 22 } + }, + [29] = { + args = { 224 }, + critical_damage = 4, + deps_cells = { 23, 21, 137, 31 } + }, + [30] = { + args = { 214 }, + critical_damage = 4, + deps_cells = { 24, 22, 140, 32 } + }, + [31] = { + args = { 229 }, + critical_damage = 2 + }, + [32] = { + args = { 219 }, + critical_damage = 2 }, [35] = { - args = { 67 }, - critical_damage = 20, - deps_cells = { 25, 37, 11, 17 } + args = { 225 }, + critical_damage = 5, + deps_cells = { 29, 138, 37 } }, [36] = { - args = { 68 }, - critical_damage = 20, - deps_cells = { 26, 38, 12, 18 } + args = { 215 }, + critical_damage = 5, + deps_cells = { 30, 139, 38 } }, [37] = { - args = { 55 }, - critical_damage = 4 + args = { 228 }, + critical_damage = 2 }, [38] = { - args = { 56 }, - critical_damage = 4 - }, - [43] = { - args = { 61 }, - critical_damage = 4, - deps_cells = { 53 } + args = { 218 }, + critical_damage = 2 }, - [44] = { - args = { 62 }, + [40] = { + args = { 241 }, critical_damage = 4, deps_cells = { 54 } }, + [42] = { + args = { 242 }, + critical_damage = 3, + deps_cells = { 53, 40 }, + detachable = { + shape = "b-52_oblomok_keel" + } + }, + [45] = { + args = { 235 }, + critical_damage = 2, + deps_cells = { 49 } + }, + [46] = { + args = { 233 }, + critical_damage = 2, + deps_cells = { 50 } + }, [47] = { - args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + args = { 236 }, + critical_damage = 2, + deps_cells = { 45, 51 }, + detachable = { + shape = "b-52_oblomok_stab_L" + } }, [48] = { - args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } + args = { 234 }, + critical_damage = 2, + deps_cells = { 46, 52 }, + detachable = { + shape = "b-52_oblomok_stab_R" + } + }, + [49] = { + args = { -1 }, + critical_damage = 1 + }, + [50] = { + args = { -1 }, + critical_damage = 1 }, [51] = { - args = { 59 }, - critical_damage = 2 + args = { -1 }, + critical_damage = 2, + deps_cells = { 49 } }, [52] = { - args = { 60 }, - critical_damage = 2 + args = { -1 }, + critical_damage = 2, + deps_cells = { 50 } }, [53] = { - args = { 57 }, - critical_damage = 2 + args = { -1 }, + critical_damage = 1, + deps_cells = { 54 } }, [54] = { - args = { 58 }, - critical_damage = 2 + args = { -1 }, + critical_damage = 1 }, [55] = { - args = { 81 }, - critical_damage = 15 + args = { 159 }, + critical_damage = 4 + }, + [56] = { + args = { 158 }, + critical_damage = 5 + }, + [57] = { + args = { 157 }, + critical_damage = 5 + }, + [58] = { + args = { 156 }, + critical_damage = 5 + }, + [59] = { + args = { 148 }, + critical_damage = 3 + }, + [82] = { + args = { 152 }, + critical_damage = 4 + }, + [99] = { + args = { 151 }, + critical_damage = 4 + }, + [100] = { + args = { 155 }, + critical_damage = 5 + }, + [137] = { + args = { 168 }, + critical_damage = 3, + deps_cells = { 17 } + }, + [138] = { + args = { 162 }, + critical_damage = 3, + deps_cells = { 11 } + }, + [139] = { + args = { 179 }, + critical_damage = 3, + deps_cells = { 12 } + }, + [140] = { + args = { 173 }, + critical_damage = 3, + deps_cells = { 18 } + }, + [141] = { + args = { 147 }, + critical_damage = 3 + }, + cell_indices = { + COCKPIT = 3, + ELEVATOR_L_IN = 51, + ELEVATOR_L_OUT = 49, + ELEVATOR_R_IN = 52, + ELEVATOR_R_OUT = 50, + ENGINE_L_IN = 11, + ENGINE_L_OUT = 17, + ENGINE_R_IN = 12, + ENGINE_R_OUT = 18, + FLAP_L_IN = 37, + FLAP_L_OUT = 31, + FLAP_R_IN = 38, + FLAP_R_OUT = 32, + FUSELAGE_BOTTOM = 82, + FUSELAGE_LEFT_SIDE = 9, + FUSELAGE_RIGHT_SIDE = 10, + FUSELAGE_TOP = 99, + KEEL_R_CENTER = 42, + KEEL_R_OUT = 40, + MTG_1 = 137, + MTG_2 = 138, + MTG_3 = 139, + MTG_4 = 140, + NOSE_BOTTOM = 59, + NOSE_CENTER = 0, + NOSE_LEFT_SIDE = 1, + NOSE_RIGHT_SIDE = 2, + NOSE_TOP = 141, + RUDDER_L = 53, + RUDDER_R = 54, + STABILIZER_L_IN = 47, + STABILIZER_L_OUT = 45, + STABILIZER_R_IN = 48, + STABILIZER_R_OUT = 46, + TAIL = 55, + TAIL_BOTTOM = 58, + TAIL_LEFT_SIDE = 56, + TAIL_RIGHT_SIDE = 57, + TAIL_TOP = 100, + WING_L_CENTER = 29, + WING_L_IN = 35, + WING_L_OUT = 23, + WING_L_PART_OUT = 21, + WING_R_CENTER = 30, + WING_R_IN = 36, + WING_R_OUT = 24, + WING_R_PART_OUT = 22 } }, - DamageParts = { "B-52-OBLOMOK-WING-R", "B-52-OBLOMOK-WING-L" }, + DamageParts = { "b-52_oblomok_wing_R", "b-52_oblomok_wing_L" }, DefaultTask = <1>{ Name = "Ground Attack", OldID = "Ground Attack", @@ -112,7 +309,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, DisplayName = "B-52H", EPLRS = true, - EmptyWeight = "83460", + EmptyWeight = 83460, H_max = 16764, HumanCockpit = false, HumanRadio = { @@ -130,10 +327,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { M_max = 256735, M_nominal = 200000, Mach_max = 0.95, - MaxFuelWeight = "141135", - MaxHeight = "17000", - MaxSpeed = "1000", - MaxTakeOffWeight = "256735", + MaxFuelWeight = 141135, + MaxHeight = 16764, + MaxSpeed = 957.6, + MaxTakeOffWeight = 256735, Name = "B-52H", Ny_max = 2.5, Ny_max_e = 2, @@ -141,67 +338,106 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Picture = "B-52H.png", Pylons = { { Launchers = { { - CLSID = "{585D626E-7F42-4073-AB70-41E728C333E2}" + CLSID = "{585D626E-7F42-4073-AB70-41E728C333E2}", + DrawArgs = { { 18, 0 }, { 3, 0.5 } }, + arg_value = 0.1 }, { - CLSID = "{4CD2BB0F-5493-44EF-A927-9760350F7BA1}" + CLSID = "{4CD2BB0F-5493-44EF-A927-9760350F7BA1}", + DrawArgs = { { 18, 0.1 }, { 3, 0.5 } }, + arg_value = 0.1 }, { - CLSID = "{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}" + CLSID = "{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}", + DrawArgs = { { 18, 0.2 }, { 3, 0.5 } }, + arg_value = 0.1 }, { - CLSID = "{45447F82-01B5-4029-A572-9AAD28AF0275}" + CLSID = "{HSAB-6xAGM-84}", + DrawArgs = { { 18, 0.1 }, { 3, 0.5 } }, + arg_value = 0.1 + }, { + CLSID = "{45447F82-01B5-4029-A572-9AAD28AF0275}", + arg_value = 0.2 } }, Number = 1, Order = 1, Type = 1, X = 6.012, Y = -1.136, - Z = -5.069 + Z = -5.514, + arg = 308, + arg_value = 0, + connector = "Pylon1", + use_full_connector_position = true }, { Launchers = { { - CLSID = "{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}" + CLSID = "{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}", + Type = 8, + arg_value = 0.1, + connector = "Pylon20_R" }, { - CLSID = "{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}" + CLSID = "{8_x_AGM_86C}", + Type = 8, + arg_value = 0.1, + connector = "Pylon20_R" }, { - CLSID = "{8_x_AGM_86C}" + CLSID = "{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}" }, { - CLSID = "{46ACDCF8-5451-4E26-BDDB-E78D5830E93C}" + CLSID = "{46ACDCF8-5451-4E26-BDDB-E78D5830E93C}", + obsolete = true } }, Number = 2, Order = 2, Type = 2, X = 0.576, Y = -2, - Z = 0 + Z = 0, + arg = 309, + arg_value = 0, + connector = "disable", + use_full_connector_position = true }, { Launchers = { { - CLSID = "{585D626E-7F42-4073-AB70-41E728C333E2}" + CLSID = "{585D626E-7F42-4073-AB70-41E728C333E2}", + DrawArgs = { { 18, 0 }, { 3, 0 } }, + arg_value = 0.1 }, { - CLSID = "{4CD2BB0F-5493-44EF-A927-9760350F7BA1}" + CLSID = "{4CD2BB0F-5493-44EF-A927-9760350F7BA1}", + DrawArgs = { { 18, 0.1 }, { 3, 0 } }, + arg_value = 0.1 }, { - CLSID = "{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}" + CLSID = "{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}", + DrawArgs = { { 18, 0.2 }, { 3, 0 } }, + arg_value = 0.1 }, { - CLSID = "{45447F82-01B5-4029-A572-9AAD28AF0275}" + CLSID = "{HSAB-6xAGM-84}", + DrawArgs = { { 18, 0.1 }, { 3, 0 } }, + arg_value = 0.1 }, { - CLSID = "{HSAB*9 GBU-31}" + CLSID = "{45447F82-01B5-4029-A572-9AAD28AF0275}", + arg_value = 0.2 } }, Number = 3, Order = 3, Type = 1, X = 6.012, Y = -1.136, - Z = 5.069 + Z = 5.514, + arg = 310, + arg_value = 0, + connector = "Pylon2", + use_full_connector_position = true } }, RCS = 100, - Rate = "100", + Rate = 100, SFM_Data = { aerodynamics = { - Cy0 = 0.2, + Cy0 = 0.55, Czbe = -0.012, Mzalfa = 6.6, Mzalfadt = 1, cx_brk = 0.06, cx_flap = 0.05, cx_gear = 0.015, - cy_flap = 1.2, + cy_flap = 0.9, kjx = 1.4, kjz = 0.00125, table_data = { { 0, 0.024, 0.1, 0.0426, 1e-06, 0.5, 20, 1.2 }, { 0.1, 0.024, 0.1, 0.0426, 1e-06, 1, 20, 1.2 }, { 0.2, 0.024, 0.1, 0.0426, 1e-06, 1.5, 20, 1.2 }, { 0.3, 0.024, 0.1, 0.0426, 1e-06, 2, 20, 1.2 }, { 0.4, 0.024, 0.1, 0.0426, 1e-06, 2.5, 20, 1.2 }, { 0.5, 0.024, 0.1, 0.0426, 1e-06, 3, 20, 1.2 }, { 0.6, 0.024, 0.1, 0.044, 1e-06, 3.5, 20, 1.2 }, { 0.7, 0.025, 0.1, 0.045, 0.02, 3.5, 20, 1 }, { 0.8, 0.029, 0.1, 0.049, 0.05, 3.5, 20, 0.9 }, { 0.9, 0.04, 0.1, 0.071, 0.07, 3.5, 20, 0.8 }, { 1, 0.06, 0.1, 0.138, 0.2, 3.5, 20, 0.76666666666667 }, { 1.5, 0.06, 0.1, 0.138, 0.2, 3.5, 20, 0.6 }, { 2, 0.06, 0.1, 0.138, 0.2, 3.5, 20, 0.6 } } @@ -258,81 +494,164 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { V_take_off = 65, Vy_max = 10.2, Waypoint_Custom_Panel = true, - WingSpan = "56.4", + WingSpan = 56.4, WorldID = 23, - _file = "Scripts/Database/planes\\B-52H.lua", - air_refuel_receptacle_pos = { 17.314, 1.838, 0 }, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", + air_refuel_receptacle_pos = { 16.76, 1.838, 0 }, attribute = { 1, 1, 4, "Redacted", "Strategic bombers", "Refuelable", "Datalink", "Link16", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes", "Battle airplanes", "Bombers" }, average_fuel_consumption = 0.193, bank_angle_max = 45, bigParkingRamp = true, + bomb_bay_movement = 2, brakeshute_name = 1, + chaff_flare_dispenser = { { + dir = { 0, -1, 0 }, + pos = { -2.007, -0.175, 12.194 } + }, { + dir = { 0, -1, 0 }, + pos = { -2.007, -0.175, -12.194 } + }, { + dir = { 0, -1, 0 }, + pos = { -18.574, 0.113, 1.573 } + }, { + dir = { 0, -1, 0 }, + pos = { -18.574, 0.113, -1.573 } + } }, country_of_origin = "USA", crew_members = { { - bailout_arg = -1, + bailout_arg = 118, drop_canopy_name = 12, + ejection_added_speed = { 0, 30, -0.3 }, ejection_seat_name = 18, - pos = { 18.827, 0.879, 0 }, + pos = { 18.4, 1.2, -0.5 }, role = "pilot", role_display_name = "Pilot in command" }, { - bailout_arg = -1, + bailout_arg = 118, drop_canopy_name = 0, + ejection_added_speed = { 0, 30, 0.3 }, ejection_seat_name = 18, - pos = { 18.827, 0.879, 0 }, + pilot_body_arg = 472, + pos = { 18.4, 1.2, 0.5 }, role = "copilot", role_display_name = "Copilot" }, { - bailout_arg = -1, + bailout_arg = 118, drop_canopy_name = 0, + ejection_added_speed = { 0, 30, -0.3 }, + ejection_rotation = { 0, 180, 0 }, ejection_seat_name = 18, - pos = { 18.827, 0.879, 0 }, + pilot_body_arg = 487, + pos = { 15, 1.2, -0.5 }, role = "flight_officer", - role_display_name = "Flight officer" + role_display_name = "EW officer" }, { - bailout_arg = -1, + bailout_arg = 118, drop_canopy_name = 0, + ejection_added_speed = { 0, -30, -0.3 }, ejection_seat_name = 18, - pos = { 18.827, 0.879, 0 }, + pilot_body_arg = 488, + pos = { 16.48, -0.879, -0.5 }, role = "flight_officer", - role_display_name = "Flight officer" + role_display_name = "Radar Navigator" + }, { + bailout_arg = 118, + drop_canopy_name = 0, + ejection_added_speed = { 0, -30, 0.3 }, + ejection_seat_name = 18, + pilot_body_arg = 489, + pos = { 16.48, -0.879, 0.5 }, + role = "flight_officer", + role_display_name = "Navigator" } }, detection_range_max = 0, - engines_count = 4, + effects_presets = { { + effect = "OVERWING_VAPOR", + file = "./CoreMods/tech/HeavyMetalCore/Effects/B_52H_overwingVapor.lua" + } }, + encyclopediaAnimation = { + args = { + [0] = 1, + [3] = 1, + [26] = 1, + [126] = 0.101, + [127] = 0.101, + [128] = 0.101, + [129] = 0.101 + } + }, + engines_count = 8, engines_nozzles = { { diameter = 1.523, elevation = 0, + engine_number = 1, + exhaust_length_ab = 11.794, + exhaust_length_ab_K = 0.76, + pos = { -1.82, -1.02, -19 }, + smokiness_level = 0.4 + }, { + diameter = 1.523, + elevation = 0, + engine_number = 1, + exhaust_length_ab = 11.794, + exhaust_length_ab_K = 0.76, + pos = { -1.82, -1.05, -17.66 }, + smokiness_level = 0.4 + }, { + diameter = 1.523, + elevation = 0, + engine_number = 2, + exhaust_length_ab = 11.794, + exhaust_length_ab_K = 0.76, + pos = { 4.05, -0.76, -11.12 }, + smokiness_level = 0.4 + }, { + diameter = 1.523, + elevation = 0, + engine_number = 2, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, - pos = { -2.179, -1.478, -18.182 }, + pos = { 4.05, -0.78, -9.73 }, smokiness_level = 0.4 }, { diameter = 1.523, elevation = 0, + engine_number = 3, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, - pos = { 3.992, -0.926, -10.405 }, + pos = { 4.05, -0.78, 9.73 }, smokiness_level = 0.4 }, { diameter = 1.523, elevation = 0, + engine_number = 3, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, - pos = { 3.992, -0.926, 10.405 }, + pos = { 4.05, -0.76, 11.12 }, smokiness_level = 0.4 }, { diameter = 1.523, elevation = 0, + engine_number = 4, exhaust_length_ab = 11.794, exhaust_length_ab_K = 0.76, - pos = { -2.179, -1.478, 18.182 }, + pos = { -1.82, -1.05, 17.66 }, + smokiness_level = 0.4 + }, { + diameter = 1.523, + elevation = 0, + engine_number = 4, + exhaust_length_ab = 11.794, + exhaust_length_ab_K = 0.76, + pos = { -1.82, -1.02, 19 }, smokiness_level = 0.4 } }, - fires_pos = { { -10.305, -2.064, 0 }, { 5.345, 1.584, 4.588 }, { 5.345, 1.584, -4.588 }, { -0.82, 0.265, 2.774 }, { -0.82, 0.265, -2.774 }, { -0.82, 0.255, 4.274 }, { -0.82, 0.255, -4.274 }, { 4.582, -0.755, 10.138 }, { 4.582, -0.755, -10.138 }, { -0.895, -1.158, 18.02 }, { -0.895, -1.158, -18.02 } }, + fires_pos = { { -10.305, -2.064, 0 }, { 5.345, 1.384, 3.288 }, { 5.345, 1.384, -3.288 }, { -0.82, 0.665, 12.1 }, { -0.82, 0.665, -12.1 }, { -5.2, -0.15, 19.16 }, { -5.2, -0.15, -19.16 }, { 4.08, -0.88, 10.4 }, { 4.08, -0.88, -10.4 }, { -1.8, -1.067, 18.31 }, { -1.8, -1.067, -18.31 } }, flaps_maneuver = 1, has_afteburner = false, has_differential_stabilizer = false, - has_speedbrake = false, + has_speedbrake = true, height = 12.4, length = 49.05, lights_data = { @@ -340,10 +659,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [2] = { lights = { { lights = { { - argument = 51, + angle_max = 0.69813170079773, + angle_min = 0.31415926535898, + argument = 208, + connector = "RESERV_SPOT_PTR_1", + dir_correction = { + azimuth = 0.13962634015955, + elevation = -0.38397243543875 + }, exposure = { { 0, 0.9, 1 } }, movable = true, - position = { 9.3, -2.832, 1.3 }, proto = <2>{ angle_change_rate = 0.05235987755983, angle_max = 0.20943951023932, @@ -352,185 +677,292 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { power_up_t = 3.22, range = 6480 }, + range = 4000, typename = "Spot" }, { + angle_max = 0.78539816339745, + angle_min = 0.20943951023932, + argument = 209, + connector = "RESERV_SPOT_PTR_2", + dir_correction = { + azimuth = -0.1221730476396, + elevation = -0.24434609527921 + }, exposure = { { 0, 0.9, 1 } }, movable = true, - position = { 9.8, -2.832, 1.3 }, - proto =
, - range = 8, - typename = "Omni" - }, { - exposure = { { 0, 0.9, 1 } }, - movable = true, - position = { 9.032, -2.032, -1.993 }, - power_up_t = 1.2, proto =
, + range = 2500, typename = "Spot" - }, { - exposure = { { 0, 0.9, 1 } }, - movable = true, - position = { 9.532, -2.032, -1.993 }, - power_up_t = 1.2, - proto =
, - range = 8, - typename = "Omni" - }, { + } }, + typename = "Collection" + } }, + typename = "collection" + }, + [3] = { + lights = { { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 190, + connector = "BANO_2", + dir_correction = { + azimuth = 0, + elevation = 0.78539816339745 + }, + movable = true, + proto = { + angle_max = 3.1415926535898, + color = { 1, 0.3, 0.1, 0.18 }, + range = 75 + }, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 191, + connector = "BANO_1", + dir_correction = { + azimuth = 0, + elevation = 0.78539816339745 + }, + movable = true, + proto = { + angle_max = 3.1415926535898, + color = { 0, 0.8, 0.6, 0.18 }, + range = 75 + }, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 192, + connector = "BANO_0_L", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + movable = true, + proto = <3>{ + angle_max = 3.1415926535898, + color = { 1, 1, 1, 0.155 }, + range = 30 + }, + range = 75, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 192, + connector = "BANO_0_R", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + movable = true, + proto =
, + range = 75, + typename = "Spot" + } }, + typename = "collection" + }, + [4] = { + lights = { { + argument = 210, + typename = "argumentlight" + } }, + typename = "collection" + }, + [6] = { + lights = { { + lights = { { + angle_max = 0.62831853071796, + angle_min = 0.36651914291881, + argument = 211, + connector = "MAIN_SPOT_PTR_1", + dir_correction = { + azimuth = 0, + elevation = 0.069813170079773 + }, exposure = { { 0, 0.9, 1 } }, movable = true, - position = { 11.518, -2.032, 1.993 }, - power_up_t = 1.4, - proto =
, + proto = <4>{ + angle_change_rate = 0.043633231299858, + angle_max = 0.17453292519943, + angle_min = 0.10471975511966, + color = { 255, 201, 125, 0.19370562748477 }, + power_up_t = 0.6, + range = 2400 + }, typename = "Spot" }, { + angle_max = 1.4311699866354, + angle_min = 0.75049157835756, + argument = 211, + connector = "MAIN_SPOT_PTR_2", + dir_correction = { + azimuth = 0, + elevation = 0 + }, exposure = { { 0, 0.9, 1 } }, movable = true, - position = { 12.018, -2.032, 1.993 }, - power_up_t = 1.4, - proto =
, - range = 8, - typename = "Omni" - }, { - exposure = { { 0, 0.9, 1 } }, - movable = true, - position = { -3.93, 0.327, -20.898 }, - proto =
, + proto =
, + range = 200, typename = "Spot" }, { + angle_max = 2.0943951023932, + angle_min = 1.3962634015955, + argument = 211, + connector = "MAIN_SPOT_PTR_3", + dir_correction = { + azimuth = 0, + elevation = 0 + }, exposure = { { 0, 0.9, 1 } }, movable = true, - position = { -3.43, 0.327, -20.898 }, - proto =
, - range = 8, - typename = "Omni" - }, { - exposure = { { 0, 0.9, 1 } }, - movable = true, - position = { -3.93, 0.327, 20.898 }, - power_up_t = 1.4, - proto =
, + proto =
, + range = 100, typename = "Spot" }, { + angle_max = 0.62831853071796, + angle_min = 0.36651914291881, + argument = 211, + connector = "MAIN_SPOT_PTR_4", + dir_correction = { + azimuth = 0, + elevation = 0.034906585039887 + }, exposure = { { 0, 0.9, 1 } }, movable = true, - position = { -3.43, 0.327, 20.898 }, - power_up_t = 1.4, - proto =
, - range = 8, - typename = "Omni" + proto =
, + typename = "Spot" } }, typename = "Collection" } }, typename = "collection" }, - [3] = { - argument = 49, - typename = "argumentlight" - }, - [6] = { + [7] = { lights = { { lights = { { - argument = 51, - position = { 9.3, -2.832, 1.3 }, - proto = <3>{ - angle_change_rate = -0.19198621771938, - angle_max = 0.7679448708775, - angle_min = 0.614355896702, - color = { 255, 201, 125, 0.27855844122716 }, - power_up_t = 2.42, - range = 960 - }, - typename = "Spot" - }, { - position = { 9.8, -2.832, 1.3 }, - proto =
, - range = 8, - typename = "Omni" - }, { - position = { 9.032, -2.032, -1.993 }, - power_up_t = 1.2, - proto =
, - typename = "Spot" - }, { - position = { 9.532, -2.032, -1.993 }, - power_up_t = 1.2, - proto =
, - range = 8, - typename = "Omni" - }, { - position = { 11.518, -2.032, 1.993 }, - power_up_t = 1.6, + angular_velocity = 4.1887902047864, + argument = -1, + connector = "RED_BEACON", + flood_light_argument = 200, proto = { - angle_change_rate = -0.19198621771938, - angle_max = 0.7679448708775, - angle_min = 0.614355896702, - color = { 255, 201, 125, 0.2137366596101 }, - power_up_t = 1.55, - range = 612 + angle_max = 0.78539816339745, + angle_min = 0.61086523819802, + angular_velocity = 6.2831853071796, + color = { 1, 0, 0, 0.19049409439665 }, + cups = 2, + range = 40 }, - typename = "Spot" - }, { - position = { 12.018, -2.032, 1.993 }, - power_up_t = 1.6, - proto =
, - range = 8, - typename = "Omni" - }, { - position = { -3.93, 0.327, -20.898 }, - proto =
, - typename = "Spot" - }, { - position = { -3.43, 0.327, -20.898 }, - proto =
, - range = 8, - typename = "Omni" - }, { - position = { -3.93, 0.327, 20.898 }, - power_up_t = 0.4, - proto =
, - typename = "Spot" - }, { - position = { -3.43, 0.327, 20.898 }, - power_up_t = 0.4, - proto =
, - range = 8, - typename = "Omni" + range = 0, + rotary_assembly_argument = 199, + typename = "RotatingBeacon" } }, typename = "Collection" } }, typename = "collection" + }, + [9] = { + lights = { { + argument = 69, + typename = "argumentlight" + } }, + typename = "collection" + }, + [10] = { + lights = { { + argument = 212, + typename = "argumentlight" + } }, + typename = "collection" } }, typename = "collection" }, - main_gear_pos = { -7.462, -3.451, 1.806 }, - main_gear_wheel_diameter = 0.972, + main_gear_amortizer_direct_stroke = 0, + main_gear_amortizer_normal_weight_stroke = -0.3577, + main_gear_amortizer_reversal_stroke = -0.477, + main_gear_pos = { -6.296, -3.849, 1.24 }, + main_gear_wheel_diameter = 1.39, mapclasskey = "P0091000027", mechanimations = { + BombBay = { { + Sequence = { { + C = { { "Arg", 26, "to", 1, "in", 2, "sign", 1 } } + } }, + Transition = { "Close", "Open" } + }, { + Sequence = { { + C = { { "Arg", 26, "to", 0, "in", 4.5, "sign", -1 } } + } }, + Transition = { "Open", "Close" } + } }, Door0 = { { - Flags = { "Reversible" }, Sequence = { { - C = { { "Arg", 38, "to", 0.9, "in", 9 } } + C = { { "Sleep", "for", 0 } } } }, Transition = { "Close", "Open" } }, { - Flags = { "Reversible", "StepsBackwards" }, Sequence = { { - C = { { "Arg", 38, "to", 0, "in", 6 } } + C = { { "Sleep", "for", 0 } } } }, Transition = { "Open", "Close" } }, { Sequence = { { - C = { { "JettisonCanopy", 0 } } + C = { { "Sleep", "for", 50 } } + }, { + C = { { "Arg", 38, "to", 1, "in", 3 } } + } }, + Transition = { "Open", "Board" } + }, { + Sequence = { { + C = { { "Arg", 38, "to", 0, "in", 6 } } + } }, + Transition = { "Board", "Open" } + }, { + Sequence = { { + C = { { "PosType", 9 }, { "Sleep", "for", 0.5 } } + }, { + C = { { "Arg", 118, "set", 1 } } } }, Transition = { "Any", "Bailout" } } }, Door1 = { DuplicateOf = "Door0" - } + }, + Door2 = { + DuplicateOf = "Door0" + }, + Door3 = { + DuplicateOf = "Door0" + }, + Door4 = { + DuplicateOf = "Door0" + }, + Door5 = { + DuplicateOf = "Door0" + }, + ServiceHatches = { { + Sequence = { { + C = { { "PosType", 3 }, { "Sleep", "for", 30 } } + }, { + C = { { "Arg", 24, "set", 1 } } + } }, + Transition = { "Close", "Open" } + }, { + Sequence = { { + C = { { "PosType", 6 }, { "Sleep", "for", 5 } } + }, { + C = { { "Arg", 24, "set", 0 } } + } }, + Transition = { "Open", "Close" } + } } }, - nose_gear_pos = { 8.442, -3.451, 0 }, - nose_gear_wheel_diameter = 0.754, + nose_gear_amortizer_direct_stroke = 0, + nose_gear_amortizer_normal_weight_stroke = -0.3577, + nose_gear_amortizer_reversal_stroke = -0.477, + nose_gear_pos = { 9.051, -3.849, 1.24 }, + nose_gear_wheel_diameter = 1.39, passivCounterm = { CMDS_Edit = false, SingleChargeTotal = 1317, @@ -555,7 +987,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { thrust_sum_ab = 61680, thrust_sum_max = 61680, type = "B-52H", + wheel_steering_angle_max = 0.95993108859688, wing_area = 371, wing_span = 56.4, - wing_tip_pos = { -13.5, -0.265, 28.2 } + wing_tip_pos = { -11, -2, 28.6 } } \ No newline at end of file diff --git a/_G/db/Units/Planes/Plane/Bf-109K-4.lua b/_G/db/Units/Planes/Plane/Bf-109K-4.lua index c44e1b45..6496667a 100644 --- a/_G/db/Units/Planes/Plane/Bf-109K-4.lua +++ b/_G/db/Units/Planes/Plane/Bf-109K-4.lua @@ -2877,7 +2877,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.077, nose_gear_amortizer_reversal_stroke = -0.114, - nose_gear_pos = { -5.219, -0.476, 0 }, + nose_gear_pos = { -5.219, -0.46, 0 }, nose_gear_wheel_diameter = 0.319, panelRadio = { { ID = "FuG16", diff --git a/_G/db/Units/Planes/Plane/C-130.lua b/_G/db/Units/Planes/Plane/C-130.lua index 5ec96a27..ba5cf035 100644 --- a/_G/db/Units/Planes/Plane/C-130.lua +++ b/_G/db/Units/Planes/Plane/C-130.lua @@ -55,68 +55,43 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [23] = { args = { 223 }, - critical_damage = 8, - deps_cells = { 25 } + critical_damage = 8 }, [24] = { args = { 213 }, - critical_damage = 8, - deps_cells = { 26 } - }, - [25] = { - args = { 226 }, - critical_damage = 3 - }, - [26] = { - args = { 216 }, - critical_damage = 3 + critical_damage = 8 }, [29] = { args = { 224 }, critical_damage = 9, - deps_cells = { 25, 23 } + deps_cells = { 23 } }, [30] = { args = { 214 }, critical_damage = 9, - deps_cells = { 26, 24 } + deps_cells = { 24 } }, [35] = { args = { 225 }, critical_damage = 20, - deps_cells = { 29, 25, 23, 12, 18 } + deps_cells = { 29, 23, 12, 18 } }, [36] = { args = { 215 }, critical_damage = 20, - deps_cells = { 30, 26, 24, 11, 17 } + deps_cells = { 30, 24, 11, 17 } }, [43] = { args = { 142 }, - critical_damage = 9, - deps_cells = { 53 } + critical_damage = 9 }, [47] = { args = { 236 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 234 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 240 }, - critical_damage = 3 - }, - [52] = { - args = { 237 }, - critical_damage = 3 - }, - [53] = { - args = { 248 }, - critical_damage = 3 + critical_damage = 5 }, [55] = { args = { 159 }, @@ -130,10 +105,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 140 }, critical_damage = 5 }, - [61] = { - args = { 151 }, - critical_damage = 6 - }, [82] = { args = { 153 }, critical_damage = 5 @@ -163,6 +134,20 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { far_wall_pos = { 6.1, -1.35, 0 }, maximalCapacity = 21770, nominalCapacity = 19350, + out_door = { + rampa_left = { + heading = 2.7925268031909, + large = false, + x = -11, + z = -1 + }, + rampa_right = { + heading = -2.7925268031909, + large = false, + x = -11, + z = 1 + } + }, para_unit_point = 64, unit_block = { 0.76, 0.775 }, unit_point = 92 @@ -550,15 +535,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Open", "Close" } } } }, - mechconnectors = { - Door11 = { { - shift_orient = { 0, 160, 0 }, - shift_pos = { -11, -0.5, -1 } - }, { - shift_orient = { 0, -160, 0 }, - shift_pos = { -11, -0.5, 1 } - } } - }, nose_gear_pos = { 8.133, -2.5, 0 }, nose_gear_wheel_diameter = 0.754, openRamp = 1, diff --git a/_G/db/Units/Planes/Plane/C-17A.lua b/_G/db/Units/Planes/Plane/C-17A.lua index f7f8ce98..cfc47744 100644 --- a/_G/db/Units/Planes/Plane/C-17A.lua +++ b/_G/db/Units/Planes/Plane/C-17A.lua @@ -13,8 +13,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 65 }, critical_damage = 10 }, - [8] = { - critical_damage = 10 + [10] = { + critical_damage = 20 }, [11] = { critical_damage = 3 @@ -22,80 +22,39 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [12] = { critical_damage = 3 }, - [15] = { - critical_damage = 10 - }, - [16] = { - critical_damage = 10 - }, [17] = { critical_damage = 3 }, [18] = { critical_damage = 3 }, - [25] = { - args = { 53 }, - critical_damage = 5 - }, - [26] = { - args = { 54 }, - critical_damage = 5 - }, [35] = { args = { 67 }, critical_damage = 20, - deps_cells = { 25, 37, 11, 17 } + deps_cells = { 11, 17 } }, [36] = { args = { 68 }, critical_damage = 20, - deps_cells = { 26, 38, 12, 18 } - }, - [37] = { - args = { 55 }, - critical_damage = 4 - }, - [38] = { - args = { 56 }, - critical_damage = 4 + deps_cells = { 12, 18 } }, [43] = { args = { 61 }, critical_damage = 10, - deps_cells = { 53, 47, 48, 51, 52 } - }, - [44] = { - args = { 62 }, - critical_damage = 4, - deps_cells = { 54 } + deps_cells = { 53, 47, 48 } }, [47] = { args = { 63 }, - critical_damage = 5, - deps_cells = { 51 } + critical_damage = 5 }, [48] = { args = { 64 }, - critical_damage = 5, - deps_cells = { 52 } - }, - [51] = { - args = { 59 }, - critical_damage = 2 - }, - [52] = { - args = { 60 }, - critical_damage = 2 + critical_damage = 5 }, [53] = { args = { 57 }, critical_damage = 2 }, - [54] = { - args = { 58 }, - critical_damage = 2 - }, [55] = { args = { 81 }, critical_damage = 15 @@ -124,6 +83,20 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { area = { 15, 5.28, 3.96 }, maximalCapacity = 77500, nominalCapacity = 56245, + out_door = { + rampa_left = { + heading = 2.7925268031909, + large = false, + x = -12, + z = -1.5 + }, + rampa_right = { + heading = -2.7925268031909, + large = false, + x = -12, + z = 1.5 + } + }, para_unit_point = 102, unit_block = { 0.59, 1.32 }, unit_point = 102 diff --git a/_G/db/Units/Planes/Plane/C-47.lua b/_G/db/Units/Planes/Plane/C-47.lua index 26ab8647..83be123c 100644 --- a/_G/db/Units/Planes/Plane/C-47.lua +++ b/_G/db/Units/Planes/Plane/C-47.lua @@ -1061,7 +1061,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { IR_emission_coeff_ab = 0, InheriteCommonCallnames = true, InternalCargo = { - area = { 12, 2.1, 1.8 }, + area = { 9.3, 1.5, 1.8 }, + far_wall_pos = { 4, -0.6, 0 }, maximalCapacity = 2300, nominalCapacity = 2000, para_unit_point = 28, diff --git a/_G/db/Units/Planes/Plane/Christen Eagle II.lua b/_G/db/Units/Planes/Plane/Christen Eagle II.lua index 2a9f05ec..aa293082 100644 --- a/_G/db/Units/Planes/Plane/Christen Eagle II.lua +++ b/_G/db/Units/Planes/Plane/Christen Eagle II.lua @@ -431,6 +431,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { k_piston = 3000, k_reg = 0.003, k_vel = 0.017, + prop_blades_count = 2, + prop_locations = { { 1.56, -0.03, 0 } }, table_data = { { 0, 2500 }, { 0.03, 2450 }, { 0.06, 2400 }, { 0.09, 2350 }, { 0.12, 2300 }, { 0.15, 2250 }, { 0.18, 2200 }, { 0.21, 2150 }, { 0.24, 2100 }, { 0.27, 2050 }, { 0.3, 2000 }, { 0.4, 1840 } }, typeng = 2 } @@ -495,6 +497,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role_display_name = "Pilot" } }, date_of_introduction = 1977, + debrisGeneration = true, defFuelRatio = 0.5493, detection_range_max = 0, engines_count = 1, @@ -685,6 +688,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { min = 220 } } } }, + propellorShapeName = "CE2_Blade.FBX", + propellorShapeType = "3ARG_PROC_BLUR", radar_can_see_ground = false, range = 690, shape_table_data = { { diff --git a/_G/db/Units/Planes/Plane/E-2C.lua b/_G/db/Units/Planes/Plane/E-2C.lua index f37950d6..8d37287b 100644 --- a/_G/db/Units/Planes/Plane/E-2C.lua +++ b/_G/db/Units/Planes/Plane/E-2C.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.14, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 0, CAS_min = 43, CanopyGeometry = { -0.34202014332567, -0.4924038765061, -0.64278760968654, 0.11161889704895, 0.86602540378444 }, @@ -53,6 +82,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 266 }, critical_damage = 6 }, + [17] = { + critical_damage = 6 + }, + [18] = { + critical_damage = 6 + }, [23] = { args = { 223 }, critical_damage = 6, @@ -117,6 +152,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 6, deps_cells = { 54 } }, + [43] = { + critical_damage = 6 + }, + [44] = { + critical_damage = 6 + }, [47] = { args = { 236 }, critical_damage = 12, @@ -143,11 +184,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 247 }, critical_damage = 6 }, - [55] = { - args = { 159 }, - critical_damage = 50, - deps_cells = { 56, 57, 58, 47, 51, 39, 53, 48, 52, 40, 54 } - }, [56] = { args = { 158 }, critical_damage = 50, @@ -174,6 +210,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [82] = { args = { 152 }, critical_damage = 6 + }, + [98] = { + critical_damage = 3 } }, DamageParts = { "E-2C-OBLOMOK-WING-R", "E-2C-OBLOMOK-WING-L" }, diff --git a/_G/db/Units/Planes/Plane/E-3A.lua b/_G/db/Units/Planes/Plane/E-3A.lua index 9f5d3824..f0cc68f8 100644 --- a/_G/db/Units/Planes/Plane/E-3A.lua +++ b/_G/db/Units/Planes/Plane/E-3A.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.14, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 0, CAS_min = 54, CanopyGeometry = { -0.17364817766693, -0.40821789367673, -0.64278760968654, 0.11161889704895, 0.86602540378444 }, diff --git a/_G/db/Units/Planes/Plane/F-117A.lua b/_G/db/Units/Planes/Plane/F-117A.lua index eeb920c0..03d7db2d 100644 --- a/_G/db/Units/Planes/Plane/F-117A.lua +++ b/_G/db/Units/Planes/Plane/F-117A.lua @@ -396,7 +396,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { -0.942, -2.009, 2.449 }, + main_gear_pos = { -0.942, -1.98, 2.449 }, main_gear_wheel_diameter = 0.972, mapclasskey = "P0091000027", mechanimations = { @@ -422,7 +422,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { DuplicateOf = "Door0" } }, - nose_gear_pos = { 4.913, -2.009, 0 }, + nose_gear_pos = { 4.913, -1.99, 0 }, nose_gear_wheel_diameter = 0.754, radar_can_see_ground = false, range = 2000, diff --git a/_G/db/Units/Planes/Plane/F-14A.lua b/_G/db/Units/Planes/Plane/F-14A.lua index a3a9e14c..c35b3e77 100644 --- a/_G/db/Units/Planes/Plane/F-14A.lua +++ b/_G/db/Units/Planes/Plane/F-14A.lua @@ -1086,7 +1086,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Stage", "Extend" } } } }, - nose_gear_pos = { 6.454, -1.817, 0 }, + nose_gear_pos = { 6.454, -1.78, 0 }, nose_gear_wheel_diameter = 0.754, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/F-15C.lua b/_G/db/Units/Planes/Plane/F-15C.lua index 4942a2cf..6d748f27 100644 --- a/_G/db/Units/Planes/Plane/F-15C.lua +++ b/_G/db/Units/Planes/Plane/F-15C.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.16, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 244.4, CAS_min = 58, CanopyGeometry = { -0.17364817766693, -0.55667039922642, -0.93969262078591, -0.51342418176678, -0.087155742747658 }, @@ -181,6 +210,18 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [82] = { args = { 152 }, critical_damage = 2 + }, + [83] = { + args = { 134 }, + critical_damage = 2 + }, + [84] = { + args = { 136 }, + critical_damage = 2 + }, + [85] = { + args = { 135 }, + critical_damage = 2 } }, DamageParts = { "F-15-OBLOMOK-WING-R", "F-15-OBLOMOK-WING-L" }, @@ -317,8 +358,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "M_61", supply = { count = 940, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 }, { 3 }, { 4, 5 }, { 6 }, { 7, 8 } }, shells = { { AP_cap_caliber = 20, diff --git a/_G/db/Units/Planes/Plane/F-15E.lua b/_G/db/Units/Planes/Plane/F-15E.lua index 3702b604..41e72dd1 100644 --- a/_G/db/Units/Planes/Plane/F-15E.lua +++ b/_G/db/Units/Planes/Plane/F-15E.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.16, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 244.4, CAS_min = 58, CanopyGeometry = { -0.17364817766693, -0.55667039922642, -0.93969262078591, -0.51342418176678, -0.087155742747658 }, @@ -228,8 +257,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "M_61", supply = { count = 940, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 }, { 3 }, { 4, 5 }, { 6 }, { 7, 8 } }, shells = { { AP_cap_caliber = 20, diff --git a/_G/db/Units/Planes/Plane/F-16A MLU.lua b/_G/db/Units/Planes/Plane/F-16A MLU.lua index 4c4a9834..353fb8dc 100644 --- a/_G/db/Units/Planes/Plane/F-16A MLU.lua +++ b/_G/db/Units/Planes/Plane/F-16A MLU.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.16, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 132.86, CAS_min = 60, CanopyGeometry = { -0.34202014332567, -0.64085638205579, -0.93969262078591, -0.51342418176678, -0.087155742747658 }, @@ -149,8 +178,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "M_61", supply = { count = 511, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 }, { 3 }, { 4, 5 }, { 6 }, { 7, 8 } }, shells = { { AP_cap_caliber = 20, diff --git a/_G/db/Units/Planes/Plane/F-16C bl.50.lua b/_G/db/Units/Planes/Plane/F-16C bl.50.lua index cd66a67f..bab669cb 100644 --- a/_G/db/Units/Planes/Plane/F-16C bl.50.lua +++ b/_G/db/Units/Planes/Plane/F-16C bl.50.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.16, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 132.86, CAS_min = 60, CanopyGeometry = { -0.34202014332567, -0.64085638205579, -0.93969262078591, -0.51342418176678, -0.087155742747658 }, @@ -149,8 +178,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "M_61", supply = { count = 511, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 }, { 3 }, { 4, 5 }, { 6 }, { 7, 8 } }, shells = { { AP_cap_caliber = 20, diff --git a/_G/db/Units/Planes/Plane/F-16C bl.52d.lua b/_G/db/Units/Planes/Plane/F-16C bl.52d.lua index 2f71ec10..24e87a98 100644 --- a/_G/db/Units/Planes/Plane/F-16C bl.52d.lua +++ b/_G/db/Units/Planes/Plane/F-16C bl.52d.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.16, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 132.86, CAS_min = 60, CanopyGeometry = { -0.34202014332567, -0.64085638205579, -0.93969262078591, -0.51342418176678, -0.087155742747658 }, @@ -149,8 +178,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "M_61", supply = { count = 511, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 }, { 3 }, { 4, 5 }, { 6 }, { 7, 8 } }, shells = { { AP_cap_caliber = 20, diff --git a/_G/db/Units/Planes/Plane/F-16C_50.lua b/_G/db/Units/Planes/Plane/F-16C_50.lua index f717231d..4843a7ac 100644 --- a/_G/db/Units/Planes/Plane/F-16C_50.lua +++ b/_G/db/Units/Planes/Plane/F-16C_50.lua @@ -58,6 +58,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = 2 } }, wCtrl = 150 + }, { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false } }, AmmoWeight = 132.6, CAS_min = 60, @@ -218,6 +246,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [85] = { args = { 136 }, critical_damage = 3 + }, + [98] = { + critical_damage = 2 } }, DamageParts = { "f-16c_bl50_oblomok_wing_R", "f-16c_bl50_oblomok_wing_L" }, @@ -269,8 +300,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "M_61", supply = { count = 510, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 }, { 3 }, { 4, 5 }, { 6 }, { 7, 8 } }, shells = { { AP_cap_caliber = 20, @@ -1255,70 +1286,78 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Cx_gain_empty = 0.389, Cx_gain_item = 3.45 }, <47>{ + CLSID = "{TER_9A_3*BDU-50LD}", + Cx_gain_empty = 0.682, + Cx_gain_item = 2.5 + }, <48>{ + CLSID = "{TER_9A_3*BDU-50HD}", + Cx_gain_empty = 0.517, + Cx_gain_item = 2.143 + }, <49>{ CLSID = "{444BA8AE-82A7-4345-842E-76154EFCCA46}", Cx_gain_item = 0.41 - }, <48>{ + }, <50>{ CLSID = "LAU_117_AGM_65G", Cx_gain_item = 0.41 - }, <49>{ + }, <51>{ CLSID = "LAU_117_AGM_65H", Cx_gain_item = 0.41 - }, <50>{ + }, <52>{ CLSID = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}", Cx_gain_item = 0.41 - }, <51>{ + }, <53>{ CLSID = "LAU_88_AGM_65D_ONE", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 - }, <52>{ + }, <54>{ CLSID = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 - }, <53>{ + }, <55>{ CLSID = "LAU_88_AGM_65H", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 - }, <54>{ + }, <56>{ CLSID = "LAU_88_AGM_65H_3", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 - }, <55>{ + }, <57>{ CLSID = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", Cx_gain_item = 0.4 - }, <56>{ + }, <58>{ CLSID = "{GBU-31}", Cx_gain = 0.17 - }, <57>{ + }, <59>{ CLSID = "{GBU-31V3B}", Cx_gain = 0.265 - }, <58>{ + }, <60>{ CLSID = "{GBU-38}", Cx_gain = 0.473 - }, <59>{ + }, <61>{ CLSID = "{BRU57_2*GBU-38}", Cx_gain_empty = 0.572 - }, <60>{ + }, <62>{ CLSID = "{AGM-154A}", Cx_gain = 0.486, Type = 1 - }, <61>{ + }, <63>{ CLSID = "{BRU57_2*AGM-154A}", Cx_gain_empty = 0.445, Cx_gain_item = 0.6657, Type = 1 - }, <62>{ + }, <64>{ CLSID = "MXU-648-TP" - }, <63>{ + }, <65>{ CLSID = "ALQ_184", Cx_gain = 1.281 - }, <64>{ + }, <66>{ CLSID = "ALQ_184_Long", Cx_gain = 1.281, DrawArgs = { { 57, 1 } } - }, <65>{ + }, <67>{ CLSID = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}", Cx_gain = 0.955 - }, <66>{ + }, <68>{ CLSID = "", add_mass = -131.1, arg_value = 1 @@ -1354,6 +1393,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "LAU_88_AGM_65H_2_L", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 + }, { + CLSID = "{TER_9A_2L*BDU-50LGB}", + Cx_gain_empty = 0.526, + Cx_gain_item = 2.143 } }, Number = 3, Order = 3, @@ -1367,152 +1410,164 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { mass = 131.1, use_full_connector_position = true }, { - Launchers = { <67>{ + Launchers = { <69>{ CLSID = "LAU3_WP156", Cx_gain_empty = 0.478, add_mass = 131.1, arg_value = 0.5 - }, <68>{ + }, <70>{ CLSID = "LAU3_WP1B", Cx_gain_empty = 0.478, add_mass = 131.1, arg_value = 0.5 - }, <69>{ + }, <71>{ CLSID = "LAU3_WP61", Cx_gain_empty = 0.478, add_mass = 131.1, arg_value = 0.5 - }, <70>{ + }, <72>{ CLSID = "LAU3_HE5", Cx_gain_empty = 0.478, add_mass = 131.1, arg_value = 0.5 - }, <71>{ + }, <73>{ CLSID = "LAU3_HE151", Cx_gain_empty = 0.478, add_mass = 131.1, arg_value = 0.5 - }, <72>{ + }, <74>{ CLSID = "{BDU-50LD}", Cx_gain = 1.388, add_mass = 131.1, arg_value = 0.5 - }, <73>{ + }, <75>{ CLSID = "{BDU-50LGB}", Cx_gain = 1.667, add_mass = 131.1, arg_value = 0.5 - }, <74>{ + }, <76>{ CLSID = "{BDU-50HD}", Cx_gain = 1.668, add_mass = 131.1, arg_value = 0.5 - }, <75>{ + }, <77>{ CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", Cx_gain = 1.563, add_mass = 131.1, arg_value = 0.5 - }, <76>{ + }, <78>{ CLSID = "{Mk82SNAKEYE}", Cx_gain = 1.882, add_mass = 131.1, arg_value = 0.5 - }, <77>{ + }, <79>{ CLSID = "{Mk82AIR}", Cx_gain = 1.882, add_mass = 131.1, arg_value = 0.5 - }, <78>{ + }, <80>{ CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", Cx_gain = 1.26, add_mass = 131.1, arg_value = 0.5 - }, <79>{ + }, <81>{ CLSID = "{Mk_84AIR_GP}", Cx_gain = 1.4, add_mass = 131.1, arg_value = 0.5 - }, <80>{ + }, <82>{ CLSID = "{Mk_84AIR_TP}", Cx_gain = 1.4, add_mass = 131.1, arg_value = 0.5 - }, <81>{ + }, <83>{ CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", Cx_gain = 1.673, add_mass = 131.1, arg_value = 0.5 - }, <82>{ + }, <84>{ CLSID = "{DB769D48-67D7-42ED-A2BE-108D566C8B1E}", Cx_gain = 0.959, add_mass = 131.1, arg_value = 0.5 - }, <83>{ + }, <85>{ CLSID = "{34759BBC-AF1E-4AEE-A581-498FF7A6EBCE}", Cx_gain = 3.04, add_mass = 131.1, arg_value = 0.5 - }, <84>{ + }, <86>{ CLSID = "{CBU-87}", Cx_gain = 3.398, add_mass = 131.1, arg_value = 0.5 - }, <85>{ + }, <87>{ CLSID = "{5335D97A-35A5-4643-9D9B-026C75961E52}", Cx_gain = 3.398, add_mass = 131.1, arg_value = 0.5 - }, <86>{ + }, <88>{ CLSID = "{TER_9A_3*MK-82}", Cx_gain_empty = 0.625, Cx_gain_item = 2.813, add_mass = 131.1, arg_value = 0.5 - }, <87>{ + }, <89>{ CLSID = "{TER_9A_3*MK-82_Snakeye}", Cx_gain_empty = 0.478, Cx_gain_item = 2.957, add_mass = 131.1, arg_value = 0.5 - }, <88>{ + }, <90>{ CLSID = "{TER_9A_3*MK-82AIR}", Cx_gain_empty = 0.478, Cx_gain_item = 2.957, add_mass = 131.1, arg_value = 0.5 - }, <89>{ + }, <91>{ CLSID = "{TER_9A_3*BDU-33}", Cx_gain_empty = 0.389, Cx_gain_item = 3.45, add_mass = 131.1, arg_value = 0.5 - }, <90>{ + }, <92>{ CLSID = "{TER_9A_3*CBU-87}", Cx_gain_empty = 0.156, Cx_gain_item = 4.152, add_mass = 131.1, arg_value = 0.5 - }, <91>{ + }, <93>{ CLSID = "{TER_9A_3*CBU-97}", Cx_gain_empty = 0.156, Cx_gain_item = 4.152, add_mass = 131.1, arg_value = 0.5 - }, <92>{ + }, <94>{ + CLSID = "{TER_9A_3*BDU-50LD}", + Cx_gain_empty = 0.682, + Cx_gain_item = 2.5, + add_mass = 131.1, + arg_value = 0.5 + }, <95>{ + CLSID = "{TER_9A_3*BDU-50HD}", + Cx_gain_empty = 0.517, + Cx_gain_item = 2.143, + add_mass = 131.1, + arg_value = 0.5 + }, <96>{ CLSID = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C93}", Cx_gain_item = 0.4, add_mass = 131.1, arg_value = 0.5 - }, <93>{ + }, <97>{ CLSID = "{F376DBEE-4CAE-41BA-ADD9-B2910AC95DEC}", DrawArgs = { { 57, 1 } }, add_mass = 133.8, arg_value = 0.3 - }, <94>{ + }, <98>{ CLSID = "MXU-648-TP", add_mass = 131.1, arg_value = 0.5 - }, <95>{ + }, <99>{ CLSID = "", arg_value = 1 }, { @@ -1545,6 +1600,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Cx_gain_item = 4.152, add_mass = 131.1, arg_value = 0.5 + }, { + CLSID = "{TER_9A_2L*BDU-50LGB}", + Cx_gain_empty = 0.526, + Cx_gain_item = 2.143, + add_mass = 131.1, + arg_value = 0.5 } }, Number = 4, Order = 4, @@ -1593,7 +1654,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { DisplayName = "6", - Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { CLSID = "{TER_9A_2R*MK-82}", Cx_gain_empty = 0.714, Cx_gain_item = 2.813, @@ -1623,6 +1684,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Cx_gain_item = 4.152, add_mass = 131.1, arg_value = 0.5 + }, { + CLSID = "{TER_9A_2R*BDU-50LGB}", + Cx_gain_empty = 0.526, + Cx_gain_item = 2.143, + add_mass = 131.1, + arg_value = 0.5 } }, Number = 6, Order = 8, @@ -1636,7 +1703,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { DisplayName = "7", - Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { + Launchers = {
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
, { CLSID = "{TER_9A_2R*MK-82}", Cx_gain_empty = 0.714, Cx_gain_item = 2.813 @@ -1668,6 +1735,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "LAU_88_AGM_65H_2_R", Cx_gain_empty = 0.371, Cx_gain_item = 0.665 + }, { + CLSID = "{TER_9A_2R*BDU-50LGB}", + Cx_gain_empty = 0.526, + Cx_gain_item = 2.143 } }, Number = 7, Order = 9, @@ -2021,6 +2092,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir = { 0, -1, 0 }, pos = { -4.73, -0.5, 0.93 } } }, + connectDatalinks = { "Link16" }, country_of_origin = "USA", crew_members = { { canopy_pos = { 0, 0, 0 }, @@ -2030,6 +2102,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role = "pilot", role_display_name = "Pilot" } }, + datalinks = { + Link16 = "CoreMods\\aircraft\\F-16C\\Datalinks\\Link16.lua" + }, detection_range_max = 160, effects_presets = { { effect = "OVERWING_VAPOR", @@ -2075,7 +2150,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 241, 0.245, 0.255, 1, 0 } }, mode = "1 Flash", period = 0.5, - proto = <96>{ + proto = <100>{ angle_max = 3.1415926535898, angle_min = 0.5235987755983, color = { 0.92, 0.92, 1, 0.20784609690827 }, @@ -2097,7 +2172,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { exposure = { { 241, 0.245, 0.255, 1, 0 } }, mode = "1 Flash", period = 0.5, - proto =
, + proto =
, range = 64, typename = "Spot" } }, diff --git a/_G/db/Units/Planes/Plane/F-5E-3.lua b/_G/db/Units/Planes/Plane/F-5E-3.lua index 11a71063..f75e5204 100644 --- a/_G/db/Units/Planes/Plane/F-5E-3.lua +++ b/_G/db/Units/Planes/Plane/F-5E-3.lua @@ -288,22 +288,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [29] = { args = { 224 }, critical_damage = 4, - deps_cells = { 23, 25, 27, 146 } + deps_cells = { 23, 25, 27, 147 } }, [30] = { args = { 214 }, critical_damage = 4, - deps_cells = { 24, 26, 28, 150 } + deps_cells = { 24, 26, 28, 151 } }, [35] = { args = { 225 }, critical_damage = 5, - deps_cells = { 29, 37, 147 } + deps_cells = { 29, 37, 148 } }, [36] = { args = { 215 }, critical_damage = 5, - deps_cells = { 30, 38, 149 } + deps_cells = { 30, 38, 150 } }, [37] = { args = { 227 }, @@ -317,6 +317,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 242 }, critical_damage = 4 }, + [43] = { + args = { 242 }, + critical_damage = 4, + deps_cells = { 39 } + }, [47] = { args = { 240 }, critical_damage = 2 @@ -365,43 +370,43 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [137] = { - args = { 158 }, - critical_damage = 3 + critical_damage = 2 }, [138] = { - args = { 157 }, + args = { 158 }, critical_damage = 3 }, [139] = { - args = { 267 }, + args = { 157 }, critical_damage = 3 }, [140] = { - args = { 169 }, + args = { 267 }, critical_damage = 3 }, [141] = { - args = { 163 }, + args = { 169 }, critical_damage = 3 }, [142] = { - args = { 168 }, + args = { 163 }, critical_damage = 3 }, [143] = { - args = { 162 }, + args = { 168 }, critical_damage = 3 }, [144] = { - args = { 166 }, + args = { 162 }, critical_damage = 3 }, [145] = { - args = { 160 }, + args = { 166 }, critical_damage = 3 }, [146] = { - critical_damage = 2 + args = { 160 }, + critical_damage = 3 }, [147] = { critical_damage = 2 @@ -416,12 +421,16 @@ _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, @@ -430,34 +439,35 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { 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_BOTTOM_LEFT = 138, + FUSELAGE_BOTTOM_RIGHT = 139, 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, + 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, 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, + PYLON_02 = 147, + PYLON_03 = 148, + PYLON_04 = 149, + PYLON_05 = 150, + PYLON_06 = 151, RUDDER = 53, - R_GEAR_BOX = 151, + R_GEAR_BOX = 152, STABILIZER_L_IN = 47, STABILIZER_R_IN = 48, TAIL = 55, diff --git a/_G/db/Units/Planes/Plane/F-5E.lua b/_G/db/Units/Planes/Plane/F-5E.lua index 6220d367..1d5194cc 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, 146 } + deps_cells = { 23, 25, 27, 147 } }, [30] = { args = { 214 }, critical_damage = 4, - deps_cells = { 24, 26, 28, 150 } + deps_cells = { 24, 26, 28, 151 } }, [35] = { args = { 225 }, critical_damage = 5, - deps_cells = { 29, 37, 147 } + deps_cells = { 29, 37, 148 } }, [36] = { args = { 215 }, critical_damage = 5, - deps_cells = { 30, 38, 149 } + deps_cells = { 30, 38, 150 } }, [37] = { args = { 227 }, @@ -111,6 +111,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 242 }, critical_damage = 4 }, + [43] = { + args = { 242 }, + critical_damage = 4, + deps_cells = { 39 } + }, [47] = { args = { 240 }, critical_damage = 2 @@ -159,43 +164,43 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 2 }, [137] = { - args = { 158 }, - critical_damage = 3 + critical_damage = 2 }, [138] = { - args = { 157 }, + args = { 158 }, critical_damage = 3 }, [139] = { - args = { 267 }, + args = { 157 }, critical_damage = 3 }, [140] = { - args = { 169 }, + args = { 267 }, critical_damage = 3 }, [141] = { - args = { 163 }, + args = { 169 }, critical_damage = 3 }, [142] = { - args = { 168 }, + args = { 163 }, critical_damage = 3 }, [143] = { - args = { 162 }, + args = { 168 }, critical_damage = 3 }, [144] = { - args = { 166 }, + args = { 162 }, critical_damage = 3 }, [145] = { - args = { 160 }, + args = { 166 }, critical_damage = 3 }, [146] = { - critical_damage = 2 + args = { 160 }, + critical_damage = 3 }, [147] = { critical_damage = 2 @@ -210,12 +215,16 @@ _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, @@ -224,34 +233,35 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { 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_BOTTOM_LEFT = 138, + FUSELAGE_BOTTOM_RIGHT = 139, 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, + 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, 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, + PYLON_02 = 147, + PYLON_03 = 148, + PYLON_04 = 149, + PYLON_05 = 150, + PYLON_06 = 151, RUDDER = 53, - R_GEAR_BOX = 151, + R_GEAR_BOX = 152, STABILIZER_L_IN = 47, STABILIZER_R_IN = 48, TAIL = 55, diff --git a/_G/db/Units/Planes/Plane/F-86F Sabre.lua b/_G/db/Units/Planes/Plane/F-86F Sabre.lua index 7ac205bc..fdff9032 100644 --- a/_G/db/Units/Planes/Plane/F-86F Sabre.lua +++ b/_G/db/Units/Planes/Plane/F-86F Sabre.lua @@ -17,6 +17,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 65, 147 }, critical_damage = 1 }, + [0] = { + args = { 146 }, + critical_damage = 3 + }, [9] = { args = { 154 }, critical_damage = 3 @@ -25,6 +29,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 153 }, critical_damage = 3 }, + [11] = { + args = { 167 }, + critical_damage = 3 + }, [19] = { args = { 185 }, critical_damage = 1 @@ -64,12 +72,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [35] = { args = { 225 }, critical_damage = 7, - deps_cells = { 29, 23, 25, 37, 86 } + deps_cells = { 29, 23, 25, 37 } }, [36] = { args = { 215 }, critical_damage = 7, - deps_cells = { 30, 24, 26, 38, 87 } + deps_cells = { 30, 24, 26, 38 } }, [37] = { args = { 227 }, @@ -155,13 +163,73 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 152 }, critical_damage = 3 }, - [86] = { - args = { 308, 309, 310, 311 }, - critical_damage = 2 + [83] = { + args = { 134 }, + critical_damage = 3 }, - [87] = { - args = { 312, 313, 314, 315 }, - critical_damage = 2 + [84] = { + args = { 136 }, + critical_damage = 3 + }, + [85] = { + args = { 135 }, + critical_damage = 3 + }, + [137] = { + args = { 265, 134 }, + critical_damage = 1 + }, + [138] = { + args = { 267, 136 }, + critical_damage = 1 + }, + [139] = { + args = { 266, 135 }, + critical_damage = 1 + }, + cell_indices = { + AILERON_L = 25, + AILERON_R = 26, + AIR_BRAKE_L = 19, + AIR_BRAKE_R = 20, + COCKPIT = 3, + ELEVATOR_L_IN = 51, + ELEVATOR_L_OUT = 49, + ELEVATOR_R_IN = 52, + ELEVATOR_R_OUT = 50, + ENGINE = 11, + FIN_L_BOTTOM = 43, + FIN_L_CENTER = 41, + FIN_L_TOP = 39, + FLAP_L = 37, + FLAP_R = 38, + FUSELAGE_BOTTOM = 82, + FUSELAGE_LEFT_SIDE = 9, + FUSELAGE_RIGHT_SIDE = 10, + GEAR_DOOR_F = 137, + GEAR_DOOR_L = 138, + GEAR_DOOR_R = 139, + NOSE_BOTTOM = 59, + NOSE_CENTER = 0, + NOSE_LEFT_SIDE = 1, + NOSE_RIGHT_SIDE = 2, + RUDDER = 53, + STABILIZER_L_IN = 47, + STABILIZER_L_OUT = 45, + STABILIZER_R_IN = 48, + STABILIZER_R_OUT = 46, + TAIL_BOTTOM = 58, + 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_R_CENTER = 30, + WING_R_IN = 36, + WING_R_OUT = 24 } }, DamageParts = { "F-86F-oblomok-wing-R", "F-86F-oblomok-wing-L", @@ -173,7 +241,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { WorldID = 11 }, DisplayName = "F-86F", - EmptyWeight = 5046, + EmptyWeight = 5355.8, Failures = { { enable = false, hh = 0, @@ -755,7 +823,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, IR_emission_coeff = 0.25, IR_emission_coeff_ab = 0.25, - M_empty = 5046, + M_empty = 5355.8, M_fuel_max = 1282, M_max = 9349, M_nominal = 7113, diff --git a/_G/db/Units/Planes/Plane/FA-18A.lua b/_G/db/Units/Planes/Plane/FA-18A.lua index 7976261b..50333df1 100644 --- a/_G/db/Units/Planes/Plane/FA-18A.lua +++ b/_G/db/Units/Planes/Plane/FA-18A.lua @@ -120,6 +120,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { [138] = { critical_damage = 4 }, + [139] = { + critical_damage = 5 + }, cell_indices = { CABIN = 137, COCKPIT = 3, @@ -153,6 +156,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { WING_L_PART_OUT = 21, WING_R_CENTER = 30, WING_R_IN = 36, + WING_R_IN01 = 139, WING_R_OUT = 24, WING_R_PART_IN = 34, WING_R_PART_OUT = 22 @@ -817,21 +821,24 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Z = -2.184, use_full_connector_position = true }, { + FiX = 52, Launchers = { { - CLSID = "{8D399DDA-FF81-4F14-904D-099B34FE7918}" - }, { - CLSID = "{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}" + CLSID = "{8D399DDA-FF81-4F14-904D-099B34FE7918}", + attach_point_position = { 0.5, -0.065, 0.05 } } }, Number = 4, Order = 4, Type = 1, - X = -2.766, - Y = -0.691, - Z = -1.083, + X = -2.345, + Y = -0.74, + Z = -1.11, + eject_dir = { 0, -0.9085, -0.4179 }, use_full_connector_position = true }, { Launchers = { { CLSID = "{EFEC8200-B922-11d7-9897-000476191836}" + }, { + CLSID = "{AN_ASQ_228}" } }, Number = 5, Order = 5, @@ -841,17 +848,18 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Z = 0, use_full_connector_position = true }, { + FiX = -52, Launchers = { { - CLSID = "{8D399DDA-FF81-4F14-904D-099B34FE7918}" - }, { - CLSID = "{1C2B16EB-8EB0-43de-8788-8EBB2D70B8BC}" + CLSID = "{8D399DDA-FF81-4F14-904D-099B34FE7918}", + attach_point_position = { 0.5, -0.065, -0.05 } } }, Number = 6, Order = 6, Type = 1, - X = -2.766, - Y = -0.691, - Z = 1.083, + X = -2.345, + Y = -0.74, + Z = 1.11, + eject_dir = { 0, -0.9085, 0.4179 }, use_full_connector_position = true }, { FiZ = -2, @@ -1144,7 +1152,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { -2.319, -1.846, 1.57 }, + main_gear_pos = { -2.319, -1.85, 1.57 }, main_gear_wheel_diameter = 0.778, mapclasskey = "P0091000024", mechanimations = { @@ -1216,7 +1224,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Stage", "Extend" } } } }, - nose_gear_pos = { 3.02, -1.846, 0 }, + nose_gear_pos = { 3.02, -1.75, 0 }, nose_gear_wheel_diameter = 0.566, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/FA-18C.lua b/_G/db/Units/Planes/Plane/FA-18C.lua index d5e5a992..4d44797b 100644 --- a/_G/db/Units/Planes/Plane/FA-18C.lua +++ b/_G/db/Units/Planes/Plane/FA-18C.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.16, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 150.28, CAS_min = 62, CanopyGeometry = { -0.17364817766693, -0.49640011097796, -0.81915204428899, -0.45315389351832, -0.087155742747658 }, @@ -153,6 +182,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { args = { 155 }, critical_damage = 4 }, + [139] = { + critical_damage = 5 + }, cell_indices = { CABIN = 137, COCKPIT = 3, @@ -186,6 +218,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { WING_L_PART_OUT = 21, WING_R_CENTER = 30, WING_R_IN = 36, + WING_R_IN01 = 139, WING_R_OUT = 24, WING_R_PART_IN = 34, WING_R_PART_OUT = 22 @@ -236,8 +269,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "M_61", supply = { count = 578, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 }, { 3 }, { 4, 5 }, { 6 }, { 7, 8 } }, shells = { { AP_cap_caliber = 20, @@ -998,6 +1031,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { X = -2.321, Y = -0.654, Z = -1.044, + eject_dir = { 0, -0.9085, -0.4179 }, use_full_connector_position = true }, { Launchers = { { @@ -1038,6 +1072,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { X = -2.321, Y = -0.654, Z = 1.044, + eject_dir = { 0, -0.9085, 0.4179 }, use_full_connector_position = true }, { Launchers = { { @@ -1431,7 +1466,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { -2.319, -1.846, 1.57 }, + main_gear_pos = { -2.319, -1.85, 1.57 }, main_gear_wheel_diameter = 0.778, mapclasskey = "P0091000024", mechanimations = { @@ -1503,7 +1538,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Stage", "Extend" } } } }, - nose_gear_pos = { 3.02, -1.846, 0 }, + nose_gear_pos = { 3.02, -1.77, 0 }, nose_gear_wheel_diameter = 0.566, panelRadio = { { channels = { { diff --git a/_G/db/Units/Planes/Plane/FA-18C_hornet.lua b/_G/db/Units/Planes/Plane/FA-18C_hornet.lua index 384efb96..e3259585 100644 --- a/_G/db/Units/Planes/Plane/FA-18C_hornet.lua +++ b/_G/db/Units/Planes/Plane/FA-18C_hornet.lua @@ -45,6 +45,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = 2 } }, wCtrl = 150 + }, { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false } }, AmmoWeight = 150.28, CAS_min = 62, @@ -725,8 +753,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { short_name = "M_61", supply = { count = 578, - get_mass = , - get_mass_ = , + get_mass = , + get_mass_ = , mixes = { { 1 }, { 2 }, { 3 }, { 4, 5 }, { 6 }, { 7, 8 } }, shells = { { AP_cap_caliber = 20, @@ -1369,9 +1397,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { HumanFM = { "F/A-18C", "FA18C", center_of_mass = { -1.681, -0.03348, 0 }, config_path = "./Mods/aircraft/FA-18C/FM/config.lua", - debugLine = "{M}:%1.3f {KCAS}:%4.1f {KEAS}:%4.1f {KTAS}:%4.1f {IndAS}:%4.1f {IAS}:%4.1f {AoA_U}:%5.1f {AoA}:%5.1f {AoS}:%5.1f {ny}:%5.2f {nxV}:%5.2f {wx}:%6.1f {wy}:%6.1f {wz}:%6.1f {Lstab}:%5.1f {Rud}:%5.1f {mass}:%5.1f {mass_lb}:%5.1f {x}:%2.3f {X}:%2.2f {dPsi}:%.1f", + debugLine = "{M}:%1.3f {KCAS}:%4.1f {KEAS}:%4.1f {KTAS}:%4.1f {IndAS}:%4.1f {IAS}:%4.1f {AoA_U}:%5.1f {AoA}:%5.1f {AoS}:%5.1f {ny}:%5.2f {nxV}:%5.2f {wx}:%6.1f {wy}:%6.1f {wz}:%6.1f {Lstab}:%5.1f {Rud}:%5.1f {mass}:%5.1f {mass_lb}:%5.1f {x}:%2.3f {X}:%2.2f {dPsi}:%.1f", disable_built_in_oxygen_system = true, flaps45WakeLossCoefGround = 1, + imgui_permissions = { + Mass_and_CoG = false, + Selection = false + }, major_shake_ampl = 0.25, minor_shake_ampl = 0.07, moment_of_inertia = { 31100, 192030, 165930, 3200 }, @@ -2129,6 +2161,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg = 311, arg_value = 0, connector = "Pylon4", + eject_dir = { 0, -0.9085, -0.4179 }, mass = 29.5, use_full_connector_position = true }, { @@ -2247,6 +2280,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { arg = 313, arg_value = 0, connector = "Pylon6", + eject_dir = { 0, -0.9085, 0.4179 }, mass = 29.5, use_full_connector_position = true }, { @@ -2593,17 +2627,26 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir = { 0, -1, 0 }, pos = { -1.19, -0.71, 0.843 } } }, + connectDatalinks = { "Link16" }, country_of_origin = "USA", crew_members = { { bailout_arg = -1, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 302, - ejection_seat_name = 17, - pos = { 3.755, 0.4, 0 }, + drop_canopy_name = 303, + ejection_seat_connector = "center", + ejection_seat_name = 302, + pilot_name = 304, + pos = { 3.5, 0.578, 0 }, role = "pilot", - role_display_name = "Pilot" + role_display_name = "Pilot", + skeleton_crew_class_name = "woCharacterPilot", + skeleton_crew_connector = "seat_pilot", + skeleton_crew_unit_name = "Crew FA-18C" } }, dataCartridge = true, + datalinks = { + Link16 = "CoreMods\\aircraft\\FA-18C\\Datalinks\\Link16.lua" + }, detection_range_max = 160, effects_presets = { { effect = "APU_STARTUP_BLAST", @@ -2624,6 +2667,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { smokiness_level = 0.05 }, { afterburner_effect_texture = "afterburner_f-18c", + afterburner_light_color = { 1, 1, 1 }, diameter = 0.765, elevation = -1.5, exhaust_length_ab = 4, @@ -2724,7 +2768,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { C = { { "Arg", 522, "set", 0.01 }, { "Arg", 521, "set", 0 } } } }, - Transition = { "Neutral", "GestureSaluteLeft" } + Transition = { "Any", "GestureSaluteLeft" } }, { Sequence = { { C = { { "Arg", 39, "to", 0, "speed", 0.5 }, { "Arg", 99, "to", 0, "speed", 0.5 }, { "Arg", 500, "to", 0, "speed", 0.5 }, { "Arg", 501, "to", 0, "speed", 0.5 }, { "Arg", 502, "set", 0 } } @@ -2735,7 +2779,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { C = { { "Arg", 522, "set", 0.01 }, { "Arg", 520, "set", 0 } } } }, - Transition = { "Neutral", "GestureSaluteRight" } + Transition = { "Any", "GestureSaluteRight" } }, { Sequence = { { C = { { "Arg", 522, "to", 1, "speed", 0.33 } } diff --git a/_G/db/Units/Planes/Plane/FW-190A8.lua b/_G/db/Units/Planes/Plane/FW-190A8.lua index 9b7aa5cc..3a5f1053 100644 --- a/_G/db/Units/Planes/Plane/FW-190A8.lua +++ b/_G/db/Units/Planes/Plane/FW-190A8.lua @@ -3501,7 +3501,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { net_animation = { 420 }, nose_gear_amortizer_normal_weight_stroke = -0.04, nose_gear_amortizer_reversal_stroke = -0.2, - nose_gear_pos = { -5.534, -0.74, 0 }, + nose_gear_pos = { -5.534, -0.73, 0 }, nose_gear_wheel_diameter = 0.319, panelRadio = { { ID = "FuG16", diff --git a/_G/db/Units/Planes/Plane/FW-190D9.lua b/_G/db/Units/Planes/Plane/FW-190D9.lua index 1e106f16..f7fd08c2 100644 --- a/_G/db/Units/Planes/Plane/FW-190D9.lua +++ b/_G/db/Units/Planes/Plane/FW-190D9.lua @@ -2934,7 +2934,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { 1, -2.05, 1.65 }, + main_gear_pos = { 1, -2.03, 1.65 }, main_gear_wheel_diameter = 0.683, mapclasskey = "P0091000024", mechanimations = { diff --git a/_G/db/Units/Planes/Plane/H-6J.lua b/_G/db/Units/Planes/Plane/H-6J.lua index 3d2df043..81e84c65 100644 --- a/_G/db/Units/Planes/Plane/H-6J.lua +++ b/_G/db/Units/Planes/Plane/H-6J.lua @@ -468,9 +468,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { use_full_connector_position = true }, { Launchers = { { - CLSID = "DIS_H6_250_2_N24" + CLSID = "DIS_H6_250_2_N24", + Type = 2 }, { - CLSID = "DIS_H6_250_2_N12" + CLSID = "DIS_H6_250_2_N12", + Type = 2 } }, Number = 8, Order = 8, diff --git a/_G/db/Units/Planes/Plane/Hawk.lua b/_G/db/Units/Planes/Plane/Hawk.lua index 1b739639..0b0c2743 100644 --- a/_G/db/Units/Planes/Plane/Hawk.lua +++ b/_G/db/Units/Planes/Plane/Hawk.lua @@ -508,7 +508,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { bailout_arg = -1, can_be_playable = true, canopy_pos = { 4, 1, 0 }, - drop_canopy_name = 303, + drop_canopy_name = 305, ejection_added_speed = { 0, 0, 5 }, ejection_order = 1, ejection_seat_name = 269, @@ -519,7 +519,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { bailout_arg = -1, can_be_playable = true, canopy_pos = { 4, 1, 0 }, - drop_canopy_name = 303, + drop_canopy_name = 305, ejection_added_speed = { 0, 0, -5 }, ejection_order = 2, ejection_seat_name = 269, diff --git a/_G/db/Units/Planes/Plane/I-16.lua b/_G/db/Units/Planes/Plane/I-16.lua index afba308e..db757324 100644 --- a/_G/db/Units/Planes/Plane/I-16.lua +++ b/_G/db/Units/Planes/Plane/I-16.lua @@ -890,7 +890,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { drop_canopy_name = 0, drop_parachute_name = "i16_pilot_parachute", ejection_seat_name = 0, - pilot_name = 304, + pilot_name = 306, pos = { -1.439, 0.182, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/IL-76MD.lua b/_G/db/Units/Planes/Plane/IL-76MD.lua index 9a094ccb..015521c7 100644 --- a/_G/db/Units/Planes/Plane/IL-76MD.lua +++ b/_G/db/Units/Planes/Plane/IL-76MD.lua @@ -309,9 +309,36 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { IR_emission_coeff = 4, IR_emission_coeff_ab = 0, InternalCargo = { - area = { 20, 3.15, 2.7 }, + area = { 24, 4, 3 }, + far_wall_pos = { 12, -1.32, 0 }, maximalCapacity = 48000, nominalCapacity = 40000, + out_door = { + main_left = { + heading = 1.5707963267949, + large = false, + x = 11, + z = -1.15 + }, + main_right = { + heading = -1.5707963267949, + large = false, + x = 11, + z = 1.15 + }, + rampa_left = { + heading = 2.7925268031909, + large = false, + x = -10, + z = -1 + }, + rampa_right = { + heading = -2.7925268031909, + large = false, + x = -10, + z = 1 + } + }, para_unit_point = 126, unit_block = { 0.64, 0.78 }, unit_point = 167 @@ -628,15 +655,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Open", "Close" } } } }, - mechconnectors = { - Door11 = { { - shift_orient = { 0, 160, 0 }, - shift_pos = { -12, -1.5, -1.5 } - }, { - shift_orient = { 0, -160, 0 }, - shift_pos = { -12, -1.5, 1.5 } - } } - }, nose_gear_pos = { 11.146, -4.009, 0 }, nose_gear_wheel_diameter = 0.754, openRamp = 1, diff --git a/_G/db/Units/Planes/Plane/IL-78M.lua b/_G/db/Units/Planes/Plane/IL-78M.lua index 15823d3a..65a8e052 100644 --- a/_G/db/Units/Planes/Plane/IL-78M.lua +++ b/_G/db/Units/Planes/Plane/IL-78M.lua @@ -187,7 +187,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { OldID = "Refueling", WorldID = 13 }, - DisplayName = "IL-78M Tanker", + DisplayName = "IL-78M", EmptyWeight = "98000", H_max = 12000, HumanCockpit = false, @@ -209,7 +209,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { MaxHeight = "12000", MaxSpeed = "850", MaxTakeOffWeight = "210000", - Name = "IL-78M Tanker", + Name = "IL-78M", Ny_max = 2.5, Ny_max_e = 2, Ny_min = 0.5, diff --git a/_G/db/Units/Planes/Plane/JF-17.lua b/_G/db/Units/Planes/Plane/JF-17.lua index fabc9c08..2beedca8 100644 --- a/_G/db/Units/Planes/Plane/JF-17.lua +++ b/_G/db/Units/Planes/Plane/JF-17.lua @@ -34,7 +34,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = "AARProbe", label = "Remove AAR Probe", playerOnly = true, - weight = 20 + weight = -20 } }, AmmoWeight = 79.2, CAS_min = 58, diff --git a/_G/db/Units/Planes/Plane/Ju-88A4.lua b/_G/db/Units/Planes/Plane/Ju-88A4.lua index 4c56715b..ed1fe85c 100644 --- a/_G/db/Units/Planes/Plane/Ju-88A4.lua +++ b/_G/db/Units/Planes/Plane/Ju-88A4.lua @@ -1826,7 +1826,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { boarding_arg = 428, canopy_arg = 38, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 335, + drop_canopy_name = 338, drop_parachute_name = "pilot_bf109_parachute", ejection_added_speed = { -0.5, -1, -2 }, ejection_order = 3, @@ -1840,7 +1840,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { boarding_arg = 428, canopy_arg = 38, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 335, + drop_canopy_name = 338, drop_parachute_name = "pilot_bf109_parachute", ejection_added_speed = { -0.5, -1.5, 2.5 }, ejection_order = 1, @@ -1854,7 +1854,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { boarding_arg = 428, canopy_arg = 38, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 335, + drop_canopy_name = 338, drop_parachute_name = "pilot_bf109_parachute", ejection_added_speed = { -0.5, -1.5, -2.5 }, ejection_order = 2, @@ -1868,7 +1868,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { boarding_arg = 428, canopy_arg = 38, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 335, + drop_canopy_name = 338, drop_parachute_name = "pilot_bf109_parachute", ejection_added_speed = { 0, -1.5, 0 }, ejection_order = 1, diff --git a/_G/db/Units/Planes/Plane/KC-135.lua b/_G/db/Units/Planes/Plane/KC-135.lua index 5be2d533..1a0dd021 100644 --- a/_G/db/Units/Planes/Plane/KC-135.lua +++ b/_G/db/Units/Planes/Plane/KC-135.lua @@ -1,5 +1,34 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.14, + AddPropAircraft = { { + control = "label", + id = "datalink_Label", + label = "DATALINK", + playerOnly = false, + xLbl = 150 + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignLabel", + label = "Voice Callsign Label", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "VoiceCallsignNumber", + label = "Voice Callsign Number", + onChange = , + playerOnly = false + }, { + control = "editbox", + getDefault = , + id = "STN_L16", + label = "STN", + onChange = , + onFocus = , + playerOnly = false + } }, AmmoWeight = 0, CAS_min = 54, CanopyGeometry = { -0.17364817766693, -0.40821789367673, -0.64278760968654, 0.11161889704895, 0.86602540378444 }, diff --git a/_G/db/Units/Planes/Plane/KC135MPRS.lua b/_G/db/Units/Planes/Plane/KC135MPRS.lua index 5204d45a..7491154a 100644 --- a/_G/db/Units/Planes/Plane/KC135MPRS.lua +++ b/_G/db/Units/Planes/Plane/KC135MPRS.lua @@ -14,7 +14,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { OldID = "Refueling", WorldID = 13 }, - DisplayName = "KC-135MPRS Tanker", + DisplayName = "KC-135MPRS", EPLRS = true, EmptyWeight = 44663, H_max = 12000, @@ -36,7 +36,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { MaxHeight = 12000, MaxSpeed = 1009.008, MaxTakeOffWeight = 146000, - Name = "KC-135MPRS Tanker", + Name = "KC-135MPRS", Ny_max = 2.5, Ny_max_e = 2, Ny_min = 0.5, diff --git a/_G/db/Units/Planes/Plane/L-39C.lua b/_G/db/Units/Planes/Plane/L-39C.lua index 7459559f..fed87f22 100644 --- a/_G/db/Units/Planes/Plane/L-39C.lua +++ b/_G/db/Units/Planes/Plane/L-39C.lua @@ -818,12 +818,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { can_be_playable = true, canopy_arg = 38, canopy_pos = { 2.916, 0.798, 0 }, - drop_canopy_name = 306, + drop_canopy_name = 308, drop_parachute_name = "pilot_l39_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, - ejection_seat_name = 305, - pilot_name = 307, + ejection_seat_name = 307, + pilot_name = 309, pos = { 3.266, 0.329, 0 }, role = "pilot", role_display_name = "Pilot" @@ -831,13 +831,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { can_be_playable = true, canopy_arg = 421, canopy_pos = { 1.563, 0.895, 0 }, - drop_canopy_name = 308, + drop_canopy_name = 310, drop_parachute_name = "pilot_l39_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, - ejection_seat_name = 305, + ejection_seat_name = 307, pilot_body_arg = 472, - pilot_name = 307, + pilot_name = 309, pos = { 1.765, 0.549, 0 }, role = "instructor", role_display_name = "Instructor" diff --git a/_G/db/Units/Planes/Plane/L-39ZA.lua b/_G/db/Units/Planes/Plane/L-39ZA.lua index 975656c3..00d13454 100644 --- a/_G/db/Units/Planes/Plane/L-39ZA.lua +++ b/_G/db/Units/Planes/Plane/L-39ZA.lua @@ -1166,17 +1166,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir = { 0, 1, 0 }, pos = { -3.677, 1.012, 0.859 } } }, - country_of_origin = "CZE", + country_of_origin = "USSR", crew_members = { { can_be_playable = true, canopy_arg = 38, canopy_pos = { 2.916, 0.798, 0 }, - drop_canopy_name = 306, + drop_canopy_name = 308, drop_parachute_name = "pilot_l39_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, - ejection_seat_name = 305, - pilot_name = 307, + ejection_seat_name = 307, + pilot_name = 309, pos = { 3.266, 0.329, 0 }, role = "pilot", role_display_name = "Pilot" @@ -1184,13 +1184,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { can_be_playable = true, canopy_arg = 421, canopy_pos = { 1.563, 0.895, 0 }, - drop_canopy_name = 308, + drop_canopy_name = 310, drop_parachute_name = "pilot_l39_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, - ejection_seat_name = 305, + ejection_seat_name = 307, pilot_body_arg = 472, - pilot_name = 307, + pilot_name = 309, pos = { 1.765, 0.549, 0 }, role = "instructor", role_display_name = "Instructor" diff --git a/_G/db/Units/Planes/Plane/M-2000C.lua b/_G/db/Units/Planes/Plane/M-2000C.lua index 25357ece..8ddff952 100644 --- a/_G/db/Units/Planes/Plane/M-2000C.lua +++ b/_G/db/Units/Planes/Plane/M-2000C.lua @@ -2383,11 +2383,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, crew_members = { { bailout_arg = -1, - drop_canopy_name = 310, + drop_canopy_name = 312, drop_parachute_name = "M-2000C_parachute", - ejection_seat_name = 309, + ejection_seat_name = 311, g_suit = 5, - pilot_name = 311, + pilot_name = 313, pos = { 2.679, 0.512, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/MB-339A.lua b/_G/db/Units/Planes/Plane/MB-339A.lua index cfd3c171..1cc33357 100644 --- a/_G/db/Units/Planes/Plane/MB-339A.lua +++ b/_G/db/Units/Planes/Plane/MB-339A.lua @@ -1,104 +1,208 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.16, AddPropAircraft = { { + arg = 472, + argTbl = { + [false] = 0, + [true] = 0.99 + }, control = "checkbox", defValue = false, id = "SoloFlight", label = "Solo Flight", weightWhenOn = -85 }, { - control = "comboList", - defValue = 1, - id = "NetCrewControlPriority", - label = "Aircraft Control Priority", - playerOnly = true, - values = { { - dispName = "Pilot", - id = 0 - }, { - dispName = "Instructor", - id = 1 - }, { - dispName = "Ask Always", - id = -1 - }, { - dispName = "Equally Responsible", - id = -2 - } }, - wCtrl = 150 - }, { + arg = 1998, control = "checkbox", defValue = false, id = "MountBlindHood", label = "Mount Blind Hood", playerOnly = false }, { + arg = 550, control = "comboList", - defValue = 1, id = "PilotEquipment", label = "Pilot Equipment", - playerOnly = false, values = { { - dispName = "HGU-33 only", - id = 0 + dispName = "Livery Default" + }, { + dispName = "HGU-55P + Secumar", + id = 1, + value = 0 }, { dispName = "HGU-33 + Aerazur", - id = 1 + id = 2, + value = 0.8 + } }, + wCtrl = 150 + }, { + arg = 999, + control = "comboList", + id = "AircraftVariant", + label = "Aircraft Variant", + values = { { + dispName = "Livery Default" }, { - dispName = "HGU-55P + Secumar", - id = -1 + dispName = "Pre-MLU", + id = 1, + value = 1 }, { - dispName = "HGU-2A + Secumar", - id = -2 + dispName = "MLU", + id = 2, + value = 0 } }, wCtrl = 150 }, { - control = "groupbox", - defValue = 1, + control = "label", + id = "spacer_Label", + label = "" + }, { + control = "label", id = "ARMAMENT", label = "ARMAMENT", - wCtrl = 150 + xLbl = 120 + }, { + control = "label", + id = "gunsight_Label", + label = "Gunsight & Gun Camera" }, { + arg = 477, + argTbl = { + [false] = 1, + [true] = 0 + }, control = "checkbox", defValue = true, id = "SAAB_RGS-2_Gunsight", - label = "SAAB RGS-2 Gunsight" + label = "SAAB RGS-2 Gunsight mounted" + }, { + arg = 954, + control = "checkbox", + defValue = false, + id = "Teledyne_TCS_116-2", + label = "Teledyne TCS 116-2 Gun Camera stored", + wCtrl = 380, + wLbl = 350, + xCtrl = 250 + }, { + control = "label", + id = "spacer_Label", + label = "" + }, { + control = "label", + id = "can_Label", + label = "Gunpods", + playerOnly = true }, { control = "comboList", defValue = 0.5, id = "DEFA_553_Burst", label = "DEFA 553 Burst", + playerOnly = true, values = { { - dispName = "0.5 Second", + dispName = "0.5 Seconds", id = 0.5 }, { dispName = "1.0 Second", id = 1 } }, - wCtrl = 150 + wCtrl = 100, + xCtrl = 100 }, { control = "checkbox", defValue = false, id = "EnableCutOff", - label = "Enable Cut Off" + label = "Enable Cut Off", + playerOnly = true, + xCtrl = 100 }, { - control = "slider", - defValue = 250, - dimension = "ms", - id = "RocketRippleTiming", - label = "Rocket Ripple Timing", - max = 500, - min = 100, + control = "label", + id = "spacer_Label", + label = "" + }, { + control = "label", + id = "intl_Label", + label = "Intervalometers", playerOnly = true }, { - control = "slider", + control = "comboList", + defValue = 62, + id = "RocketRippleTiming", + label = "Rocket Launchers Timings", + playerOnly = true, + values = { { + dispName = "33ms", + id = 33 + }, { + dispName = "40ms", + id = 40 + }, { + dispName = "62ms", + id = 62 + }, { + dispName = "95ms", + id = 95 + } }, + wCtrl = 70 + }, { + control = "comboList", defValue = 300, - dimension = "ms", id = "BombsRippleTiming", - label = "Bombs Ripple Timing", - max = 1500, - min = 100, - playerOnly = true + label = "14-3-M2 Rack Timings", + playerOnly = true, + values = { { + dispName = "300ms", + id = 300 + }, { + dispName = "450ms", + id = 450 + }, { + dispName = "600ms", + id = 600 + }, { + dispName = "750ms", + id = 750 + }, { + dispName = "900ms", + id = 900 + }, { + dispName = "1.2s", + id = 1200 + }, { + dispName = "1.5s", + id = 1500 + } }, + wCtrl = 70 + }, { + control = "label", + id = "spacer_Label", + label = "" + }, { + control = "label", + id = "mul_Label", + label = "MULTIPLAYER", + playerOnly = true, + xLbl = 120 + }, { + control = "comboList", + defValue = 1, + id = "NetCrewControlPriority", + label = "Aircraft Control Priority", + playerOnly = true, + values = { { + dispName = "Pilot", + id = 0 + }, { + dispName = "Instructor", + id = 1 + }, { + dispName = "Ask Always", + id = -1 + }, { + dispName = "Equally Responsible", + id = -2 + } }, + wCtrl = 150 } }, AmmoWeight = 0, CAS_min = 56, @@ -1860,7 +1964,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_added_speed = { -4.5, 15, 0.4 }, ejection_order = 2, ejection_play_arg = 1050, - ejection_seat_name = 312, + ejection_seat_name = 314, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, @@ -1878,7 +1982,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_added_speed = { -4, 14.5, -0.4 }, ejection_order = 1, ejection_play_arg = 1472, - ejection_seat_name = 313, + ejection_seat_name = 315, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, @@ -2002,9 +2106,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { typename = "collection" }, main_gear_amortizer_direct_stroke = 0, - main_gear_amortizer_normal_weight_stroke = -0.262, - main_gear_amortizer_reversal_stroke = -0.297, - main_gear_pos = { -0.652, -1.573, 1.25 }, + main_gear_amortizer_normal_weight_stroke = -0.08, + main_gear_amortizer_reversal_stroke = -0.291, + main_gear_pos = { -0.652, -1.593, 1.25 }, main_gear_wheel_diameter = 0.54, mapclasskey = "P0091000025", mechanimations = { @@ -2055,9 +2159,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, net_animation = { 38, 190, 191, 192, 203, 202, 201, 208, 200, 477, 1003, 525, 526, 527, 39, 99, 337, 399, 480, 524 }, nose_gear_amortizer_direct_stroke = 0, - nose_gear_amortizer_normal_weight_stroke = -0.153, - nose_gear_amortizer_reversal_stroke = -0.189, - nose_gear_pos = { 3.675, -1.471, 0 }, + nose_gear_amortizer_normal_weight_stroke = -0.04, + nose_gear_amortizer_reversal_stroke = -0.174, + nose_gear_pos = { 3.675, -1.491, 0 }, nose_gear_wheel_diameter = 0.395, panelRadio = { { channels = { { diff --git a/_G/db/Units/Planes/Plane/MB-339APAN.lua b/_G/db/Units/Planes/Plane/MB-339APAN.lua index 583611bc..80ffb937 100644 --- a/_G/db/Units/Planes/Plane/MB-339APAN.lua +++ b/_G/db/Units/Planes/Plane/MB-339APAN.lua @@ -1,11 +1,74 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AOA_take_off = 0.16, AddPropAircraft = { { + arg = 472, + argTbl = { + [false] = 0, + [true] = 0.99 + }, control = "checkbox", - defValue = true, + defValue = false, id = "SoloFlight", label = "Solo Flight", weightWhenOn = -85 + }, { + arg = 550, + control = "comboList", + id = "PilotEquipment", + label = "Pilot Equipment", + values = { { + dispName = "Livery Default" + }, { + dispName = "HGU-55P + Secumar", + id = 1, + value = 0 + }, { + dispName = "HGU-33 + Aerazur", + id = 2, + value = 0.8 + } }, + wCtrl = 150 + }, { + arg = 999, + control = "comboList", + id = "AircraftVariant", + label = "Aircraft Variant", + values = { { + dispName = "Livery Default" + }, { + dispName = "Pre-MLU", + id = 1, + value = 1 + }, { + dispName = "MLU", + id = 2, + value = 0 + } }, + wCtrl = 150 + }, { + control = "label", + id = "spacer_Label", + label = "" + }, { + control = "label", + id = "aero_Label", + label = "AEROBATICS", + xLbl = 120 + }, { + control = "checkbox", + defValue = false, + id = "UnlimitedSmoke", + label = "Unlimited Smoke" + }, { + control = "label", + id = "spacer_Label", + label = "" + }, { + control = "label", + id = "mul_Label", + label = "MULTIPLAYER", + playerOnly = true, + xLbl = 120 }, { control = "comboList", defValue = 1, @@ -26,11 +89,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = -2 } }, wCtrl = 150 - }, { - control = "checkbox", - defValue = false, - id = "UnlimitedSmoke", - label = "Unlimited Smoke" } }, AmmoWeight = 0, CAS_min = 56, @@ -1163,7 +1221,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_added_speed = { -4.5, 15, 0.4 }, ejection_order = 2, ejection_play_arg = 1050, - ejection_seat_name = 312, + ejection_seat_name = 314, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, @@ -1181,7 +1239,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_added_speed = { -4, 14.5, -0.4 }, ejection_order = 1, ejection_play_arg = 1472, - ejection_seat_name = 313, + ejection_seat_name = 315, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, @@ -1301,9 +1359,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { typename = "collection" }, main_gear_amortizer_direct_stroke = 0, - main_gear_amortizer_normal_weight_stroke = -0.262, - main_gear_amortizer_reversal_stroke = -0.297, - main_gear_pos = { -0.652, -1.573, 1.25 }, + main_gear_amortizer_normal_weight_stroke = -0.08, + main_gear_amortizer_reversal_stroke = -0.291, + main_gear_pos = { -0.652, -1.593, 1.25 }, main_gear_wheel_diameter = 0.54, mapclasskey = "P0091000025", mechanimations = { @@ -1354,9 +1412,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, net_animation = { 38, 190, 191, 192, 203, 202, 201, 208, 200, 477, 1003, 525, 526, 527, 39, 99, 337, 399, 480, 524 }, nose_gear_amortizer_direct_stroke = 0, - nose_gear_amortizer_normal_weight_stroke = -0.153, - nose_gear_amortizer_reversal_stroke = -0.189, - nose_gear_pos = { 3.675, -1.471, 0 }, + nose_gear_amortizer_normal_weight_stroke = -0.04, + nose_gear_amortizer_reversal_stroke = -0.174, + nose_gear_pos = { 3.675, -1.491, 0 }, nose_gear_wheel_diameter = 0.395, panelRadio = { { channels = { { diff --git a/_G/db/Units/Planes/Plane/MQ-9 Reaper.lua b/_G/db/Units/Planes/Plane/MQ-9 Reaper.lua index 944ce9a9..619d7117 100644 --- a/_G/db/Units/Planes/Plane/MQ-9 Reaper.lua +++ b/_G/db/Units/Planes/Plane/MQ-9 Reaper.lua @@ -514,7 +514,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.075, nose_gear_amortizer_reversal_stroke = -0.196, - nose_gear_pos = { 2.504, -1.978, 0 }, + nose_gear_pos = { 2.504, -1.94, 0 }, nose_gear_wheel_diameter = 0.319, radar_can_see_ground = true, range = 5920, diff --git a/_G/db/Units/Planes/Plane/MiG-15bis.lua b/_G/db/Units/Planes/Plane/MiG-15bis.lua index 728cef70..61eac230 100644 --- a/_G/db/Units/Planes/Plane/MiG-15bis.lua +++ b/_G/db/Units/Planes/Plane/MiG-15bis.lua @@ -860,17 +860,18 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { _origin = "MiG-15bis AI by Eagle Dynamics", attribute = { 1, 1, 1, "Redacted", "Battleplanes", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes", "Battle airplanes" }, average_fuel_consumption = 0.5, + bailout_arg = 91, bank_angle_max = 85, brakeshute_name = 0, country_of_origin = "SUN", crew_members = { { bailout_arg = 91, canopy_pos = { 1.5, 0.7, 0 }, - drop_canopy_name = 315, + drop_canopy_name = 317, drop_parachute_name = "pilot_mig15_parachute", - ejection_seat_name = 314, + ejection_seat_name = 316, g_suit = 0.35, - pilot_name = 316, + pilot_name = 318, pos = { 1.771, 0.856, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/MiG-19P.lua b/_G/db/Units/Planes/Plane/MiG-19P.lua index 14badccc..24c44cea 100644 --- a/_G/db/Units/Planes/Plane/MiG-19P.lua +++ b/_G/db/Units/Planes/Plane/MiG-19P.lua @@ -1201,11 +1201,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { bank_angle_max = 85, brakeshute_name = 2, crew_members = { { - drop_canopy_name = 318, + drop_canopy_name = 320, drop_parachute_name = "pilot_mig15_parachute", - ejection_seat_name = 317, + ejection_seat_name = 319, g_suit = 0.8, - pilot_name = 316, + pilot_name = 318, pos = { 3.756, 0.391, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/MiG-21Bis.lua b/_G/db/Units/Planes/Plane/MiG-21Bis.lua index e87341d7..9bbae5be 100644 --- a/_G/db/Units/Planes/Plane/MiG-21Bis.lua +++ b/_G/db/Units/Planes/Plane/MiG-21Bis.lua @@ -1168,21 +1168,29 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } }, { CLSID = "{R-13M}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 309, arg_value = 0.5, connector = "PYLON_L_OUT" }, { CLSID = "{R-13M1}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 309, arg_value = 0.5, connector = "PYLON_L_OUT" }, { CLSID = "{R-3R}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 309, arg_value = 0.5, connector = "PYLON_L_OUT" }, { CLSID = "{R-3S}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 309, arg_value = 0.5, connector = "PYLON_L_OUT" @@ -1191,16 +1199,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "PYLON_L_OUT" }, { CLSID = "{R-60}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 309, arg_value = 0.5, connector = "PYLON_L_OUT" }, { CLSID = "{R-60M}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 309, arg_value = 0.5, connector = "PYLON_L_OUT" }, { CLSID = "{R-60M 2L}", + Cx_gain_empty = 0.33, + Cx_gain_item = 0.001, arg = 309, arg_value = 0.5, connector = "PYLON_L_OUT", @@ -1223,6 +1237,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } }, { CLSID = "{R-60 2L}", + Cx_gain_empty = 0.33, + Cx_gain_item = 0.001, arg = 309, arg_value = 0.5, connector = "PYLON_L_OUT", @@ -1389,21 +1405,29 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } }, { CLSID = "{R-13M}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 310, arg_value = 0.5, connector = "PYLON_L_IN" }, { CLSID = "{R-13M1}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 310, arg_value = 0.5, connector = "PYLON_L_IN" }, { CLSID = "{R-3R}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 310, arg_value = 0.5, connector = "PYLON_L_IN" }, { CLSID = "{R-3S}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 310, arg_value = 0.5, connector = "PYLON_L_IN" @@ -1415,16 +1439,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "PYLON_L_IN" }, { CLSID = "{R-60}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 310, arg_value = 0.5, connector = "PYLON_L_IN" }, { CLSID = "{R-60M}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 310, arg_value = 0.5, connector = "PYLON_L_IN" }, { CLSID = "{R-60M 2L}", + Cx_gain_empty = 0.33, + Cx_gain_item = 0.001, arg = 310, arg_value = 0.5, connector = "PYLON_L_IN", @@ -1447,6 +1477,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } }, { CLSID = "{R-60 2L}", + Cx_gain_empty = 0.33, + Cx_gain_item = 0.001, arg = 310, arg_value = 0.5, connector = "PYLON_L_IN", @@ -1672,21 +1704,29 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } }, { CLSID = "{R-13M}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 311, arg_value = 0.5, connector = "PYLON_R_IN" }, { CLSID = "{R-13M1}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 311, arg_value = 0.5, connector = "PYLON_R_IN" }, { CLSID = "{R-3R}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 311, arg_value = 0.5, connector = "PYLON_R_IN" }, { CLSID = "{R-3S}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 311, arg_value = 0.5, connector = "PYLON_R_IN" @@ -1698,16 +1738,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "PYLON_R_IN" }, { CLSID = "{R-60}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 311, arg_value = 0.5, connector = "PYLON_R_IN" }, { CLSID = "{R-60M}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 311, arg_value = 0.5, connector = "PYLON_R_IN" }, { CLSID = "{R-60M 2R}", + Cx_gain_empty = 0.33, + Cx_gain_item = 0.001, arg = 311, arg_value = 0.5, connector = "PYLON_R_IN", @@ -1730,6 +1776,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } }, { CLSID = "{R-60 2R}", + Cx_gain_empty = 0.33, + Cx_gain_item = 0.001, arg = 311, arg_value = 0.5, connector = "PYLON_R_IN", @@ -1833,21 +1881,29 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } }, { CLSID = "{R-13M}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 312, arg_value = 0.5, connector = "PYLON_R_OUT" }, { CLSID = "{R-13M1}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 312, arg_value = 0.5, connector = "PYLON_R_OUT" }, { CLSID = "{R-3R}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 312, arg_value = 0.5, connector = "PYLON_R_OUT" }, { CLSID = "{R-3S}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 312, arg_value = 0.5, connector = "PYLON_R_OUT" @@ -1856,16 +1912,22 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "PYLON_R_OUT" }, { CLSID = "{R-60}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 312, arg_value = 0.5, connector = "PYLON_R_OUT" }, { CLSID = "{R-60M}", + Cx_gain_empty = 0.5, + Cx_gain_item = 0.001, arg = 312, arg_value = 0.5, connector = "PYLON_R_OUT" }, { CLSID = "{R-60M 2R}", + Cx_gain_empty = 0.33, + Cx_gain_item = 0.001, arg = 312, arg_value = 0.5, connector = "PYLON_R_OUT", @@ -1888,6 +1950,8 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } } }, { CLSID = "{R-60 2R}", + Cx_gain_empty = 0.33, + Cx_gain_item = 0.001, arg = 312, arg_value = 0.5, connector = "PYLON_R_OUT", @@ -2176,9 +2240,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { pos = { -1.714, -0.38, -0.5 } } }, crew_members = { { - drop_canopy_name = 320, - ejection_seat_name = 319, - pilot_name = 321, + drop_canopy_name = 322, + ejection_seat_name = 321, + pilot_name = 323, pos = { 2.711, 0.65, 0 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/MiG-23MLD.lua b/_G/db/Units/Planes/Plane/MiG-23MLD.lua index 05d26280..51aed7e0 100644 --- a/_G/db/Units/Planes/Plane/MiG-23MLD.lua +++ b/_G/db/Units/Planes/Plane/MiG-23MLD.lua @@ -602,7 +602,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { DuplicateOf = "Door0" } }, - nose_gear_pos = { 4.647, -2.33, 0 }, + nose_gear_pos = { 4.647, -2.32, 0 }, nose_gear_wheel_diameter = 0.541, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/MiG-29A.lua b/_G/db/Units/Planes/Plane/MiG-29A.lua index f3c358d8..a028817d 100644 --- a/_G/db/Units/Planes/Plane/MiG-29A.lua +++ b/_G/db/Units/Planes/Plane/MiG-29A.lua @@ -962,7 +962,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { main_gear_amortizer_direct_stroke = 0, main_gear_amortizer_normal_weight_stroke = -0.1, main_gear_amortizer_reversal_stroke = -0.294, - main_gear_pos = { -0.678, -1.689, 1.544 }, + main_gear_pos = { -0.678, -1.67, 1.544 }, main_gear_wheel_diameter = 0.84, mapclasskey = "P0091000024", mechanimations = { diff --git a/_G/db/Units/Planes/Plane/MiG-29G.lua b/_G/db/Units/Planes/Plane/MiG-29G.lua index 58bd73a8..1df17e29 100644 --- a/_G/db/Units/Planes/Plane/MiG-29G.lua +++ b/_G/db/Units/Planes/Plane/MiG-29G.lua @@ -961,7 +961,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { main_gear_amortizer_direct_stroke = 0, main_gear_amortizer_normal_weight_stroke = -0.1, main_gear_amortizer_reversal_stroke = -0.294, - main_gear_pos = { -0.678, -1.689, 1.544 }, + main_gear_pos = { -0.678, -1.67, 1.544 }, main_gear_wheel_diameter = 0.84, mapclasskey = "P0091000024", mechanimations = { diff --git a/_G/db/Units/Planes/Plane/MiG-29S.lua b/_G/db/Units/Planes/Plane/MiG-29S.lua index 2ad79c7b..628c51d9 100644 --- a/_G/db/Units/Planes/Plane/MiG-29S.lua +++ b/_G/db/Units/Planes/Plane/MiG-29S.lua @@ -961,7 +961,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { { { -1.36, -0.185, 0 }, { -0. }, typename = "collection" }, - main_gear_pos = { -0.68, -1.525, 1.55 }, + main_gear_pos = { -0.68, -1.5, 1.55 }, main_gear_wheel_diameter = 0.84, mapclasskey = "P0091000024", mechanimations = { diff --git a/_G/db/Units/Planes/Plane/Mirage-F1B.lua b/_G/db/Units/Planes/Plane/Mirage-F1B.lua index 2766be47..32ed40eb 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1B.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1B.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -271,6 +265,26 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = "SoloFlight", label = "Solo Flight", weight = -80 + }, { + control = "comboList", + defValue = 1, + id = "NetCrewControlPriority", + label = "Aircraft Control Priority", + playerOnly = true, + values = { { + dispName = "Pilot", + id = 0 + }, { + dispName = "Instructor", + id = 1 + }, { + dispName = "Ask Always", + id = -1 + }, { + dispName = "Equally Responsible", + id = -2 + } }, + wCtrl = 150 } }, AmmoWeight = 0, CAS_min = 50, @@ -1571,6 +1585,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1689,6 +1707,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1841,6 +1863,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2119,7 +2145,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2135,16 +2161,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.311, 0.907, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, ejection_play_arg = 149, - ejection_seat_name = 326, + ejection_seat_name = 328, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 327, + pilot_name = 329, pos = { 3.19, 0.003, 0 }, role = "pilot", role_display_name = "Pilot" @@ -2156,15 +2182,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 421, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, - ejection_seat_name = 328, + ejection_seat_name = 330, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, - pilot_name = 329, + pilot_name = 331, pos = { 1.525, 0.221, -0.005 }, role = "instructor", role_display_name = "Instructor" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BD.lua b/_G/db/Units/Planes/Plane/Mirage-F1BD.lua index 710e02e7..996a60d4 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BD.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BD.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -271,6 +265,26 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = "SoloFlight", label = "Solo Flight", weight = -80 + }, { + control = "comboList", + defValue = 1, + id = "NetCrewControlPriority", + label = "Aircraft Control Priority", + playerOnly = true, + values = { { + dispName = "Pilot", + id = 0 + }, { + dispName = "Instructor", + id = 1 + }, { + dispName = "Ask Always", + id = -1 + }, { + dispName = "Equally Responsible", + id = -2 + } }, + wCtrl = 150 } }, AmmoWeight = 0, CAS_min = 50, @@ -1591,6 +1605,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1695,6 +1713,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1822,6 +1844,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2106,7 +2132,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2122,16 +2148,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.311, 0.907, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, ejection_play_arg = 149, - ejection_seat_name = 326, + ejection_seat_name = 328, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 327, + pilot_name = 329, pos = { 3.19, 0.003, 0 }, role = "pilot", role_display_name = "Pilot" @@ -2143,15 +2169,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 421, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, - ejection_seat_name = 328, + ejection_seat_name = 330, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, - pilot_name = 329, + pilot_name = 331, pos = { 1.525, 0.221, -0.005 }, role = "instructor", role_display_name = "Instructor" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BE.lua b/_G/db/Units/Planes/Plane/Mirage-F1BE.lua index d4d0b95d..ec60d7bc 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BE.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -271,6 +265,26 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = "SoloFlight", label = "Solo Flight", weight = -80 + }, { + control = "comboList", + defValue = 1, + id = "NetCrewControlPriority", + label = "Aircraft Control Priority", + playerOnly = true, + values = { { + dispName = "Pilot", + id = 0 + }, { + dispName = "Instructor", + id = 1 + }, { + dispName = "Ask Always", + id = -1 + }, { + dispName = "Equally Responsible", + id = -2 + } }, + wCtrl = 150 } }, AmmoWeight = 0, CAS_min = 50, @@ -279,7 +293,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { elevation = { -50, 90 } }, Categories = { "{78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F}", "Interceptor" }, - Countries = { "Spain", "Morocco", "USA" }, Damage = { { args = { 150 }, critical_damage = 5 @@ -1345,6 +1358,266 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { prob = 100 } }, H_max = 15240, + HumanCockpit = true, + HumanCockpitPath = "./Mods/aircraft/Mirage-F1/Cockpit/Mirage-F1/Mirage-F1BE/", + HumanCockpitPlugins = { { + _file = "./Mods/aircraft/NS430/entry.lua", + _origin = "NS430", + name = "NS430", + path = "./Mods/aircraft/NS430/Cockpit/Scripts/", + per_unit_data = { + ["A-10A"] = { + enable_options_key_for_unit = "a10a_enabled" + }, + ["A-10C"] = <2>{ + enable_options_key_for_unit = "disabled" + }, + ["A-10C_2"] =
, + ["AH-64D_BLK_II"] =
, + AJS37 = { + enable_options_key_for_unit = "ajs37_enabled" + }, + AV8BNA = { + enable_options_key_for_unit = "av8b_enabled" + }, + ["Bf-109K-4"] = { + enable_options_key_for_unit = "bf109k4_enabled" + }, + ["C-101CC"] = { + enable_options_key_for_unit = "c101cc_common_enabled" + }, + ["C-101EB"] = { + enable_options_key_for_unit = "c101eb_common_enabled" + }, + ["Christen Eagle II"] = { + enable_options_key_for_unit = "CE_II_enabled" + }, + ["F-14B"] = { + enable_options_key_for_unit = "f14b_enabled" + }, + ["F-15C"] = { + enable_options_key_for_unit = "f15c_enabled" + }, + ["F-16C_50"] =
, + ["F-5E-3"] = { + enable_options_key_for_unit = "f5e3_enabled" + }, + ["F-86F Sabre"] = { + enable_options_key_for_unit = "f86f_enabled" + }, + ["FA-18C_hornet"] =
, + ["FW-190D9"] = { + enable_options_key_for_unit = "fw190d9_enabled" + }, + ["I-16"] = { + enable_options_key_for_unit = "i16_enabled" + }, + ["J-11A"] = { + enable_options_key_for_unit = "j11a_enabled" + }, + ["JF-17"] = { + enable_options_key_for_unit = "jf17_enabled" + }, + ["Ka-50"] =
, + ["Ka-50_3"] =
, + ["L-39C"] = { + enable_options_key_for_unit = "l39c_common_enabled" + }, + ["L-39ZA"] = { + enable_options_key_for_unit = "l39za_enabled" + }, + ["M-2000C"] = { + enable_options_key_for_unit = "miraj_enabled" + }, + ["Mi-24P"] = { + enable_options_key_for_unit = "mi24p_enabled" + }, + ["Mi-8MT"] = { + enable_options_key_for_unit = "mi8_common_enabled" + }, + ["MiG-15bis"] = { + enable_options_key_for_unit = "mig15bis_enabled" + }, + ["MiG-21bis"] = { + enable_options_key_for_unit = "mig21bis_enabled" + }, + ["MiG-29A"] = { + enable_options_key_for_unit = "mig29a_enabled" + }, + ["MiG-29G"] = { + enable_options_key_for_unit = "mig29g_enabled" + }, + ["MiG-29S"] = { + enable_options_key_for_unit = "mig29s_enabled" + }, + ["P-51D"] = { + enable_options_key_for_unit = "p51d_enabled" + }, + SA342L = { + enable_options_key_for_unit = "sa342_enabled" + }, + SA342M = { + enable_options_key_for_unit = "sa342_enabled" + }, + SA342Minigun = { + enable_options_key_for_unit = "sa342_enabled" + }, + SA342Mistral = { + enable_options_key_for_unit = "sa342_enabled" + }, + SpitfireLFMkIX = { + enable_options_key_for_unit = "SpitfireLFMkIX_enabled" + }, + SpitfireLFMkIXCW = { + enable_options_key_for_unit = "SpitfireLFMkIXCW_enabled" + }, + ["Su-25"] = { + enable_options_key_for_unit = "su25_enabled" + }, + ["Su-25T"] = { + enable_options_key_for_unit = "su25t_enabled" + }, + ["Su-27"] = { + enable_options_key_for_unit = "su27_enabled" + }, + ["Su-33"] = { + enable_options_key_for_unit = "su33_enabled" + }, + ["TF-51D"] = { + enable_options_key_for_unit = "tf51d_enabled" + }, + ["UH-1H"] = { + enable_options_key_for_unit = "uh1h_enabled" + }, + ["Yak-52"] = { + enable_options_key_for_unit = "yak52_enabled" + } + } + } }, + HumanCommPanelPath = "./Mods/aircraft/Mirage-F1/Comm/comm.lua", + HumanFM = { "Mirage F1 by Aerges", "MirageF1cmn", + center_of_mass = { -1.425, -0.096, 0 }, + disable_built_in_oxygen_system = true, + gyro_effect = true, + moment_of_inertia = { 8206, 70591, 65780, 2729 }, + rigid_body_back_damper_force_factor = 153226.66666667, + rigid_body_default_force_damage = 383066.66666667, + rigid_body_default_force_max = 766133.33333333, + rigid_body_default_spring_force_factor = 1838720, + rigid_body_direct_damper_force_factor = 91936, + suspension = { { + allowable_hard_contact_length = 0.1, + amortizer_back_damper_force_factor = 8000, + amortizer_basic_length = 0.3, + amortizer_direct_damper_force_factor = 10000, + amortizer_max_length = 0.3, + amortizer_min_length = 0, + amortizer_reduce_length = 0.004, + amortizer_spring_force_factor = 1350000, + amortizer_spring_force_factor_rate = 2.65, + amortizer_static_force = 6500, + arg_amortizer = 1, + arg_post = 0, + arg_wheel_damage = 134, + arg_wheel_rotation = 101, + arg_wheel_yaw = 2, + axle_angle = 0, + damage_element = 83, + damage_omega = 30, + damper_coeff = 300, + drag_factor = 0, + influence_of_pos_z_to_V_l_z = false, + mass = 83, + moment_limit = 0, + noise_k = 0.4, + self_attitude = false, + track_width = 0.2, + wheel_axle_offset = 0.05, + wheel_damage_delta_speedX = 28, + wheel_damage_force_factor = 250, + wheel_damage_speedX = 90, + wheel_glide_friction_factor = 0.28, + wheel_ground_block_flag = false, + wheel_kz_factor = 0, + wheel_moment_of_inertia = 0.6, + wheel_radius = 0.17, + wheel_roll_friction_factor = 0.02, + wheel_side_friction_factor = 0.65, + wheel_static_friction_factor = 0.9, + yaw_limit = 0.78539816339745 + }, { + allowable_hard_contact_length = 0.2, + amortizer_back_damper_force_factor = 40000, + amortizer_basic_length = 0.21, + amortizer_direct_damper_force_factor = 60000, + amortizer_max_length = 0.21, + amortizer_min_length = 0, + amortizer_reduce_length = 0.008, + amortizer_spring_force_factor = 1885000, + amortizer_spring_force_factor_rate = 1.755, + amortizer_static_force = 30000, + anti_skid_installed = true, + arg_amortizer = 6, + arg_post = 5, + arg_wheel_damage = 136, + arg_wheel_rotation = 103, + damage_element = 84, + drag_factor = 0, + influence_of_pos_z_to_V_l_z = true, + mass = 210, + noise_k = 0.4, + track_width = 0.3, + wheel_axle_offset = 0.25, + wheel_brake_moment_max = 8500, + wheel_damage_delta_speedX = 28, + wheel_damage_force_factor = 250, + wheel_damage_speedX = 90, + wheel_glide_friction_factor = 0.28, + wheel_ground_block_flag = true, + wheel_kz_factor = 0, + wheel_moment_of_inertia = 4.95, + wheel_radius = 0.3, + wheel_roll_friction_factor = 0.02, + wheel_side_friction_factor = 0.65, + wheel_static_friction_factor = 0.9 + }, { + allowable_hard_contact_length = 0.2, + amortizer_back_damper_force_factor = 40000, + amortizer_basic_length = 0.21, + amortizer_direct_damper_force_factor = 60000, + amortizer_max_length = 0.21, + amortizer_min_length = 0, + amortizer_reduce_length = 0.008, + amortizer_spring_force_factor = 1885000, + amortizer_spring_force_factor_rate = 1.755, + amortizer_static_force = 30000, + anti_skid_installed = true, + arg_amortizer = 4, + arg_post = 3, + arg_wheel_damage = 135, + arg_wheel_rotation = 102, + damage_element = 85, + drag_factor = 0, + influence_of_pos_z_to_V_l_z = true, + mass = 210, + noise_k = 0.4, + track_width = 0.3, + wheel_axle_offset = 0.25, + wheel_brake_moment_max = 8500, + wheel_damage_delta_speedX = 28, + wheel_damage_force_factor = 250, + wheel_damage_speedX = 90, + wheel_glide_friction_factor = 0.28, + wheel_ground_block_flag = true, + wheel_kz_factor = 0, + wheel_moment_of_inertia = 4.95, + wheel_radius = 0.3, + wheel_roll_friction_factor = 0.02, + wheel_side_friction_factor = 0.65, + wheel_static_friction_factor = 0.9 + } }, + zeroize_amortizers_before_collision_check = false + }, HumanRadio = { editable = true, frequency = 127.5, @@ -1595,6 +1868,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1731,6 +2008,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1907,6 +2188,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2179,6 +2464,215 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { RWR = "Abstract RWR" }, Shape = "Mirage-F1B", + SnapViews = { { { + hAngle = 0, + rollAngle = 0, + vAngle = -10, + viewAngle = 80, + x_trans = -0.02, + y_trans = 0.003, + z_trans = 0 + }, { + hAngle = 90.382431, + rollAngle = 0, + vAngle = -52.480587, + viewAngle = 69.780899, + x_trans = 0.07794, + y_trans = -0.099448, + z_trans = -0.043705 + }, { + hAngle = 6.741884, + rollAngle = 0, + vAngle = -40.086639, + viewAngle = 72.555, + x_trans = 0, + y_trans = 0, + z_trans = 0.194226 + }, { + hAngle = -74.849602, + rollAngle = 0, + vAngle = -47.992794, + viewAngle = 58.012501, + x_trans = 0, + y_trans = -0.099955, + z_trans = 0.008404 + }, { + hAngle = 28.081524, + rollAngle = 0, + vAngle = -36.981689, + viewAngle = 52.877102, + x_trans = 0.199877, + y_trans = -0.099924, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = -10, + viewAngle = 80, + x_trans = -0.02, + y_trans = 0.003, + z_trans = 0 + }, { + hAngle = -38.423161, + rollAngle = 0, + vAngle = -38.28899, + viewAngle = 43.796249, + x_trans = 0.199001, + y_trans = -0.0981, + z_trans = 0 + }, { + hAngle = 131.835434, + rollAngle = 0, + vAngle = -7.7, + viewAngle = 99.106483, + x_trans = 0.116748, + y_trans = 0.04, + z_trans = -0.063734 + }, { + hAngle = -166.5, + rollAngle = 0, + vAngle = 8.120656, + viewAngle = 87, + x_trans = 0.2, + y_trans = 0.099448, + z_trans = 0.3 + }, { + hAngle = -131.835434, + rollAngle = 0, + vAngle = -7.7, + viewAngle = 99.106483, + x_trans = 0.116748, + y_trans = 0.04, + z_trans = 0.063734 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = 10, + viewAngle = 60, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = 10, + viewAngle = 60, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = -10, + viewAngle = 80, + x_trans = -0.02, + y_trans = 0.003, + z_trans = 0 + } }, { { + hAngle = 0, + rollAngle = 0, + vAngle = -10, + viewAngle = 80, + x_trans = -0.02, + y_trans = 0.003, + z_trans = 0 + }, { + hAngle = 90.382431, + rollAngle = 0, + vAngle = -52.480587, + viewAngle = 69.780899, + x_trans = 0.07794, + y_trans = -0.099448, + z_trans = -0.043705 + }, { + hAngle = 6.741884, + rollAngle = 0, + vAngle = -40.086639, + viewAngle = 72.555, + x_trans = 0, + y_trans = 0, + z_trans = 0.194226 + }, { + hAngle = -74.849602, + rollAngle = 0, + vAngle = -47.992794, + viewAngle = 58.012501, + x_trans = 0, + y_trans = -0.099955, + z_trans = 0.008404 + }, { + hAngle = 28.081524, + rollAngle = 0, + vAngle = -36.981689, + viewAngle = 52.877102, + x_trans = 0.199877, + y_trans = -0.099924, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = -10, + viewAngle = 80, + x_trans = -0.02, + y_trans = 0.003, + z_trans = 0 + }, { + hAngle = -38.423161, + rollAngle = 0, + vAngle = -38.28899, + viewAngle = 43.796249, + x_trans = 0.199001, + y_trans = -0.0981, + z_trans = 0 + }, { + hAngle = 131.835434, + rollAngle = 0, + vAngle = -7.7, + viewAngle = 99.106483, + x_trans = 0.116748, + y_trans = 0.04, + z_trans = -0.063734 + }, { + hAngle = -166.5, + rollAngle = 0, + vAngle = 8.120656, + viewAngle = 87, + x_trans = 0.2, + y_trans = 0.099448, + z_trans = 0.3 + }, { + hAngle = -131.835434, + rollAngle = 0, + vAngle = -7.7, + viewAngle = 99.106483, + x_trans = 0.116748, + y_trans = 0.04, + z_trans = 0.063734 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = 10, + viewAngle = 60, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = 10, + viewAngle = 60, + x_trans = 0, + y_trans = 0, + z_trans = 0 + }, { + hAngle = 0, + rollAngle = 0, + vAngle = -10, + viewAngle = 80, + x_trans = -0.02, + y_trans = 0.003, + z_trans = 0 + } } }, Tasks = { { Name = "Ground Attack", OldID = "Ground Attack", @@ -2217,17 +2711,58 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { V_max_sea_level = 400, V_opt = 300, V_take_off = 100, + ViewSettings = { + Arcade = { + AnglesDefault = { 0, -8 }, + LocalPoint = { -21.5, 5.618, 0 } + }, + Chase = { + AnglesDefault = { 0, 0 }, + LocalPoint = { -5, 1, 3 } + }, + Cockpit = { { + Allow360rotation = false, + CameraAngleLimits = { 200, -90, 90 }, + CameraAngleRestriction = { false, 90, 0.5 }, + CameraViewAngleLimits = { 20, 140 }, + CockpitLocalPoint = { 3.437, 0.368, 0 }, + EyePoint = { 0.05, 0.1, 0 }, + ShoulderSize = 0.25, + limits_6DOF = { + roll = 90, + x = { -0.05, 0.2 }, + y = { -0.1, 0.1 }, + z = { -0.22, 0.22 } + } + }, { + Allow360rotation = false, + CameraAngleLimits = { 200, -90, 90 }, + CameraAngleRestriction = { false, 90, 0.5 }, + CameraViewAngleLimits = { 20, 140 }, + CockpitLocalPoint = { 1.88, 0.632, 0 }, + EyePoint = { 0.05, 0.1, 0 }, + ShoulderSize = 0.25, + limits_6DOF = { + roll = 90, + x = { -0.05, 0.2 }, + y = { -0.1, 0.1 }, + z = { -0.22, 0.22 } + } + } } + }, Vy_max = 243, Waypoint_Custom_Panel = true, WingSpan = 8.4, WorldID = 320, _file = "./CoreMods/aircraft/Mirage-F1/Mirage-F1BE.lua", + _file_flyable = "./Mods/aircraft/Mirage-F1/entry.lua", _origin = "Mirage F1 Assets by Aerges", + _origin_flyable = "Mirage F1 by Aerges", attribute = { 1, 1, 1, "Redacted", "Multirole fighters", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes", "Battle airplanes" }, average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2243,16 +2778,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.311, 0.907, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, ejection_play_arg = 149, - ejection_seat_name = 326, + ejection_seat_name = 328, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 327, + pilot_name = 329, pos = { 3.19, 0.003, 0 }, role = "pilot", role_display_name = "Pilot" @@ -2264,15 +2799,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 421, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, - ejection_seat_name = 328, + ejection_seat_name = 330, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, - pilot_name = 329, + pilot_name = 331, pos = { 1.525, 0.221, -0.005 }, role = "instructor", role_display_name = "Instructor" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua b/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua index 46d7fdb0..9967c876 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1BQ.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -271,6 +265,26 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = "SoloFlight", label = "Solo Flight", weight = -80 + }, { + control = "comboList", + defValue = 1, + id = "NetCrewControlPriority", + label = "Aircraft Control Priority", + playerOnly = true, + values = { { + dispName = "Pilot", + id = 0 + }, { + dispName = "Instructor", + id = 1 + }, { + dispName = "Ask Always", + id = -1 + }, { + dispName = "Equally Responsible", + id = -2 + } }, + wCtrl = 150 } }, AmmoWeight = 0, CAS_min = 50, @@ -1591,6 +1605,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1695,6 +1713,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1822,6 +1844,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2106,7 +2132,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2122,16 +2148,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.311, 0.907, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, ejection_play_arg = 149, - ejection_seat_name = 326, + ejection_seat_name = 328, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 327, + pilot_name = 329, pos = { 3.19, 0.003, 0 }, role = "pilot", role_display_name = "Pilot" @@ -2143,15 +2169,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 421, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, - ejection_seat_name = 328, + ejection_seat_name = 330, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, - pilot_name = 329, + pilot_name = 331, pos = { 1.525, 0.221, -0.005 }, role = "instructor", role_display_name = "Instructor" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua b/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua index 5037bd62..0ecf7a29 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1C-200.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1715,6 +1709,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1833,6 +1831,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "BR_250", arg_value = 0.15 @@ -1997,6 +1999,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2272,7 +2278,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2288,16 +2294,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1C.lua b/_G/db/Units/Planes/Plane/Mirage-F1C.lua index b5be1404..f4df3a74 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1C.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1C.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1720,6 +1714,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1838,6 +1836,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1990,6 +1992,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2268,7 +2274,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2284,16 +2290,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CE.lua b/_G/db/Units/Planes/Plane/Mirage-F1CE.lua index 7d7a69ac..c433b02a 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CE.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1750,7 +1744,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { wheel_side_friction_factor = 0.65, wheel_static_friction_factor = 0.9 } }, - zeroize_amortizers_before_collision_check = true + zeroize_amortizers_before_collision_check = false }, HumanRadio = { editable = true, @@ -2002,6 +1996,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2138,6 +2136,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2314,6 +2316,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2766,7 +2772,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2782,16 +2788,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CG.lua b/_G/db/Units/Planes/Plane/Mirage-F1CG.lua index 3cf2f6ae..8fac1bae 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CG.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CG.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1729,6 +1723,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1847,6 +1845,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "BR_250", arg_value = 0.15 @@ -2011,6 +2013,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2299,7 +2305,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2315,16 +2321,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CH.lua b/_G/db/Units/Planes/Plane/Mirage-F1CH.lua index d3a81595..cccd07e9 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CH.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CH.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1715,6 +1709,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1833,6 +1831,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "BR_250", arg_value = 0.15 @@ -1997,6 +1999,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2271,7 +2277,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2287,16 +2293,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua b/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua index 7c1acbda..f2a9ee49 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CJ.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1715,6 +1709,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1833,6 +1831,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "BR_250", arg_value = 0.15 @@ -1997,6 +1999,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2271,7 +2277,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2287,16 +2293,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CK.lua b/_G/db/Units/Planes/Plane/Mirage-F1CK.lua index f94df83a..740c0fcc 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CK.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CK.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1715,6 +1709,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1833,6 +1831,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "BR_250", arg_value = 0.15 @@ -1997,6 +1999,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2271,7 +2277,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2287,16 +2293,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CR.lua b/_G/db/Units/Planes/Plane/Mirage-F1CR.lua index 447619b2..8b777bc0 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CR.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CR.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1685,6 +1679,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", arg_value = 0.15 @@ -1743,6 +1741,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "BR_250", arg_value = 0.15 @@ -1861,6 +1863,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", arg_value = 0.15 @@ -2096,7 +2102,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2112,16 +2118,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CT.lua b/_G/db/Units/Planes/Plane/Mirage-F1CT.lua index 8240ff51..7fe1e963 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CT.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CT.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1685,6 +1679,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{S530F}", arg_value = 0.25, @@ -1769,6 +1767,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}", arg_value = 0.15 @@ -1881,6 +1883,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{S530F}", arg_value = 0.25, @@ -2142,7 +2148,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2158,16 +2164,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua b/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua index 5eade2f4..5f4b7399 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1CZ.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1715,6 +1709,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1833,6 +1831,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "BR_250", arg_value = 0.15 @@ -1997,6 +1999,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2271,7 +2277,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2287,16 +2293,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua b/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua index 1218ee48..7d10aaef 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1DDA.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -271,6 +265,26 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { id = "SoloFlight", label = "Solo Flight", weight = -80 + }, { + control = "comboList", + defValue = 1, + id = "NetCrewControlPriority", + label = "Aircraft Control Priority", + playerOnly = true, + values = { { + dispName = "Pilot", + id = 0 + }, { + dispName = "Instructor", + id = 1 + }, { + dispName = "Ask Always", + id = -1 + }, { + dispName = "Equally Responsible", + id = -2 + } }, + wCtrl = 150 } }, AmmoWeight = 0, CAS_min = 50, @@ -1579,6 +1593,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1675,6 +1693,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1796,6 +1818,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2060,7 +2086,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2076,16 +2102,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.311, 0.907, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 2, ejection_play_arg = 149, - ejection_seat_name = 326, + ejection_seat_name = 328, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 327, + pilot_name = 329, pos = { 3.19, 0.003, 0 }, role = "pilot", role_display_name = "Pilot" @@ -2097,15 +2123,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 421, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 0.811, 0.892, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 15, 0 }, ejection_order = 1, - ejection_seat_name = 328, + ejection_seat_name = 330, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 472, - pilot_name = 329, + pilot_name = 331, pos = { 1.525, 0.221, -0.005 }, role = "instructor", role_display_name = "Instructor" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1ED.lua b/_G/db/Units/Planes/Plane/Mirage-F1ED.lua index 46adaaf1..b12dc68d 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1ED.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1ED.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1739,6 +1733,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1843,6 +1841,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1970,6 +1972,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2254,7 +2260,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2270,16 +2276,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua b/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua index 913f6542..949484e8 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EDA.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1727,6 +1721,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1823,6 +1821,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1944,6 +1946,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2208,7 +2214,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2224,16 +2230,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EE.lua b/_G/db/Units/Planes/Plane/Mirage-F1EE.lua index d1bcfb4a..3ce85f58 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EE.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1781,7 +1775,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { wheel_side_friction_factor = 0.65, wheel_static_friction_factor = 0.9 } }, - zeroize_amortizers_before_collision_check = true + zeroize_amortizers_before_collision_check = false }, HumanRadio = { editable = true, @@ -2041,6 +2035,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2177,6 +2175,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2353,6 +2355,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2814,7 +2820,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2830,16 +2836,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EH.lua b/_G/db/Units/Planes/Plane/Mirage-F1EH.lua index d733d3dd..0436b3ef 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EH.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EH.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1715,6 +1709,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -1833,6 +1831,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "BR_250", arg_value = 0.15 @@ -1997,6 +1999,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{R530F_EM}", arg_value = 0.25, @@ -2272,7 +2278,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2288,16 +2294,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua b/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua index 5e0c1f72..311920d7 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1EQ.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1739,6 +1733,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1843,6 +1841,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1970,6 +1972,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2255,7 +2261,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2271,16 +2277,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1JA.lua b/_G/db/Units/Planes/Plane/Mirage-F1JA.lua index fe97f94e..73b728e6 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1JA.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1JA.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1714,6 +1708,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } } }, Number = 3, Order = 3, @@ -1766,6 +1764,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } } }, Number = 4, Order = 4, @@ -1866,6 +1868,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } } }, Number = 5, Order = 5, @@ -2073,7 +2079,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2089,16 +2095,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua b/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua index 049233e2..252067a0 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1M-CE.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1743,6 +1737,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1879,6 +1877,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2055,6 +2057,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2375,7 +2381,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2391,16 +2397,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua b/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua index 8bd28e2b..dda4b22f 100644 --- a/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua +++ b/_G/db/Units/Planes/Plane/Mirage-F1M-EE.lua @@ -64,23 +64,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { label = "Chaff Burst Interval", playerOnly = true, values = { { - dispName = "0.05 s", - id = 1 - }, { dispName = "0.1 s", - id = 2 - }, { - dispName = "0.15 s", - id = 3 + id = 1 }, { dispName = "0.2 s", - id = 4 + id = 2 }, { dispName = "0.3 s", - id = 5 + id = 3 }, { dispName = "0.4 s", - id = 6 + id = 4 } }, wCtrl = 75 }, { @@ -1751,6 +1745,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -1887,6 +1885,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2063,6 +2065,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, { CLSID = "PTB-1200-F1-EMPTY", arg_value = 0.15 + }, { + CLSID = "{CC420_GUN_POD}", + arg_value = 0.15, + attach_point_position = { -0.2, 0.029, 0 } }, { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", arg_value = 0.15 @@ -2392,7 +2398,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { average_fuel_consumption = 0.5, bank_angle_max = 85, bigParkingRamp = false, - brakeshute_name = 325, + brakeshute_name = 327, chaff_flare_dispenser = { { dir = { 0, -1, -1 }, pos = { -4.312, -0.648, -0.488 } @@ -2408,16 +2414,16 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_args = { 38, 1 }, canopy_ejection_dir = { -0.4, 1, 0 }, canopy_pos = { 2.312, 0.625, 0 }, - drop_canopy_name = 323, + drop_canopy_name = 325, drop_parachute_name = "Mirage-F1_parachute", ejection_added_speed = { -5, 30, 0 }, ejection_order = -1, ejection_play_arg = 149, - ejection_seat_name = 322, + ejection_seat_name = 324, ejection_through_canopy = true, g_suit = 1, pilot_body_arg = 50, - pilot_name = 324, + pilot_name = 326, pos = { 3.192, -0.013, -0.02 }, role = "pilot", role_display_name = "Pilot" diff --git a/_G/db/Units/Planes/Plane/MosquitoFBMkVI.lua b/_G/db/Units/Planes/Plane/MosquitoFBMkVI.lua index 33bc4d7c..1d3b5c4e 100644 --- a/_G/db/Units/Planes/Plane/MosquitoFBMkVI.lua +++ b/_G/db/Units/Planes/Plane/MosquitoFBMkVI.lua @@ -5805,7 +5805,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "PosType", 0 }, { "Arg", 0, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, Door0 = { { Flags = { "Reversible" }, @@ -5905,7 +5905,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "VelType", 3 }, { "PosType", 6 }, { "Arg", 5, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, RightStrut = { { Flags = { "Reversible" }, @@ -5923,7 +5923,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "VelType", 4 }, { "PosType", 7 }, { "Arg", 3, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, ServiceHatch10 = { { Flags = { "Reversible" }, diff --git a/_G/db/Units/Planes/Plane/P-47D-30.lua b/_G/db/Units/Planes/Plane/P-47D-30.lua index 53020c62..c78587a7 100644 --- a/_G/db/Units/Planes/Plane/P-47D-30.lua +++ b/_G/db/Units/Planes/Plane/P-47D-30.lua @@ -4124,7 +4124,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "PosType", 0 }, { "Arg", 0, "to", 0.441, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, Door0 = { { Flags = { "Reversible" }, @@ -4274,7 +4274,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "VelType", 5 }, { "PosType", 6 }, { "Arg", 5, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, RightStrut = { { Flags = { "Reversible" }, @@ -4306,7 +4306,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "VelType", 3 }, { "PosType", 7 }, { "Arg", 3, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } } }, net_animation = { 182, 184, 188, 278, 279 }, diff --git a/_G/db/Units/Planes/Plane/P-47D-30bl1.lua b/_G/db/Units/Planes/Plane/P-47D-30bl1.lua index dc7a0967..79de1808 100644 --- a/_G/db/Units/Planes/Plane/P-47D-30bl1.lua +++ b/_G/db/Units/Planes/Plane/P-47D-30bl1.lua @@ -4074,7 +4074,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "PosType", 0 }, { "Arg", 0, "to", 0.441, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, Door0 = { { Flags = { "Reversible" }, @@ -4224,7 +4224,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "VelType", 5 }, { "PosType", 6 }, { "Arg", 5, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, RightStrut = { { Flags = { "Reversible" }, @@ -4256,7 +4256,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "VelType", 3 }, { "PosType", 7 }, { "Arg", 3, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } } }, net_animation = { 182, 184, 188, 278, 279 }, diff --git a/_G/db/Units/Planes/Plane/P-47D-40.lua b/_G/db/Units/Planes/Plane/P-47D-40.lua index d8fcd7ed..fe480b3b 100644 --- a/_G/db/Units/Planes/Plane/P-47D-40.lua +++ b/_G/db/Units/Planes/Plane/P-47D-40.lua @@ -4174,7 +4174,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "PosType", 0 }, { "Arg", 0, "to", 0.441, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, Door0 = { { Flags = { "Reversible" }, @@ -4324,7 +4324,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "VelType", 5 }, { "PosType", 6 }, { "Arg", 5, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } }, RightStrut = { { Flags = { "Reversible" }, @@ -4356,7 +4356,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Sequence = { { C = { { "VelType", 3 }, { "PosType", 7 }, { "Arg", 3, "to", 0.5, "speed", 2, "sign", -1 } } } }, - Transition = { "Extend", "Collapse" } + Transition = { "Any", "Collapse" } } } }, net_animation = { 182, 184, 188, 278, 279 }, diff --git a/_G/db/Units/Planes/Plane/P-51D-30-NA.lua b/_G/db/Units/Planes/Plane/P-51D-30-NA.lua index a829d4cc..07bf7ddc 100644 --- a/_G/db/Units/Planes/Plane/P-51D-30-NA.lua +++ b/_G/db/Units/Planes/Plane/P-51D-30-NA.lua @@ -3204,7 +3204,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "PYLON_9_B", forbidden = { { loadout = { "{HVAR}" }, - station = 5 + station = 6 } } }, { CLSID = "{HVAR}", diff --git a/_G/db/Units/Planes/Plane/P-51D.lua b/_G/db/Units/Planes/Plane/P-51D.lua index 7ca12e11..608e1043 100644 --- a/_G/db/Units/Planes/Plane/P-51D.lua +++ b/_G/db/Units/Planes/Plane/P-51D.lua @@ -3206,7 +3206,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { connector = "PYLON_9_B", forbidden = { { loadout = { "{HVAR}" }, - station = 5 + station = 6 } } }, { CLSID = "{HVAR}", diff --git a/_G/db/Units/Planes/Plane/S-3B Tanker.lua b/_G/db/Units/Planes/Plane/S-3B Tanker.lua index 0216e607..e2ded573 100644 --- a/_G/db/Units/Planes/Plane/S-3B Tanker.lua +++ b/_G/db/Units/Planes/Plane/S-3B Tanker.lua @@ -47,13 +47,13 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, [35] = { args = { 67 }, - critical_damage = 20, - deps_cells = { 25, 37, 11, 17 } + critical_damage = 10, + deps_cells = { 25, 37 } }, [36] = { args = { 68 }, - critical_damage = 20, - deps_cells = { 26, 38, 12, 18 } + critical_damage = 10, + deps_cells = { 26, 38 } }, [37] = { args = { 55 }, diff --git a/_G/db/Units/Planes/Plane/S-3B.lua b/_G/db/Units/Planes/Plane/S-3B.lua index e96e825b..eb3f1d8b 100644 --- a/_G/db/Units/Planes/Plane/S-3B.lua +++ b/_G/db/Units/Planes/Plane/S-3B.lua @@ -7,6 +7,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { CLSID = "{8A302789-A55D-4897-B647-66493FA6826F}", Name = "" } }, + Countries = {}, Damage = { [0] = { args = { 82 }, @@ -104,25 +105,24 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { critical_damage = 15 } }, - DamageParts = { "S-3A-OBLOMOK-WING-R", "S-3A-OBLOMOK-WING-L" }, DefaultTask = <1>{ Name = "Anti-ship Strike", OldID = "Antiship Strike", WorldID = 30 }, DisplayName = "S-3B", - EmptyWeight = "12088", + EmptyWeight = 12088, H_max = 7500, - HumanCockpit = false, HumanRadio = { editable = true, frequency = 251, maxFrequency = 399.975, - minFrequency = 100, + minFrequency = 225, modulation = 0 }, IR_emission_coeff = 0.53, IR_emission_coeff_ab = 0, + InheriteCommonCallnames = true, LandRWCategories = { { Name = "AircraftCarrier With Arresting Gear" } }, @@ -131,18 +131,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { M_max = 23831, M_nominal = 19278, Mach_max = 0.682, - MaxFuelWeight = "5500", - MaxHeight = "10700", - MaxSpeed = "840", - MaxTakeOffWeight = "23831", + MaxFuelWeight = 5500, + MaxHeight = 7500, + MaxSpeed = 834.12, + MaxTakeOffWeight = 23831, Name = "S-3B", Ny_max = 2.5, Ny_max_e = 2, Ny_min = -1, Picture = "S-3B.png", Pylons = { { - FiZ = -3, - Launchers = { { + Launchers = <2>{ { CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}" }, { CLSID = "{B83CB620-5BBE-4BEA-910C-EB605A327EF9}" @@ -172,9 +171,11 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Type = 0, X = -0.723, Y = 0.281, - Z = -3.893 + Z = -3.893, + connector = "Pylon1", + use_full_connector_position = true }, { - Launchers = { { + Launchers = <3>{ { CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" }, { CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}" @@ -184,76 +185,49 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Type = 2, X = -0.069, Y = -0.05, - Z = -0.858 + Z = -0.858, + connector = "Pylon3", + use_full_connector_position = true }, { - Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" - }, { - CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}" - } }, + Launchers =
, Number = 3, Order = 3, Type = 2, X = -0.069, Y = -0.05, - Z = -0.5 + Z = -0.5, + connector = "Pylon4", + use_full_connector_position = true }, { - Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" - }, { - CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}" - } }, + Launchers =
, Number = 4, Order = 4, Type = 2, X = -0.069, Y = -0.05, - Z = 0.5 + Z = 0.5, + connector = "Pylon5", + use_full_connector_position = true }, { - Launchers = { { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" - }, { - CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}" - } }, + Launchers =
, Number = 5, Order = 5, Type = 2, X = -0.069, Y = -0.05, - Z = 0.858 + Z = 0.858, + connector = "Pylon6", + use_full_connector_position = true }, { - FiZ = -3, - Launchers = { { - CLSID = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}" - }, { - CLSID = "{B83CB620-5BBE-4BEA-910C-EB605A327EF9}" - }, { - CLSID = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}" - }, { - CLSID = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}" - }, { - CLSID = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}" - }, { - CLSID = "{444BA8AE-82A7-4345-842E-76154EFCCA46}" - }, { - CLSID = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}" - }, { - CLSID = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}", - Type = 1 - }, { - CLSID = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", - Type = 1 - }, { - CLSID = "{F3EFE0AB-E91A-42D8-9CA2-B63C91ED570A}" - }, { - CLSID = "{A504D93B-4E80-4B4F-A533-0D9B65F2C55F}" - } }, + Launchers =
, Number = 6, Order = 6, Type = 0, X = -0.723, Y = 0.281, - Z = 3.893 + Z = 3.893, + connector = "Pylon2", + use_full_connector_position = true } }, RCS = 30, Rate = "50", @@ -284,14 +258,17 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dpdh_m = 4500, hMaxEng = 19.5, table_data = { { 0, 81967.2, 81967.2 }, { 0.1, 72180, 72180 }, { 0.2, 62600, 62600 }, { 0.3, 53520, 53520 }, { 0.4, 45160, 45160 }, { 0.5, 37780, 37780 }, { 0.6, 31860, 31860 }, { 0.7, 27920, 27920 }, { 0.8, 26520, 26520 }, { 0.9, 24000, 24000 }, { 1, 20000, 20000 } }, - type = "TurboJet" + type = "TurboFan" } }, Sensors = { RADAR = "AN/APS-137", RWR = "Abstract RWR" }, - Shape = "S-3A", + Shape = "S-3B", + SpecificCallnames = { + USA = { { "Navy One", "Navy One" }, { "Mauler", "Mauler" }, { "Bloodhound", "Bloodhound" } } + }, TakeOffRWCategories = { { Name = "AircraftCarrier With Catapult" } }, @@ -311,14 +288,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { V_take_off = 60, Vy_max = 8, Waypoint_Custom_Panel = true, - WingSpan = "20.93", + WingSpan = 20.93, WorldID = 42, - _file = "Scripts/Database/planes\\S-3B.lua", - air_refuel_receptacle_pos = { 6.054, 1.699, 0 }, - attribute = { 1, 1, 5, "Redacted", "Aux", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes" }, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/S-3B.lua", + _origin = "HeavyMetalCore", + air_refuel_receptacle_pos = { 6.18, 1.23, 0 }, + attribute = { 1, 1, 5, "Redacted", "Aux", "Refuelable", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes" }, average_fuel_consumption = 0.06, bank_angle_max = 45, - bigParkingRamp = true, brakeshute_name = 0, country_of_origin = "USA", crew_members = { { @@ -341,16 +318,27 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { ejection_seat_name = 9, pos = { 1.271, 0.748, -0.521 }, role = "flight_officer", - role_display_name = "Flight officer" + role_display_name = "Tactical coordinator" }, { bailout_arg = -1, drop_canopy_name = 0, ejection_seat_name = 9, pos = { 1.271, 0.748, 0.521 }, role = "flight_officer", - role_display_name = "Flight officer" + role_display_name = "Sensor operator" } }, detection_range_max = 0, + doors_movement = 2, + doors_transmission = "Electrical", + encyclopediaAnimation = { + args = { + [9] = 0.492, + [10] = 0.477, + [13] = 0.758, + [14] = 0.75, + [26] = 1 + } + }, engines_count = 2, engines_nozzles = { { diameter = 1.085, @@ -368,25 +356,28 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { smokiness_level = 0.02 } }, fires_pos = { { -0.386, 1.39, 0 }, { -0.386, 1.39, 1.899 }, { -0.386, 1.39, -1.899 }, { -0.82, 0.265, 2.774 }, { -0.82, 0.265, -2.774 }, { -0.82, 0.255, 4.274 }, { -0.82, 0.255, -4.274 }, { -0.583, 0.172, 2.434 }, { -0.583, 0.172, -2.434 }, { -2.345, -0.517, 0 }, { 2.345, -0.517, 0 } }, - flaps_maneuver = 1, + flaps_maneuver = 0.655, + flaps_transmission = "Hydraulic", has_afteburner = false, has_differential_stabilizer = false, - has_speedbrake = false, + has_speedbrake = true, height = 6.93, + launch_bar_connected_arg_value = 0.87, length = 16.26, lights_data = { lights = { [2] = { lights = { { lights = { { - argument = 51, - direction = { - elevation = 0.10471975511966 + argument = 208, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 0, + elevation = 0.1221730476396 }, exposure = { { 0, 0.99, 1 } }, movable = true, - position = { 4.619, -0.725, -0.246 }, - proto = <2>{ + proto = <4>{ angle_change_rate = 0.039269908169872, angle_max = 0.15707963267949, angle_min = 0.087266462599716, @@ -396,10 +387,15 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "Spot" }, { + argument = 208, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 0, + elevation = 0.05235987755983 + }, exposure = { { 0, 0.99, 1 } }, movable = true, - position = { 4.869, -0.725, -0.246 }, - proto =
, + proto =
, range = 4, typename = "Omni" } }, @@ -408,20 +404,92 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { typename = "collection" }, [3] = { - argument = 49, - typename = "argumentlight" + lights = { { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 190, + connector = "BANO_0", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + movable = true, + proto = { + angle_max = 3.1415926535898, + color = { 1, 1, 1, 0.155 }, + range = 30 + }, + range = 10, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 191, + connector = "BANO_1", + dir_correction = { + azimuth = 0, + elevation = 0.78539816339745 + }, + movable = true, + proto = { + angle_max = 2.6179938779915, + angle_min = 1.5707963267949, + color = { 1, 0.35, 0.15, 0.15 }, + range = 40 + }, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 192, + connector = "BANO_2", + dir_correction = { + azimuth = 0, + elevation = 0.78539816339745 + }, + movable = true, + proto = <5>{ + angle_max = 2.6179938779915, + angle_min = 1.5707963267949, + color = { 0, 0.894, 0.6, 0.15 }, + range = 40 + }, + typename = "Spot" + }, { + angle_max = 2.7925268031909, + angle_min = 1.5707963267949, + argument = 193, + connector = "BANO_3", + dir_correction = { + azimuth = 0, + elevation = 0 + }, + exposure = { { 25, 0.99, 1 } }, + movable = true, + proto =
, + typename = "Spot" + } }, + typename = "collection" + }, + [4] = { + lights = { { + argument = 201, + typename = "argumentlight" + } }, + typename = "collection" }, [6] = { lights = { { lights = { { - argument = 51, - direction = { - elevation = 0.10471975511966 + argument = 208, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 0, + elevation = 0 }, exposure = { { 0, 0.99, 1 } }, movable = true, - position = { 4.619, -0.725, -0.246 }, - proto = <3>{ + proto = <6>{ angle_change_rate = -0.11780972450962, angle_max = 0.47123889803847, angle_min = 0.37699111843078, @@ -431,24 +499,153 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "Spot" }, { + argument = 208, + connector = "MAIN_SPOT_PTR", + dir_correction = { + azimuth = 0, + elevation = 0 + }, exposure = { { 0, 0.99, 1 } }, movable = true, - position = { 4.869, -0.725, -0.246 }, - proto =
, + proto =
, range = 4, typename = "Omni" } }, typename = "Collection" } }, typename = "collection" + }, + [7] = { + lights = { { + lights = { { + angular_velocity = 4.1887902047864, + connector = "RED_BEACON", + cups = 1, + emitter_angle_z = 0.26179938779915, + flood_light_argument = 199, + proto = { + angle_max = 0.78539816339745, + angle_min = 0.61086523819802, + angular_velocity = 6.2831853071796, + color = { 1, 0, 0, 0.19049409439665 }, + cups = 2, + range = 40 + }, + rotary_assembly_argument = 200, + typename = "RotatingBeacon" + }, { + angular_velocity = 4.1887902047864, + connector = "WHITE_BEACON", + cups = 1, + emitter_angle_z = 0.034906585039887, + flood_light_argument = 197, + phase_shift = 0.2, + proto = { + angle_max = 1.3089969389957, + angle_min = 0, + angular_velocity = 6.8067840827779, + color = { 1, 1, 1, 0.45820519420888 }, + cups = 1, + range = 64 + }, + range = 40, + rotary_assembly_argument = 198, + typename = "RotatingBeacon" + } }, + typename = "Collection" + } }, + typename = "collection" + }, + [8] = { + lights = { { + argument = 195, + exposure = { { 91, 0.7, 1 } }, + movable = true, + typename = "argumentlight" + } }, + typename = "collection" + }, + [9] = { + lights = { { + argument = 69, + typename = "argumentlight" + } }, + typename = "collection" + }, + [10] = { + lights = { { + argument = 212, + exposure = { { 22, 0.5, 1 } }, + movable = true, + typename = "argumentlight" + }, { + argument = 212, + color = { 1, 0, 0, 0.19049409439665 }, + connector = "PROBE_LIGHT", + dir_correction = { + azimuth = 0, + elevation = -0.94247779607694 + }, + exposure = { { 22, 0.7, 1 } }, + movable = true, + proto = { + angle_max = 0.7679448708775, + angle_min = 0.614355896702, + color = { 255, 201, 125, 0.2137366596101 }, + power_up_t = 0.75, + range = 840 + }, + typename = "Spot" + }, { + argument = 211, + exposure = { { 42, 0.1, 1 } }, + movable = true, + typename = "argumentlight" + } }, + typename = "collection" } }, typename = "collection" }, - main_gear_pos = { -2.071, -1.477, 1.989 }, - main_gear_wheel_diameter = 0.824, + main_gear_amortizer_direct_stroke = 0, + main_gear_amortizer_normal_weight_stroke = -0.4021, + main_gear_amortizer_reversal_stroke = -0.52, + main_gear_pos = { -1.023, -2.25417, 1.8614 }, + main_gear_wheel_diameter = 0.75, mapclasskey = "P0091000063", mechanimations = { + CentralStrut = { { + Flags = { "Reversible" }, + Sequence = { { + C = { { "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.066666666666667, "sign", 1 } }, + Width = { 0.5, 1 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 5 }, { "Arg", 0, "to", 0, "speed", 0.1, "sign", -1 } }, + Width = { 0, 0.5 } + }, { + C = { { "Sleep", "for", 0.5 } }, + Width = { 0.5, 0.75 } + }, { + C = { { "Arg", 0, "set", 0 }, { "VelType", 4 }, { "Arg", 117, "to", 0, "speed", 0.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 = { { Sequence = { { C = { { "Sleep", "for", 0 } } @@ -487,43 +684,113 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { } }, LaunchBar = { { Sequence = { { - C = { { "ChangeDriveTo", "HydraulicGravityAssisted" }, { "VelType", 2 }, { "Arg", 85, "to", 1, "in", 4.5 } } + C = { { "ChangeDriveTo", "HydraulicGravityAssisted" }, { "VelType", 3 }, { "Arg", 85, "to", 1, "in", 2.4 } } } }, Transition = { "Retract", "Extend" } }, { Sequence = { { - C = { { "ChangeDriveTo", "Hydraulic" }, { "VelType", 2 }, { "Arg", 85, "to", 0, "in", 4.5 } } - } }, - Transition = { "Extend", "Retract" } - }, { - Sequence = { { - C = { { "ChangeDriveTo", "HydraulicGravityAssisted" }, { "VelType", 2 }, { "Arg", 85, "to", 0.745, "in", 4 } } + C = { { "ChangeDriveTo", "HydraulicGravityAssisted" }, { "VelType", 3 }, { "Arg", 85, "to", 0.815, "in", 2.2 } } } }, Transition = { "Retract", "Stage" } }, { Sequence = { { - C = { { "ChangeDriveTo", "Hydraulic" }, { "VelType", 2 }, { "Arg", 85, "to", 0, "in", 4 } } + C = { { "ChangeDriveTo", "Hydraulic" }, { "VelType", 2 }, { "Arg", 85, "to", 0, "in", 1.5 } } } }, - Transition = { "Stage", "Retract" } + Transition = { "Any", "Retract" } }, { Sequence = { { - C = { { "ChangeDriveTo", "Mechanical" }, { "Arg", 85, "from", 1, "to", 0.745, "in", 1 } } + C = { { "ChangeDriveTo", "Mechanical" }, { "Sleep", "for", 0 } } + }, { + C = { { "Arg", 85, "from", 1, "to", 0.82, "in", 0.4 } } + }, { + C = { { "Arg", 85, "from", 0.82, "to", 0.79, "in", 0.09 } } + }, { + C = { { "Sleep", "for", 0.14 } } + }, { + C = { { "Arg", 85, "from", 0.78, "to", 0.98, "in", 0.1 } } } }, Transition = { "Extend", "Stage" } }, { Sequence = { { - C = { { "ChangeDriveTo", "Mechanical" }, { "Arg", 85, "from", 0.745, "to", 0.743, "in", 1 } } + C = { { "ChangeDriveTo", "Mechanical" }, { "VelType", 2 }, { "Arg", 85, "from", 1, "to", 0.87, "in", 0.15 } } } }, Transition = { "Stage", "Pull" } }, { Sequence = { { - C = { { "ChangeDriveTo", "Mechanical" }, { "Arg", 85, "from", 0.745, "to", 1, "in", 0.2 } } + C = { { "ChangeDriveTo", "HydraulicGravityAssisted" }, { "VelType", 3 }, { "Arg", 85, "from", 0.815, "to", 0.881, "in", 0.2 } } } }, Transition = { "Stage", "Extend" } + } }, + 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.066666666666667, "sign", 1 } }, + Width = { 0.5, 1 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 5 }, { "Arg", 5, "to", 0, "speed", 0.1, "sign", -1 } }, + Width = { 0, 0.5 } + }, { + C = { { "Sleep", "for", 0.5 } }, + Width = { 0.5, 0.75 } + }, { + C = { { "Arg", 5, "set", 0 }, { "VelType", 4 }, { "Arg", 116, "to", 0, "speed", 0.5, "sign", -1 } }, + Width = { 0.75, 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.066666666666667, "sign", 1 } }, + Width = { 0.5, 1 } + } }, + Transition = { "Retract", "Extend" } + }, { + Flags = { "Reversible" }, + Sequence = { { + C = { { "VelType", 5 }, { "Arg", 3, "to", 0, "speed", 0.1, "sign", -1 } }, + Width = { 0, 0.5 } + }, { + C = { { "Sleep", "for", 0.5 } }, + Width = { 0.5, 0.75 } + }, { + C = { { "Arg", 3, "set", 0 }, { "VelType", 4 }, { "Arg", 115, "to", 0, "speed", 0.5, "sign", -1 } }, + Width = { 0.75, 1 } + } }, + Transition = { "Extend", "Retract" } + }, { + Sequence = { { + C = { { "VelType", 3 }, { "PosType", 7 }, { "Arg", 3, "to", 0.5, "speed", 2, "sign", -1 } } + } }, + Transition = { "Any", "Collapse" } } } }, - nose_gear_pos = { 3.832, -1.477, 0 }, - nose_gear_wheel_diameter = 0.531, + nose_gear_amortizer_direct_stroke = 0, + nose_gear_amortizer_normal_weight_stroke = -0.4289, + nose_gear_amortizer_reversal_stroke = -0.548, + nose_gear_pos = { 4.819, -2.48294, 0 }, + nose_gear_wheel_diameter = 0.578, passivCounterm = { CMDS_Edit = true, SingleChargeTotal = 60, @@ -548,8 +815,10 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { thrust_sum_ab = 8414, thrust_sum_max = 8414, type = "S-3B", + undercarriage_movement = 2, + undercarriage_transmission = "Hydraulic", wing_area = 55.55, wing_span = 20.93, - wing_tip_pos = { -2.821, 1.179, 10.409 }, + wing_tip_pos = { -2.86, 0.7, 10.23 }, wing_type = 2 } \ No newline at end of file diff --git a/_G/db/Units/Planes/Plane/Su-17M4.lua b/_G/db/Units/Planes/Plane/Su-17M4.lua index c0784f5f..796bb499 100644 --- a/_G/db/Units/Planes/Plane/Su-17M4.lua +++ b/_G/db/Units/Planes/Plane/Su-17M4.lua @@ -891,7 +891,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { DuplicateOf = "Door0" } }, - nose_gear_pos = { 3.875, -1.835, 0 }, + nose_gear_pos = { 3.875, -1.81, 0 }, nose_gear_wheel_diameter = 0.754, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/Su-25.lua b/_G/db/Units/Planes/Plane/Su-25.lua index ff0d625b..ad9e15de 100644 --- a/_G/db/Units/Planes/Plane/Su-25.lua +++ b/_G/db/Units/Planes/Plane/Su-25.lua @@ -1198,7 +1198,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir = { 0, 1, 0 }, pos = { -3.677, 1.012, 0.859 } } }, - country_of_origin = "RUS", + country_of_origin = "USSR", crew_members = { { canopy_pos = { 0, 0, 0 }, drop_canopy_name = 34, diff --git a/_G/db/Units/Planes/Plane/Su-25T.lua b/_G/db/Units/Planes/Plane/Su-25T.lua index 8be24f02..52194e25 100644 --- a/_G/db/Units/Planes/Plane/Su-25T.lua +++ b/_G/db/Units/Planes/Plane/Su-25T.lua @@ -1404,7 +1404,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { dir = { 0, 1, 0 }, pos = { -3.677, 1.012, 0.859 } } }, - country_of_origin = "RUS", + country_of_origin = "USSR", crew_members = { { canopy_pos = { 3.41, 0, 0 }, drop_canopy_name = 49, diff --git a/_G/db/Units/Planes/Plane/Su-30.lua b/_G/db/Units/Planes/Plane/Su-30.lua index 34467036..27fc1d13 100644 --- a/_G/db/Units/Planes/Plane/Su-30.lua +++ b/_G/db/Units/Planes/Plane/Su-30.lua @@ -876,7 +876,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { }, typename = "collection" }, - main_gear_pos = { -0.624, -2.238, 2.256 }, + main_gear_pos = { -0.624, -2.19, 2.256 }, main_gear_wheel_diameter = 0.972, mapclasskey = "P0091000024", mechanimations = { @@ -903,7 +903,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Transition = { "Any", "Bailout" } } } }, - nose_gear_pos = { 5.207, -2.238, 0 }, + nose_gear_pos = { 5.207, -2.19, 0 }, nose_gear_wheel_diameter = 0.754, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/Su-33.lua b/_G/db/Units/Planes/Plane/Su-33.lua index 66626c06..0656711f 100644 --- a/_G/db/Units/Planes/Plane/Su-33.lua +++ b/_G/db/Units/Planes/Plane/Su-33.lua @@ -1644,7 +1644,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { nose_gear_amortizer_direct_stroke = 0.17, nose_gear_amortizer_normal_weight_stroke = 0, nose_gear_amortizer_reversal_stroke = -0.42, - nose_gear_pos = { 5.346, -2.16, 0 }, + nose_gear_pos = { 5.346, -2.14, 0 }, nose_gear_wheel_diameter = 0.754, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/Su-34.lua b/_G/db/Units/Planes/Plane/Su-34.lua index b33541a7..700d6ddd 100644 --- a/_G/db/Units/Planes/Plane/Su-34.lua +++ b/_G/db/Units/Planes/Plane/Su-34.lua @@ -1287,7 +1287,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { crew_members = { { canopy_ejection_dir = { 0, 0.5, -0.5 }, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 330, + drop_canopy_name = 332, ejection_seat_name = 9, pos = { 7.99, 0.7, -0.367 }, role = "pilot", @@ -1296,7 +1296,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { canopy_arg = 118, canopy_ejection_dir = { 0, 0.5, 0.5 }, canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 331, + drop_canopy_name = 333, ejection_seat_name = 9, pos = { 7.99, 0.7, 0.392 }, role = "copilot", diff --git a/_G/db/Units/Planes/Plane/TF-51D.lua b/_G/db/Units/Planes/Plane/TF-51D.lua index 510f984d..c44b0943 100644 --- a/_G/db/Units/Planes/Plane/TF-51D.lua +++ b/_G/db/Units/Planes/Plane/TF-51D.lua @@ -3,7 +3,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { AmmoWeight = 0, CAS_min = 56, CanopyGeometry = { -0.087155742747658, -0.51342418176678, -0.93969262078591, -0.51342418176678, -0.087155742747658 }, - Countries = { "Russia", "Ukraine", "Germany", "USA", "Italy", "UK", "Turkey", "Canada", "France", "Spain", "Belgium", "The Netherlands", "Norway", "Denmark", "Georgia", "Israel", "Australia", "Abkhazia" }, Damage = { { args = { 150 }, critical_damage = 5 @@ -1366,9 +1365,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { Waypoint_Custom_Panel = true, WingSpan = 9.12, WorldID = 65, - _file = "./Mods/aircraft/TF-51D/TF-51D.lua", + _file = "./CoreMods/aircraft/TF-51D/TF-51D.lua", _file_flyable = "./Mods/aircraft/TF-51D/entry.lua", - _origin = "TF-51D Mustang by Eagle Dynamics", + _origin = "TF-51D Mustang AI by Eagle Dynamics", _origin_flyable = "TF-51D Mustang by Eagle Dynamics", attribute = { 1, 1, 1, "Redacted", "Battleplanes", "All", "NonAndLightArmoredUnits", "NonArmoredUnits", "Air", "Planes", "Battle airplanes" }, average_fuel_consumption = 0.302, @@ -1377,7 +1376,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { country_of_origin = "USA", crew_members = { { canopy_pos = { 0, 0, 0 }, - drop_canopy_name = 336, + drop_canopy_name = 334, drop_parachute_name = "pilot_p51_parachute", ejection_seat_name = 0, pilot_name = 56, @@ -1385,7 +1384,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { role = "pilot", role_display_name = "Pilot" } }, - defFuelRatio = 0.68, + date_of_introduction = 1945, detection_range_max = 0, engines_count = 1, engines_nozzles = { { @@ -1589,46 +1588,6 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { net_animation = { 278, 279, 420 }, nose_gear_pos = { -4.99, -0.82, 0 }, nose_gear_wheel_diameter = 0.319, - panelRadio = { { - ID = "SCR522", - channels = { { - connect = true, - default = 105, - modulation = "AM", - name = "Channel A" - }, { - default = 124, - modulation = "AM", - name = "Channel B" - }, { - default = 131, - modulation = "AM", - name = "Channel C" - }, { - default = 139, - modulation = "AM", - name = "Channel D" - } }, - displayUnits = "MHz", - name = "SCR-522", - range = { - max = 156, - min = 38 - } - }, { - ID = "BC1206", - channels = { { - default = 108.9, - modulation = "AM", - name = "Initial Frequency" - } }, - displayUnits = "MHz", - name = "BC-1206", - range = { - max = 200, - min = 100 - } - } }, propellorShapeName = "P-51D_blade.FBX", propellorShapeType = "3ARG_PROC_BLUR", radar_can_see_ground = false, diff --git a/_G/db/Units/Planes/Plane/Tu-160.lua b/_G/db/Units/Planes/Plane/Tu-160.lua index 726445a4..c23f242c 100644 --- a/_G/db/Units/Planes/Plane/Tu-160.lua +++ b/_G/db/Units/Planes/Plane/Tu-160.lua @@ -436,7 +436,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { DuplicateOf = "Door0" } }, - nose_gear_pos = { 15.622, -3.843, 0 }, + nose_gear_pos = { 15.622, -3.73, 0 }, nose_gear_wheel_diameter = 0.754, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/Tu-95MS.lua b/_G/db/Units/Planes/Plane/Tu-95MS.lua index 89b08bbb..bbad8901 100644 --- a/_G/db/Units/Planes/Plane/Tu-95MS.lua +++ b/_G/db/Units/Planes/Plane/Tu-95MS.lua @@ -482,7 +482,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { DuplicateOf = "Door0" } }, - nose_gear_pos = { 14.203, -4.597, 0 }, + nose_gear_pos = { 14.203, -4.55, 0 }, nose_gear_wheel_diameter = 0.754, passivCounterm = { CMDS_Edit = true, diff --git a/_G/db/Units/Planes/Plane/Yak-52.lua b/_G/db/Units/Planes/Plane/Yak-52.lua index 192f580c..e6d0bc96 100644 --- a/_G/db/Units/Planes/Plane/Yak-52.lua +++ b/_G/db/Units/Planes/Plane/Yak-52.lua @@ -640,14 +640,14 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { table_data = { { 0, 0.0242, 0.1, 0.0634, 0, 0.15, 20, 1.58 }, { 0.2, 0.0242, 0.1, 0.0634, 0, 1.606, 20, 1.58 }, { 0.342, 0.0245, 0.0787, 0.061, 0.017, 2.353, 18, 1.3 }, { 0.5, 0.0263, 0.077, 0.057, 0.025, 1.145, 16, 0.95 }, { 0.59, 0.0268, 0.0768, 0.0514, 0.026, 0.761, 15, 0.75 }, { 0.67, 0.0331, 0.0784, 0.047, 0.021, 0.384, 14.5, 0.62 }, { 0.74, 0.0465, 0.0848, 0.08, 0.16, 0.206, 10, 0.46 }, { 0.76, 0.0527, 0.0813, 0.1, 0.25, 0.133, 9, 0.42 }, { 0.8, 0.0737, 0.0695, 0.2, 0.36, 0.077, 6, 0.38 }, { 0.83, 0.1006, 0.0993, 0.34, 2.4, 0.063, 4.5, 0.3 }, { 0.9, 0.147, 0.073, 0.56, 3, 0.042, 3, 0.2 } } }, engine = { - D_prop = 3.28, + D_prop = { 2.4, 2.4 }, Displ = 27, ForsRUD = 1, Init_Mom = 220, MAX_Manifold_P_1 = 155774, MAX_Manifold_P_2 = 206570, MAX_Manifold_P_3 = 226648, - MOI_prop = 65, + MOI_prop = { 4.5, 12 }, MaksRUD = 1, MaxRUD = 1, MinRUD = 0, @@ -681,6 +681,12 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { k_piston = 3000, k_reg = 0.003, k_vel = 0.017, + prop_blades_count = { 2, 3 }, + prop_direction = -1, + prop_locations = { { 1.6834, 0, 0 }, { 0, 0, 0 }, { 1.7046, 0, 0 }, { 0, 0, 0 } }, + prop_pitch_feather = { 0, 0 }, + prop_pitch_max = { 32, 32 }, + prop_pitch_min = { 12, 12 }, table_data = { { 0, 16620 }, { 0.1, 15600 }, { 0.2, 14340 }, { 0.3, 13320 }, { 0.4, 12230 }, { 0.5, 11300 }, { 0.6, 10600 }, { 0.7, 10050 }, { 0.8, 9820 }, { 0.9, 5902 }, { 1.9, 3469 } }, type = "Radial" } @@ -1075,7 +1081,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { nose_gear_amortizer_direct_stroke = 0, nose_gear_amortizer_normal_weight_stroke = -0.003, nose_gear_amortizer_reversal_stroke = -0.15, - nose_gear_pos = { 0.803, -1.526, 0 }, + nose_gear_pos = { 0.803, -1.506, 0 }, nose_gear_wheel_diameter = 0.319, panelRadio = { { ID = "ARK-15M", @@ -1119,7 +1125,9 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { min = 0.1 } } }, - propellorShapeType = "3ARG", + propellorShapeHubs = { { 0.08, 0.1 }, { 0, 0 } }, + propellorShapeNames = { "Yak-52_2blade.FBX", "Yak-52_3blade.FBX" }, + propellorShapeType = "3ARG_PROC_BLUR", radar_can_see_ground = false, range = 465, shape_table_data = { { @@ -1127,7 +1135,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { desrt = "Bf-109K-4_oblomki", drawonmap = true, file = "Yak-52", - fire = { 300, 2 }, + fire = { 3600, 2 }, index = "Redacted", life = 18, name = "Yak-52", @@ -1136,7 +1144,7 @@ _G["db"]["Units"]["Planes"]["Plane"]["#Index"] = { vis = 3 }, { file = "Bf-109K-4_oblomki", - fire = { 240, 2 }, + fire = { 3600, 2 }, name = "Bf-109K-4_oblomki" } }, swapped_names = true, diff --git a/_G/db/Units/Ships/Ship/ALBATROS.lua b/_G/db/Units/Ships/Ship/ALBATROS.lua index 5785aba3..d485276f 100644 --- a/_G/db/Units/Ships/Ship/ALBATROS.lua +++ b/_G/db/Units/Ships/Ship/ALBATROS.lua @@ -201,6 +201,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 30000, radar_type = 104, + searchRadarFrequencies = { { 6000000000, 8000000000 } }, searchRadarMaxElevation = 0.69813170079773 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/BDK-775.lua b/_G/db/Units/Ships/Ship/BDK-775.lua index 8cb8d7b5..2f0e7f28 100644 --- a/_G/db/Units/Ships/Ship/BDK-775.lua +++ b/_G/db/Units/Ships/Ship/BDK-775.lua @@ -286,6 +286,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { radar1_period = 6, radar2_period = 3, sensor = { + height = 12.8, max_alt_finding_target = 10000, max_range_finding_target = 64000, min_alt_finding_target = 0, diff --git a/_G/db/Units/Ships/Ship/CVN_71.lua b/_G/db/Units/Ships/Ship/CVN_71.lua index eb2af999..151df449 100644 --- a/_G/db/Units/Ships/Ship/CVN_71.lua +++ b/_G/db/Units/Ships/Ship/CVN_71.lua @@ -384,7 +384,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { boxPosLocal = { 0, 0, 0, 0 } } }, cameraPosLocal = { 0, 1.75, -2.5 }, - dockPos = { 0, 0, 0 } + dockPos = { 0, 0, 0 }, + indoor = true }, HANGAR = { HQ_model = "Nimitz_Hangar", @@ -446,7 +447,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { TACAN_position = { -55, 55, 29 }, Tail_Width = 22, TaxiForTORoutes = { { - Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 7.6, 20.1494, 10.5 }, 1, 20 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 2 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -458,7 +459,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -26, 20.1494, 12 }, 3, 20 }, { { -39, 20.1494, 4 }, 3 }, { { -81, 20.1494, -2.7 }, 2 }, { { -83, 20.1494, -20 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { - Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 20, 20.1494, 8 }, 2 }, { { 39, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { -23, 20.1494, 34 }, 1 }, { { -23, 20.1494, 11 }, 2 }, { { 7, 20.1494, 3 }, 2 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -470,13 +471,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { 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 } }, RunwayIdx = 4 }, { - Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 22, 20.1494, 8 }, 2 }, { { 40, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + 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 } }, RunwayIdx = 1 }, { Points = { { { -102.5, 20.1494, 34 }, 1 }, { { -102.5, 20.1494, 12.7 }, 2 }, { { -60, 20.1494, 8 }, 3 }, { { -10, 20.1494, 3.8 }, 3 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { 35, 20.1494, 34 }, 1 }, { { 34.5, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 35, 20.1494, 34 }, 1 }, { { 35, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 23, 20.1494, 34 }, 1 }, { { 23, 20.1494, 23 }, 1 }, { { 8.6, 20.1494, 10.5 }, 1 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -485,10 +486,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { 6, 20.1494, 32.5 }, 1 }, { { 6, 20.1494, 10.5 }, 1 }, { { 13, 20.1494, 0 }, 1 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { -118, 20.1494, 28 }, 1 }, { { -118, 20.1494, 16 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 20, 20.1494, 8 }, 2 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -118, 20.1494, 28 }, 1 }, { { -112, 20.1494, 16 }, 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 } }, RunwayIdx = 1 }, { - Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -121, 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 } }, + 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 } }, @@ -496,7 +497,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -125, 20.1494, 17.5 }, 2 }, { { -143, 20.1494, 26 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -124, 20.1494, 15 }, 2 }, { { -130, 20.1494, 27.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 4 }, { { -118, 20.1494, 11 }, 2 }, { { -118, 20.1494, 29 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 23 }, 6 }, { { -106, 20.1494, 15 }, 2 }, { { -103.5, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 23 }, 6 }, { { -95, 20.1494, 15 }, 2 }, { { -92, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -70, 20.1494, 19 }, 6 }, { { -79, 20.1494, 10 }, 2 }, { { -77, 20.1494, 26.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 15 }, 4 }, { { -66, 20.1494, 5 }, 2 }, { { -63, 20.1494, 17.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -45, 20.1494, 14 }, 4 }, { { -56, 20.1494, 5 }, 2 }, { { -52, 20.1494, 17 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -40, 20.1494, 12 }, 4 }, { { -45, 20.1494, 2 }, 2 }, { { -41, 20.1494, 16 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 25, 20.1494, 0 }, 5 }, { { 6, 20.1494, 24 }, 3 }, { { 6, 20.1494, 10 }, 2 }, { { 6, 20.1494, 32.5 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 4 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 3 }, { { 41, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, -2 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -20, 20.1494, 14 }, 3 }, { { -25, 20.1494, 10 }, 2 }, { { -25, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 20, 20.1494, 10 }, 5 }, { { -21, 20.1494, 10 }, 2 }, { { -14, 20.1494, -2 }, 2 }, { { -13, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 34, 20.1494, 11 }, 2 }, { { 20, 20.1494, 0 }, 2 }, { { 23.5, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 40, 20.1494, -3 }, 2 }, { { 40, 20.1494, 10 }, 2 }, { { 34, 20.1494, -4 }, 2 }, { { 35, 20.1494, 34 }, -2, 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 }, { { -102.5, 20.1494, 20 }, 2 }, { { -102.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 18 }, 6 }, { { -90, 20.1494, 19 }, 2 }, { { -90, 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 } }, RoutesNumber = 16 }, ThreatRange = 25000, @@ -873,6 +874,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 60000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 4000000000 }, { 850000000, 942000000 } }, searchRadarMaxElevation = 0.87266462599716 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/CVN_72.lua b/_G/db/Units/Ships/Ship/CVN_72.lua index 530417e2..6f97a7d3 100644 --- a/_G/db/Units/Ships/Ship/CVN_72.lua +++ b/_G/db/Units/Ships/Ship/CVN_72.lua @@ -384,7 +384,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { boxPosLocal = { 0, 0, 0, 0 } } }, cameraPosLocal = { 0, 1.75, -2.5 }, - dockPos = { 0, 0, 0 } + dockPos = { 0, 0, 0 }, + indoor = true }, HANGAR = { HQ_model = "Nimitz_Hangar", @@ -446,7 +447,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { TACAN_position = { -55, 55, 29 }, Tail_Width = 22, TaxiForTORoutes = { { - Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 7.6, 20.1494, 10.5 }, 1, 20 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 2 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -458,7 +459,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -26, 20.1494, 12 }, 3, 20 }, { { -39, 20.1494, 4 }, 3 }, { { -81, 20.1494, -2.7 }, 2 }, { { -83, 20.1494, -20 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { - Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 20, 20.1494, 8 }, 2 }, { { 39, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { -23, 20.1494, 34 }, 1 }, { { -23, 20.1494, 11 }, 2 }, { { 7, 20.1494, 3 }, 2 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -470,13 +471,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { 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 } }, RunwayIdx = 4 }, { - Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 22, 20.1494, 8 }, 2 }, { { 40, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + 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 } }, RunwayIdx = 1 }, { Points = { { { -102.5, 20.1494, 34 }, 1 }, { { -102.5, 20.1494, 12.7 }, 2 }, { { -60, 20.1494, 8 }, 3 }, { { -10, 20.1494, 3.8 }, 3 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { 35, 20.1494, 34 }, 1 }, { { 34.5, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 35, 20.1494, 34 }, 1 }, { { 35, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 23, 20.1494, 34 }, 1 }, { { 23, 20.1494, 23 }, 1 }, { { 8.6, 20.1494, 10.5 }, 1 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -485,10 +486,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { 6, 20.1494, 32.5 }, 1 }, { { 6, 20.1494, 10.5 }, 1 }, { { 13, 20.1494, 0 }, 1 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { -118, 20.1494, 28 }, 1 }, { { -118, 20.1494, 16 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 20, 20.1494, 8 }, 2 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -118, 20.1494, 28 }, 1 }, { { -112, 20.1494, 16 }, 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 } }, RunwayIdx = 1 }, { - Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -121, 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 } }, + 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 } }, @@ -496,7 +497,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -125, 20.1494, 17.5 }, 2 }, { { -143, 20.1494, 26 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -124, 20.1494, 15 }, 2 }, { { -130, 20.1494, 27.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 4 }, { { -118, 20.1494, 11 }, 2 }, { { -118, 20.1494, 29 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 23 }, 6 }, { { -106, 20.1494, 15 }, 2 }, { { -103.5, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 23 }, 6 }, { { -95, 20.1494, 15 }, 2 }, { { -92, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -70, 20.1494, 19 }, 6 }, { { -79, 20.1494, 10 }, 2 }, { { -77, 20.1494, 26.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 15 }, 4 }, { { -66, 20.1494, 5 }, 2 }, { { -63, 20.1494, 17.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -45, 20.1494, 14 }, 4 }, { { -56, 20.1494, 5 }, 2 }, { { -52, 20.1494, 17 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -40, 20.1494, 12 }, 4 }, { { -45, 20.1494, 2 }, 2 }, { { -41, 20.1494, 16 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 25, 20.1494, 0 }, 5 }, { { 6, 20.1494, 24 }, 3 }, { { 6, 20.1494, 10 }, 2 }, { { 6, 20.1494, 32.5 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 4 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 3 }, { { 41, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, -2 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -20, 20.1494, 14 }, 3 }, { { -25, 20.1494, 10 }, 2 }, { { -25, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 20, 20.1494, 10 }, 5 }, { { -21, 20.1494, 10 }, 2 }, { { -14, 20.1494, -2 }, 2 }, { { -13, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 34, 20.1494, 11 }, 2 }, { { 20, 20.1494, 0 }, 2 }, { { 23.5, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 40, 20.1494, -3 }, 2 }, { { 40, 20.1494, 10 }, 2 }, { { 34, 20.1494, -4 }, 2 }, { { 35, 20.1494, 34 }, -2, 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 }, { { -102.5, 20.1494, 20 }, 2 }, { { -102.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 18 }, 6 }, { { -90, 20.1494, 19 }, 2 }, { { -90, 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 } }, RoutesNumber = 16 }, ThreatRange = 25000, @@ -912,6 +913,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 60000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 4000000000 }, { 850000000, 942000000 } }, searchRadarMaxElevation = 0.87266462599716 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/CVN_73.lua b/_G/db/Units/Ships/Ship/CVN_73.lua index 303fa241..5eee4ff4 100644 --- a/_G/db/Units/Ships/Ship/CVN_73.lua +++ b/_G/db/Units/Ships/Ship/CVN_73.lua @@ -387,7 +387,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { boxPosLocal = { 0, 0, 0, 0 } } }, cameraPosLocal = { 0, 1.75, -2.5 }, - dockPos = { 0, 0, 0 } + dockPos = { 0, 0, 0 }, + indoor = true }, HANGAR = { HQ_model = "Nimitz_Hangar", @@ -449,7 +450,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { TACAN_position = { -55, 55, 29 }, Tail_Width = 22, TaxiForTORoutes = { { - Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 7.6, 20.1494, 10.5 }, 1, 20 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 2 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -461,7 +462,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -26, 20.1494, 12 }, 3, 20 }, { { -39, 20.1494, 4 }, 3 }, { { -81, 20.1494, -2.7 }, 2 }, { { -83, 20.1494, -20 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { - Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 20, 20.1494, 8 }, 2 }, { { 39, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { -23, 20.1494, 34 }, 1 }, { { -23, 20.1494, 11 }, 2 }, { { 7, 20.1494, 3 }, 2 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -473,13 +474,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { 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 } }, RunwayIdx = 4 }, { - Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 22, 20.1494, 8 }, 2 }, { { 40, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + 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 } }, RunwayIdx = 1 }, { Points = { { { -102.5, 20.1494, 34 }, 1 }, { { -102.5, 20.1494, 12.7 }, 2 }, { { -60, 20.1494, 8 }, 3 }, { { -10, 20.1494, 3.8 }, 3 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { 35, 20.1494, 34 }, 1 }, { { 34.5, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 35, 20.1494, 34 }, 1 }, { { 35, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 23, 20.1494, 34 }, 1 }, { { 23, 20.1494, 23 }, 1 }, { { 8.6, 20.1494, 10.5 }, 1 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -488,10 +489,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { 6, 20.1494, 32.5 }, 1 }, { { 6, 20.1494, 10.5 }, 1 }, { { 13, 20.1494, 0 }, 1 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { -118, 20.1494, 28 }, 1 }, { { -118, 20.1494, 16 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 20, 20.1494, 8 }, 2 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -118, 20.1494, 28 }, 1 }, { { -112, 20.1494, 16 }, 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 } }, RunwayIdx = 1 }, { - Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -121, 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 } }, + 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 } }, @@ -499,7 +500,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -125, 20.1494, 17.5 }, 2 }, { { -143, 20.1494, 26 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -124, 20.1494, 15 }, 2 }, { { -130, 20.1494, 27.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 4 }, { { -118, 20.1494, 11 }, 2 }, { { -118, 20.1494, 29 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 23 }, 6 }, { { -106, 20.1494, 15 }, 2 }, { { -103.5, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 23 }, 6 }, { { -95, 20.1494, 15 }, 2 }, { { -92, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -70, 20.1494, 19 }, 6 }, { { -79, 20.1494, 10 }, 2 }, { { -77, 20.1494, 26.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 15 }, 4 }, { { -66, 20.1494, 5 }, 2 }, { { -63, 20.1494, 17.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -45, 20.1494, 14 }, 4 }, { { -56, 20.1494, 5 }, 2 }, { { -52, 20.1494, 17 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -40, 20.1494, 12 }, 4 }, { { -45, 20.1494, 2 }, 2 }, { { -41, 20.1494, 16 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 25, 20.1494, 0 }, 5 }, { { 6, 20.1494, 24 }, 3 }, { { 6, 20.1494, 10 }, 2 }, { { 6, 20.1494, 32.5 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 4 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 3 }, { { 41, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, -2 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -20, 20.1494, 14 }, 3 }, { { -25, 20.1494, 10 }, 2 }, { { -25, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 20, 20.1494, 10 }, 5 }, { { -21, 20.1494, 10 }, 2 }, { { -14, 20.1494, -2 }, 2 }, { { -13, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 34, 20.1494, 11 }, 2 }, { { 20, 20.1494, 0 }, 2 }, { { 23.5, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 40, 20.1494, -3 }, 2 }, { { 40, 20.1494, 10 }, 2 }, { { 34, 20.1494, -4 }, 2 }, { { 35, 20.1494, 34 }, -2, 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 }, { { -102.5, 20.1494, 20 }, 2 }, { { -102.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 18 }, 6 }, { { -90, 20.1494, 19 }, 2 }, { { -90, 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 } }, RoutesNumber = 16 }, ThreatRange = 25000, @@ -888,6 +889,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 60000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 4000000000 }, { 850000000, 942000000 } }, searchRadarMaxElevation = 0.87266462599716 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/CVN_75.lua b/_G/db/Units/Ships/Ship/CVN_75.lua index 666be6c9..7027a3dc 100644 --- a/_G/db/Units/Ships/Ship/CVN_75.lua +++ b/_G/db/Units/Ships/Ship/CVN_75.lua @@ -387,7 +387,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { boxPosLocal = { 0, 0, 0, 0 } } }, cameraPosLocal = { 0, 1.75, -2.5 }, - dockPos = { 0, 0, 0 } + dockPos = { 0, 0, 0 }, + indoor = true }, HANGAR = { HQ_model = "Nimitz_Hangar", @@ -449,7 +450,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { TACAN_position = { -55, 55, 29 }, Tail_Width = 22, TaxiForTORoutes = { { - Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 7.6, 20.1494, 10.5 }, 1, 20 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 2 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -461,7 +462,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -26, 20.1494, 12 }, 3, 20 }, { { -39, 20.1494, 4 }, 3 }, { { -81, 20.1494, -2.7 }, 2 }, { { -83, 20.1494, -20 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { - Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 20, 20.1494, 8 }, 2 }, { { 39, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { -23, 20.1494, 34 }, 1 }, { { -23, 20.1494, 11 }, 2 }, { { 7, 20.1494, 3 }, 2 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -473,13 +474,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { 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 } }, RunwayIdx = 4 }, { - Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 22, 20.1494, 8 }, 2 }, { { 40, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + 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 } }, RunwayIdx = 1 }, { Points = { { { -102.5, 20.1494, 34 }, 1 }, { { -102.5, 20.1494, 12.7 }, 2 }, { { -60, 20.1494, 8 }, 3 }, { { -10, 20.1494, 3.8 }, 3 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { 35, 20.1494, 34 }, 1 }, { { 34.5, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 35, 20.1494, 34 }, 1 }, { { 35, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 23, 20.1494, 34 }, 1 }, { { 23, 20.1494, 23 }, 1 }, { { 8.6, 20.1494, 10.5 }, 1 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -488,10 +489,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { 6, 20.1494, 32.5 }, 1 }, { { 6, 20.1494, 10.5 }, 1 }, { { 13, 20.1494, 0 }, 1 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { -118, 20.1494, 28 }, 1 }, { { -118, 20.1494, 16 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 20, 20.1494, 8 }, 2 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -118, 20.1494, 28 }, 1 }, { { -112, 20.1494, 16 }, 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 } }, RunwayIdx = 1 }, { - Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -121, 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 } }, + 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 } }, @@ -499,7 +500,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -125, 20.1494, 17.5 }, 2 }, { { -143, 20.1494, 26 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -124, 20.1494, 15 }, 2 }, { { -130, 20.1494, 27.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 4 }, { { -118, 20.1494, 11 }, 2 }, { { -118, 20.1494, 29 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 23 }, 6 }, { { -106, 20.1494, 15 }, 2 }, { { -103.5, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 23 }, 6 }, { { -95, 20.1494, 15 }, 2 }, { { -92, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -70, 20.1494, 19 }, 6 }, { { -79, 20.1494, 10 }, 2 }, { { -77, 20.1494, 26.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 15 }, 4 }, { { -66, 20.1494, 5 }, 2 }, { { -63, 20.1494, 17.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -45, 20.1494, 14 }, 4 }, { { -56, 20.1494, 5 }, 2 }, { { -52, 20.1494, 17 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -40, 20.1494, 12 }, 4 }, { { -45, 20.1494, 2 }, 2 }, { { -41, 20.1494, 16 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 25, 20.1494, 0 }, 5 }, { { 6, 20.1494, 24 }, 3 }, { { 6, 20.1494, 10 }, 2 }, { { 6, 20.1494, 32.5 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 4 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 3 }, { { 41, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, -2 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -20, 20.1494, 14 }, 3 }, { { -25, 20.1494, 10 }, 2 }, { { -25, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 20, 20.1494, 10 }, 5 }, { { -21, 20.1494, 10 }, 2 }, { { -14, 20.1494, -2 }, 2 }, { { -13, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 34, 20.1494, 11 }, 2 }, { { 20, 20.1494, 0 }, 2 }, { { 23.5, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 40, 20.1494, -3 }, 2 }, { { 40, 20.1494, 10 }, 2 }, { { 34, 20.1494, -4 }, 2 }, { { 35, 20.1494, 34 }, -2, 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 }, { { -102.5, 20.1494, 20 }, 2 }, { { -102.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 18 }, 6 }, { { -90, 20.1494, 19 }, 2 }, { { -90, 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 } }, RoutesNumber = 16 }, ThreatRange = 25000, @@ -888,6 +889,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 60000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 4000000000 }, { 850000000, 942000000 } }, searchRadarMaxElevation = 0.87266462599716 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/CV_1143_5.lua b/_G/db/Units/Ships/Ship/CV_1143_5.lua index 37aac9c6..875af3ed 100644 --- a/_G/db/Units/Ships/Ship/CV_1143_5.lua +++ b/_G/db/Units/Ships/Ship/CV_1143_5.lua @@ -1209,6 +1209,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 550000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 3000000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 0.87266462599716 }, Waypoint_Custom_Panel = true, @@ -1272,6 +1273,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { numParking = 3, race_distance = 4630000, race_velocity = 15.4333, + sensor = { + max_alt_finding_target = 15000, + max_range_finding_target = 50000, + min_alt_finding_target = 0, + min_range_finding_target = 0, + pos = { 9.5, 52, 20.9 } + }, shape_table_data = { { classname = "lLandShip", desrt = "", diff --git a/_G/db/Units/Ships/Ship/Higgins_boat.lua b/_G/db/Units/Ships/Ship/Higgins_boat.lua index 620f6bc8..1047f66d 100644 --- a/_G/db/Units/Ships/Ship/Higgins_boat.lua +++ b/_G/db/Units/Ships/Ship/Higgins_boat.lua @@ -10,6 +10,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Gamma_max = 1, Height = 2, IR_emission_coeff = 0.08, + InternalCargo = { + maximalCapacity = 700, + nominalCapacity = 700 + }, Length = 11.05, Name = "Boat LCVP Higgins", Om = 1, @@ -121,6 +125,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { attribute = { 3, 12, 14, "Redacted", "low_reflection_vessel", "Light armed ships", "NO_SAM", "Armed Ship", "Naval", "All", "Ships", "Armed ships", "NonAndLightArmoredUnits", "NonArmoredUnits" }, chassis = {}, distFindObstacles = 50, + doorAnimation = 47, draft = 1.3, economy_distance = 300000, economy_velocity = 4, diff --git a/_G/db/Units/Ships/Ship/IMPROVED_KILO.lua b/_G/db/Units/Ships/Ship/IMPROVED_KILO.lua index a25fbc33..254c8fc2 100644 --- a/_G/db/Units/Ships/Ship/IMPROVED_KILO.lua +++ b/_G/db/Units/Ships/Ship/IMPROVED_KILO.lua @@ -1,5 +1,5 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { - CustomAimPoint = { 8, 3, 0 }, + CustomAimPoint = { 7.87, 2.7, 0 }, DeckLevel = 2.45, DetectionRange = 0, DisplayName = "SSK 636 Improved Kilo", @@ -65,7 +65,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shipLength = 58.8, snd = {}, speedup = 0.203634, - sternEffectDX = { { 0, 0, 61, 6 }, { 2, 2, 56, 4 }, { 3, 5, 48, 3 }, { 3.5, 32, 12, 3 }, { 8.3, 32, 12, 3 } }, + sternEffectDX = { { 0, 0, 61, 6 }, { 10, 10, 35, 2 }, { 15, 13, 0, 0 } }, swapped_names = true, tags = { "Submarine" }, type = "IMPROVED_KILO", diff --git a/_G/db/Units/Ships/Ship/KILO.lua b/_G/db/Units/Ships/Ship/KILO.lua index fee6983c..2dbd9332 100644 --- a/_G/db/Units/Ships/Ship/KILO.lua +++ b/_G/db/Units/Ships/Ship/KILO.lua @@ -1,5 +1,5 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { - CustomAimPoint = { 10, 3, 0 }, + CustomAimPoint = { 10, 2, 0 }, DeckLevel = 2.45, DetectionRange = 0, DisplayName = "SSK 877V Kilo", @@ -65,7 +65,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { shipLength = 58.8, snd = {}, speedup = 0.203634, - sternEffectDX = { { 0, 0, 58, 6 }, { 2, 10, 41, 4 }, { 2.5, 14.5, 31, 3 }, { 2.7, 29, 13, 2 }, { 7.5, 29, 13, 2 } }, + sternEffectDX = { { 0, 0, 57.9, 6 }, { 10, 10, 20, 1 }, { 15, 10, 0, 0 } }, swapped_names = true, tags = { "Submarine" }, type = "KILO", diff --git a/_G/db/Units/Ships/Ship/KUZNECOW.lua b/_G/db/Units/Ships/Ship/KUZNECOW.lua index 38254691..627966b6 100644 --- a/_G/db/Units/Ships/Ship/KUZNECOW.lua +++ b/_G/db/Units/Ships/Ship/KUZNECOW.lua @@ -870,6 +870,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 550000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 3000000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 0.87266462599716 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/MOLNIYA.lua b/_G/db/Units/Ships/Ship/MOLNIYA.lua index 9d9c5554..a8e36ad0 100644 --- a/_G/db/Units/Ships/Ship/MOLNIYA.lua +++ b/_G/db/Units/Ships/Ship/MOLNIYA.lua @@ -359,6 +359,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 120000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 3000000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 0.69813170079773 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/MOSCOW.lua b/_G/db/Units/Ships/Ship/MOSCOW.lua index 4219ca55..287cc38b 100644 --- a/_G/db/Units/Ships/Ship/MOSCOW.lua +++ b/_G/db/Units/Ships/Ship/MOSCOW.lua @@ -1016,6 +1016,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 500000, radar_type = 102, + searchRadarFrequencies = { { 2000000000, 2500000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 0.69813170079773 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/NEUSTRASH.lua b/_G/db/Units/Ships/Ship/NEUSTRASH.lua index 1804269b..8d5dc606 100644 --- a/_G/db/Units/Ships/Ship/NEUSTRASH.lua +++ b/_G/db/Units/Ships/Ship/NEUSTRASH.lua @@ -172,7 +172,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { distanceMin = 1000, max_trg_alt = 10000, min_trg_alt = 10, - reflection_limit = 0.02, + reflection_limit = 0.04, type = 102 } }, angles = { { 3.1415926535898, -3.1415926535898, 0, 1.1170107212764 } }, @@ -235,6 +235,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 27000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 3000000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 0.69813170079773 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/PERRY.lua b/_G/db/Units/Ships/Ship/PERRY.lua index 0cdb12b8..4b8f775f 100644 --- a/_G/db/Units/Ships/Ship/PERRY.lua +++ b/_G/db/Units/Ships/Ship/PERRY.lua @@ -402,6 +402,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 120000, radar_type = 102, + searchRadarFrequencies = { { 850000000, 942000000 }, { 10250000000, 10500000000 } }, searchRadarMaxElevation = 0.69813170079773 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/PIOTR.lua b/_G/db/Units/Ships/Ship/PIOTR.lua index 2fa25c9e..cc866f99 100644 --- a/_G/db/Units/Ships/Ship/PIOTR.lua +++ b/_G/db/Units/Ships/Ship/PIOTR.lua @@ -729,6 +729,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 550000, radar_type = 102, + searchRadarFrequencies = { { 2000000000, 3000000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 1.0471975511966 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/REZKY.lua b/_G/db/Units/Ships/Ship/REZKY.lua index 40d260b5..2fb697a5 100644 --- a/_G/db/Units/Ships/Ship/REZKY.lua +++ b/_G/db/Units/Ships/Ship/REZKY.lua @@ -180,6 +180,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 30000, radar_type = 102, + searchRadarFrequencies = { { 1000000000, 1200000000 }, { 6000000000, 8000000000 } }, searchRadarMaxElevation = 0.69813170079773 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/Stennis.lua b/_G/db/Units/Ships/Ship/Stennis.lua index c7d68de0..a65f5c4c 100644 --- a/_G/db/Units/Ships/Ship/Stennis.lua +++ b/_G/db/Units/Ships/Ship/Stennis.lua @@ -360,6 +360,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, Om = 0.05, Plane_Num_ = 72, + PlayerInteractionLocked = false, RCS = 2000000, R_min = 665.8, Rate = 5500, @@ -392,7 +393,8 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { boxPosLocal = { 0, 0, 0, 0 } } }, cameraPosLocal = { 0, 1.75, -2.5 }, - dockPos = { 0, 0, 0 } + dockPos = { 0, 0, 0 }, + indoor = true }, HANGAR = { HQ_model = "Nimitz_Hangar", @@ -454,7 +456,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { TACAN_position = { -55, 55, 29 }, Tail_Width = 22, TaxiForTORoutes = { { - Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 24.5, 20.1494, 9.5 }, 1, 20 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 7.6, 20.1494, 10.5 }, 1, 20 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 2 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -466,7 +468,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { -26, 20.1494, 12 }, 3, 20 }, { { -39, 20.1494, 4 }, 3 }, { { -81, 20.1494, -2.7 }, 2 }, { { -83, 20.1494, -20 }, 2 }, { { -79, 20.1494, -32.8 }, 2 }, { { -70, 20.1494, -33.3 }, 1 }, { { -58.5, 20.1494, -32.8 }, 1 } }, RunwayIdx = 4 }, { - Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 20, 20.1494, 8 }, 2 }, { { 39, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -11, 20.1494, 34 }, 2 }, { { -11, 20.1494, 8 }, 2 }, { { 34.25, 20.1494, 8 }, 2 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { -23, 20.1494, 34 }, 1 }, { { -23, 20.1494, 11 }, 2 }, { { 7, 20.1494, 3 }, 2 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -478,13 +480,13 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { 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 } }, RunwayIdx = 4 }, { - Points = { { { -90, 20.1494, 34 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 22, 20.1494, 8 }, 2 }, { { 40, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + 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 } }, RunwayIdx = 1 }, { Points = { { { -102.5, 20.1494, 34 }, 1 }, { { -102.5, 20.1494, 12.7 }, 2 }, { { -60, 20.1494, 8 }, 3 }, { { -10, 20.1494, 3.8 }, 3 }, { { 44.3, 20.1494, -3.25 }, 2 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { 35, 20.1494, 34 }, 1 }, { { 34.5, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { 35, 20.1494, 34 }, 1 }, { { 35, 20.1494, 24 }, 1 }, { { 24, 20.1494, 9.5 }, 1 }, { { 18.5, 20.1494, 3 }, 1 }, { { 19, 20.1494, -2 }, 1 }, { { 26, 20.1494, -3 }, 1 }, { { 39.5, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, RunwayIdx = 1 }, { Points = { { { 23, 20.1494, 34 }, 1 }, { { 23, 20.1494, 23 }, 1 }, { { 8.6, 20.1494, 10.5 }, 1 }, { { 3.1, 20.1494, 4 }, 1 }, { { 7.5, 20.1494, -1 }, 2 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, @@ -493,10 +495,10 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Points = { { { 6, 20.1494, 32.5 }, 1 }, { { 6, 20.1494, 10.5 }, 1 }, { { 13, 20.1494, 0 }, 1 }, { { 28.5, 20.1494, -2.75 }, 1 }, { { 44.3, 20.1494, -3.25 }, 1 }, { { 55.9, 20.1494, -3.68 }, 1 } }, RunwayIdx = 2 }, { - Points = { { { -118, 20.1494, 28 }, 1 }, { { -118, 20.1494, 16 }, 1 }, { { -90, 20.1494, 16.5 }, 2 }, { { -40, 20.1494, 7 }, 3 }, { { -25, 20.1494, 8 }, 3 }, { { 20, 20.1494, 8 }, 2 }, { { 37.6, 20.1494, 15 }, 2 }, { { 44, 20.1494, 21 }, 2 }, { { 55, 20.1494, 18.54 }, 1 } }, + Points = { { { -118, 20.1494, 28 }, 1 }, { { -112, 20.1494, 16 }, 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 } }, RunwayIdx = 1 }, { - Points = { { { -129.2, 20.1494, 26.2 }, 1, 20 }, { { -121, 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 } }, + 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 } }, @@ -504,7 +506,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, RoutesForTONumber = 16 }, - TaxiRoutes = { { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -125, 20.1494, 17.5 }, 2 }, { { -143, 20.1494, 26 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 6 }, { { -124, 20.1494, 15 }, 2 }, { { -130, 20.1494, 27.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -105, 20.1494, 24 }, 4 }, { { -118, 20.1494, 11 }, 2 }, { { -118, 20.1494, 29 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -95, 20.1494, 23 }, 6 }, { { -106, 20.1494, 15 }, 2 }, { { -103.5, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 23 }, 6 }, { { -95, 20.1494, 15 }, 2 }, { { -92, 20.1494, 34 }, -2, 180 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -70, 20.1494, 19 }, 6 }, { { -79, 20.1494, 10 }, 2 }, { { -77, 20.1494, 26.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -55, 20.1494, 15 }, 4 }, { { -66, 20.1494, 5 }, 2 }, { { -63, 20.1494, 17.5 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -45, 20.1494, 14 }, 4 }, { { -56, 20.1494, 5 }, 2 }, { { -52, 20.1494, 17 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -40, 20.1494, 12 }, 4 }, { { -45, 20.1494, 2 }, 2 }, { { -41, 20.1494, 16 }, -2 } }, { { { 13, 20.1494, -19 }, 10 }, { { 25, 20.1494, 0 }, 5 }, { { 6, 20.1494, 24 }, 3 }, { { 6, 20.1494, 10 }, 2 }, { { 6, 20.1494, 32.5 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 4 }, { { 42, 20.1494, 26.5 }, 2 }, { { 69.6, 20.1494, 34 }, -2 } }, { { { 24, 20.1494, -21.27 }, 10 }, { { 25, 20.1494, 10 }, 3 }, { { 41, 20.1494, 21 }, 2 }, { { 31, 20.1494, 27 }, 1 }, { { 53, 20.1494, 35 }, -2 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 10, 20.1494, 5 }, 5 }, { { -10, 20.1494, 7 }, 3 }, { { -20, 20.1494, 14 }, 3 }, { { -25, 20.1494, 10 }, 2 }, { { -25, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 20, 20.1494, 10 }, 5 }, { { -21, 20.1494, 10 }, 2 }, { { -14, 20.1494, -2 }, 2 }, { { -13, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 34, 20.1494, 11 }, 2 }, { { 20, 20.1494, 0 }, 2 }, { { 23.5, 20.1494, 34 }, -2, 180 } }, { { { 5, 20.1494, -17.8 }, 10 }, { { 40, 20.1494, -3 }, 2 }, { { 40, 20.1494, 10 }, 2 }, { { 34, 20.1494, -4 }, 2 }, { { 35, 20.1494, 34 }, -2, 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 }, { { -102.5, 20.1494, 20 }, 2 }, { { -102.5, 20.1494, 34 }, 1, 180 } }, { { { 13, 20.1494, -19 }, 5 }, { { 10, 20.1494, 5 }, 3 }, { { -10, 20.1494, 7 }, 3 }, { { -85, 20.1494, 18 }, 6 }, { { -90, 20.1494, 19 }, 2 }, { { -90, 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 } }, RoutesNumber = 16 }, ThreatRange = 25000, @@ -933,6 +935,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 60000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 4000000000 }, { 850000000, 942000000 } }, searchRadarMaxElevation = 0.87266462599716 }, Waypoint_Custom_Panel = true, @@ -941,6 +944,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { X_tail = -140, _file = "./CoreMods/tech/USS_Nimitz/Database/db_ships.lua", _origin = "USS_Nimitz", + _origin_interaction_unlock = "Supercarrier", airFindDist = 50000, airWeaponDist = 25000, animation_arguments = { diff --git a/_G/db/Units/Ships/Ship/TICONDEROG.lua b/_G/db/Units/Ships/Ship/TICONDEROG.lua index 1be864e3..2ac6b451 100644 --- a/_G/db/Units/Ships/Ship/TICONDEROG.lua +++ b/_G/db/Units/Ships/Ship/TICONDEROG.lua @@ -454,7 +454,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { beamWidth = 1.5707963267949, distanceMax = 150000, distanceMin = 1000, - frequencyRange = { 500000000, 580000000 }, + frequencyRange = { 8000000000, 12000000000 }, max_number_of_missiles_channels = 2, max_trg_alt = 30000, min_trg_alt = 5, @@ -1452,7 +1452,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 450000, radar_type = 102, - searchRadarFrequencies = { { 50000000, 54000000 }, { 2000000000, 2200000000 } }, + searchRadarFrequencies = { { 3100000, 3500000 }, { 850000000, 942000000 } }, searchRadarMaxElevation = 1.0471975511966 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/Type_052B.lua b/_G/db/Units/Ships/Ship/Type_052B.lua index a5c551e4..c6ebee3d 100644 --- a/_G/db/Units/Ships/Ship/Type_052B.lua +++ b/_G/db/Units/Ships/Ship/Type_052B.lua @@ -475,6 +475,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 450000, radar_type = 102, + searchRadarFrequencies = { { 2000000000, 2500000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 1.3962634015955 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/Type_052C.lua b/_G/db/Units/Ships/Ship/Type_052C.lua index f73d77a9..b579d22b 100644 --- a/_G/db/Units/Ships/Ship/Type_052C.lua +++ b/_G/db/Units/Ships/Ship/Type_052C.lua @@ -739,7 +739,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 450000, radar_type = 102, - searchRadarFrequencies = { { 50000000, 54000000 }, { 2000000000, 2200000000 } }, + searchRadarFrequencies = { { 2000000000, 3000000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 1.3962634015955 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/Type_054A.lua b/_G/db/Units/Ships/Ship/Type_054A.lua index 6e96aefb..55002231 100644 --- a/_G/db/Units/Ships/Ship/Type_054A.lua +++ b/_G/db/Units/Ships/Ship/Type_054A.lua @@ -955,6 +955,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 450000, radar_type = 102, + searchRadarFrequencies = { { 2000000000, 2500000000 }, { 8000000000, 12000000000 } }, searchRadarMaxElevation = 1.3962634015955 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua b/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua index bc9242ec..6225cb4d 100644 --- a/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua +++ b/_G/db/Units/Ships/Ship/USS_Arleigh_Burke_IIa.lua @@ -284,7 +284,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { beamWidth = 1.5707963267949, distanceMax = 150000, distanceMin = 1000, - frequencyRange = { 500000000, 580000000 }, + frequencyRange = { 8000000000, 12000000000 }, max_number_of_missiles_channels = 2, max_trg_alt = 30000, min_trg_alt = 5, @@ -1099,7 +1099,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 450000, radar_type = 102, - searchRadarFrequencies = { { 50000000, 54000000 }, { 2000000000, 2200000000 } }, + searchRadarFrequencies = { { 3100000, 3500000 }, { 850000000, 942000000 } }, searchRadarMaxElevation = 1.0471975511966 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/VINSON.lua b/_G/db/Units/Ships/Ship/VINSON.lua index 140d7bd2..7c27770e 100644 --- a/_G/db/Units/Ships/Ship/VINSON.lua +++ b/_G/db/Units/Ships/Ship/VINSON.lua @@ -290,6 +290,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { }, maxTargetDetectionRange = 30000, radar_type = 104, + searchRadarFrequencies = { { 2000000000, 4000000000 }, { 850000000, 942000000 } }, searchRadarMaxElevation = 0.87266462599716 }, Waypoint_Custom_Panel = true, diff --git a/_G/db/Units/Ships/Ship/santafe.lua b/_G/db/Units/Ships/Ship/santafe.lua index 042582e2..6278e67f 100644 --- a/_G/db/Units/Ships/Ship/santafe.lua +++ b/_G/db/Units/Ships/Ship/santafe.lua @@ -1,5 +1,70 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { Countries = { "USA", "Argentina" }, + DM = { { + area_arg = 70, + area_fire = { + pos = { 6.76, 0, 2.95 }, + size = 0.7 + }, + area_life = 40, + area_name = "DMG-CONNING-TOWER" + }, { + area_arg = 71, + area_fire = { + pos = { 23, 0, 2.95 }, + size = 0.7 + }, + area_life = 40, + area_name = "PALUBA-FWD" + }, { + area_arg = 72, + area_fire = { + pos = { -18, 0, 2.95 }, + size = 0.7 + }, + area_life = 40, + area_name = "PALUBA-AFT" + }, { + area_arg = 73, + area_fire = { + pos = { 33.9, 0, 0.3 }, + size = 0.8 + }, + area_life = 60, + area_name = "DMG-BOW" + }, { + area_arg = 74, + area_fire = { + pos = { -3.4, 0, 0.3 }, + size = 0.8 + }, + area_life = 60, + area_name = "DMG-HULL-MIDSHIPS" + }, { + area_arg = 75, + area_fire = { + pos = { 35.3, 0, 0.3 }, + size = 0.8 + }, + area_life = 60, + area_name = "DMG-STERN" + }, { + area_arg = 76, + area_fire = { + pos = { -3.4, 0, 0 }, + size = 1.2 + }, + area_life = 60, + area_name = "DMG-LOWER-HULL" + }, { + area_arg = 77, + area_fire = { + pos = { -3.4, 0, 0.3 }, + size = 1.2 + }, + area_life = 70, + area_name = "SantaFe_Destroyed" + } }, DeckLevel = 3, DisplayName = "ARA Santa Fe S-21", Gamma_max = 0.25, @@ -184,7 +249,7 @@ _G["db"]["Units"]["Ships"]["Ship"]["#Index"] = { economy_distance = 72000000, economy_velocity = 5.15, enablePlayerCanDrive = false, - life = 3, + life = 100, mapclasskey = "P0091000038", mass = 5300000, maxPeriscopeDepth = 12, diff --git a/_G/launcher/ALQ_184.lua b/_G/launcher/ALQ_184.lua index a2ef213e..787ef5c2 100644 --- a/_G/launcher/ALQ_184.lua +++ b/_G/launcher/ALQ_184.lua @@ -5,8 +5,13 @@ _G["launcher"]["ALQ_184"] = { ShapeName = "ALQ-184" } }, Picture = "ALQ184.png", + ShapeName = "ALQ-184", Weight = 215, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.ALQ-184", attribute = { 4, 15, 45, "Redacted" }, - displayName = "ALQ-184 - ECM Pod" + category = 6, + displayName = "ALQ-184 - ECM Pod", + name = "ALQ-184" } \ No newline at end of file diff --git a/_G/launcher/ALQ_184_Long.lua b/_G/launcher/ALQ_184_Long.lua index a8fc6890..354c8b04 100644 --- a/_G/launcher/ALQ_184_Long.lua +++ b/_G/launcher/ALQ_184_Long.lua @@ -5,6 +5,7 @@ _G["launcher"]["ALQ_184_Long"] = { ShapeName = "alq-184long" } }, Picture = "ALQ184.png", + ShapeName = "alq-184long", Weight = 286, _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", _origin = "AircraftWeaponPack", diff --git a/_G/launcher/B-1B_Mk-848.lua b/_G/launcher/B-1B_Mk-848.lua index e7df2263..4d227e13 100644 --- a/_G/launcher/B-1B_Mk-848.lua +++ b/_G/launcher/B-1B_Mk-848.lua @@ -1,34 +1,42 @@ _G["launcher"]["B-1B_Mk-84*8"] = { CLSID = "B-1B_Mk-84*8", Count = 8, - Elements = { { - Position = { 0, -0.35, 0 }, - Rotation = { -0, 0, 0 } + Elements = { "_G/Pylons/B_1_B_Conventional_Rotary_Launcher.lua", { + ShapeName = "MK-84", + connector_name = "AttachPoint001" }, { - Position = { 0, -0.24748737341529, 0.24748737341529 }, - Rotation = { -45.003314762674, 0, 0 } + ShapeName = "MK-84", + connector_name = "AttachPoint008" }, { - Position = { 0, -2.1431318985079e-17, 0.35 }, - Rotation = { -90.006629525348, 0, 0 } + ShapeName = "MK-84", + connector_name = "AttachPoint007" }, { - Position = { 0, 0.24748737341529, 0.24748737341529 }, - Rotation = { -135.00994428802, 0, 0 } + ShapeName = "MK-84", + connector_name = "AttachPoint006" }, { - Position = { 0, 0.35, 4.2862637970157e-17 }, - Rotation = { -180.0132590507, 0, 0 } + ShapeName = "MK-84", + connector_name = "AttachPoint005" }, { - Position = { 0, 0.24748737341529, -0.24748737341529 }, - Rotation = { -225.01657381337, 0, 0 } + ShapeName = "MK-84", + connector_name = "AttachPoint004" }, { - Position = { 0, 6.4293956955236e-17, -0.35 }, - Rotation = { -270.01988857604, 0, 0 } + ShapeName = "MK-84", + connector_name = "AttachPoint003" }, { - Position = { 0, -0.24748737341529, -0.24748737341529 }, - Rotation = { -315.02320333872, 0, 0 } + ShapeName = "MK-84", + connector_name = "AttachPoint002" } }, Picture = "mk84.png", - Weight = 7152, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 9, "Redacted" }, - displayName = "8 x Mk-84 - 2000lb GP Bombs LD" + Weight = 8024.9, + Weight_Empty = 760.9, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "8 x Mk-84 - 2000lb GP Bombs LD", + ejectPitchRate = -20, + ejectVelocity = 3, + kind_of_shipping = 0, + name = "B-1B_Mk-84*8", + wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/BRU-42_3BDU-33.lua b/_G/launcher/BRU-42_3BDU-33.lua index 0a4da2fa..7ed25b2b 100644 --- a/_G/launcher/BRU-42_3BDU-33.lua +++ b/_G/launcher/BRU-42_3BDU-33.lua @@ -6,13 +6,13 @@ _G["launcher"]["BRU-42_3*BDU-33"] = { ShapeName = "BRU-42_LS" }, { ShapeName = "BDU-33", - connector_name = "Point01" + connector_name = "Point03" }, { ShapeName = "BDU-33", connector_name = "Point02" }, { ShapeName = "BDU-33", - connector_name = "Point03" + connector_name = "Point01" } }, Picture = "BDU-33.png", Weight = 90.15, diff --git a/_G/launcher/BRU-42_3GBU-12.lua b/_G/launcher/BRU-42_3GBU-12.lua index 389562aa..5931ac9c 100644 --- a/_G/launcher/BRU-42_3GBU-12.lua +++ b/_G/launcher/BRU-42_3GBU-12.lua @@ -6,13 +6,13 @@ _G["launcher"]["BRU-42_3*GBU-12"] = { ShapeName = "BRU-42_LS" }, { ShapeName = "GBU-12", - connector_name = "Point01" + connector_name = "Point03" }, { ShapeName = "GBU-12", connector_name = "Point02" }, { ShapeName = "GBU-12", - connector_name = "Point03" + connector_name = "Point01" } }, Picture = "GBU12.png", Weight = 887.25, diff --git a/_G/launcher/Beer_Bomb_(D)_on_LH_Spitfire_Wing_Carrier.lua b/_G/launcher/Beer_Bomb_(D)_on_LH_Spitfire_Wing_Carrier.lua index 90581a1f..fa3cfcf1 100644 --- a/_G/launcher/Beer_Bomb_(D)_on_LH_Spitfire_Wing_Carrier.lua +++ b/_G/launcher/Beer_Bomb_(D)_on_LH_Spitfire_Wing_Carrier.lua @@ -16,7 +16,7 @@ _G["launcher"]["Beer_Bomb_(D)_on_LH_Spitfire_Wing_Carrier"] = { PictureBlendColor = "0xffffffff", Weight = 104, Weight_Empty = 4, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = { 4, 5, 32, "Redacted" }, category = 1, diff --git a/_G/launcher/Beer_Bomb_(D)_on_RH_Spitfire_Wing_Carrier.lua b/_G/launcher/Beer_Bomb_(D)_on_RH_Spitfire_Wing_Carrier.lua index 6f47d8cc..d101afb0 100644 --- a/_G/launcher/Beer_Bomb_(D)_on_RH_Spitfire_Wing_Carrier.lua +++ b/_G/launcher/Beer_Bomb_(D)_on_RH_Spitfire_Wing_Carrier.lua @@ -16,7 +16,7 @@ _G["launcher"]["Beer_Bomb_(D)_on_RH_Spitfire_Wing_Carrier"] = { PictureBlendColor = "0xffffffff", Weight = 104, Weight_Empty = 4, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = { 4, 5, 32, "Redacted" }, category = 1, diff --git a/_G/launcher/Beer_Bomb_(L)_on_LH_Spitfire_Wing_Carrier.lua b/_G/launcher/Beer_Bomb_(L)_on_LH_Spitfire_Wing_Carrier.lua index 84335c50..218f9ab4 100644 --- a/_G/launcher/Beer_Bomb_(L)_on_LH_Spitfire_Wing_Carrier.lua +++ b/_G/launcher/Beer_Bomb_(L)_on_LH_Spitfire_Wing_Carrier.lua @@ -15,7 +15,7 @@ _G["launcher"]["Beer_Bomb_(L)_on_LH_Spitfire_Wing_Carrier"] = { PictureBlendColor = "0xffffffff", Weight = 104, Weight_Empty = 4, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = { 4, 5, 32, "Redacted" }, category = 1, diff --git a/_G/launcher/Beer_Bomb_(L)_on_RH_Spitfire_Wing_Carrier.lua b/_G/launcher/Beer_Bomb_(L)_on_RH_Spitfire_Wing_Carrier.lua index 17544bb8..ecfdd268 100644 --- a/_G/launcher/Beer_Bomb_(L)_on_RH_Spitfire_Wing_Carrier.lua +++ b/_G/launcher/Beer_Bomb_(L)_on_RH_Spitfire_Wing_Carrier.lua @@ -15,7 +15,7 @@ _G["launcher"]["Beer_Bomb_(L)_on_RH_Spitfire_Wing_Carrier"] = { PictureBlendColor = "0xffffffff", Weight = 104, Weight_Empty = 4, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = { 4, 5, 32, "Redacted" }, category = 1, diff --git a/_G/launcher/British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier.lua b/_G/launcher/British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier.lua index 6b2b6bda..806107cd 100644 --- a/_G/launcher/British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier.lua +++ b/_G/launcher/British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier.lua @@ -11,7 +11,7 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier"] = { PictureBlendColor = "0xffffffff", Weight = 108.326, Weight_Empty = 4, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = { 4, 5, 32, "Redacted" }, category = 1, @@ -22,21 +22,21 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 19", id = 1 }, { - dispName = "Tail Pistol No. 17 Mk I", - id = 2 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -48,43 +48,31 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier"] = { stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 2.5, - id = 2.5 + id = 2.5, + units = "s" }, { dispName = 12, - id = 12 + id = 12, + units = "s" }, { dispName = 15, - id = 15 + id = 15, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_TP17MkI", - label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, - stringIndex = 2, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "rev", @@ -93,17 +81,56 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_NP19", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "Tail Pistol No. 17 Mk I", + id = 1 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "spinbox", + defValue = 1800, + dimension = "h", + id = "function_delay_ctrl_TP17MkI", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 1 } }, baseDim = "rev", control = "spinbox", @@ -111,13 +138,15 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_LH_Spitfire_Wing_Carrier"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP17MkI", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier.lua b/_G/launcher/British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier.lua index 83353a9b..444fbfc5 100644 --- a/_G/launcher/British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier.lua +++ b/_G/launcher/British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier.lua @@ -11,7 +11,7 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier"] = { PictureBlendColor = "0xffffffff", Weight = 108.326, Weight_Empty = 4, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = { 4, 5, 32, "Redacted" }, category = 1, @@ -22,21 +22,21 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 19", id = 1 }, { - dispName = "Tail Pistol No. 17 Mk I", - id = 2 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -48,43 +48,31 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier"] = { stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 2.5, - id = 2.5 + id = 2.5, + units = "s" }, { dispName = 12, - id = 12 + id = 12, + units = "s" }, { dispName = 15, - id = 15 + id = 15, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_TP17MkI", - label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, - stringIndex = 2, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "rev", @@ -93,17 +81,56 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_NP19", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "Tail Pistol No. 17 Mk I", + id = 1 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "spinbox", + defValue = 1800, + dimension = "h", + id = "function_delay_ctrl_TP17MkI", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 1 } }, baseDim = "rev", control = "spinbox", @@ -111,13 +138,15 @@ _G["launcher"]["British_GP_250LBS_Bomb_MK4_on_RH_Spitfire_Wing_Carrier"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP17MkI", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3.lua b/_G/launcher/British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3.lua index 9a0c9635..14fc5329 100644 --- a/_G/launcher/British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3.lua +++ b/_G/launcher/British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3.lua @@ -11,7 +11,7 @@ _G["launcher"]["British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3"] = { PictureBlendColor = "0xffffffff", Weight = 225.188, Weight_Empty = 12, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = { 4, 5, 32, "Redacted" }, category = 1, @@ -22,21 +22,21 @@ _G["launcher"]["British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 19", id = 1 }, { - dispName = "Tail Pistol No. 17 Mk I", - id = 2 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -48,43 +48,31 @@ _G["launcher"]["British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3"] = { stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 2.5, - id = 2.5 + id = 2.5, + units = "s" }, { dispName = 12, - id = 12 + id = 12, + units = "s" }, { dispName = 15, - id = 15 + id = 15, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_TP17MkI", - label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, - stringIndex = 2, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "rev", @@ -93,17 +81,56 @@ _G["launcher"]["British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_NP19", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "Tail Pistol No. 17 Mk I", + id = 1 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "spinbox", + defValue = 1800, + dimension = "h", + id = "function_delay_ctrl_TP17MkI", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 1 } }, baseDim = "rev", control = "spinbox", @@ -111,13 +138,15 @@ _G["launcher"]["British_GP_500LBS_Bomb_MK4_on_British_UniversalBC_MK3"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP17MkI", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/CATM-9M.lua b/_G/launcher/CATM-9M.lua index e27be732..f3a60e7f 100644 --- a/_G/launcher/CATM-9M.lua +++ b/_G/launcher/CATM-9M.lua @@ -1,7 +1,7 @@ _G["launcher"]["CATM-9M"] = { CLSID = "CATM-9M", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "CATM-9M" } }, diff --git a/_G/launcher/CBU8710.lua b/_G/launcher/CBU8710.lua index 2c70b647..da0ef45c 100644 --- a/_G/launcher/CBU8710.lua +++ b/_G/launcher/CBU8710.lua @@ -1,30 +1,47 @@ _G["launcher"]["CBU87*10"] = { CLSID = "CBU87*10", Count = 10, - Elements = { { - Position = { -0.9, 0.315, -0.45 } + Elements = { "_G/Pylons/B_1_B_10-store_Conventional_Bomb_Module.lua", { + ShapeName = "CBU-87", + connector_name = "AttachPoint010" }, { - Position = { 0.9, 0.315, 0 } + ShapeName = "CBU-87", + connector_name = "AttachPoint005" }, { - Position = { -0.9, 0.315, 0.45 } + ShapeName = "CBU-87", + connector_name = "AttachPoint009" }, { - Position = { -0.9, 0, -0.675 } + ShapeName = "CBU-87", + connector_name = "AttachPoint007" }, { - Position = { 0.9, 0, -0.225 } + ShapeName = "CBU-87", + connector_name = "AttachPoint003" }, { - Position = { -0.9, 0, 0.225 } + ShapeName = "CBU-87", + connector_name = "AttachPoint008" }, { - Position = { 0.9, 0, 0.675 } + ShapeName = "CBU-87", + connector_name = "AttachPoint004" }, { - Position = { 0.9, -0.315, -0.45 } + ShapeName = "CBU-87", + connector_name = "AttachPoint006" }, { - Position = { -0.9, -0.315, 0 } + ShapeName = "CBU-87", + connector_name = "AttachPoint002" }, { - Position = { 0.9, -0.315, 0.45 } + ShapeName = "CBU-87", + connector_name = "AttachPoint001" } }, Picture = "CBU.png", - Weight = 4300, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 38, "Redacted" }, - displayName = "10 x CBU-87 - 202 x CEM Cluster Bombs" + Weight = 5477.3, + Weight_Empty = 1277.3, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "10 x CBU-87 - 202 x CEM Cluster Bombs", + ejectPitchRate = -20, + ejectVelocity = 3, + name = "CBU87*10", + wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/CBU9710.lua b/_G/launcher/CBU9710.lua index 4f8fc0ab..8a44408f 100644 --- a/_G/launcher/CBU9710.lua +++ b/_G/launcher/CBU9710.lua @@ -2,29 +2,49 @@ _G["launcher"]["CBU97*10"] = { CLSID = "CBU97*10", Count = 10, Elements = { { - Position = { -0.9, 0.315, -0.45 } + IsAdapter = true, + ShapeName = "B_1_B_10-store_Conventional_Bomb_Module" }, { - Position = { 0.9, 0.315, 0 } + ShapeName = "CBU-97", + connector_name = "AttachPoint010" }, { - Position = { -0.9, 0.315, 0.45 } + ShapeName = "CBU-97", + connector_name = "AttachPoint005" }, { - Position = { -0.9, 0, -0.675 } + ShapeName = "CBU-97", + connector_name = "AttachPoint009" }, { - Position = { 0.9, 0, -0.225 } + ShapeName = "CBU-97", + connector_name = "AttachPoint007" }, { - Position = { -0.9, 0, 0.225 } + ShapeName = "CBU-97", + connector_name = "AttachPoint003" }, { - Position = { 0.9, 0, 0.675 } + ShapeName = "CBU-97", + connector_name = "AttachPoint008" }, { - Position = { 0.9, -0.315, -0.45 } + ShapeName = "CBU-97", + connector_name = "AttachPoint004" }, { - Position = { -0.9, -0.315, 0 } + ShapeName = "CBU-97", + connector_name = "AttachPoint006" }, { - Position = { 0.9, -0.315, 0.45 } + ShapeName = "CBU-97", + connector_name = "AttachPoint002" + }, { + ShapeName = "CBU-97", + connector_name = "AttachPoint001" } }, Picture = "CBU.png", - Weight = 4170, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 38, "Redacted" }, - displayName = "10 x CBU-97 - 10 x SFW Cluster Bombs" + Weight = 5477.3, + Weight_Empty = 1277.3, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "10 x CBU-97 - 10 x SFW Cluster Bombs", + ejectPitchRate = -20, + ejectVelocity = 3, + name = "CBU97*10", + wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_BOMB_250_2.lua b/_G/launcher/DIS_BOMB_250_2.lua index 77a412d7..5b773141 100644 --- a/_G/launcher/DIS_BOMB_250_2.lua +++ b/_G/launcher/DIS_BOMB_250_2.lua @@ -12,5 +12,5 @@ _G["launcher"]["DIS_BOMB_250_2"] = { attribute = { 4, 5, 9, "Redacted" }, category = 1, displayName = "250-2 - 250kg GP Bombs HD", - ejectImpulse = 140 + 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 342f79b6..5cda2a80 100644 --- a/_G/launcher/DIS_BOMB_250_3.lua +++ b/_G/launcher/DIS_BOMB_250_3.lua @@ -12,5 +12,5 @@ _G["launcher"]["DIS_BOMB_250_3"] = { attribute = { 4, 5, 9, "Redacted" }, category = 1, displayName = "250-3 - 250kg GP Bombs LD", - ejectImpulse = 140 + ejectVelocity = 1.8 } \ No newline at end of file diff --git a/_G/launcher/DIS_C-701IR.lua b/_G/launcher/DIS_C-701IR.lua index e0ac37f8..38eba43d 100644 --- a/_G/launcher/DIS_C-701IR.lua +++ b/_G/launcher/DIS_C-701IR.lua @@ -12,5 +12,5 @@ _G["launcher"]["DIS_C-701IR"] = { attribute = { 4, 4, 8, "Redacted" }, category = 2, displayName = "C-701IR", - ejectImpulse = 140 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_C-701T.lua b/_G/launcher/DIS_C-701T.lua index cf99fc4d..addfa26d 100644 --- a/_G/launcher/DIS_C-701T.lua +++ b/_G/launcher/DIS_C-701T.lua @@ -12,5 +12,5 @@ _G["launcher"]["DIS_C-701T"] = { attribute = { 4, 4, 8, "Redacted" }, category = 2, displayName = "C-701T", - ejectImpulse = 140 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_C-802AK.lua b/_G/launcher/DIS_C-802AK.lua index a13bb231..a9b7eec8 100644 --- a/_G/launcher/DIS_C-802AK.lua +++ b/_G/launcher/DIS_C-802AK.lua @@ -15,5 +15,5 @@ _G["launcher"]["DIS_C-802AK"] = { category = 2, displayName = "C802AK (DIS)", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 858 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_CM-802AKG.lua b/_G/launcher/DIS_CM-802AKG.lua index 525f5a97..c7c74e13 100644 --- a/_G/launcher/DIS_CM-802AKG.lua +++ b/_G/launcher/DIS_CM-802AKG.lua @@ -15,5 +15,5 @@ _G["launcher"]["DIS_CM-802AKG"] = { category = 2, displayName = "CM802AKG (DIS)", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 858 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_CM-802AKG_AI.lua b/_G/launcher/DIS_CM-802AKG_AI.lua index cf95b3d6..749671e2 100644 --- a/_G/launcher/DIS_CM-802AKG_AI.lua +++ b/_G/launcher/DIS_CM-802AKG_AI.lua @@ -15,5 +15,5 @@ _G["launcher"]["DIS_CM-802AKG_AI"] = { category = 2, displayName = "CM802AKG (DIS) for AI", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 858 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_DF4A_KD20.lua b/_G/launcher/DIS_DF4A_KD20.lua index 0f626c3f..8ed15aaa 100644 --- a/_G/launcher/DIS_DF4A_KD20.lua +++ b/_G/launcher/DIS_DF4A_KD20.lua @@ -14,7 +14,7 @@ _G["launcher"]["DIS_DF4A_KD20"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "KD-20", - ejectImpulse = 2000, + ejectVelocity = 2, name = "DIS_DF4A_KD20", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_DF4B_YJ12.lua b/_G/launcher/DIS_DF4B_YJ12.lua index c48bcad9..3dc7884b 100644 --- a/_G/launcher/DIS_DF4B_YJ12.lua +++ b/_G/launcher/DIS_DF4B_YJ12.lua @@ -14,7 +14,7 @@ _G["launcher"]["DIS_DF4B_YJ12"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "YJ-12", - ejectImpulse = 2000, + ejectVelocity = 2, name = "DIS_DF4B_YJ12", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_GB6.lua b/_G/launcher/DIS_GB6.lua index 684228a0..dd6199da 100644 --- a/_G/launcher/DIS_GB6.lua +++ b/_G/launcher/DIS_GB6.lua @@ -13,5 +13,5 @@ _G["launcher"]["DIS_GB6"] = { category = 1, displayName = "GB-6", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 744 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_GB6_HE.lua b/_G/launcher/DIS_GB6_HE.lua index 1770b402..6b6a3731 100644 --- a/_G/launcher/DIS_GB6_HE.lua +++ b/_G/launcher/DIS_GB6_HE.lua @@ -13,5 +13,5 @@ _G["launcher"]["DIS_GB6_HE"] = { category = 1, displayName = "GB-6-HE", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 744 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_GB6_TSP.lua b/_G/launcher/DIS_GB6_TSP.lua index 864b80e6..0ec62529 100644 --- a/_G/launcher/DIS_GB6_TSP.lua +++ b/_G/launcher/DIS_GB6_TSP.lua @@ -13,5 +13,5 @@ _G["launcher"]["DIS_GB6_TSP"] = { category = 1, displayName = "GB-6-SFW", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 744 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_GBU_10.lua b/_G/launcher/DIS_GBU_10.lua index 3205edff..ccb85d60 100644 --- a/_G/launcher/DIS_GBU_10.lua +++ b/_G/launcher/DIS_GBU_10.lua @@ -15,5 +15,5 @@ _G["launcher"]["DIS_GBU_10"] = { attribute = { 4, 5, 36, "Redacted" }, category = 1, displayName = "GBU-10", - ejectImpulse = 140 + ejectVelocity = 1.8 } \ No newline at end of file diff --git a/_G/launcher/DIS_GBU_12.lua b/_G/launcher/DIS_GBU_12.lua index cb35a72a..6737d3a0 100644 --- a/_G/launcher/DIS_GBU_12.lua +++ b/_G/launcher/DIS_GBU_12.lua @@ -15,5 +15,5 @@ _G["launcher"]["DIS_GBU_12"] = { attribute = { 4, 5, 36, "Redacted" }, category = 1, displayName = "GBU-12", - ejectImpulse = 140 + ejectVelocity = 1.8 } \ No newline at end of file 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 3100c45b..7ed89573 100644 --- a/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_L.lua +++ b/_G/launcher/DIS_GBU_12_DUAL_GDJ_II19_L.lua @@ -21,7 +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", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_GBU_12_DUAL_GDJ_II19_L", wsTypeOfWeapon = { 4, 5, 36, "Redacted" } } \ No newline at end of file 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 662fa8fc..90b8e390 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,6 @@ _G["launcher"]["DIS_GBU_12_DUAL_GDJ_II19_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x GBU-12", - ejectImpulse = 140, + ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 36, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_GBU_16.lua b/_G/launcher/DIS_GBU_16.lua index f2b849a0..0a3ab127 100644 --- a/_G/launcher/DIS_GBU_16.lua +++ b/_G/launcher/DIS_GBU_16.lua @@ -15,5 +15,5 @@ _G["launcher"]["DIS_GBU_16"] = { attribute = { 4, 5, 36, "Redacted" }, category = 1, displayName = "GBU-16", - ejectImpulse = 140 + ejectVelocity = 1.8 } \ No newline at end of file diff --git a/_G/launcher/DIS_GDJ_KD63.lua b/_G/launcher/DIS_GDJ_KD63.lua index eeec02cf..837a736f 100644 --- a/_G/launcher/DIS_GDJ_KD63.lua +++ b/_G/launcher/DIS_GDJ_KD63.lua @@ -15,7 +15,7 @@ _G["launcher"]["DIS_GDJ_KD63"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "KD-63", - ejectImpulse = 2000, + ejectVelocity = 2, name = "DIS_GDJ_KD63", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_GDJ_KD63B.lua b/_G/launcher/DIS_GDJ_KD63B.lua index a41c2341..c6834057 100644 --- a/_G/launcher/DIS_GDJ_KD63B.lua +++ b/_G/launcher/DIS_GDJ_KD63B.lua @@ -18,7 +18,7 @@ _G["launcher"]["DIS_GDJ_KD63B"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "KD-63B", - ejectImpulse = 2000, + ejectVelocity = 2, name = "DIS_GDJ_KD63B", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_GDJ_YJ83K.lua b/_G/launcher/DIS_GDJ_YJ83K.lua index cce04726..c0bf5278 100644 --- a/_G/launcher/DIS_GDJ_YJ83K.lua +++ b/_G/launcher/DIS_GDJ_YJ83K.lua @@ -16,7 +16,7 @@ _G["launcher"]["DIS_GDJ_YJ83K"] = { category = 2, displayName = "YJ-83K", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 858, + ejectVelocity = 2, name = "DIS_GDJ_YJ83K", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_H6_250_2_N12.lua b/_G/launcher/DIS_H6_250_2_N12.lua index d76ba97a..28fddccb 100644 --- a/_G/launcher/DIS_H6_250_2_N12.lua +++ b/_G/launcher/DIS_H6_250_2_N12.lua @@ -1,7 +1,7 @@ _G["launcher"]["DIS_H6_250_2_N12"] = { CLSID = "DIS_H6_250_2_N12", Count = 12, - Cx_pil = 0, + Cx_pil = 0.0120879, Elements = { { Position = { 2.2, 0, -0.5 }, ShapeName = "250-2" @@ -46,7 +46,7 @@ _G["launcher"]["DIS_H6_250_2_N12"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "12 x 250-2 - 250kg GP Bombs HD", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_H6_250_2_N12", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_H6_250_2_N24.lua b/_G/launcher/DIS_H6_250_2_N24.lua index d23acf44..6fd7dd97 100644 --- a/_G/launcher/DIS_H6_250_2_N24.lua +++ b/_G/launcher/DIS_H6_250_2_N24.lua @@ -1,7 +1,7 @@ _G["launcher"]["DIS_H6_250_2_N24"] = { CLSID = "DIS_H6_250_2_N24", Count = 24, - Cx_pil = 0, + Cx_pil = 0.0240759, Elements = { { Position = { 2.2, 0.64, -0.5 }, ShapeName = "250-2" @@ -82,7 +82,7 @@ _G["launcher"]["DIS_H6_250_2_N24"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "24 x 250-2 - 250kg GP Bombs HD", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_H6_250_2_N24", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_KD20.lua b/_G/launcher/DIS_KD20.lua index aa1dd83d..946360f2 100644 --- a/_G/launcher/DIS_KD20.lua +++ b/_G/launcher/DIS_KD20.lua @@ -13,5 +13,5 @@ _G["launcher"]["DIS_KD20"] = { attribute = { 4, 4, 8, "Redacted" }, category = 2, displayName = "KD-20", - ejectImpulse = 2000 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_KD63.lua b/_G/launcher/DIS_KD63.lua index 2aa97ef9..272432bb 100644 --- a/_G/launcher/DIS_KD63.lua +++ b/_G/launcher/DIS_KD63.lua @@ -14,5 +14,5 @@ _G["launcher"]["DIS_KD63"] = { attribute = { 4, 4, 8, "Redacted" }, category = 2, displayName = "KD-63", - ejectImpulse = 2000 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_KD63B.lua b/_G/launcher/DIS_KD63B.lua index bea0dad7..ccca398d 100644 --- a/_G/launcher/DIS_KD63B.lua +++ b/_G/launcher/DIS_KD63B.lua @@ -14,5 +14,5 @@ _G["launcher"]["DIS_KD63B"] = { attribute = { 4, 4, 8, "Redacted" }, category = 2, displayName = "KD-63B", - ejectImpulse = 2000 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_LS_6_100.lua b/_G/launcher/DIS_LS_6_100.lua index a4110e49..2f8e7b89 100644 --- a/_G/launcher/DIS_LS_6_100.lua +++ b/_G/launcher/DIS_LS_6_100.lua @@ -13,5 +13,5 @@ _G["launcher"]["DIS_LS_6_100"] = { category = 1, displayName = "LS-6-100", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 105.6 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_LS_6_100_DUAL_L.lua b/_G/launcher/DIS_LS_6_100_DUAL_L.lua index f36094e1..e6d33944 100644 --- a/_G/launcher/DIS_LS_6_100_DUAL_L.lua +++ b/_G/launcher/DIS_LS_6_100_DUAL_L.lua @@ -22,7 +22,7 @@ _G["launcher"]["DIS_LS_6_100_DUAL_L"] = { category = 1, displayName = "LS-6-100 Dual", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 105.6, + ejectVelocity = 2, name = "DIS_LS_6_100_DUAL_L", wsTypeOfWeapon = { 4, 5, 36, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_LS_6_100_DUAL_R.lua b/_G/launcher/DIS_LS_6_100_DUAL_R.lua index 6d1c3a1f..5df8351f 100644 --- a/_G/launcher/DIS_LS_6_100_DUAL_R.lua +++ b/_G/launcher/DIS_LS_6_100_DUAL_R.lua @@ -22,7 +22,7 @@ _G["launcher"]["DIS_LS_6_100_DUAL_R"] = { category = 1, displayName = "LS-6-100 Dual", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 105.6, + ejectVelocity = 2, name = "DIS_LS_6_100_DUAL_R", wsTypeOfWeapon = { 4, 5, 36, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_LS_6_250.lua b/_G/launcher/DIS_LS_6_250.lua index 60476e5e..1107cd16 100644 --- a/_G/launcher/DIS_LS_6_250.lua +++ b/_G/launcher/DIS_LS_6_250.lua @@ -14,5 +14,5 @@ _G["launcher"]["DIS_LS_6_250"] = { category = 1, displayName = "LS-6-250", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 330 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_LS_6_250_DUAL_L.lua b/_G/launcher/DIS_LS_6_250_DUAL_L.lua index 85973eec..b61450e2 100644 --- a/_G/launcher/DIS_LS_6_250_DUAL_L.lua +++ b/_G/launcher/DIS_LS_6_250_DUAL_L.lua @@ -22,7 +22,7 @@ _G["launcher"]["DIS_LS_6_250_DUAL_L"] = { category = 1, displayName = "LS-6-250 Dual", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 330, + ejectVelocity = 2, name = "DIS_LS_6_250_DUAL_L", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_LS_6_250_DUAL_R.lua b/_G/launcher/DIS_LS_6_250_DUAL_R.lua index 9d95f67c..9e4b34cd 100644 --- a/_G/launcher/DIS_LS_6_250_DUAL_R.lua +++ b/_G/launcher/DIS_LS_6_250_DUAL_R.lua @@ -22,7 +22,7 @@ _G["launcher"]["DIS_LS_6_250_DUAL_R"] = { category = 1, displayName = "LS-6-250 Dual", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 330, + ejectVelocity = 2, name = "DIS_LS_6_250_DUAL_R", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_LS_6_500.lua b/_G/launcher/DIS_LS_6_500.lua index 942700bd..b064feba 100644 --- a/_G/launcher/DIS_LS_6_500.lua +++ b/_G/launcher/DIS_LS_6_500.lua @@ -14,5 +14,5 @@ _G["launcher"]["DIS_LS_6_500"] = { category = 1, displayName = "LS-6-500", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 630 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_MER6_250_2_N6.lua b/_G/launcher/DIS_MER6_250_2_N6.lua index ee9bf6d2..d2c132ec 100644 --- a/_G/launcher/DIS_MER6_250_2_N6.lua +++ b/_G/launcher/DIS_MER6_250_2_N6.lua @@ -31,7 +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", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_MER6_250_2_N6", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_MER6_250_3_N6.lua b/_G/launcher/DIS_MER6_250_3_N6.lua index 08e8e44d..84af2581 100644 --- a/_G/launcher/DIS_MER6_250_3_N6.lua +++ b/_G/launcher/DIS_MER6_250_3_N6.lua @@ -28,7 +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", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_MER6_250_3_N6", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_MK_20.lua b/_G/launcher/DIS_MK_20.lua index f6a6e5b1..86ee809b 100644 --- a/_G/launcher/DIS_MK_20.lua +++ b/_G/launcher/DIS_MK_20.lua @@ -14,5 +14,5 @@ _G["launcher"]["DIS_MK_20"] = { attribute = { 4, 5, 38, "Redacted" }, category = 1, displayName = "Mk-20", - ejectImpulse = 140 + ejectVelocity = 1.8 } \ No newline at end of file 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 9edab064..7423251f 100644 --- a/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_L.lua +++ b/_G/launcher/DIS_MK_20_DUAL_GDJ_II19_L.lua @@ -20,7 +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", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_MK_20_DUAL_GDJ_II19_L", wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file 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 a20a2c43..4405d0a1 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,6 @@ _G["launcher"]["DIS_MK_20_DUAL_GDJ_II19_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-20", - ejectImpulse = 140, + ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file 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 80c5a906..d61bf9a6 100644 --- a/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_L.lua +++ b/_G/launcher/DIS_MK_82S_DUAL_GDJ_II19_L.lua @@ -20,7 +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", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_MK_82S_DUAL_GDJ_II19_L", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file 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 25392c63..b05c4ba2 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,6 @@ _G["launcher"]["DIS_MK_82S_DUAL_GDJ_II19_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-82 SnakeEye", - ejectImpulse = 140, + ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file 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 0e7e793a..ef3027a0 100644 --- a/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_L.lua +++ b/_G/launcher/DIS_MK_82_DUAL_GDJ_II19_L.lua @@ -20,7 +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", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_MK_82_DUAL_GDJ_II19_L", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file 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 0be11f27..b71c476a 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,6 @@ _G["launcher"]["DIS_MK_82_DUAL_GDJ_II19_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "GDJ-II19 - 2 x Mk-82", - ejectImpulse = 140, + ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_TYPE200.lua b/_G/launcher/DIS_TYPE200.lua index e5ea24fb..2f813297 100644 --- a/_G/launcher/DIS_TYPE200.lua +++ b/_G/launcher/DIS_TYPE200.lua @@ -13,5 +13,5 @@ _G["launcher"]["DIS_TYPE200"] = { attribute = { 4, 5, 37, "Redacted" }, category = 1, displayName = "TYPE-200A", - ejectImpulse = 140 + ejectVelocity = 1.8 } \ No newline at end of file diff --git a/_G/launcher/DIS_TYPE200_DUAL_L.lua b/_G/launcher/DIS_TYPE200_DUAL_L.lua index 9d2653a4..da0ebc38 100644 --- a/_G/launcher/DIS_TYPE200_DUAL_L.lua +++ b/_G/launcher/DIS_TYPE200_DUAL_L.lua @@ -18,7 +18,7 @@ _G["launcher"]["DIS_TYPE200_DUAL_L"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "TYPE-200A Dual", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_TYPE200_DUAL_L", wsTypeOfWeapon = { 4, 5, 37, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_TYPE200_DUAL_R.lua b/_G/launcher/DIS_TYPE200_DUAL_R.lua index 39c6a683..c9e4a716 100644 --- a/_G/launcher/DIS_TYPE200_DUAL_R.lua +++ b/_G/launcher/DIS_TYPE200_DUAL_R.lua @@ -18,7 +18,7 @@ _G["launcher"]["DIS_TYPE200_DUAL_R"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "TYPE-200A Dual", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "DIS_TYPE200_DUAL_R", wsTypeOfWeapon = { 4, 5, 37, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/DIS_WMD7.lua b/_G/launcher/DIS_WMD7.lua index cadebdc4..77d13720 100644 --- a/_G/launcher/DIS_WMD7.lua +++ b/_G/launcher/DIS_WMD7.lua @@ -15,7 +15,7 @@ _G["launcher"]["DIS_WMD7"] = { _unique_resource_name = "weapons.containers.wmd7", attribute = { 4, 15, 44, "Redacted" }, category = 6, - displayName = "WMD7 POD", + displayName = "AVIC WMD7 POD", laserDesignator = true, laserRanger = true, name = "wmd7", diff --git a/_G/launcher/DIS_YJ12.lua b/_G/launcher/DIS_YJ12.lua index 1fb4c387..9f1785e2 100644 --- a/_G/launcher/DIS_YJ12.lua +++ b/_G/launcher/DIS_YJ12.lua @@ -13,5 +13,5 @@ _G["launcher"]["DIS_YJ12"] = { attribute = { 4, 4, 8, "Redacted" }, category = 2, displayName = "YJ-12", - ejectImpulse = 2000 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/DIS_YJ83K.lua b/_G/launcher/DIS_YJ83K.lua index 53c09a0a..eccbb8d7 100644 --- a/_G/launcher/DIS_YJ83K.lua +++ b/_G/launcher/DIS_YJ83K.lua @@ -14,5 +14,5 @@ _G["launcher"]["DIS_YJ83K"] = { category = 2, displayName = "YJ-83K", ejectDirection = { 0, -1, 0 }, - ejectImpulse = 858 + ejectVelocity = 2 } \ No newline at end of file diff --git a/_G/launcher/ER_4_SC50.lua b/_G/launcher/ER_4_SC50.lua index 2454bb70..f9b06a7b 100644 --- a/_G/launcher/ER_4_SC50.lua +++ b/_G/launcher/ER_4_SC50.lua @@ -29,25 +29,25 @@ _G["launcher"]["ER_4_SC50"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { dispName = "Zünder 25C", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "", control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", label = "Function Delay Mode", stringIndex = 1, values = { { @@ -58,15 +58,15 @@ _G["launcher"]["ER_4_SC50"] = { id = 2 } }, wCtrl = 75, - xCtrl = 700, - xLbl = 560 + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -75,20 +75,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "s", id = "function_delay_ctrl_oV_VFD_Z25C", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -97,20 +99,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "s", id = "function_delay_ctrl_oV_FFD_Z25C", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -119,20 +123,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "s", id = "function_delay_ctrl_mV_FFD_Z25C", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -141,20 +147,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "ms", id = "function_delay_ctrl_mV_VFD_Z25C", label = "mV Mode Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -163,20 +171,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "s", id = "function_delay_ctrl_Vz_FFD_Z25C", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -185,20 +195,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "s", id = "function_delay_ctrl_Vz_VFD_Z25C", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -207,20 +219,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "ms", id = "arm_delay_ctrl_Strz_VFD_Z25C", label = "Sturz Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -229,20 +243,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "ms", id = "arm_delay_ctrl_Strz_FFD_Z25C", label = "Sturz Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -251,20 +267,22 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "ms", id = "arm_delay_ctrl_Wgrcht_FFD_Z25C", label = "Wagerecht Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -273,13 +291,15 @@ _G["launcher"]["ER_4_SC50"] = { dimension = "ms", id = "arm_delay_ctrl_Wgrcht_VFD_Z25C", label = "Wagerecht Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/GBU-318.lua b/_G/launcher/GBU-318.lua index 14d4685b..27cf0d7f 100644 --- a/_G/launcher/GBU-318.lua +++ b/_G/launcher/GBU-318.lua @@ -2,33 +2,44 @@ _G["launcher"]["GBU-31*8"] = { CLSID = "GBU-31*8", Count = 8, Elements = { { - Position = { 0, -0.35, 0 }, - Rotation = { -0, 0, 0 } + IsAdapter = true, + ShapeName = "B_1_B_Conventional_Rotary_Launcher" }, { - Position = { 0, -0.24748737341529, 0.24748737341529 }, - Rotation = { -45.003314762674, 0, 0 } + ShapeName = "GBU-31", + connector_name = "AttachPoint001" }, { - Position = { 0, -2.1431318985079e-17, 0.35 }, - Rotation = { -90.006629525348, 0, 0 } + ShapeName = "GBU-31", + connector_name = "AttachPoint008" }, { - Position = { 0, 0.24748737341529, 0.24748737341529 }, - Rotation = { -135.00994428802, 0, 0 } + ShapeName = "GBU-31", + connector_name = "AttachPoint007" }, { - Position = { 0, 0.35, 4.2862637970157e-17 }, - Rotation = { -180.0132590507, 0, 0 } + ShapeName = "GBU-31", + connector_name = "AttachPoint006" }, { - Position = { 0, 0.24748737341529, -0.24748737341529 }, - Rotation = { -225.01657381337, 0, 0 } + ShapeName = "GBU-31", + connector_name = "AttachPoint005" }, { - Position = { 0, 6.4293956955236e-17, -0.35 }, - Rotation = { -270.01988857604, 0, 0 } + ShapeName = "GBU-31", + connector_name = "AttachPoint004" }, { - Position = { 0, -0.24748737341529, -0.24748737341529 }, - Rotation = { -315.02320333872, 0, 0 } + ShapeName = "GBU-31", + connector_name = "AttachPoint003" + }, { + ShapeName = "GBU-31", + connector_name = "AttachPoint002" } }, Picture = "GBU31.png", - Weight = 7152, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 36, "Redacted" }, - displayName = "8 x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bombs" + Weight = 8160.9, + Weight_Empty = 760.9, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "8 x GBU-31(V)1/B - JDAM, 2000lb GPS Guided Bombs", + ejectPitchRate = -20, + ejectVelocity = 3, + kind_of_shipping = 0, + name = "GBU-31*8", + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/GBU-31V3B8.lua b/_G/launcher/GBU-31V3B8.lua index e1f9d82c..995c1aed 100644 --- a/_G/launcher/GBU-31V3B8.lua +++ b/_G/launcher/GBU-31V3B8.lua @@ -2,33 +2,44 @@ _G["launcher"]["GBU-31V3B*8"] = { CLSID = "GBU-31V3B*8", Count = 8, Elements = { { - Position = { 0, -0.35, 0 }, - Rotation = { -0, 0, 0 } + IsAdapter = true, + ShapeName = "B_1_B_Conventional_Rotary_Launcher" }, { - Position = { 0, -0.24748737341529, 0.24748737341529 }, - Rotation = { -45.003314762674, 0, 0 } + ShapeName = "GBU-31(V)3B", + connector_name = "AttachPoint001" }, { - Position = { 0, -2.1431318985079e-17, 0.35 }, - Rotation = { -90.006629525348, 0, 0 } + ShapeName = "GBU-31(V)3B", + connector_name = "AttachPoint008" }, { - Position = { 0, 0.24748737341529, 0.24748737341529 }, - Rotation = { -135.00994428802, 0, 0 } + ShapeName = "GBU-31(V)3B", + connector_name = "AttachPoint007" }, { - Position = { 0, 0.35, 4.2862637970157e-17 }, - Rotation = { -180.0132590507, 0, 0 } + ShapeName = "GBU-31(V)3B", + connector_name = "AttachPoint006" }, { - Position = { 0, 0.24748737341529, -0.24748737341529 }, - Rotation = { -225.01657381337, 0, 0 } + ShapeName = "GBU-31(V)3B", + connector_name = "AttachPoint005" }, { - Position = { 0, 6.4293956955236e-17, -0.35 }, - Rotation = { -270.01988857604, 0, 0 } + ShapeName = "GBU-31(V)3B", + connector_name = "AttachPoint004" }, { - Position = { 0, -0.24748737341529, -0.24748737341529 }, - Rotation = { -315.02320333872, 0, 0 } + ShapeName = "GBU-31(V)3B", + connector_name = "AttachPoint003" + }, { + ShapeName = "GBU-31(V)3B", + connector_name = "AttachPoint002" } }, Picture = "GBU-31V3B.png", - Weight = 7848, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 36, "Redacted" }, - displayName = "8 x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Penetrator Bombs" + Weight = 8448.9, + Weight_Empty = 760.9, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "8 x GBU-31(V)3/B - JDAM, 2000lb GPS Guided Penetrator Bombs", + ejectPitchRate = -20, + ejectVelocity = 3, + kind_of_shipping = 0, + name = "GBU-31V3B*8", + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/GBU-3816.lua b/_G/launcher/GBU-3816.lua index 1b956b01..3f9af67f 100644 --- a/_G/launcher/GBU-3816.lua +++ b/_G/launcher/GBU-3816.lua @@ -1,66 +1,103 @@ _G["launcher"]["GBU-38*16"] = { CLSID = "GBU-38*16", - Count = 16, + Count = 28, Elements = { { - Position = { -0.9, 0.651, -0.31 } + IsAdapter = true, + ShapeName = "B_1_B_28-store_Conventional_Bomb_Module" }, { - Position = { 0.9, 0.651, 0 } + ShapeName = "GBU-38", + connector_name = "AttachPoint012" }, { - Position = { -0.9, 0.651, 0.31 } + ShapeName = "GBU-38", + connector_name = "AttachPoint017" }, { - Position = { -0.9, 0.434, -0.465 } + ShapeName = "GBU-38", + connector_name = "AttachPoint011" }, { - Position = { 0.9, 0.434, -0.155 } + ShapeName = "GBU-38", + connector_name = "AttachPoint016" }, { - Position = { -0.9, 0.434, 0.155 } + ShapeName = "GBU-38", + connector_name = "AttachPoint010" }, { - Position = { 0.9, 0.434, 0.465 } + ShapeName = "GBU-38", + connector_name = "AttachPoint015" }, { - Position = { -0.9, 0.217, -0.62 } + ShapeName = "GBU-38", + connector_name = "AttachPoint014" }, { - Position = { 0.9, 0.217, -0.31 } + ShapeName = "GBU-38", + connector_name = "AttachPoint013" }, { - Position = { -0.9, 0.217, 0 } + ShapeName = "GBU-38", + connector_name = "AttachPoint009" }, { - Position = { 0.9, 0.217, 0.31 } + ShapeName = "GBU-38", + connector_name = "AttachPoint025" }, { - Position = { -0.9, 0.217, 0.62 } + ShapeName = "GBU-38", + connector_name = "AttachPoint008" }, { - Position = { 0.9, 1.1102230246252e-16, -0.465 } + ShapeName = "GBU-38", + connector_name = "AttachPoint024" }, { - Position = { -0.9, 1.1102230246252e-16, -0.155 } + ShapeName = "GBU-38", + connector_name = "AttachPoint007" }, { - Position = { 0.9, 1.1102230246252e-16, 0.155 } + ShapeName = "GBU-38", + connector_name = "AttachPoint023" }, { - Position = { -0.9, 1.1102230246252e-16, 0.465 } + ShapeName = "GBU-38", + connector_name = "AttachPoint006" }, { - Position = { 0.9, -0.217, -0.62 } + ShapeName = "GBU-38", + connector_name = "AttachPoint027" }, { - Position = { -0.9, -0.217, -0.31 } + ShapeName = "GBU-38", + connector_name = "AttachPoint005" }, { - Position = { 0.9, -0.217, 0 } + ShapeName = "GBU-38", + connector_name = "AttachPoint026" }, { - Position = { -0.9, -0.217, 0.31 } + ShapeName = "GBU-38", + connector_name = "AttachPoint004" }, { - Position = { 0.9, -0.217, 0.62 } + ShapeName = "GBU-38", + connector_name = "AttachPoint028" }, { - Position = { -0.9, -0.434, -0.465 } + ShapeName = "GBU-38", + connector_name = "AttachPoint003" }, { - Position = { 0.9, -0.434, -0.155 } + ShapeName = "GBU-38", + connector_name = "AttachPoint022" }, { - Position = { -0.9, -0.434, 0.155 } + ShapeName = "GBU-38", + connector_name = "AttachPoint002" }, { - Position = { 0.9, -0.434, 0.465 } + ShapeName = "GBU-38", + connector_name = "AttachPoint021" }, { - Position = { 0.9, -0.651, -0.31 } + ShapeName = "GBU-38", + connector_name = "AttachPoint001" }, { - Position = { -0.9, -0.651, 0 } + ShapeName = "GBU-38", + connector_name = "AttachPoint020" }, { - Position = { 0.9, -0.651, 0.31 } + ShapeName = "GBU-38", + connector_name = "AttachPoint019" + }, { + ShapeName = "GBU-38", + connector_name = "AttachPoint018" } }, + ForceVisibility = true, Picture = "GBU38.png", - Weight = 3856, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 36, "Redacted" }, - displayName = "16 x GBU-38 - JDAM, 500lb GPS Guided Bombs" + Weight = 8522.2, + Weight_Empty = 1435.4, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "28 x GBU-38 - JDAM, 500lb GPS Guided Bombs", + name = "GBU-38*16", + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/LAU-105_1AIM-9L_L.lua b/_G/launcher/LAU-105_1AIM-9L_L.lua index a7dedfa8..2e18aa5e 100644 --- a/_G/launcher/LAU-105_1AIM-9L_L.lua +++ b/_G/launcher/LAU-105_1AIM-9L_L.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_1*AIM-9L_L"] = { CLSID = "LAU-105_1*AIM-9L_L", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00111015625, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -12,8 +12,8 @@ _G["launcher"]["LAU-105_1*AIM-9L_L"] = { } }, Picture = "us_AIM-9L.png", PictureBlendColor = "0xffffffff", - Weight = 115.73, - Weight_Empty = 30, + Weight = 291.73, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_1AIM-9L_R.lua b/_G/launcher/LAU-105_1AIM-9L_R.lua index 99a99eb7..668052ff 100644 --- a/_G/launcher/LAU-105_1AIM-9L_R.lua +++ b/_G/launcher/LAU-105_1AIM-9L_R.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_1*AIM-9L_R"] = { CLSID = "LAU-105_1*AIM-9L_R", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00111015625, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -12,8 +12,8 @@ _G["launcher"]["LAU-105_1*AIM-9L_R"] = { } }, Picture = "us_AIM-9L.png", PictureBlendColor = "0xffffffff", - Weight = 115.73, - Weight_Empty = 30, + Weight = 291.73, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_1AIM-9M_L.lua b/_G/launcher/LAU-105_1AIM-9M_L.lua index cf01bcc9..f85b115a 100644 --- a/_G/launcher/LAU-105_1AIM-9M_L.lua +++ b/_G/launcher/LAU-105_1AIM-9M_L.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_1*AIM-9M_L"] = { CLSID = "LAU-105_1*AIM-9M_L", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00111015625, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -12,8 +12,8 @@ _G["launcher"]["LAU-105_1*AIM-9M_L"] = { } }, Picture = "us_AIM-9L.png", PictureBlendColor = "0xffffffff", - Weight = 115.73, - Weight_Empty = 30, + Weight = 291.73, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_1AIM-9M_R.lua b/_G/launcher/LAU-105_1AIM-9M_R.lua index c74051f4..2c73ed8f 100644 --- a/_G/launcher/LAU-105_1AIM-9M_R.lua +++ b/_G/launcher/LAU-105_1AIM-9M_R.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_1*AIM-9M_R"] = { CLSID = "LAU-105_1*AIM-9M_R", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00111015625, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -12,8 +12,8 @@ _G["launcher"]["LAU-105_1*AIM-9M_R"] = { } }, Picture = "us_AIM-9L.png", PictureBlendColor = "0xffffffff", - Weight = 115.73, - Weight_Empty = 30, + Weight = 291.73, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_1CATM-9M_L.lua b/_G/launcher/LAU-105_1CATM-9M_L.lua index 69142011..2285e322 100644 --- a/_G/launcher/LAU-105_1CATM-9M_L.lua +++ b/_G/launcher/LAU-105_1CATM-9M_L.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_1*CATM-9M_L"] = { CLSID = "LAU-105_1*CATM-9M_L", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00111015625, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -12,8 +12,8 @@ _G["launcher"]["LAU-105_1*CATM-9M_L"] = { } }, Picture = "us_CATM-9.png", PictureBlendColor = "0xffffffff", - Weight = 115.73, - Weight_Empty = 30, + Weight = 291.73, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_1CATM-9M_R.lua b/_G/launcher/LAU-105_1CATM-9M_R.lua index 97fe4e1a..c8d11236 100644 --- a/_G/launcher/LAU-105_1CATM-9M_R.lua +++ b/_G/launcher/LAU-105_1CATM-9M_R.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_1*CATM-9M_R"] = { CLSID = "LAU-105_1*CATM-9M_R", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00111015625, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -12,8 +12,8 @@ _G["launcher"]["LAU-105_1*CATM-9M_R"] = { } }, Picture = "us_CATM-9.png", PictureBlendColor = "0xffffffff", - Weight = 115.73, - Weight_Empty = 30, + Weight = 291.73, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_2AIM-9L.lua b/_G/launcher/LAU-105_2AIM-9L.lua index b30edc5b..5b98d679 100644 --- a/_G/launcher/LAU-105_2AIM-9L.lua +++ b/_G/launcher/LAU-105_2AIM-9L.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_2*AIM-9L"] = { CLSID = "LAU-105_2*AIM-9L", Count = 2, - Cx_pil = 0.00014, + Cx_pil = 0.0015203125, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -16,8 +16,8 @@ _G["launcher"]["LAU-105_2*AIM-9L"] = { } }, Picture = "us_AIM-9L.png", PictureBlendColor = "0xffffffff", - Weight = 201.46, - Weight_Empty = 30, + Weight = 377.46, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_2AIM-9P5.lua b/_G/launcher/LAU-105_2AIM-9P5.lua index bfce9821..249539a2 100644 --- a/_G/launcher/LAU-105_2AIM-9P5.lua +++ b/_G/launcher/LAU-105_2AIM-9P5.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_2*AIM-9P5"] = { CLSID = "LAU-105_2*AIM-9P5", Count = 2, - Cx_pil = 0.00014, + Cx_pil = 0.0015203125, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -16,8 +16,8 @@ _G["launcher"]["LAU-105_2*AIM-9P5"] = { } }, Picture = "us_AIM-9P-5.png", PictureBlendColor = "0xffffffff", - Weight = 201, - Weight_Empty = 30, + Weight = 367.4, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_2CATM-9M.lua b/_G/launcher/LAU-105_2CATM-9M.lua index e8e15b99..71f930f2 100644 --- a/_G/launcher/LAU-105_2CATM-9M.lua +++ b/_G/launcher/LAU-105_2CATM-9M.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_2*CATM-9M"] = { CLSID = "LAU-105_2*CATM-9M", Count = 2, - Cx_pil = 0.00014, + Cx_pil = 0.0015203125, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -16,8 +16,8 @@ _G["launcher"]["LAU-105_2*CATM-9M"] = { } }, Picture = "us_CATM-9.png", PictureBlendColor = "0xffffffff", - Weight = 201.46, - Weight_Empty = 30, + Weight = 377.46, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-105_AIS_ASQ_T50_L.lua b/_G/launcher/LAU-105_AIS_ASQ_T50_L.lua index 57270153..2e874f86 100644 --- a/_G/launcher/LAU-105_AIS_ASQ_T50_L.lua +++ b/_G/launcher/LAU-105_AIS_ASQ_T50_L.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_AIS_ASQ_T50_L"] = { CLSID = "LAU-105_AIS_ASQ_T50_L", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00111015625, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -12,8 +12,8 @@ _G["launcher"]["LAU-105_AIS_ASQ_T50_L"] = { } }, Picture = "ais-pod-t50.png", PictureBlendColor = "0xffffffff", - Weight = 92.6, - Weight_Empty = 30, + Weight = 268.6, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.containers.lau-105", diff --git a/_G/launcher/LAU-105_AIS_ASQ_T50_R.lua b/_G/launcher/LAU-105_AIS_ASQ_T50_R.lua index 11e463c1..02fa435a 100644 --- a/_G/launcher/LAU-105_AIS_ASQ_T50_R.lua +++ b/_G/launcher/LAU-105_AIS_ASQ_T50_R.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-105_AIS_ASQ_T50_R"] = { CLSID = "LAU-105_AIS_ASQ_T50_R", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00111015625, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -12,8 +12,8 @@ _G["launcher"]["LAU-105_AIS_ASQ_T50_R"] = { } }, Picture = "ais-pod-t50.png", PictureBlendColor = "0xffffffff", - Weight = 92.6, - Weight_Empty = 30, + Weight = 268.6, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/LAU-115_2LAU-127_AIM-9L.lua b/_G/launcher/LAU-115_2LAU-127_AIM-9L.lua index e45f434c..18da962d 100644 --- a/_G/launcher/LAU-115_2LAU-127_AIM-9L.lua +++ b/_G/launcher/LAU-115_2LAU-127_AIM-9L.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_2*LAU-127_AIM-9L"] = { CLSID = "LAU-115_2*LAU-127_AIM-9L", Count = 2, - Cx_pil = 0.001657734375, + Cx_pil = 0.001560078125, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_2LAU-127_AIM-9M.lua b/_G/launcher/LAU-115_2LAU-127_AIM-9M.lua index 26f2067e..552e1609 100644 --- a/_G/launcher/LAU-115_2LAU-127_AIM-9M.lua +++ b/_G/launcher/LAU-115_2LAU-127_AIM-9M.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_2*LAU-127_AIM-9M"] = { CLSID = "LAU-115_2*LAU-127_AIM-9M", Count = 2, - Cx_pil = 0.001657734375, + Cx_pil = 0.001560078125, Elements = { "_G/Pylons/LAU-115C+2_LAU127.lua", { ShapeName = "AIM-9", connector_name = "Point03" diff --git a/_G/launcher/LAU-115_2LAU-127_AIM-9X.lua b/_G/launcher/LAU-115_2LAU-127_AIM-9X.lua index 94001890..1faebf0e 100644 --- a/_G/launcher/LAU-115_2LAU-127_AIM-9X.lua +++ b/_G/launcher/LAU-115_2LAU-127_AIM-9X.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_2*LAU-127_AIM-9X"] = { CLSID = "LAU-115_2*LAU-127_AIM-9X", Count = 2, - Cx_pil = 0.001657734375, + Cx_pil = 0.001560078125, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_2LAU-127_CATM-9M.lua b/_G/launcher/LAU-115_2LAU-127_CATM-9M.lua index 2d2c07da..7c6d8c43 100644 --- a/_G/launcher/LAU-115_2LAU-127_CATM-9M.lua +++ b/_G/launcher/LAU-115_2LAU-127_CATM-9M.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_2*LAU-127_CATM-9M"] = { CLSID = "LAU-115_2*LAU-127_CATM-9M", Count = 2, - Cx_pil = 0.001657734375, + Cx_pil = 0.001560078125, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_LAU-127_AIM-9L.lua b/_G/launcher/LAU-115_LAU-127_AIM-9L.lua index 98f38823..78f650e3 100644 --- a/_G/launcher/LAU-115_LAU-127_AIM-9L.lua +++ b/_G/launcher/LAU-115_LAU-127_AIM-9L.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_LAU-127_AIM-9L"] = { CLSID = "LAU-115_LAU-127_AIM-9L", Count = 1, - Cx_pil = 0.00119875, + Cx_pil = 0.001149921875, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_LAU-127_AIM-9L_R.lua b/_G/launcher/LAU-115_LAU-127_AIM-9L_R.lua index 69c7c698..bd54d0d4 100644 --- a/_G/launcher/LAU-115_LAU-127_AIM-9L_R.lua +++ b/_G/launcher/LAU-115_LAU-127_AIM-9L_R.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_LAU-127_AIM-9L_R"] = { CLSID = "LAU-115_LAU-127_AIM-9L_R", Count = 1, - Cx_pil = 0.00119875, + Cx_pil = 0.001149921875, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_LAU-127_AIM-9M.lua b/_G/launcher/LAU-115_LAU-127_AIM-9M.lua index 1fb2e11a..dca3c015 100644 --- a/_G/launcher/LAU-115_LAU-127_AIM-9M.lua +++ b/_G/launcher/LAU-115_LAU-127_AIM-9M.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_LAU-127_AIM-9M"] = { CLSID = "LAU-115_LAU-127_AIM-9M", Count = 1, - Cx_pil = 0.00119875, + Cx_pil = 0.001149921875, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_LAU-127_AIM-9M_R.lua b/_G/launcher/LAU-115_LAU-127_AIM-9M_R.lua index 3faf8691..57355ac0 100644 --- a/_G/launcher/LAU-115_LAU-127_AIM-9M_R.lua +++ b/_G/launcher/LAU-115_LAU-127_AIM-9M_R.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_LAU-127_AIM-9M_R"] = { CLSID = "LAU-115_LAU-127_AIM-9M_R", Count = 1, - Cx_pil = 0.00119875, + Cx_pil = 0.001149921875, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_LAU-127_AIM-9X.lua b/_G/launcher/LAU-115_LAU-127_AIM-9X.lua index 231e2197..89f9cf47 100644 --- a/_G/launcher/LAU-115_LAU-127_AIM-9X.lua +++ b/_G/launcher/LAU-115_LAU-127_AIM-9X.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_LAU-127_AIM-9X"] = { CLSID = "LAU-115_LAU-127_AIM-9X", Count = 1, - Cx_pil = 0.00119875, + Cx_pil = 0.001149921875, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_LAU-127_AIM-9X_R.lua b/_G/launcher/LAU-115_LAU-127_AIM-9X_R.lua index c6930152..48d85973 100644 --- a/_G/launcher/LAU-115_LAU-127_AIM-9X_R.lua +++ b/_G/launcher/LAU-115_LAU-127_AIM-9X_R.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_LAU-127_AIM-9X_R"] = { CLSID = "LAU-115_LAU-127_AIM-9X_R", Count = 1, - Cx_pil = 0.00119875, + Cx_pil = 0.001149921875, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_LAU-127_CATM-9M.lua b/_G/launcher/LAU-115_LAU-127_CATM-9M.lua index c97aa253..6e320116 100644 --- a/_G/launcher/LAU-115_LAU-127_CATM-9M.lua +++ b/_G/launcher/LAU-115_LAU-127_CATM-9M.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_LAU-127_CATM-9M"] = { CLSID = "LAU-115_LAU-127_CATM-9M", Count = 1, - Cx_pil = 0.00119875, + Cx_pil = 0.001149921875, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU-115_LAU-127_CATM-9M_R.lua b/_G/launcher/LAU-115_LAU-127_CATM-9M_R.lua index 68f92a7d..1f7be2db 100644 --- a/_G/launcher/LAU-115_LAU-127_CATM-9M_R.lua +++ b/_G/launcher/LAU-115_LAU-127_CATM-9M_R.lua @@ -1,7 +1,7 @@ _G["launcher"]["LAU-115_LAU-127_CATM-9M_R"] = { CLSID = "LAU-115_LAU-127_CATM-9M_R", Count = 1, - Cx_pil = 0.00119875, + Cx_pil = 0.001149921875, Elements = { { IsAdapter = true, ShapeName = "LAU-115C+2_LAU127" diff --git a/_G/launcher/LAU_117_AGM_65L.lua b/_G/launcher/LAU_117_AGM_65L.lua index 48f55874..4ed36221 100644 --- a/_G/launcher/LAU_117_AGM_65L.lua +++ b/_G/launcher/LAU_117_AGM_65L.lua @@ -15,7 +15,7 @@ _G["launcher"]["LAU_117_AGM_65L"] = { _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 2, - displayName = "LAU-117 with AGM-65L - Maverick E2/L (CCD Laser ASM)", + displayName = "LAU-117 with AGM-65E2/L - Maverick E2/L (Laser Guided ASM)", name = "LAU_117_AGM_65L", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/MK_8228.lua b/_G/launcher/MK_8228.lua index 4f69aa8e..7fecc709 100644 --- a/_G/launcher/MK_8228.lua +++ b/_G/launcher/MK_8228.lua @@ -1,66 +1,100 @@ _G["launcher"]["MK_82*28"] = { CLSID = "MK_82*28", Count = 28, - Elements = { { - Position = { -0.9, 0.651, -0.31 } + Elements = { "_G/Pylons/B_1_B_28-store_Conventional_Bomb_Module.lua", { + ShapeName = "MK-82", + connector_name = "AttachPoint012" }, { - Position = { 0.9, 0.651, 0 } + ShapeName = "MK-82", + connector_name = "AttachPoint017" }, { - Position = { -0.9, 0.651, 0.31 } + ShapeName = "MK-82", + connector_name = "AttachPoint011" }, { - Position = { -0.9, 0.434, -0.465 } + ShapeName = "MK-82", + connector_name = "AttachPoint016" }, { - Position = { 0.9, 0.434, -0.155 } + ShapeName = "MK-82", + connector_name = "AttachPoint010" }, { - Position = { -0.9, 0.434, 0.155 } + ShapeName = "MK-82", + connector_name = "AttachPoint015" }, { - Position = { 0.9, 0.434, 0.465 } + ShapeName = "MK-82", + connector_name = "AttachPoint014" }, { - Position = { -0.9, 0.217, -0.62 } + ShapeName = "MK-82", + connector_name = "AttachPoint013" }, { - Position = { 0.9, 0.217, -0.31 } + ShapeName = "MK-82", + connector_name = "AttachPoint009" }, { - Position = { -0.9, 0.217, 0 } + ShapeName = "MK-82", + connector_name = "AttachPoint025" }, { - Position = { 0.9, 0.217, 0.31 } + ShapeName = "MK-82", + connector_name = "AttachPoint008" }, { - Position = { -0.9, 0.217, 0.62 } + ShapeName = "MK-82", + connector_name = "AttachPoint024" }, { - Position = { 0.9, 1.1102230246252e-16, -0.465 } + ShapeName = "MK-82", + connector_name = "AttachPoint007" }, { - Position = { -0.9, 1.1102230246252e-16, -0.155 } + ShapeName = "MK-82", + connector_name = "AttachPoint023" }, { - Position = { 0.9, 1.1102230246252e-16, 0.155 } + ShapeName = "MK-82", + connector_name = "AttachPoint006" }, { - Position = { -0.9, 1.1102230246252e-16, 0.465 } + ShapeName = "MK-82", + connector_name = "AttachPoint027" }, { - Position = { 0.9, -0.217, -0.62 } + ShapeName = "MK-82", + connector_name = "AttachPoint005" }, { - Position = { -0.9, -0.217, -0.31 } + ShapeName = "MK-82", + connector_name = "AttachPoint026" }, { - Position = { 0.9, -0.217, 0 } + ShapeName = "MK-82", + connector_name = "AttachPoint004" }, { - Position = { -0.9, -0.217, 0.31 } + ShapeName = "MK-82", + connector_name = "AttachPoint028" }, { - Position = { 0.9, -0.217, 0.62 } + ShapeName = "MK-82", + connector_name = "AttachPoint003" }, { - Position = { -0.9, -0.434, -0.465 } + ShapeName = "MK-82", + connector_name = "AttachPoint022" }, { - Position = { 0.9, -0.434, -0.155 } + ShapeName = "MK-82", + connector_name = "AttachPoint002" }, { - Position = { -0.9, -0.434, 0.155 } + ShapeName = "MK-82", + connector_name = "AttachPoint021" }, { - Position = { 0.9, -0.434, 0.465 } + ShapeName = "MK-82", + connector_name = "AttachPoint001" }, { - Position = { 0.9, -0.651, -0.31 } + ShapeName = "MK-82", + connector_name = "AttachPoint020" }, { - Position = { -0.9, -0.651, 0 } + ShapeName = "MK-82", + connector_name = "AttachPoint019" }, { - Position = { 0.9, -0.651, 0.31 } + ShapeName = "MK-82", + connector_name = "AttachPoint018" } }, + ForceVisibility = true, Picture = "mk82.png", - Weight = 6748, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 9, "Redacted" }, - displayName = "28 x Mk-82 - 500lb GP Bombs LD" + Weight = 7819.4, + Weight_Empty = 1435.4, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "28 x Mk-82 - 500lb GP Bombs LD", + name = "MK_82*28", + wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/SC_501_SC250.lua b/_G/launcher/SC_501_SC250.lua index 6e08f457..d8250abf 100644 --- a/_G/launcher/SC_501_SC250.lua +++ b/_G/launcher/SC_501_SC250.lua @@ -18,25 +18,25 @@ _G["launcher"]["SC_501_SC250"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { dispName = "Zünder 25C", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "", control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", label = "Function Delay Mode", stringIndex = 1, values = { { @@ -47,15 +47,15 @@ _G["launcher"]["SC_501_SC250"] = { id = 2 } }, wCtrl = 75, - xCtrl = 700, - xLbl = 560 + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -64,20 +64,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "s", id = "function_delay_ctrl_oV_VFD_Z25C", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -86,20 +88,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "s", id = "function_delay_ctrl_oV_FFD_Z25C", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -108,20 +112,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "s", id = "function_delay_ctrl_mV_FFD_Z25C", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -130,20 +136,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "ms", id = "function_delay_ctrl_mV_VFD_Z25C", label = "mV Mode Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -152,20 +160,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "s", id = "function_delay_ctrl_Vz_FFD_Z25C", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -174,20 +184,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "s", id = "function_delay_ctrl_Vz_VFD_Z25C", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -196,20 +208,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "ms", id = "arm_delay_ctrl_Strz_VFD_Z25C", label = "Sturz Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -218,20 +232,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "ms", id = "arm_delay_ctrl_Strz_FFD_Z25C", label = "Sturz Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -240,20 +256,22 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "ms", id = "arm_delay_ctrl_Wgrcht_FFD_Z25C", label = "Wagerecht Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -262,12 +280,14 @@ _G["launcher"]["SC_501_SC250"] = { dimension = "ms", id = "arm_delay_ctrl_Wgrcht_VFD_Z25C", label = "Wagerecht Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/SC_501_SC500.lua b/_G/launcher/SC_501_SC500.lua index be94757d..3781170f 100644 --- a/_G/launcher/SC_501_SC500.lua +++ b/_G/launcher/SC_501_SC500.lua @@ -18,7 +18,7 @@ _G["launcher"]["SC_501_SC500"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -28,18 +28,18 @@ _G["launcher"]["SC_501_SC500"] = { dispName = "Zünder 17", id = 2 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "", control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", label = "Function Delay Mode", stringIndex = 1, values = { { @@ -50,15 +50,15 @@ _G["launcher"]["SC_501_SC500"] = { id = 2 } }, wCtrl = 75, - xCtrl = 700, - xLbl = 560 + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -67,16 +67,18 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "ms", id = "function_delay_ctrl_oV_VFD_Z38", label = "oV Mode Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -85,20 +87,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "min", id = "function_delay_ctrl_oV_Z17", label = "oV Mode Function Delay", - max = 60, + max = 16666666666.667, min = 0, readOnly = true, step = 0.00016666666666667, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -107,20 +111,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "function_delay_ctrl_oV_FFD_Z38", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -129,20 +135,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "function_delay_ctrl_mV_FFD_Z38", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -151,16 +159,18 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "function_delay_ctrl_mV_VFD_Z38", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -169,20 +179,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "min", id = "function_delay_ctrl_mV_Z17", label = "mV Mode Function Delay", - max = 60, + max = 16666666666.667, min = 0, readOnly = true, step = 0.00016666666666667, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -191,16 +203,18 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "function_delay_ctrl_Vz_FFD_Z38", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -209,20 +223,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "min", id = "function_delay_ctrl_Vz_Z17", label = "Vz Mode Function Delay", - max = 60, + max = 16666666666.667, min = 0, readOnly = true, step = 0.00016666666666667, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -231,20 +247,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "function_delay_ctrl_Vz_VFD_Z38", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -253,16 +271,18 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "arm_delay_ctrl_Strz_FFD_Z38", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -271,20 +291,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z17", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -293,20 +315,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "arm_delay_ctrl_Strz_VFD_Z38", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -315,20 +339,22 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_VFD_Z38", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -337,16 +363,18 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_FFD_Z38", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -355,12 +383,14 @@ _G["launcher"]["SC_501_SC500"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z17", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/SPITFIRE_45GAL_SLIPPER_TANK.lua b/_G/launcher/SPITFIRE_45GAL_SLIPPER_TANK.lua index 0e3117ea..e67dfde0 100644 --- a/_G/launcher/SPITFIRE_45GAL_SLIPPER_TANK.lua +++ b/_G/launcher/SPITFIRE_45GAL_SLIPPER_TANK.lua @@ -8,7 +8,7 @@ _G["launcher"]["SPITFIRE_45GAL_SLIPPER_TANK"] = { PictureBlendColor = "0xffffffff", Weight = 138.647, Weight_Empty = 16, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", _unique_resource_name = "weapons.droptanks.Spitfire_slipper_tank", attribute = { 1, 3, 43, "Redacted" }, diff --git a/_G/launcher/SPITFIRE_45GAL_TORPEDO_TANK.lua b/_G/launcher/SPITFIRE_45GAL_TORPEDO_TANK.lua index 2b8712e2..1130078d 100644 --- a/_G/launcher/SPITFIRE_45GAL_TORPEDO_TANK.lua +++ b/_G/launcher/SPITFIRE_45GAL_TORPEDO_TANK.lua @@ -8,7 +8,7 @@ _G["launcher"]["SPITFIRE_45GAL_TORPEDO_TANK"] = { PictureBlendColor = "0xffffffff", Weight = 144.647, Weight_Empty = 22, - _file = "./CoreMods/WWII Units/SpitfireLFMkIX/SpitfireLFMkIX.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", _unique_resource_name = "weapons.droptanks.Spitfire_tank_1", attribute = { 1, 3, 43, "Redacted" }, diff --git a/_G/launcher/TEST_ROTARY_LAUNCHER_MK82.lua b/_G/launcher/TEST_ROTARY_LAUNCHER_MK82.lua deleted file mode 100644 index 785c0417..00000000 --- a/_G/launcher/TEST_ROTARY_LAUNCHER_MK82.lua +++ /dev/null @@ -1,82 +0,0 @@ -_G["launcher"]["TEST_ROTARY_LAUNCHER_MK82"] = { - CLSID = "TEST_ROTARY_LAUNCHER_MK82", - Count = 24, - Elements = { { - Position = { 0, -0.35, 0 }, - Rotation = { -0, 0, 0 } - }, { - Position = { 2.45, -0.35, 0 }, - Rotation = { -0, 0, 0 } - }, { - Position = { 4.9, -0.35, 0 }, - Rotation = { -0, 0, 0 } - }, { - Position = { 0, -0.24748737341529, 0.24748737341529 }, - Rotation = { -45.003314762674, 0, 0 } - }, { - Position = { 2.45, -0.24748737341529, 0.24748737341529 }, - Rotation = { -45.003314762674, 0, 0 } - }, { - Position = { 4.9, -0.24748737341529, 0.24748737341529 }, - Rotation = { -45.003314762674, 0, 0 } - }, { - Position = { 0, -2.1431318985079e-17, 0.35 }, - Rotation = { -90.006629525348, 0, 0 } - }, { - Position = { 2.45, -2.1431318985079e-17, 0.35 }, - Rotation = { -90.006629525348, 0, 0 } - }, { - Position = { 4.9, -2.1431318985079e-17, 0.35 }, - Rotation = { -90.006629525348, 0, 0 } - }, { - Position = { 0, 0.24748737341529, 0.24748737341529 }, - Rotation = { -135.00994428802, 0, 0 } - }, { - Position = { 2.45, 0.24748737341529, 0.24748737341529 }, - Rotation = { -135.00994428802, 0, 0 } - }, { - Position = { 4.9, 0.24748737341529, 0.24748737341529 }, - Rotation = { -135.00994428802, 0, 0 } - }, { - Position = { 0, 0.35, 4.2862637970157e-17 }, - Rotation = { -180.0132590507, 0, 0 } - }, { - Position = { 2.45, 0.35, 4.2862637970157e-17 }, - Rotation = { -180.0132590507, 0, 0 } - }, { - Position = { 4.9, 0.35, 4.2862637970157e-17 }, - Rotation = { -180.0132590507, 0, 0 } - }, { - Position = { 0, 0.24748737341529, -0.24748737341529 }, - Rotation = { -225.01657381337, 0, 0 } - }, { - Position = { 2.45, 0.24748737341529, -0.24748737341529 }, - Rotation = { -225.01657381337, 0, 0 } - }, { - Position = { 4.9, 0.24748737341529, -0.24748737341529 }, - Rotation = { -225.01657381337, 0, 0 } - }, { - Position = { 0, 6.4293956955236e-17, -0.35 }, - Rotation = { -270.01988857604, 0, 0 } - }, { - Position = { 2.45, 6.4293956955236e-17, -0.35 }, - Rotation = { -270.01988857604, 0, 0 } - }, { - Position = { 4.9, 6.4293956955236e-17, -0.35 }, - Rotation = { -270.01988857604, 0, 0 } - }, { - Position = { 0, -0.24748737341529, -0.24748737341529 }, - Rotation = { -315.02320333872, 0, 0 } - }, { - Position = { 2.45, -0.24748737341529, -0.24748737341529 }, - Rotation = { -315.02320333872, 0, 0 } - }, { - Position = { 4.9, -0.24748737341529, -0.24748737341529 }, - Rotation = { -315.02320333872, 0, 0 } - } }, - Picture = "mk82.png", - Weight = 6748, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 9, "Redacted" }, - displayName = "TEST ROTARY LAUNCHER MK82" -} \ No newline at end of file diff --git a/_G/launcher/{0519A261-0AB6-11d6-9193-00A0249B6F00}.lua b/_G/launcher/{0519A261-0AB6-11d6-9193-00A0249B6F00}.lua index 94f9211d..1be57892 100644 --- a/_G/launcher/{0519A261-0AB6-11d6-9193-00A0249B6F00}.lua +++ b/_G/launcher/{0519A261-0AB6-11d6-9193-00A0249B6F00}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{0519A261-0AB6-11d6-9193-00A0249B6F00}"] = { ShapeName = "ETHER" } }, Picture = "ether.png", + ShapeName = "ETHER", Weight = 200, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.ETHER", attribute = { 4, 15, 44, "Redacted" }, - displayName = "ETHER" + category = 6, + displayName = "ETHER", + name = "ETHER" } \ No newline at end of file diff --git a/_G/launcher/{0519A262-0AB6-11d6-9193-00A0249B6F00}.lua b/_G/launcher/{0519A262-0AB6-11d6-9193-00A0249B6F00}.lua index eff92e73..1666c267 100644 --- a/_G/launcher/{0519A262-0AB6-11d6-9193-00A0249B6F00}.lua +++ b/_G/launcher/{0519A262-0AB6-11d6-9193-00A0249B6F00}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{0519A262-0AB6-11d6-9193-00A0249B6F00}"] = { ShapeName = "TANGAZH" } }, Picture = "L005.png", + ShapeName = "TANGAZH", Weight = 200, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.TANGAZH", attribute = { 4, 15, 44, "Redacted" }, - displayName = "Tangazh ELINT pod" + category = 6, + displayName = "Tangazh ELINT pod", + name = "TANGAZH" } \ No newline at end of file diff --git a/_G/launcher/{0519A263-0AB6-11d6-9193-00A0249B6F00}.lua b/_G/launcher/{0519A263-0AB6-11d6-9193-00A0249B6F00}.lua index e7b2d4a9..3434835e 100644 --- a/_G/launcher/{0519A263-0AB6-11d6-9193-00A0249B6F00}.lua +++ b/_G/launcher/{0519A263-0AB6-11d6-9193-00A0249B6F00}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{0519A263-0AB6-11d6-9193-00A0249B6F00}"] = { ShapeName = "SHPIL" } }, Picture = "Shpil.png", + ShapeName = "SHPIL", Weight = 200, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.SHPIL", attribute = { 4, 15, 44, "Redacted" }, - displayName = "Shpil-2 Laser Recon & Intel Pod" + category = 6, + displayName = "Shpil-2 Laser Recon & Intel Pod", + name = "SHPIL" } \ No newline at end of file diff --git a/_G/launcher/{0519A264-0AB6-11d6-9193-00A0249B6F00}.lua b/_G/launcher/{0519A264-0AB6-11d6-9193-00A0249B6F00}.lua index db30be70..582c04eb 100644 --- a/_G/launcher/{0519A264-0AB6-11d6-9193-00A0249B6F00}.lua +++ b/_G/launcher/{0519A264-0AB6-11d6-9193-00A0249B6F00}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{0519A264-0AB6-11d6-9193-00A0249B6F00}"] = { ShapeName = "Fantasm" } }, Picture = "L081.png", + ShapeName = "Fantasm", Weight = 300, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.Fantasm", attribute = { 4, 15, 44, "Redacted" }, - displayName = "L-081 Fantasmagoria ELINT pod" + category = 6, + displayName = "L-081 Fantasmagoria ELINT pod", + name = "Fantasm" } \ No newline at end of file diff --git a/_G/launcher/{14_3_M2_6xBAP100}.lua b/_G/launcher/{14_3_M2_6xBAP100}.lua index 6b2bf8d2..642ae472 100644 --- a/_G/launcher/{14_3_M2_6xBAP100}.lua +++ b/_G/launcher/{14_3_M2_6xBAP100}.lua @@ -31,7 +31,7 @@ _G["launcher"]["{14_3_M2_6xBAP100}"] = { attribute =
, category = 1, displayName = "14-3-M2 - 6 x BAP-100 - 32kg Concrete Piercing Chute Retarded Bomb w/Booster", - ejectImpulse = 500, + ejectVelocity = 14, kind_of_shipping = 1, name = "{14_3_M2_6xBAP100}", wsTypeOfWeapon = { 4, 5, 37, "Redacted" } diff --git a/_G/launcher/{14_3_M2_6xBAT120}.lua b/_G/launcher/{14_3_M2_6xBAT120}.lua index 5a4c3b19..8736c749 100644 --- a/_G/launcher/{14_3_M2_6xBAT120}.lua +++ b/_G/launcher/{14_3_M2_6xBAT120}.lua @@ -34,7 +34,7 @@ _G["launcher"]["{14_3_M2_6xBAT120}"] = { attribute =
, category = 1, displayName = "14-3-M2 - 6 x BAT-120 ABL - 34kg HE/Frag Chute Retarded Bomb HD", - ejectImpulse = 500, + ejectVelocity = 14, kind_of_shipping = 1, name = "{14_3_M2_6xBAT120}", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } diff --git a/_G/launcher/{14_3_M2_9xBAP100}.lua b/_G/launcher/{14_3_M2_9xBAP100}.lua index 6097761f..e7712b22 100644 --- a/_G/launcher/{14_3_M2_9xBAP100}.lua +++ b/_G/launcher/{14_3_M2_9xBAP100}.lua @@ -43,7 +43,7 @@ _G["launcher"]["{14_3_M2_9xBAP100}"] = { attribute =
, category = 1, displayName = "14-3-M2 - 9 x BAP-100 - 32kg Concrete Piercing Chute Retarded Bomb w/Booster", - ejectImpulse = 500, + ejectVelocity = 14, kind_of_shipping = 1, name = "{14_3_M2_9xBAP100}", wsTypeOfWeapon = { 4, 5, 37, "Redacted" } diff --git a/_G/launcher/{14_3_M2_9xBAT120}.lua b/_G/launcher/{14_3_M2_9xBAT120}.lua index 3e78908e..e2a47574 100644 --- a/_G/launcher/{14_3_M2_9xBAT120}.lua +++ b/_G/launcher/{14_3_M2_9xBAT120}.lua @@ -43,7 +43,7 @@ _G["launcher"]["{14_3_M2_9xBAT120}"] = { attribute =
, category = 1, displayName = "14-3-M2 - 9 x BAT-120 ABL - 34kg HE/Frag Chute Retarded Bomb HD", - ejectImpulse = 500, + ejectVelocity = 14, kind_of_shipping = 1, name = "{14_3_M2_9xBAT120}", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } diff --git a/_G/launcher/{199D6D51-1764-497E-9AE5-7D07C8D4D87E}.lua b/_G/launcher/{199D6D51-1764-497E-9AE5-7D07C8D4D87E}.lua index 22881b45..9f9dfb85 100644 --- a/_G/launcher/{199D6D51-1764-497E-9AE5-7D07C8D4D87E}.lua +++ b/_G/launcher/{199D6D51-1764-497E-9AE5-7D07C8D4D87E}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{199D6D51-1764-497E-9AE5-7D07C8D4D87E}"] = { ShapeName = "PAVETACK" } }, Picture = "L005.png", + ShapeName = "PAVETACK", Weight = 200, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.PAVETACK", attribute = { 4, 15, 44, "Redacted" }, - displayName = "Pavetack F-111" + category = 6, + displayName = "Pavetack F-111", + name = "PAVETACK" } \ No newline at end of file diff --git a/_G/launcher/{1C2B16EB-8EB0-43de-8788-8EBB2D70B8BC}.lua b/_G/launcher/{1C2B16EB-8EB0-43de-8788-8EBB2D70B8BC}.lua index f5e99c47..3b8ee679 100644 --- a/_G/launcher/{1C2B16EB-8EB0-43de-8788-8EBB2D70B8BC}.lua +++ b/_G/launcher/{1C2B16EB-8EB0-43de-8788-8EBB2D70B8BC}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{1C2B16EB-8EB0-43de-8788-8EBB2D70B8BC}"] = { ShapeName = "F-18-LDT-POD" } }, Picture = "ANASQ173.png", + ShapeName = "F-18-LDT-POD", Weight = 250, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.F-18-LDT-POD", attribute = { 4, 15, 44, "Redacted" }, - displayName = "AN/ASQ-173 Laser Spot Tracker/Strike CAMera (LST/SCAM)" + category = 6, + displayName = "AN/ASQ-173 Laser Spot Tracker/Strike CAMera (LST/SCAM)", + name = "F-18-LDT-POD" } \ No newline at end of file diff --git a/_G/launcher/{2234F529-1D57-4496-8BB0-0150F9BDBBD3}.lua b/_G/launcher/{2234F529-1D57-4496-8BB0-0150F9BDBBD3}.lua index 15d605ce..4d918b35 100644 --- a/_G/launcher/{2234F529-1D57-4496-8BB0-0150F9BDBBD3}.lua +++ b/_G/launcher/{2234F529-1D57-4496-8BB0-0150F9BDBBD3}.lua @@ -16,6 +16,6 @@ _G["launcher"]["{2234F529-1D57-4496-8BB0-0150F9BDBBD3}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-35 (AS-20 Kayak) - 520kg, AShM, IN & Act Rdr", - ejectImpulse = 2000, + ejectVelocity = 2, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{22906569-A97F-404B-BA4F-D96DBF94D05E}.lua b/_G/launcher/{22906569-A97F-404B-BA4F-D96DBF94D05E}.lua index 3604adc0..ae7664a6 100644 --- a/_G/launcher/{22906569-A97F-404B-BA4F-D96DBF94D05E}.lua +++ b/_G/launcher/{22906569-A97F-404B-BA4F-D96DBF94D05E}.lua @@ -5,8 +5,12 @@ _G["launcher"]["{22906569-A97F-404B-BA4F-D96DBF94D05E}"] = { ShapeName = "AGM-86" } }, Picture = "AGM86.png", - Weight = 39000, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 41000, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 8, "Redacted" }, - displayName = "20 x AGM-86D" + category = 2, + displayName = "20 x AGM-86D", + ejectPitchRate = -10, + ejectVelocity = 1 } \ No newline at end of file diff --git a/_G/launcher/{275A2855-4A79-4B2D-B082-91EA2ADF4691}.lua b/_G/launcher/{275A2855-4A79-4B2D-B082-91EA2ADF4691}.lua index 270460d5..8c851f52 100644 --- a/_G/launcher/{275A2855-4A79-4B2D-B082-91EA2ADF4691}.lua +++ b/_G/launcher/{275A2855-4A79-4B2D-B082-91EA2ADF4691}.lua @@ -1,20 +1,23 @@ _G["launcher"]["{275A2855-4A79-4B2D-B082-91EA2ADF4691}"] = { CLSID = "{275A2855-4A79-4B2D-B082-91EA2ADF4691}", Count = 2, - Cx_pil = 0.0006, + Cx_pil = 0.0012396484375, Elements = { { ShapeName = "apu-60-2_R" }, { - ShapeName = "R-60", + ShapeName = "r-60", connector_name = "Point Pilon R60" }, { - ShapeName = "R-60", + ShapeName = "r-60", connector_name = "Point Pilon R60_1" } }, Picture = "r60.png", - Weight = 148, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 158, + Weight_Empty = 71, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - displayName = "APU-60-2M with 2 x R-60M (AA-8 Aphid) - Infra Red", + category = 4, + displayName = "APU-60-2M with 2 x R-60M (AA-8 Aphid-B) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{30_6_M2_12xBAP100}.lua b/_G/launcher/{30_6_M2_12xBAP100}.lua index 0001462a..ca8626cb 100644 --- a/_G/launcher/{30_6_M2_12xBAP100}.lua +++ b/_G/launcher/{30_6_M2_12xBAP100}.lua @@ -49,7 +49,7 @@ _G["launcher"]["{30_6_M2_12xBAP100}"] = { attribute =
, category = 1, displayName = "30-6-M2 - 12 x BAP-100 - 32kg Concrete Piercing Chute Retarded Bomb w/Booster", - ejectImpulse = 500, + ejectVelocity = 14, kind_of_shipping = 1, name = "{30_6_M2_12xBAP100}", wsTypeOfWeapon = { 4, 5, 37, "Redacted" } diff --git a/_G/launcher/{30_6_M2_12xBAT120}.lua b/_G/launcher/{30_6_M2_12xBAT120}.lua index 8ee48c3b..76c7fbbf 100644 --- a/_G/launcher/{30_6_M2_12xBAT120}.lua +++ b/_G/launcher/{30_6_M2_12xBAT120}.lua @@ -52,7 +52,7 @@ _G["launcher"]["{30_6_M2_12xBAT120}"] = { attribute =
, category = 1, displayName = "30-6-M2 - 12 x BAT-120 ABL - 34kg HE/Frag Chute Retarded Bomb HD", - ejectImpulse = 500, + ejectVelocity = 14, kind_of_shipping = 1, name = "{30_6_M2_12xBAT120}", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } diff --git a/_G/launcher/{30_6_M2_18xBAP100}.lua b/_G/launcher/{30_6_M2_18xBAP100}.lua index 575b7850..2eca0d5d 100644 --- a/_G/launcher/{30_6_M2_18xBAP100}.lua +++ b/_G/launcher/{30_6_M2_18xBAP100}.lua @@ -70,7 +70,7 @@ _G["launcher"]["{30_6_M2_18xBAP100}"] = { attribute =
, category = 1, displayName = "30-6-M2 - 18 x BAP-100 - 32kg Concrete Piercing Chute Retarded Bomb w/Booster", - ejectImpulse = 500, + ejectVelocity = 14, kind_of_shipping = 1, name = "{30_6_M2_18xBAP100}", wsTypeOfWeapon = { 4, 5, 37, "Redacted" } diff --git a/_G/launcher/{30_6_M2_18xBAT120}.lua b/_G/launcher/{30_6_M2_18xBAT120}.lua index f8e9abc8..b53aa20f 100644 --- a/_G/launcher/{30_6_M2_18xBAT120}.lua +++ b/_G/launcher/{30_6_M2_18xBAT120}.lua @@ -70,7 +70,7 @@ _G["launcher"]["{30_6_M2_18xBAT120}"] = { attribute =
, category = 1, displayName = "30-6-M2 - 18 x BAT-120 ABL - 34kg HE/Frag Chute Retarded Bomb HD", - ejectImpulse = 500, + ejectVelocity = 14, kind_of_shipping = 1, name = "{30_6_M2_18xBAT120}", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } diff --git a/_G/launcher/{3468C652-E830-4E73-AFA9-B5F260AB7C3D}.lua b/_G/launcher/{3468C652-E830-4E73-AFA9-B5F260AB7C3D}.lua index 0c8c4d83..5b77d562 100644 --- a/_G/launcher/{3468C652-E830-4E73-AFA9-B5F260AB7C3D}.lua +++ b/_G/launcher/{3468C652-E830-4E73-AFA9-B5F260AB7C3D}.lua @@ -14,6 +14,7 @@ _G["launcher"]["{3468C652-E830-4E73-AFA9-B5F260AB7C3D}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-29L (AS-14 Kedge) - 657kg, ASM, Semi-Act Laser", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{3C0745ED-8B0B-42eb-B907-5BD5C1717447}.lua b/_G/launcher/{3C0745ED-8B0B-42eb-B907-5BD5C1717447}.lua index 0f4475d5..f1a356ce 100644 --- a/_G/launcher/{3C0745ED-8B0B-42eb-B907-5BD5C1717447}.lua +++ b/_G/launcher/{3C0745ED-8B0B-42eb-B907-5BD5C1717447}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{3C0745ED-8B0B-42eb-B907-5BD5C1717447}"] = { CLSID = "{3C0745ED-8B0B-42eb-B907-5BD5C1717447}", Count = 2, - Cx_pil = 0.00014, + Cx_pil = 0.0015203125, Elements = { { IsAdapter = true, ShapeName = "lau-105" @@ -16,8 +16,8 @@ _G["launcher"]["{3C0745ED-8B0B-42eb-B907-5BD5C1717447}"] = { } }, Picture = "us_AIM-9P.png", PictureBlendColor = "0xffffffff", - Weight = 201, - Weight_Empty = 30, + Weight = 355.68, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{3E6B632D-65EB-44D2-9501-1C2D04515404}.lua b/_G/launcher/{3E6B632D-65EB-44D2-9501-1C2D04515404}.lua index 72be1ded..1757362f 100644 --- a/_G/launcher/{3E6B632D-65EB-44D2-9501-1C2D04515404}.lua +++ b/_G/launcher/{3E6B632D-65EB-44D2-9501-1C2D04515404}.lua @@ -1,11 +1,15 @@ _G["launcher"]["{3E6B632D-65EB-44D2-9501-1C2D04515404}"] = { CLSID = "{3E6B632D-65EB-44D2-9501-1C2D04515404}", + Count = 1, Elements = { { - ShapeName = "AGM-45" + ShapeName = "agm-45" } }, Picture = "agm45.png", Weight = 177, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/anti-radiation missiles.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 8, "Redacted" }, - displayName = "AGM-45B Shrike ARM (Imp)" + category = 2, + displayName = "AGM-45B Shrike ARM (Imp)", + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{3E6B632D-65EB-44D2-9501-1C2D04515405}.lua b/_G/launcher/{3E6B632D-65EB-44D2-9501-1C2D04515405}.lua index 7194ea88..e906a310 100644 --- a/_G/launcher/{3E6B632D-65EB-44D2-9501-1C2D04515405}.lua +++ b/_G/launcher/{3E6B632D-65EB-44D2-9501-1C2D04515405}.lua @@ -1,8 +1,8 @@ _G["launcher"]["{3E6B632D-65EB-44D2-9501-1C2D04515405}"] = { CLSID = "{3E6B632D-65EB-44D2-9501-1C2D04515405}", Count = 1, - Cx_pil = 0.001, Elements = { { + IsAdapter = true, ShapeName = "lau-118a" }, { Position = { 0.091, -0.129, 0 }, @@ -10,8 +10,11 @@ _G["launcher"]["{3E6B632D-65EB-44D2-9501-1C2D04515405}"] = { } }, Picture = "agm45.png", Weight = 222.4, - _file = "Scripts/Database/db_weapons_data.lua", + Weight_Empty = 45.4, + _file = "./CoreMods/aircraft/AircraftWeaponPack/anti-radiation missiles.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - displayName = "LAU-118a with AGM-45B Shrike ARM (Imp)", + category = 2, + displayName = "LAU-118A - AGM-45B Shrike ARM (Imp)", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{40EF17B7-F508-45de-8566-6FFECC0C1AB8}.lua b/_G/launcher/{40EF17B7-F508-45de-8566-6FFECC0C1AB8}.lua index 49c912a1..c2432d66 100644 --- a/_G/launcher/{40EF17B7-F508-45de-8566-6FFECC0C1AB8}.lua +++ b/_G/launcher/{40EF17B7-F508-45de-8566-6FFECC0C1AB8}.lua @@ -1,12 +1,16 @@ _G["launcher"]["{40EF17B7-F508-45de-8566-6FFECC0C1AB8}"] = { CLSID = "{40EF17B7-F508-45de-8566-6FFECC0C1AB8}", + Count = 1, + Cx_pil = 0.00061, Elements = { { - ShapeName = "AIM-120C-5" + ShapeName = "AIM-120C" } }, Picture = "us_AIM-120C.png", PictureBlendColor = "0xffffffff", - Weight = 161.5, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 161.48, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 7, "Redacted" }, - displayName = "AIM-120C-5 AMRAAM - Active Rdr AAM" + category = 4, + displayName = "AIM-120C AMRAAM - Active Radar AAM" } \ No newline at end of file diff --git a/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82A}.lua b/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82A}.lua index b258aaa7..3824f4ad 100644 --- a/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82A}.lua +++ b/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82A}.lua @@ -6,8 +6,13 @@ _G["launcher"]["{44EE8698-89F9-48EE-AF36-5FD31896A82A}"] = { } }, Picture = "L005.png", Required = { "{44EE8698-89F9-48EE-AF36-5FD31896A82F}" }, + ShapeName = "SORBCIJA_R", Weight = 150, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.SORBCIJA_R", attribute = { 4, 15, 45, "Redacted" }, - displayName = "L005 Sorbtsiya ECM pod (right)" + category = 6, + displayName = "L005 Sorbtsiya ECM pod (right)", + name = "SORBCIJA_R" } \ No newline at end of file diff --git a/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82C}.lua b/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82C}.lua index 21739125..2ff0e7ef 100644 --- a/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82C}.lua +++ b/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82C}.lua @@ -6,8 +6,12 @@ _G["launcher"]["{44EE8698-89F9-48EE-AF36-5FD31896A82C}"] = { } }, Picture = "MPS410.png", Required = { "{44EE8698-89F9-48EE-AF36-5FD31896A82D}" }, + ShapeName = "MPS-410", Weight = 150, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 15, 45, "Redacted" }, - displayName = "MPS-410" + category = 6, + displayName = "MPS-410", + name = "MPS-410" } \ No newline at end of file diff --git a/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82D}.lua b/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82D}.lua index 8a4d975c..5c064cf4 100644 --- a/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82D}.lua +++ b/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82D}.lua @@ -6,8 +6,13 @@ _G["launcher"]["{44EE8698-89F9-48EE-AF36-5FD31896A82D}"] = { } }, Picture = "MPS410.png", Required = { "{44EE8698-89F9-48EE-AF36-5FD31896A82C}" }, + ShapeName = "MPS-410", Weight = 150, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.MPS-410", attribute = { 4, 15, 45, "Redacted" }, - displayName = "MPS-410" + category = 6, + displayName = "MPS-410", + name = "MPS-410" } \ No newline at end of file diff --git a/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82F}.lua b/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82F}.lua index 34651f2b..a49d298e 100644 --- a/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82F}.lua +++ b/_G/launcher/{44EE8698-89F9-48EE-AF36-5FD31896A82F}.lua @@ -6,8 +6,13 @@ _G["launcher"]["{44EE8698-89F9-48EE-AF36-5FD31896A82F}"] = { } }, Picture = "L005.png", Required = { "{44EE8698-89F9-48EE-AF36-5FD31896A82A}" }, + ShapeName = "SORBCIJA_L", Weight = 150, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.SORBCIJA_L", attribute = { 4, 15, 45, "Redacted" }, - displayName = "L005 Sorbtsiya ECM pod (left)" + category = 6, + displayName = "L005 Sorbtsiya ECM pod (left)", + name = "SORBCIJA_L" } \ No newline at end of file diff --git a/_G/launcher/{45447F82-01B5-4029-A572-9AAD28AF0275}.lua b/_G/launcher/{45447F82-01B5-4029-A572-9AAD28AF0275}.lua index f7b9763b..2b5a81ef 100644 --- a/_G/launcher/{45447F82-01B5-4029-A572-9AAD28AF0275}.lua +++ b/_G/launcher/{45447F82-01B5-4029-A572-9AAD28AF0275}.lua @@ -2,35 +2,35 @@ _G["launcher"]["{45447F82-01B5-4029-A572-9AAD28AF0275}"] = { CLSID = "{45447F82-01B5-4029-A572-9AAD28AF0275}", Count = 6, Cx_pil = 0.000681, - Elements = { { - ShapeName = "B52-MBD_AGM86" + Elements = { "_G/Pylons/b-52_suu67.lua", { + ShapeName = "AGM-86", + connector_name = "Pylon1" }, { - Position = { -2.096, 0.138, 0 }, - ShapeName = "AGM-86" + ShapeName = "AGM-86", + connector_name = "Pylon3" }, { - Position = { 4.277, 0.138, 0 }, - ShapeName = "AGM-86" + ShapeName = "AGM-86", + connector_name = "Pylon4" }, { - DrawArgs = { { 3, -1 } }, - Position = { -2.096, 0.847, 0.838 }, - ShapeName = "AGM-86" + ShapeName = "AGM-86", + connector_name = "Pylon6" }, { - DrawArgs = { { 3, 1 } }, - Position = { -2.096, 0.847, -0.838 }, - ShapeName = "AGM-86" + ShapeName = "AGM-86", + connector_name = "Pylon2" }, { - DrawArgs = { { 3, -1 } }, - Position = { 4.277, 0.847, 0.838 }, - ShapeName = "AGM-86" - }, { - DrawArgs = { { 3, 1 } }, - Position = { 4.277, 0.847, -0.838 }, - ShapeName = "AGM-86" + ShapeName = "AGM-86", + connector_name = "Pylon5" } }, Picture = "AGM86.png", - Weight = 11760, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 10716.7, + Weight_Empty = 2016.7, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", attribute = { 4, 4, 32, "Redacted" }, + category = 2, displayName = "6 x AGM-86D on MER", + ejectPitchRate = -10, + ejectVelocity = 1, + kind_of_shipping = 0, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{46ACDCF8-5451-4E26-BDDB-E78D5830E93C}.lua b/_G/launcher/{46ACDCF8-5451-4E26-BDDB-E78D5830E93C}.lua index c7ad5567..db249b0e 100644 --- a/_G/launcher/{46ACDCF8-5451-4E26-BDDB-E78D5830E93C}.lua +++ b/_G/launcher/{46ACDCF8-5451-4E26-BDDB-E78D5830E93C}.lua @@ -6,7 +6,9 @@ _G["launcher"]["{46ACDCF8-5451-4E26-BDDB-E78D5830E93C}"] = { } }, Picture = "agm84a.png", Weight = 5292, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", attribute = { 4, 4, 8, "Redacted" }, + category = 2, displayName = "8 x AGM-84A Harpoon ASM" } \ No newline at end of file diff --git a/_G/launcher/{4CD2BB0F-5493-44EF-A927-9760350F7BA1}.lua b/_G/launcher/{4CD2BB0F-5493-44EF-A927-9760350F7BA1}.lua index 0dcb9a1d..0ceb9152 100644 --- a/_G/launcher/{4CD2BB0F-5493-44EF-A927-9760350F7BA1}.lua +++ b/_G/launcher/{4CD2BB0F-5493-44EF-A927-9760350F7BA1}.lua @@ -2,46 +2,41 @@ _G["launcher"]["{4CD2BB0F-5493-44EF-A927-9760350F7BA1}"] = { CLSID = "{4CD2BB0F-5493-44EF-A927-9760350F7BA1}", Count = 9, Cx_pil = 0.005, - Elements = { { - ShapeName = "B52-MBD_MK84" + Elements = { "_G/Pylons/b-52_HSAB.lua", { + ShapeName = "ROCKEYE", + connector_name = "Pylon1" }, { - Position = { -3.853, -0.134, 0 }, - ShapeName = "ROCKEYE" + ShapeName = "ROCKEYE", + connector_name = "Pylon3" }, { - Position = { -0.052, -0.134, 0 }, - ShapeName = "ROCKEYE" + ShapeName = "ROCKEYE", + connector_name = "Pylon4" }, { - Position = { 3.774, -0.134, 0 }, - ShapeName = "ROCKEYE" + ShapeName = "ROCKEYE", + connector_name = "Pylon6" }, { - Position = { -3.853, -0.038, 0.147 }, - Rotation = { -65, 0, 0 }, - ShapeName = "ROCKEYE" + ShapeName = "ROCKEYE", + connector_name = "Pylon7" }, { - Position = { -3.853, -0.038, -0.147 }, - Rotation = { 65, 0, 0 }, - ShapeName = "ROCKEYE" + ShapeName = "ROCKEYE", + connector_name = "Pylon9" }, { - Position = { -0.052, -0.038, 0.147 }, - Rotation = { -65, 0, 0 }, - ShapeName = "ROCKEYE" + ShapeName = "ROCKEYE", + connector_name = "Pylon2" }, { - Position = { -0.052, -0.038, -0.147 }, - Rotation = { 65, 0, 0 }, - ShapeName = "ROCKEYE" + ShapeName = "ROCKEYE", + connector_name = "Pylon5" }, { - Position = { 3.774, -0.038, 0.147 }, - Rotation = { -65, 0, 0 }, - ShapeName = "ROCKEYE" - }, { - Position = { 3.774, -0.038, -0.147 }, - Rotation = { 65, 0, 0 }, - ShapeName = "ROCKEYE" + ShapeName = "ROCKEYE", + connector_name = "Pylon8" } }, Picture = "rockeye.png", - Weight = 2050, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 3086.6, + Weight_Empty = 1088.6, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", attribute = { 4, 5, 32, "Redacted" }, + category = 1, displayName = "HSAB with 9 x Mk-20 Rockeye - 490lbs CBUs, 247 x HEAT Bomblets", wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{4D13E282-DF46-4B23-864A-A9423DFDE504}.lua b/_G/launcher/{4D13E282-DF46-4B23-864A-A9423DFDE504}.lua index 34e61158..91797e2c 100644 --- a/_G/launcher/{4D13E282-DF46-4B23-864A-A9423DFDE504}.lua +++ b/_G/launcher/{4D13E282-DF46-4B23-864A-A9423DFDE504}.lua @@ -15,6 +15,7 @@ _G["launcher"]["{4D13E282-DF46-4B23-864A-A9423DFDE504}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-31A (AS-17 Krypton) - 610kg, AShM, IN & Act Rdr", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{4D13E282-DF46-4B23-864A-A9423DFDE50A}.lua b/_G/launcher/{4D13E282-DF46-4B23-864A-A9423DFDE50A}.lua index 7a5d1494..be86ed8e 100644 --- a/_G/launcher/{4D13E282-DF46-4B23-864A-A9423DFDE50A}.lua +++ b/_G/launcher/{4D13E282-DF46-4B23-864A-A9423DFDE50A}.lua @@ -15,6 +15,7 @@ _G["launcher"]["{4D13E282-DF46-4B23-864A-A9423DFDE50A}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-31A (AS-17 Krypton) - 610kg, AShM, IN & Act Rdr", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{574EDEDF-20DE-4942-B2A2-B2EDFD621562}.lua b/_G/launcher/{574EDEDF-20DE-4942-B2A2-B2EDFD621562}.lua deleted file mode 100644 index 8ef2d331..00000000 --- a/_G/launcher/{574EDEDF-20DE-4942-B2A2-B2EDFD621562}.lua +++ /dev/null @@ -1,58 +0,0 @@ -_G["launcher"]["{574EDEDF-20DE-4942-B2A2-B2EDFD621562}"] = { - CLSID = "{574EDEDF-20DE-4942-B2A2-B2EDFD621562}", - Count = 12, - Cx_pil = 0.005, - Elements = { { - ShapeName = "B52-MBD_M117" - }, { - Position = { -3.084, -0.131, 0 }, - ShapeName = "M117" - }, { - Position = { -0.867, -0.131, 0 }, - ShapeName = "M117" - }, { - Position = { 1.349, -0.131, 0 }, - ShapeName = "M117" - }, { - Position = { 3.566, -0.131, 0 }, - ShapeName = "M117" - }, { - Position = { -3.084, -0.037, 0.141 }, - Rotation = { -65, 0, 0 }, - ShapeName = "M117" - }, { - Position = { -3.084, -0.037, -0.141 }, - Rotation = { 65, 0, 0 }, - ShapeName = "M117" - }, { - Position = { -0.867, -0.037, 0.141 }, - Rotation = { -65, 0, 0 }, - ShapeName = "M117" - }, { - Position = { -0.867, -0.037, -0.141 }, - Rotation = { 65, 0, 0 }, - ShapeName = "M117" - }, { - Position = { 1.349, -0.037, 0.141 }, - Rotation = { -65, 0, 0 }, - ShapeName = "M117" - }, { - Position = { 1.349, -0.037, -0.141 }, - Rotation = { 65, 0, 0 }, - ShapeName = "M117" - }, { - Position = { 3.566, -0.037, 0.141 }, - Rotation = { -65, 0, 0 }, - ShapeName = "M117" - }, { - Position = { 3.566, -0.037, -0.141 }, - Rotation = { 65, 0, 0 }, - ShapeName = "M117" - } }, - Picture = "KMGU2.png", - Weight = 4250, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 32, "Redacted" }, - displayName = "MER12 with 12 x M117 - 750lb GP Bombs LD", - wsTypeOfWeapon = { 4, 5, 9, "Redacted" } -} \ No newline at end of file diff --git a/_G/launcher/{585D626E-7F42-4073-AB70-41E728C333E2}.lua b/_G/launcher/{585D626E-7F42-4073-AB70-41E728C333E2}.lua index 17f17685..03a0c0f1 100644 --- a/_G/launcher/{585D626E-7F42-4073-AB70-41E728C333E2}.lua +++ b/_G/launcher/{585D626E-7F42-4073-AB70-41E728C333E2}.lua @@ -1,58 +1,45 @@ _G["launcher"]["{585D626E-7F42-4073-AB70-41E728C333E2}"] = { CLSID = "{585D626E-7F42-4073-AB70-41E728C333E2}", - Count = 12, + Count = 9, Cx_pil = 0.005, Elements = { { - ShapeName = "B52-MBD_M117" + IsAdapter = true, + ShapeName = "b-52_HSAB" }, { - Position = { -3.084, -0.131, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon1" }, { - Position = { -0.867, -0.131, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon3" }, { - Position = { 1.349, -0.131, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon4" }, { - Position = { 3.566, -0.131, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon6" }, { - Position = { -3.084, -0.037, 0.141 }, - Rotation = { -65, 0, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon7" }, { - Position = { -3.084, -0.037, -0.141 }, - Rotation = { 65, 0, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon9" }, { - Position = { -0.867, -0.037, 0.141 }, - Rotation = { -65, 0, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon2" }, { - Position = { -0.867, -0.037, -0.141 }, - Rotation = { 65, 0, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon5" }, { - Position = { 1.349, -0.037, 0.141 }, - Rotation = { -65, 0, 0 }, - ShapeName = "MK-82" - }, { - Position = { 1.349, -0.037, -0.141 }, - Rotation = { 65, 0, 0 }, - ShapeName = "MK-82" - }, { - Position = { 3.566, -0.037, 0.141 }, - Rotation = { -65, 0, 0 }, - ShapeName = "MK-82" - }, { - Position = { 3.566, -0.037, -0.141 }, - Rotation = { 65, 0, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon8" } }, Picture = "mk82.png", - Weight = 3000, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 3140.6, + Weight_Empty = 1088.6, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", attribute = { 4, 5, 32, "Redacted" }, - displayName = "MER12 with 12 x Mk-82 - 500lb GP Bombs LD", + category = 1, + displayName = "HSAB with 9 x Mk-82 - 500lb GP Bombs LD", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{5CE2FF2A-645A-4197-B48D-8720AC69394F}.lua b/_G/launcher/{5CE2FF2A-645A-4197-B48D-8720AC69394F}.lua index 7cc1e43d..8ed57517 100644 --- a/_G/launcher/{5CE2FF2A-645A-4197-B48D-8720AC69394F}.lua +++ b/_G/launcher/{5CE2FF2A-645A-4197-B48D-8720AC69394F}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{5CE2FF2A-645A-4197-B48D-8720AC69394F}"] = { CLSID = "{5CE2FF2A-645A-4197-B48D-8720AC69394F}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "AIM-9X" } }, diff --git a/_G/launcher/{601C99F7-9AF3-4ed7-A565-F8B8EC0D7AAC}.lua b/_G/launcher/{601C99F7-9AF3-4ed7-A565-F8B8EC0D7AAC}.lua index d6d440a3..55e8d926 100644 --- a/_G/launcher/{601C99F7-9AF3-4ed7-A565-F8B8EC0D7AAC}.lua +++ b/_G/launcher/{601C99F7-9AF3-4ed7-A565-F8B8EC0D7AAC}.lua @@ -14,6 +14,7 @@ _G["launcher"]["{601C99F7-9AF3-4ed7-A565-F8B8EC0D7AAC}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-29T (AS-14 Kedge) - 670kg, ASM, TV Guided", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}.lua b/_G/launcher/{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}.lua index 1615504e..697b12a8 100644 --- a/_G/launcher/{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}.lua +++ b/_G/launcher/{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}.lua @@ -6,13 +6,13 @@ _G["launcher"]["{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}"] = { ShapeName = "BRU-42_LS" }, { ShapeName = "MK-82", - connector_name = "Point01" + connector_name = "Point03" }, { ShapeName = "MK-82", connector_name = "Point02" }, { ShapeName = "MK-82", - connector_name = "Point03" + connector_name = "Point01" } }, Picture = "mk82.png", Weight = 740.25, diff --git a/_G/launcher/{682A481F-0CB5-4693-A382-D00DD4A156D7}.lua b/_G/launcher/{682A481F-0CB5-4693-A382-D00DD4A156D7}.lua index 5403ccd4..eb9019f0 100644 --- a/_G/launcher/{682A481F-0CB5-4693-A382-D00DD4A156D7}.lua +++ b/_G/launcher/{682A481F-0CB5-4693-A382-D00DD4A156D7}.lua @@ -1,12 +1,15 @@ _G["launcher"]["{682A481F-0CB5-4693-A382-D00DD4A156D7}"] = { CLSID = "{682A481F-0CB5-4693-A382-D00DD4A156D7}", + Count = 1, + Cx_pil = 0.00031982421875, Elements = { { - ShapeName = "R-60" + ShapeName = "r-60" } }, - NatoName = "(AA-8)", Picture = "r60.png", - Weight = 44, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 43.5, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 7, "Redacted" }, - displayName = "R-60M (AA-8 Aphid) - Infra Red" + category = 4, + displayName = "R-60M (AA-8 Aphid-B) - IR AAM" } \ No newline at end of file diff --git a/_G/launcher/{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}.lua b/_G/launcher/{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}.lua index d33051be..336ba90c 100644 --- a/_G/launcher/{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}.lua +++ b/_G/launcher/{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}.lua @@ -1,47 +1,36 @@ _G["launcher"]["{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}"] = { CLSID = "{696CFFC4-0BDE-42A8-BE4B-0BE3D9DD723C}", - Count = 9, + Count = 6, Cx_pil = 0.005, Elements = { { - ShapeName = "B52-MBD_MK84" + IsAdapter = true, + ShapeName = "b-52_HSAB" }, { - Position = { -3.853, -0.134, 0 }, - ShapeName = "MK-84" + ShapeName = "MK-84", + connector_name = "Pylon1" }, { - Position = { -0.052, -0.134, 0 }, - ShapeName = "MK-84" + ShapeName = "MK-84", + connector_name = "Pylon3" }, { - Position = { 3.774, -0.134, 0 }, - ShapeName = "MK-84" + ShapeName = "MK-84", + connector_name = "Pylon7" }, { - Position = { -3.853, -0.038, 0.147 }, - Rotation = { -65, 0, 0 }, - ShapeName = "MK-84" + ShapeName = "MK-84", + connector_name = "Pylon9" }, { - Position = { -3.853, -0.038, -0.147 }, - Rotation = { 65, 0, 0 }, - ShapeName = "MK-84" + ShapeName = "MK-84", + connector_name = "Pylon2" }, { - Position = { -0.052, -0.038, 0.147 }, - Rotation = { -65, 0, 0 }, - ShapeName = "MK-84" - }, { - Position = { -0.052, -0.038, -0.147 }, - Rotation = { 65, 0, 0 }, - ShapeName = "MK-84" - }, { - Position = { 3.774, -0.038, 0.147 }, - Rotation = { -65, 0, 0 }, - ShapeName = "MK-84" - }, { - Position = { 3.774, -0.038, -0.147 }, - Rotation = { 65, 0, 0 }, - ShapeName = "MK-84" + ShapeName = "MK-84", + connector_name = "Pylon8" } }, Picture = "FAB250.png", - Weight = 8100, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 6536.6, + Weight_Empty = 1088.6, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", attribute = { 4, 5, 32, "Redacted" }, - displayName = "HSAB with 9 x Mk-83 - 1000lb GP Bombs LD", + category = 1, + displayName = "HSAB with 6 x Mk-84 - 2000lb GP Bombs LD", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}.lua b/_G/launcher/{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}.lua index 380d90d5..50cef1e8 100644 --- a/_G/launcher/{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}.lua +++ b/_G/launcher/{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{6C0D552F-570B-42ff-9F6D-F10D9C1D4E1C}"] = { ShapeName = "F-18-FLIR-POD" } }, Picture = "ANAAS38.png", + ShapeName = "F-18-FLIR-POD", Weight = 200, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.F-18-FLIR-POD", attribute = { 4, 15, 44, "Redacted" }, - displayName = 'AN/AAS-38 "Nite hawk" FLIR, Laser designator & Laser spot tracker pod' + category = 6, + displayName = 'AN/AAS-38 "Nite hawk" FLIR, Laser designator & Laser spot tracker pod', + name = "F-18-FLIR-POD" } \ No newline at end of file diff --git a/_G/launcher/{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}.lua b/_G/launcher/{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}.lua index 0cf4b995..d506fe9c 100644 --- a/_G/launcher/{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}.lua +++ b/_G/launcher/{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}.lua @@ -1,91 +1,94 @@ _G["launcher"]["{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}"] = { CLSID = "{6C47D097-83FF-4FB2-9496-EAB36DDF0B05}", Count = 27, + DistributeOverCarrierDirectly = true, Elements = { { - Position = { 2.5, 1.5, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon46" }, { - Position = { 2.5, 1.5, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon37" }, { - Position = { 2.5, 1.5, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon28" }, { - Position = { 2.5, 1, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon45" }, { - Position = { 2.5, 1, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon36" }, { - Position = { 2.5, 1, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon27" }, { - Position = { 2.5, 0.5, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon44" }, { - Position = { 2.5, 0.5, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon35" }, { - Position = { 2.5, 0.5, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon26" }, { - Position = { 0.2, 1.5, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon43" }, { - Position = { 0.2, 1.5, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon34" }, { - Position = { 0.2, 1.5, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon25" }, { - Position = { 0.2, 1, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon42" }, { - Position = { 0.2, 1, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon33" }, { - Position = { 0.2, 1, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon24" }, { - Position = { 0.2, 0.5, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon41" }, { - Position = { 0.2, 0.5, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon32" }, { - Position = { 0.2, 0.5, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon23" }, { - Position = { -2.1, 1.5, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon40" }, { - Position = { -2.1, 1.5, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon31" }, { - Position = { -2.1, 1.5, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon22" }, { - Position = { -2.1, 1, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon39" }, { - Position = { -2.1, 1, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon30" }, { - Position = { -2.1, 1, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon21" }, { - Position = { -2.1, 0.5, -0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon38" }, { - Position = { -2.1, 0.5, 0 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon29" }, { - Position = { -2.1, 0.5, 0.5 }, - ShapeName = "MK-82" + ShapeName = "MK-82", + connector_name = "Pylon20" } }, Picture = "mk82.png", - Weight = 6507, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 6156, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", attribute = { 4, 5, 9, "Redacted" }, + category = 1, displayName = "27 x Mk-82 - 500lb GP Bombs LD" } \ No newline at end of file diff --git a/_G/launcher/{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}.lua b/_G/launcher/{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}.lua index 25bf107d..fda73662 100644 --- a/_G/launcher/{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}.lua +++ b/_G/launcher/{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}"] = { CLSID = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "AIM-9" } }, diff --git a/_G/launcher/{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}.lua b/_G/launcher/{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}.lua index e3561dd0..636127bf 100644 --- a/_G/launcher/{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}.lua +++ b/_G/launcher/{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}"] = { ShapeName = "ALQ-131" } }, Picture = "ALQ131.png", + ShapeName = "ALQ-131", Weight = 305, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.ALQ-131", attribute = { 4, 15, 45, "Redacted" }, - displayName = "ALQ-131 - ECM Pod" + category = 6, + displayName = "ALQ-131 - ECM Pod", + name = "ALQ-131" } \ No newline at end of file diff --git a/_G/launcher/{6_x_AGM_86C_MER}.lua b/_G/launcher/{6_x_AGM_86C_MER}.lua deleted file mode 100644 index 068e800d..00000000 --- a/_G/launcher/{6_x_AGM_86C_MER}.lua +++ /dev/null @@ -1,38 +0,0 @@ -_G["launcher"]["{6_x_AGM_86C_MER}"] = { - CLSID = "{6_x_AGM_86C_MER}", - Count = 6, - Cx_pil = 0.000681, - Elements = { { - ShapeName = "B52-MBD_AGM86" - }, { - Position = { -2.096, 0.138, 0 }, - ShapeName = "AGM-86" - }, { - Position = { 4.277, 0.138, 0 }, - ShapeName = "AGM-86" - }, { - DrawArgs = { { 3, -1 } }, - Position = { -2.096, 0.847, 0.838 }, - ShapeName = "AGM-86" - }, { - DrawArgs = { { 3, 1 } }, - Position = { -2.096, 0.847, -0.838 }, - ShapeName = "AGM-86" - }, { - DrawArgs = { { 3, -1 } }, - Position = { 4.277, 0.847, 0.838 }, - ShapeName = "AGM-86" - }, { - DrawArgs = { { 3, 1 } }, - Position = { 4.277, 0.847, -0.838 }, - ShapeName = "AGM-86" - } }, - Picture = "AGM86.png", - Weight = 12360, - Weight_Empty = 60, - _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", - _origin = "AircraftWeaponPack", - attribute = { 4, 4, 32, "Redacted" }, - category = 2, - displayName = "6 x AGM-86C on MER" -} \ No newline at end of file diff --git a/_G/launcher/{72CAC282-AE18-490B-BD4D-35E7EE969E73}.lua b/_G/launcher/{72CAC282-AE18-490B-BD4D-35E7EE969E73}.lua deleted file mode 100644 index 8b7d7dcd..00000000 --- a/_G/launcher/{72CAC282-AE18-490B-BD4D-35E7EE969E73}.lua +++ /dev/null @@ -1,12 +0,0 @@ -_G["launcher"]["{72CAC282-AE18-490B-BD4D-35E7EE969E73}"] = { - CLSID = "{72CAC282-AE18-490B-BD4D-35E7EE969E73}", - Count = 51, - Elements = { { - ShapeName = "M117" - } }, - Picture = "RBK250.png", - Weight = 17340, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 9, "Redacted" }, - displayName = "51 x M117 - 750lb GP Bombs LD" -} \ No newline at end of file diff --git a/_G/launcher/{769A15DF-6AFB-439F-9B24-5B7A45C59D16}.lua b/_G/launcher/{769A15DF-6AFB-439F-9B24-5B7A45C59D16}.lua index b1dab395..b19fb310 100644 --- a/_G/launcher/{769A15DF-6AFB-439F-9B24-5B7A45C59D16}.lua +++ b/_G/launcher/{769A15DF-6AFB-439F-9B24-5B7A45C59D16}.lua @@ -4,8 +4,12 @@ _G["launcher"]["{769A15DF-6AFB-439F-9B24-5B7A45C59D16}"] = { ShapeName = "AGM-86" } }, Picture = "AGM86.png", - Weight = 1950, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 4, 8, "Redacted", "Cruise missiles" }, - displayName = "AGM-86D" + Weight = 1450, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 8, "Redacted" }, + category = 2, + displayName = "AGM-86D", + ejectPitchRate = -10, + ejectVelocity = 1 } \ No newline at end of file diff --git a/_G/launcher/{773675AB-7C29-422f-AFD8-32844A7B7F17}.lua b/_G/launcher/{773675AB-7C29-422f-AFD8-32844A7B7F17}.lua index 466c678d..cac20d83 100644 --- a/_G/launcher/{773675AB-7C29-422f-AFD8-32844A7B7F17}.lua +++ b/_G/launcher/{773675AB-7C29-422f-AFD8-32844A7B7F17}.lua @@ -16,7 +16,7 @@ _G["launcher"]["{773675AB-7C29-422f-AFD8-32844A7B7F17}"] = { } }, Picture = "us_AIM-9P.png", PictureBlendColor = "0xffffffff", - Weight = 201, + Weight = 179.68, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}.lua b/_G/launcher/{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}.lua index 62a8d911..cc71483c 100644 --- a/_G/launcher/{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}.lua +++ b/_G/launcher/{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}.lua @@ -7,278 +7,5 @@ _G["launcher"]["{7A44FF09-527C-4B7E-B42B-3F111CFE50FB}"] = { Weight = 454, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 5, 9, "Redacted" }, - displayName = "Mk-83 - 1000lb GP Bomb LD", - settings = { { - baseDim = "", - control = "comboList", - defValue = 1, - dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", - stringIndex = 1, - values = { { - dispName = "FMU-139", - id = 1 - }, { - dispName = "FMU-152", - id = 2 - }, { - dispName = "M904E4", - id = 3 - }, { - dispName = "M905", - id = 4 - } }, - wCtrl = 355, - xCtrl = 170 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU152AB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.005, - id = 0.005 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.06, - id = 0.06 - }, { - dispName = 0.18, - id = 0.18 - }, { - dispName = 900, - id = 900 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_M905", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.05, - id = 0.05 - }, { - dispName = 0.1, - id = 0.1 - }, { - dispName = 0.25, - id = 0.25 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_M904E4", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.05, - id = 0.05 - }, { - dispName = 0.1, - id = 0.1 - }, { - dispName = 0.25, - id = 0.25 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 1 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU139CB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.06, - id = 0.06 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "s", - control = "spinbox", - defValue = 2, - dimension = "s", - id = "arm_delay_ctrl_M904E4", - label = "Arm Delay", - max = 18, - min = 2, - readOnly = false, - step = 2, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_FMU152AB_LD", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 5, - id = 5 - }, { - dispName = 6, - id = 6 - }, { - dispName = 7, - id = 7 - }, { - dispName = 8, - id = 8 - }, { - dispName = 10, - id = 10 - }, { - dispName = 14, - id = 14 - }, { - dispName = 21, - id = 21 - } }, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 1 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_FMU139CB_LD", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 6, - id = 6 - }, { - dispName = 7, - id = 7 - }, { - dispName = 10, - id = 10 - }, { - dispName = 14, - id = 14 - }, { - dispName = 20, - id = 20 - } }, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_M905", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 6, - id = 6 - }, { - dispName = 8, - id = 8 - }, { - dispName = 12, - id = 12 - }, { - dispName = 16, - id = 16 - }, { - dispName = 20, - id = 20 - } }, - xCtrl = 465, - xLbl = 285 - } } + displayName = "Mk-83 - 1000lb GP Bomb LD" } \ No newline at end of file diff --git a/_G/launcher/{7B34E0BB-E427-4C2A-A61A-8407CE18B54D}.lua b/_G/launcher/{7B34E0BB-E427-4C2A-A61A-8407CE18B54D}.lua index 27df78ad..0fc930a8 100644 --- a/_G/launcher/{7B34E0BB-E427-4C2A-A61A-8407CE18B54D}.lua +++ b/_G/launcher/{7B34E0BB-E427-4C2A-A61A-8407CE18B54D}.lua @@ -6,13 +6,13 @@ _G["launcher"]["{7B34E0BB-E427-4C2A-A61A-8407CE18B54D}"] = { ShapeName = "BRU-42_LS" }, { ShapeName = "MK-81", - connector_name = "Point01" + connector_name = "Point03" }, { ShapeName = "MK-81", connector_name = "Point02" }, { ShapeName = "MK-81", - connector_name = "Point03" + connector_name = "Point01" } }, Picture = "FAB250.png", Weight = 396.45, diff --git a/_G/launcher/{88D49E04-78DF-4F08-B47E-B81247A9E3C5}.lua b/_G/launcher/{88D49E04-78DF-4F08-B47E-B81247A9E3C5}.lua index 6fd3b5e9..14b5214e 100644 --- a/_G/launcher/{88D49E04-78DF-4F08-B47E-B81247A9E3C5}.lua +++ b/_G/launcher/{88D49E04-78DF-4F08-B47E-B81247A9E3C5}.lua @@ -6,13 +6,13 @@ _G["launcher"]["{88D49E04-78DF-4F08-B47E-B81247A9E3C5}"] = { ShapeName = "BRU-42_LS" }, { ShapeName = "GBU-16", - connector_name = "Point01" + connector_name = "Point03" }, { ShapeName = "GBU-16", connector_name = "Point02" }, { ShapeName = "GBU-16", - connector_name = "Point03" + connector_name = "Point01" } }, Picture = "GBU16.png", Weight = 1595.25, diff --git a/_G/launcher/{8C3F26A1-FA0F-11d5-9190-00A0249B6F00}.lua b/_G/launcher/{8C3F26A1-FA0F-11d5-9190-00A0249B6F00}.lua index 16032127..b32e3ddd 100644 --- a/_G/launcher/{8C3F26A1-FA0F-11d5-9190-00A0249B6F00}.lua +++ b/_G/launcher/{8C3F26A1-FA0F-11d5-9190-00A0249B6F00}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{8C3F26A1-FA0F-11d5-9190-00A0249B6F00}"] = { ShapeName = "BOZ-100" } }, Picture = "BOZ107.png", + ShapeName = "BOZ-100", Weight = 200, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.BOZ-100", attribute = { 4, 15, 48, "Redacted" }, - displayName = "BOZ-107 - Countermeasure Dispenser" + category = 6, + displayName = "BOZ-107 - Countermeasure Dispenser", + name = "BOZ-100" } \ No newline at end of file diff --git a/_G/launcher/{8C3F26A2-FA0F-11d5-9190-00A0249B6F00}.lua b/_G/launcher/{8C3F26A2-FA0F-11d5-9190-00A0249B6F00}.lua index 16be0659..f927c412 100644 --- a/_G/launcher/{8C3F26A2-FA0F-11d5-9190-00A0249B6F00}.lua +++ b/_G/launcher/{8C3F26A2-FA0F-11d5-9190-00A0249B6F00}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{8C3F26A2-FA0F-11d5-9190-00A0249B6F00}"] = { ShapeName = "SKY_SHADOW" } }, Picture = "skyshadow.png", + ShapeName = "SKY_SHADOW", Weight = 200, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.SKY_SHADOW", attribute = { 4, 15, 45, "Redacted" }, - displayName = "Sky-Shadow ECM Pod" + category = 6, + displayName = "Sky-Shadow ECM Pod", + name = "SKY_SHADOW" } \ No newline at end of file diff --git a/_G/launcher/{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}.lua b/_G/launcher/{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}.lua index 861707f2..5b4592f5 100644 --- a/_G/launcher/{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}.lua +++ b/_G/launcher/{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}.lua @@ -2,11 +2,44 @@ _G["launcher"]["{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}"] = { CLSID = "{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}", Count = 8, Elements = { { - ShapeName = "AGM-86" + IsAdapter = true, + ShapeName = "b-52_CSRL_ALCM" + }, { + ShapeName = "agm-86", + connector_name = "Pylon1" + }, { + ShapeName = "agm-86", + connector_name = "Pylon2" + }, { + ShapeName = "agm-86", + connector_name = "Pylon3" + }, { + ShapeName = "agm-86", + connector_name = "Pylon4" + }, { + ShapeName = "agm-86", + connector_name = "Pylon5" + }, { + ShapeName = "agm-86", + connector_name = "Pylon6" + }, { + ShapeName = "agm-86", + connector_name = "Pylon7" + }, { + ShapeName = "agm-86", + connector_name = "Pylon8" } }, Picture = "AGM86.png", - Weight = 15600, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 4, 8, "Redacted" }, - displayName = "8 x AGM-86D" + Weight = 13040.6, + Weight_Empty = 1440.6, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 4, 32, "Redacted" }, + category = 2, + displayName = "8 x AGM-86D", + ejectPitchRate = -10, + ejectVelocity = 1, + kind_of_shipping = 0, + name = "{8DCAF3A3-7FCF-41B8-BB88-58DEDA878EDE}", + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{8_x_AGM_86C}.lua b/_G/launcher/{8_x_AGM_86C}.lua index 9c040805..585a069f 100644 --- a/_G/launcher/{8_x_AGM_86C}.lua +++ b/_G/launcher/{8_x_AGM_86C}.lua @@ -1,14 +1,42 @@ _G["launcher"]["{8_x_AGM_86C}"] = { CLSID = "{8_x_AGM_86C}", Count = 8, - Elements = { { - ShapeName = "agm-86" + Elements = { "_G/Pylons/b-52_CSRL_ALCM.lua", { + ShapeName = "agm-86", + connector_name = "Pylon1" + }, { + ShapeName = "agm-86", + connector_name = "Pylon2" + }, { + ShapeName = "agm-86", + connector_name = "Pylon3" + }, { + ShapeName = "agm-86", + connector_name = "Pylon4" + }, { + ShapeName = "agm-86", + connector_name = "Pylon5" + }, { + ShapeName = "agm-86", + connector_name = "Pylon6" + }, { + ShapeName = "agm-86", + connector_name = "Pylon7" + }, { + ShapeName = "agm-86", + connector_name = "Pylon8" } }, Picture = "AGM86.png", - Weight = 16400, - _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", - _origin = "AircraftWeaponPack", - attribute = { 4, 4, 8, "Redacted" }, + Weight = 17040.6, + Weight_Empty = 1440.6, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 4, 32, "Redacted" }, category = 2, - displayName = "8 x AGM-86C" + displayName = "8 x AGM-86C", + ejectPitchRate = -10, + ejectVelocity = 1, + kind_of_shipping = 0, + name = "{8_x_AGM_86C}", + wsTypeOfWeapon = "weapons.missiles.AGM_86C" } \ No newline at end of file diff --git a/_G/launcher/{90321C8E-7ED1-47D4-A160-E074D5ABD902}.lua b/_G/launcher/{90321C8E-7ED1-47D4-A160-E074D5ABD902}.lua index 43f0e5fa..c1820d74 100644 --- a/_G/launcher/{90321C8E-7ED1-47D4-A160-E074D5ABD902}.lua +++ b/_G/launcher/{90321C8E-7ED1-47D4-A160-E074D5ABD902}.lua @@ -7,278 +7,5 @@ _G["launcher"]["{90321C8E-7ED1-47D4-A160-E074D5ABD902}"] = { Weight = 118, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 5, 9, "Redacted" }, - displayName = "Mk-81 - 250lb GP Bomb LD", - settings = { { - baseDim = "", - control = "comboList", - defValue = 1, - dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", - stringIndex = 1, - values = { { - dispName = "FMU-139", - id = 1 - }, { - dispName = "FMU-152", - id = 2 - }, { - dispName = "M904E4", - id = 3 - }, { - dispName = "M905", - id = 4 - } }, - wCtrl = 355, - xCtrl = 170 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU152AB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.005, - id = 0.005 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.06, - id = 0.06 - }, { - dispName = 0.18, - id = 0.18 - }, { - dispName = 900, - id = 900 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_M905", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.05, - id = 0.05 - }, { - dispName = 0.1, - id = 0.1 - }, { - dispName = 0.25, - id = 0.25 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_M904E4", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.05, - id = 0.05 - }, { - dispName = 0.1, - id = 0.1 - }, { - dispName = 0.25, - id = 0.25 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 1 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU139CB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.06, - id = 0.06 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "s", - control = "spinbox", - defValue = 2, - dimension = "s", - id = "arm_delay_ctrl_M904E4", - label = "Arm Delay", - max = 18, - min = 2, - readOnly = false, - step = 2, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_FMU152AB_LD", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 5, - id = 5 - }, { - dispName = 6, - id = 6 - }, { - dispName = 7, - id = 7 - }, { - dispName = 8, - id = 8 - }, { - dispName = 10, - id = 10 - }, { - dispName = 14, - id = 14 - }, { - dispName = 21, - id = 21 - } }, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 1 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_FMU139CB_LD", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 6, - id = 6 - }, { - dispName = 7, - id = 7 - }, { - dispName = 10, - id = 10 - }, { - dispName = 14, - id = 14 - }, { - dispName = 20, - id = 20 - } }, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_M905", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 6, - id = 6 - }, { - dispName = 8, - id = 8 - }, { - dispName = 12, - id = 12 - }, { - dispName = 16, - id = 16 - }, { - dispName = 20, - id = 20 - } }, - xCtrl = 465, - xLbl = 285 - } } + displayName = "Mk-81 - 250lb GP Bomb LD" } \ No newline at end of file diff --git a/_G/launcher/{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}.lua b/_G/launcher/{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}.lua index 9f683a28..e6185ab1 100644 --- a/_G/launcher/{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}.lua +++ b/_G/launcher/{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}.lua @@ -1,13 +1,13 @@ _G["launcher"]["{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}"] = { CLSID = "{9BFD8C90-F7AE-4e90-833B-BFD0CED0E536}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "AIM-9P" } }, Picture = "us_AIM-9P.png", PictureBlendColor = "0xffffffff", - Weight = 85.5, + Weight = 74.84, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 7, "Redacted" }, diff --git a/_G/launcher/{A111396E-D3E8-4b9c-8AC9-2432489304D5}.lua b/_G/launcher/{A111396E-D3E8-4b9c-8AC9-2432489304D5}.lua index 59b51482..87db9a05 100644 --- a/_G/launcher/{A111396E-D3E8-4b9c-8AC9-2432489304D5}.lua +++ b/_G/launcher/{A111396E-D3E8-4b9c-8AC9-2432489304D5}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{A111396E-D3E8-4b9c-8AC9-2432489304D5}"] = { ShapeName = "AAQ-28_LITENING" } }, Picture = "AAQ-28.png", + ShapeName = "AAQ-28_LITENING", Weight = 208, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.AAQ-28_LITENING", attribute = { 4, 15, 44, "Redacted" }, - displayName = "AN/AAQ-28 LITENING - Targeting Pod" + category = 6, + displayName = "AN/AAQ-28 LITENING - Targeting Pod", + name = "AAQ-28_LITENING" } \ No newline at end of file diff --git a/_G/launcher/{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}.lua b/_G/launcher/{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}.lua index 5180aba9..0303c2f7 100644 --- a/_G/launcher/{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}.lua +++ b/_G/launcher/{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}.lua @@ -2,21 +2,32 @@ _G["launcher"]["{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}"] = { CLSID = "{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}", Count = 4, Elements = { { - Position = { 0, -0.35, 0 }, - Rotation = { -0, 0, 0 } + IsAdapter = true, + ShapeName = "B_1_B_Conventional_Rotary_Launcher" }, { - Position = { 0, -2.1431318985079e-17, 0.35 }, - Rotation = { -90.006629525348, 0, 0 } + ShapeName = "agm-154", + connector_name = "AttachPoint001" }, { - Position = { 0, 0.35, 4.2862637970157e-17 }, - Rotation = { -180.0132590507, 0, 0 } + ShapeName = "agm-154", + connector_name = "AttachPoint007" }, { - Position = { 0, 6.4293956955236e-17, -0.35 }, - Rotation = { -270.01988857604, 0, 0 } + ShapeName = "agm-154", + connector_name = "AttachPoint005" + }, { + ShapeName = "agm-154", + connector_name = "AttachPoint003" } }, Picture = "AGM154.png", - Weight = 2560, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 4, 8, "Redacted" }, - displayName = "4 x AGM-154C - JSOW Unitary BROACH" + Weight = 2700.9, + Weight_Empty = 760.9, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_1B.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 4, 32, "Redacted" }, + category = 2, + displayName = "4 x AGM-154C - JSOW Unitary BROACH", + ejectPitchRate = -20, + ejectVelocity = 3, + kind_of_shipping = 0, + name = "{AABA1A14-78A1-4E85-94DD-463CF75BD9E4}", + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}.lua b/_G/launcher/{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}.lua index ca6da4b8..d8df6a10 100644 --- a/_G/launcher/{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}.lua +++ b/_G/launcher/{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}.lua @@ -7,278 +7,5 @@ _G["launcher"]["{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}"] = { Weight = 894, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 5, 9, "Redacted" }, - displayName = "Mk-84 - 2000lb GP Bomb LD", - settings = { { - baseDim = "", - control = "comboList", - defValue = 1, - dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", - stringIndex = 1, - values = { { - dispName = "FMU-139", - id = 1 - }, { - dispName = "FMU-152", - id = 2 - }, { - dispName = "M904E4", - id = 3 - }, { - dispName = "M905", - id = 4 - } }, - wCtrl = 355, - xCtrl = 170 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU152AB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.005, - id = 0.005 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.06, - id = 0.06 - }, { - dispName = 0.18, - id = 0.18 - }, { - dispName = 900, - id = 900 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_M905", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.05, - id = 0.05 - }, { - dispName = 0.1, - id = 0.1 - }, { - dispName = 0.25, - id = 0.25 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_M904E4", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.05, - id = 0.05 - }, { - dispName = 0.1, - id = 0.1 - }, { - dispName = 0.25, - id = 0.25 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 1 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU139CB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.06, - id = 0.06 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "s", - control = "spinbox", - defValue = 2, - dimension = "s", - id = "arm_delay_ctrl_M904E4", - label = "Arm Delay", - max = 18, - min = 2, - readOnly = false, - step = 2, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_FMU152AB_LD", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 5, - id = 5 - }, { - dispName = 6, - id = 6 - }, { - dispName = 7, - id = 7 - }, { - dispName = 8, - id = 8 - }, { - dispName = 10, - id = 10 - }, { - dispName = 14, - id = 14 - }, { - dispName = 21, - id = 21 - } }, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 1 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_FMU139CB_LD", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 6, - id = 6 - }, { - dispName = 7, - id = 7 - }, { - dispName = 10, - id = 10 - }, { - dispName = 14, - id = 14 - }, { - dispName = 20, - id = 20 - } }, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_M905", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 6, - id = 6 - }, { - dispName = 8, - id = 8 - }, { - dispName = 12, - id = 12 - }, { - dispName = 16, - id = 16 - }, { - dispName = 20, - id = 20 - } }, - xCtrl = 465, - xLbl = 285 - } } + displayName = "Mk-84 - 2000lb GP Bomb LD" } \ No newline at end of file diff --git a/_G/launcher/{AB_250_2_SD_10A}.lua b/_G/launcher/{AB_250_2_SD_10A}.lua index f38d2aff..67765343 100644 --- a/_G/launcher/{AB_250_2_SD_10A}.lua +++ b/_G/launcher/{AB_250_2_SD_10A}.lua @@ -18,7 +18,7 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -37,11 +37,11 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dispName = "Zünder 89B", id = 5 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 5 } }, baseDim = "s", @@ -55,11 +55,13 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { readOnly = false, step = 0.1, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 4 } }, baseDim = "s", @@ -68,16 +70,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z79A", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -86,16 +90,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z69E", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 3 } }, baseDim = "s", @@ -104,16 +110,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z79", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -122,16 +130,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z69D", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -140,16 +150,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z69D", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 3 } }, baseDim = "s", @@ -158,16 +170,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z79", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 4 } }, baseDim = "s", @@ -176,16 +190,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z79A", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -194,16 +210,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z69E", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 5 } }, baseDim = "s", @@ -212,16 +230,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Z89B", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 4 } }, baseDim = "s", @@ -230,16 +250,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z79A", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 3 } }, baseDim = "s", @@ -248,16 +270,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z79", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -266,16 +290,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z69D", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -284,16 +310,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z69E", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 3 } }, baseDim = "s", @@ -302,16 +330,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z79", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -320,16 +350,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z69E", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 4 } }, baseDim = "s", @@ -338,16 +370,18 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z79A", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -356,12 +390,14 @@ _G["launcher"]["{AB_250_2_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z69D", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/{AB_250_2_SD_2}.lua b/_G/launcher/{AB_250_2_SD_2}.lua index a581b14f..06248f5a 100644 --- a/_G/launcher/{AB_250_2_SD_2}.lua +++ b/_G/launcher/{AB_250_2_SD_2}.lua @@ -18,7 +18,7 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -37,11 +37,11 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dispName = "Zünder 89B", id = 5 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 5 } }, baseDim = "s", @@ -55,11 +55,13 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { readOnly = false, step = 0.1, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 4 } }, baseDim = "s", @@ -68,16 +70,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z79A", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -86,16 +90,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z69E", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 3 } }, baseDim = "s", @@ -104,16 +110,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z79", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -122,16 +130,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z69D", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -140,16 +150,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z69D", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 3 } }, baseDim = "s", @@ -158,16 +170,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z79", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 4 } }, baseDim = "s", @@ -176,16 +190,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z79A", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -194,16 +210,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z69E", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 5 } }, baseDim = "s", @@ -212,16 +230,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Z89B", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 4 } }, baseDim = "s", @@ -230,16 +250,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z79A", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 3 } }, baseDim = "s", @@ -248,16 +270,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z79", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -266,16 +290,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z69D", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -284,16 +310,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z69E", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 3 } }, baseDim = "s", @@ -302,16 +330,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z79", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -320,16 +350,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z69E", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 4 } }, baseDim = "s", @@ -338,16 +370,18 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z79A", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -356,12 +390,14 @@ _G["launcher"]["{AB_250_2_SD_2}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z69D", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/{AB_500_1_SD_10A}.lua b/_G/launcher/{AB_500_1_SD_10A}.lua index 85b1bc7d..85bb8710 100644 --- a/_G/launcher/{AB_500_1_SD_10A}.lua +++ b/_G/launcher/{AB_500_1_SD_10A}.lua @@ -18,18 +18,18 @@ _G["launcher"]["{AB_500_1_SD_10A}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { dispName = "Zünder 69E", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -38,16 +38,18 @@ _G["launcher"]["{AB_500_1_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_oV_Z69E", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -56,16 +58,18 @@ _G["launcher"]["{AB_500_1_SD_10A}"] = { dimension = "s", id = "function_delay_ctrl_mV_Z69E", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -74,16 +78,18 @@ _G["launcher"]["{AB_500_1_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z69E", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -92,12 +98,14 @@ _G["launcher"]["{AB_500_1_SD_10A}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z69E", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/{ACADB374-6D6C-45A0-BA7C-B22B2E108AE4}.lua b/_G/launcher/{ACADB374-6D6C-45A0-BA7C-B22B2E108AE4}.lua deleted file mode 100644 index 0fa0ea98..00000000 --- a/_G/launcher/{ACADB374-6D6C-45A0-BA7C-B22B2E108AE4}.lua +++ /dev/null @@ -1,12 +0,0 @@ -_G["launcher"]["{ACADB374-6D6C-45A0-BA7C-B22B2E108AE4}"] = { - CLSID = "{ACADB374-6D6C-45A0-BA7C-B22B2E108AE4}", - Count = 18, - Elements = { { - ShapeName = "ROCKEYE" - } }, - Picture = "rockeye.png", - Weight = 3996, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 38, "Redacted" }, - displayName = "Mk 20*18" -} \ No newline at end of file diff --git a/_G/launcher/{ADM_141A}.lua b/_G/launcher/{ADM_141A}.lua index a9fdb813..2462762b 100644 --- a/_G/launcher/{ADM_141A}.lua +++ b/_G/launcher/{ADM_141A}.lua @@ -5,7 +5,7 @@ _G["launcher"]["{ADM_141A}"] = { Elements = { { ShapeName = "ADM_141" } }, - Picture = "agm154.png", + Picture = "ADM-141.png", Weight = 180, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", diff --git a/_G/launcher/{ADM_141B}.lua b/_G/launcher/{ADM_141B}.lua index 424ed2c3..3df1cd82 100644 --- a/_G/launcher/{ADM_141B}.lua +++ b/_G/launcher/{ADM_141B}.lua @@ -5,7 +5,7 @@ _G["launcher"]["{ADM_141B}"] = { Elements = { { ShapeName = "ADM_141" } }, - Picture = "agm154.png", + Picture = "ADM-141.png", Weight = 180, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", diff --git a/_G/launcher/{AGM-154A}.lua b/_G/launcher/{AGM-154A}.lua index 5a239208..590435c4 100644 --- a/_G/launcher/{AGM-154A}.lua +++ b/_G/launcher/{AGM-154A}.lua @@ -12,5 +12,5 @@ _G["launcher"]["{AGM-154A}"] = { attribute = { 4, 4, 8, "Redacted" }, category = 2, displayName = "AGM-154A - JSOW CEB (CBU-type)", - ejectImpulse = 140 + ejectVelocity = 4 } \ No newline at end of file diff --git a/_G/launcher/{AGM-154B}.lua b/_G/launcher/{AGM-154B}.lua index 46d4d7b3..4c8c4842 100644 --- a/_G/launcher/{AGM-154B}.lua +++ b/_G/launcher/{AGM-154B}.lua @@ -12,5 +12,5 @@ _G["launcher"]["{AGM-154B}"] = { attribute = { 4, 4, 8, "Redacted" }, category = 2, displayName = "AGM-154B - JSOW Anti-Armour", - ejectImpulse = 140 + ejectVelocity = 4 } \ No newline at end of file diff --git a/_G/launcher/{AGM_12A}.lua b/_G/launcher/{AGM_12A}.lua new file mode 100644 index 00000000..352aeab3 --- /dev/null +++ b/_G/launcher/{AGM_12A}.lua @@ -0,0 +1,14 @@ +_G["launcher"]["{AGM_12A}"] = { + CLSID = "{AGM_12A}", + Count = 1, + Cx_pil = 0.0009765625, + Elements = { { + ShapeName = "AGM_12A" + } }, + Picture = "GBU31.png", + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 8, "Redacted" }, + category = 2, + displayName = "AGM-12A Bullpup - MCLOS missile" +} \ No newline at end of file diff --git a/_G/launcher/{AGM_12B}.lua b/_G/launcher/{AGM_12B}.lua new file mode 100644 index 00000000..523c29c5 --- /dev/null +++ b/_G/launcher/{AGM_12B}.lua @@ -0,0 +1,14 @@ +_G["launcher"]["{AGM_12B}"] = { + CLSID = "{AGM_12B}", + Count = 1, + Cx_pil = 0.0009765625, + Elements = { { + ShapeName = "AGM_12B" + } }, + Picture = "GBU31.png", + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 8, "Redacted" }, + category = 2, + displayName = "AGM-12B Bullpup - MCLOS missile" +} \ No newline at end of file diff --git a/_G/launcher/{AGM_130C_9}.lua b/_G/launcher/{AGM_130C_9}.lua new file mode 100644 index 00000000..926a2c18 --- /dev/null +++ b/_G/launcher/{AGM_130C_9}.lua @@ -0,0 +1,13 @@ +_G["launcher"]["{AGM_130C_9}"] = { + CLSID = "{AGM_130C_9}", + Count = 1, + Elements = { { + ShapeName = "agm_130" + } }, + Picture = "GBU31.png", + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 8, "Redacted" }, + category = 1, + displayName = "AGM-130C-9 - 3000lb TV (EO) Guided Missile" +} \ No newline at end of file diff --git a/_G/launcher/{AGM_45A}.lua b/_G/launcher/{AGM_45A}.lua index bb0ed485..763aceb9 100644 --- a/_G/launcher/{AGM_45A}.lua +++ b/_G/launcher/{AGM_45A}.lua @@ -4,11 +4,12 @@ _G["launcher"]["{AGM_45A}"] = { Elements = { { ShapeName = "agm-45" } }, - Picture = "aim7m.png", + Picture = "agm45.png", Weight = 177, _file = "./CoreMods/aircraft/AircraftWeaponPack/anti-radiation missiles.lua", _origin = "AircraftWeaponPack", - attribute = { 4, 4, 8, "Redacted" }, + attribute = <1>{ 4, 4, 8, "Redacted" }, category = 2, - displayName = "AGM-45A Shrike ARM" + displayName = "AGM-45A Shrike ARM", + wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{AGM_86C}.lua b/_G/launcher/{AGM_86C}.lua index 6108763a..c456a12b 100644 --- a/_G/launcher/{AGM_86C}.lua +++ b/_G/launcher/{AGM_86C}.lua @@ -10,5 +10,7 @@ _G["launcher"]["{AGM_86C}"] = { _origin = "AircraftWeaponPack", attribute = { 4, 4, 8, "Redacted" }, category = 2, - displayName = "AGM-86C" + displayName = "AGM-86C", + ejectPitchRate = -10, + ejectVelocity = 1 } \ No newline at end of file diff --git a/_G/launcher/{AIM-9B}.lua b/_G/launcher/{AIM-9B}.lua index 399ce62d..456a427e 100644 --- a/_G/launcher/{AIM-9B}.lua +++ b/_G/launcher/{AIM-9B}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AIM-9B}"] = { CLSID = "{AIM-9B}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "GAR-8" } }, diff --git a/_G/launcher/{AIM-9J-ON-ADAPTER}.lua b/_G/launcher/{AIM-9J-ON-ADAPTER}.lua index d3ce1e6a..429253e5 100644 --- a/_G/launcher/{AIM-9J-ON-ADAPTER}.lua +++ b/_G/launcher/{AIM-9J-ON-ADAPTER}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AIM-9J-ON-ADAPTER}"] = { CLSID = "{AIM-9J-ON-ADAPTER}", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, ShapeName = "aero-3b" @@ -11,8 +11,8 @@ _G["launcher"]["{AIM-9J-ON-ADAPTER}"] = { } }, Picture = "us_AIM-9P.png", PictureBlendColor = "0xffffffff", - Weight = 91.9, - Weight_Empty = 15, + Weight = 115.84, + Weight_Empty = 41, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{AIM-9JULI}.lua b/_G/launcher/{AIM-9JULI}.lua index e7b37fde..c3731ef3 100644 --- a/_G/launcher/{AIM-9JULI}.lua +++ b/_G/launcher/{AIM-9JULI}.lua @@ -1,13 +1,13 @@ _G["launcher"]["{AIM-9JULI}"] = { CLSID = "{AIM-9JULI}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "AIM-9JULI" } }, Picture = "us_AIM-9P.png", PictureBlendColor = "0xffffffff", - Weight = 85.6, + Weight = 82.3, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 7, "Redacted" }, diff --git a/_G/launcher/{AIM-9J}.lua b/_G/launcher/{AIM-9J}.lua index 228710f5..ad1cbbc5 100644 --- a/_G/launcher/{AIM-9J}.lua +++ b/_G/launcher/{AIM-9J}.lua @@ -1,13 +1,13 @@ _G["launcher"]["{AIM-9J}"] = { CLSID = "{AIM-9J}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "AIM-9J" } }, Picture = "us_AIM-9P.png", PictureBlendColor = "0xffffffff", - Weight = 76.9, + Weight = 74.84, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 7, "Redacted" }, diff --git a/_G/launcher/{AIM-9L}.lua b/_G/launcher/{AIM-9L}.lua index 0ad5f36f..2edeb7e5 100644 --- a/_G/launcher/{AIM-9L}.lua +++ b/_G/launcher/{AIM-9L}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AIM-9L}"] = { CLSID = "{AIM-9L}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "AIM-9L" } }, diff --git a/_G/launcher/{AIM-9M-ON-ADAPTER}.lua b/_G/launcher/{AIM-9M-ON-ADAPTER}.lua index 57926945..d25fbcb0 100644 --- a/_G/launcher/{AIM-9M-ON-ADAPTER}.lua +++ b/_G/launcher/{AIM-9M-ON-ADAPTER}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AIM-9M-ON-ADAPTER}"] = { CLSID = "{AIM-9M-ON-ADAPTER}", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, ShapeName = "aero-3b" @@ -11,8 +11,8 @@ _G["launcher"]["{AIM-9M-ON-ADAPTER}"] = { } }, Picture = "us_AIM-9L.png", PictureBlendColor = "0xffffffff", - Weight = 100.73, - Weight_Empty = 15, + Weight = 126.73, + Weight_Empty = 41, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{AIM-9P-ON-ADAPTER}.lua b/_G/launcher/{AIM-9P-ON-ADAPTER}.lua index 2d99301f..481d7477 100644 --- a/_G/launcher/{AIM-9P-ON-ADAPTER}.lua +++ b/_G/launcher/{AIM-9P-ON-ADAPTER}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AIM-9P-ON-ADAPTER}"] = { CLSID = "{AIM-9P-ON-ADAPTER}", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, ShapeName = "aero-3b" @@ -11,8 +11,8 @@ _G["launcher"]["{AIM-9P-ON-ADAPTER}"] = { } }, Picture = "us_AIM-9P.png", PictureBlendColor = "0xffffffff", - Weight = 100.5, - Weight_Empty = 15, + Weight = 115.84, + Weight_Empty = 41, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{AIM-9P5-ON-ADAPTER}.lua b/_G/launcher/{AIM-9P5-ON-ADAPTER}.lua index aeff30d0..261c9220 100644 --- a/_G/launcher/{AIM-9P5-ON-ADAPTER}.lua +++ b/_G/launcher/{AIM-9P5-ON-ADAPTER}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AIM-9P5-ON-ADAPTER}"] = { CLSID = "{AIM-9P5-ON-ADAPTER}", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, ShapeName = "aero-3b" @@ -11,8 +11,8 @@ _G["launcher"]["{AIM-9P5-ON-ADAPTER}"] = { } }, Picture = "us_AIM-9P-5.png", PictureBlendColor = "0xffffffff", - Weight = 100.5, - Weight_Empty = 15, + Weight = 121.7, + Weight_Empty = 41, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{AIM-9P5}.lua b/_G/launcher/{AIM-9P5}.lua index 3f7e7693..d81fd1e8 100644 --- a/_G/launcher/{AIM-9P5}.lua +++ b/_G/launcher/{AIM-9P5}.lua @@ -1,13 +1,13 @@ _G["launcher"]["{AIM-9P5}"] = { CLSID = "{AIM-9P5}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "AIM-9P5" } }, Picture = "us_AIM-9P-5.png", PictureBlendColor = "0xffffffff", - Weight = 85.5, + Weight = 80.7, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 7, "Redacted" }, diff --git a/_G/launcher/{AIM-9X-ON-ADAPTER}.lua b/_G/launcher/{AIM-9X-ON-ADAPTER}.lua index 9da2cf1f..b289a386 100644 --- a/_G/launcher/{AIM-9X-ON-ADAPTER}.lua +++ b/_G/launcher/{AIM-9X-ON-ADAPTER}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AIM-9X-ON-ADAPTER}"] = { CLSID = "{AIM-9X-ON-ADAPTER}", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, ShapeName = "aero-3b" @@ -11,8 +11,8 @@ _G["launcher"]["{AIM-9X-ON-ADAPTER}"] = { } }, Picture = "us_AIM-9X.png", PictureBlendColor = "0xffffffff", - Weight = 99.46, - Weight_Empty = 15, + Weight = 125.46, + Weight_Empty = 41, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{AIS_ASQ_T50}.lua b/_G/launcher/{AIS_ASQ_T50}.lua index ef291b9a..31b5848a 100644 --- a/_G/launcher/{AIS_ASQ_T50}.lua +++ b/_G/launcher/{AIS_ASQ_T50}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{AIS_ASQ_T50}"] = { CLSID = "{AIS_ASQ_T50}", Count = 1, - Cx_pil = 0.000458984375, + Cx_pil = 0.00041015625, Elements = { { ShapeName = "ais-pod-t50" } }, diff --git a/_G/launcher/{AN-M64}.lua b/_G/launcher/{AN-M64}.lua index c46c34d3..6deeb8f5 100644 --- a/_G/launcher/{AN-M64}.lua +++ b/_G/launcher/{AN-M64}.lua @@ -14,214 +14,328 @@ _G["launcher"]["{AN-M64}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { - dispName = "AN-M101A2", + dispName = "AN-M103A1", id = 1 }, { - dispName = "AN-M116", + dispName = "Mk 243 Mod 0", id = 2 }, { - dispName = "AN-M124A1", + dispName = "Mk 244 Mod 1", id = 3 }, { - dispName = "AN-M133", + dispName = "M135A1", id = 4 }, { - dispName = "AN-M103A1", + dispName = "M136A1", id = 5 }, { - dispName = "Mk 243 Mod 0", + dispName = "AN-M139A1", id = 6 }, { - dispName = "Mk 243 Mod 1", + dispName = "AN-M140A1", id = 7 + }, { + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "s", control = "spinbox", defValue = 4, dimension = "s", - id = "function_delay_ctrl_Mk243Mod1", + id = "function_delay_ctrl_Mk244Mod1", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M135A1", + label = "Airburst Delay", + max = 92, + min = 5, + readOnly = false, + step = 0.1, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 6 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM103A1", + id = "function_delay_ctrl_ANM139A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.1, - id = 0.1 + dispName = 0.01, + id = 0.01, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 6 + id = "NFP_fuze_type_nose", + value = 5 } }, baseDim = "s", control = "spinbox", - defValue = 0.025, - dimension = "ms", - id = "function_delay_ctrl_Mk243Mod0", - label = "Function Delay", - max = 3600000, - min = 0, - readOnly = true, - step = 10, + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M136A1", + label = "Airburst Delay", + max = 30.6, + min = 5, + readOnly = false, + step = 0.2, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 7 } }, baseDim = "s", - control = "spinbox", - defValue = 3600, - dimension = "h", - id = "function_delay_ctrl_ANM124A1", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM140A1", label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, stringIndex = 2, - xCtrl = 170, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_nose", + value = 2 } }, baseDim = "s", control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_ANM133", + defValue = 0.025, + dimension = "ms", + id = "function_delay_ctrl_Mk243Mod0", label = "Function Delay", - max = 1, + max = 1e+15, min = 0, readOnly = true, - step = 2.7777777777778e-06, + step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM101A2", + id = "function_delay_ctrl_ANM103A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 + id = 0, + units = "s" }, { dispName = 0.1, - id = 0.1 + id = 0.1, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0 } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "function_delay_ctrl_ANM116", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 330, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, - values = { { - dispName = 5, - id = 5 - }, { - dispName = 11, - id = 11 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0.025 } }, - xCtrl = 170, - xLbl = 10 + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.025_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 330, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM124A1", + id = "vane_rev_threshold_ctrl_FD_0_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 5 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M136A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0.01 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.01_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "rev", control = "spinbox", defValue = 130, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod0", + id = "vane_rev_threshold_ctrl_Mk244Mod1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -233,17 +347,59 @@ _G["launcher"]["{AN-M64}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0.1_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 2 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 130, + dimension = "rev", + id = "vane_rev_threshold_ctrl_Mk243Mod0", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M135A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -255,16 +411,195 @@ _G["launcher"]["{AN-M64}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "AN-M101A2", + id = 1 + }, { + dispName = "AN-M116", + id = 2 + }, { + dispName = "AN-M124A1", + id = 3 + }, { + dispName = "AN-M133", + id = 4 + }, { + dispName = "M161", + id = 5 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM101A2", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 3 + } }, + baseDim = "s", + control = "spinbox", + defValue = 3600, + dimension = "h", + id = "function_delay_ctrl_ANM124A1", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 2 + } }, + baseDim = "s", + control = "comboList", + defValue = 5, + dimension = "s", + id = "function_delay_ctrl_ANM116", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 5, + id = 5, + units = "s" + }, { + dispName = 11, + id = 11, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 600, + dimension = "min", + id = "function_delay_ctrl_ANM133", + label = "Function Delay", + max = 16666666666.667, + min = 0, + readOnly = true, + step = 0.00016666666666667, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 5 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_M161", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 72, + dimension = "rev", + id = "vane_rev_threshold_ctrl_ANM133", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -273,16 +608,18 @@ _G["launcher"]["{AN-M64}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM101A2", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 2 } }, baseDim = "rev", @@ -291,48 +628,54 @@ _G["launcher"]["{AN-M64}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM116", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_tail", + value = 3 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 6, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM133", + id = "vane_rev_threshold_ctrl_ANM124A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_tail", + value = 5 } }, baseDim = "rev", control = "spinbox", - defValue = 130, + defValue = 720, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod1", + id = "vane_rev_threshold_ctrl_M161", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{AN_ASQ_213}.lua b/_G/launcher/{AN_ASQ_213}.lua index dd4e44dc..052edeec 100644 --- a/_G/launcher/{AN_ASQ_213}.lua +++ b/_G/launcher/{AN_ASQ_213}.lua @@ -5,7 +5,7 @@ _G["launcher"]["{AN_ASQ_213}"] = { Elements = { { ShapeName = "16c_hts_pod" } }, - Picture = "lantirn.png", + Picture = "HTS.png", Weight = 57.2, _file = "./CoreMods/aircraft/AircraftWeaponPack/targeting_pods.lua", _origin = "AircraftWeaponPack", diff --git a/_G/launcher/{AN_M30A1}.lua b/_G/launcher/{AN_M30A1}.lua index b9c9e5d0..e79f4f36 100644 --- a/_G/launcher/{AN_M30A1}.lua +++ b/_G/launcher/{AN_M30A1}.lua @@ -18,214 +18,328 @@ _G["launcher"]["{AN_M30A1}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { - dispName = "AN-M100A2", + dispName = "AN-M103A1", id = 1 }, { - dispName = "AN-M115", + dispName = "Mk 243 Mod 0", id = 2 }, { - dispName = "AN-M123A1", + dispName = "Mk 244 Mod 1", id = 3 }, { - dispName = "AN-M132", + dispName = "M135A1", id = 4 }, { - dispName = "AN-M103A1", + dispName = "M136A1", id = 5 }, { - dispName = "Mk 243 Mod 0", + dispName = "AN-M139A1", id = 6 }, { - dispName = "Mk 243 Mod 1", + dispName = "AN-M140A1", id = 7 + }, { + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "s", control = "spinbox", defValue = 4, dimension = "s", - id = "function_delay_ctrl_Mk243Mod1", + id = "function_delay_ctrl_Mk244Mod1", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M135A1", + label = "Airburst Delay", + max = 92, + min = 5, + readOnly = false, + step = 0.1, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 6 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM103A1", + id = "function_delay_ctrl_ANM139A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.1, - id = 0.1 + dispName = 0.01, + id = 0.01, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 6 + id = "NFP_fuze_type_nose", + value = 5 } }, baseDim = "s", control = "spinbox", - defValue = 0.025, - dimension = "ms", - id = "function_delay_ctrl_Mk243Mod0", - label = "Function Delay", - max = 3600000, - min = 0, - readOnly = true, - step = 10, + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M136A1", + label = "Airburst Delay", + max = 30.6, + min = 5, + readOnly = false, + step = 0.2, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 7 } }, baseDim = "s", - control = "spinbox", - defValue = 3600, - dimension = "h", - id = "function_delay_ctrl_ANM123A1", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM140A1", label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, stringIndex = 2, - xCtrl = 170, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_nose", + value = 2 } }, baseDim = "s", control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_ANM132", + defValue = 0.025, + dimension = "ms", + id = "function_delay_ctrl_Mk243Mod0", label = "Function Delay", - max = 1, + max = 1e+15, min = 0, readOnly = true, - step = 2.7777777777778e-06, + step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM100A2", + id = "function_delay_ctrl_ANM103A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 + id = 0, + units = "s" }, { dispName = 0.1, - id = 0.1 + id = 0.1, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0 } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "function_delay_ctrl_ANM115", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 330, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, - values = { { - dispName = 5, - id = 5 - }, { - dispName = 11, - id = 11 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0.025 } }, - xCtrl = 170, - xLbl = 10 + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.025_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 330, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM123A1", + id = "vane_rev_threshold_ctrl_FD_0_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 5 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M136A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0.01 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.01_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "rev", control = "spinbox", defValue = 130, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod0", + id = "vane_rev_threshold_ctrl_Mk244Mod1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -237,17 +351,59 @@ _G["launcher"]["{AN_M30A1}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0.1_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 2 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 130, + dimension = "rev", + id = "vane_rev_threshold_ctrl_Mk243Mod0", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M135A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -259,16 +415,195 @@ _G["launcher"]["{AN_M30A1}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "AN-M100A2", + id = 1 + }, { + dispName = "AN-M115", + id = 2 + }, { + dispName = "AN-M123A1", + id = 3 + }, { + dispName = "AN-M132", + id = 4 + }, { + dispName = "M160", + id = 5 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM100A2", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 3 + } }, + baseDim = "s", + control = "spinbox", + defValue = 3600, + dimension = "h", + id = "function_delay_ctrl_ANM123A1", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 2 + } }, + baseDim = "s", + control = "comboList", + defValue = 5, + dimension = "s", + id = "function_delay_ctrl_ANM115", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 5, + id = 5, + units = "s" + }, { + dispName = 11, + id = 11, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 600, + dimension = "min", + id = "function_delay_ctrl_ANM132", + label = "Function Delay", + max = 16666666666.667, + min = 0, + readOnly = true, + step = 0.00016666666666667, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 5 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_M160", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 72, + dimension = "rev", + id = "vane_rev_threshold_ctrl_ANM132", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -277,16 +612,18 @@ _G["launcher"]["{AN_M30A1}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM100A2", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 2 } }, baseDim = "rev", @@ -295,48 +632,54 @@ _G["launcher"]["{AN_M30A1}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM115", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_tail", + value = 3 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 6, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM132", + id = "vane_rev_threshold_ctrl_ANM123A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_tail", + value = 5 } }, baseDim = "rev", control = "spinbox", - defValue = 130, + defValue = 720, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod1", + id = "vane_rev_threshold_ctrl_M160", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{AN_M57}.lua b/_G/launcher/{AN_M57}.lua index d5cd758b..37c04426 100644 --- a/_G/launcher/{AN_M57}.lua +++ b/_G/launcher/{AN_M57}.lua @@ -18,214 +18,328 @@ _G["launcher"]["{AN_M57}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { - dispName = "AN-M100A2", + dispName = "AN-M103A1", id = 1 }, { - dispName = "AN-M115", + dispName = "Mk 243 Mod 0", id = 2 }, { - dispName = "AN-M123A1", + dispName = "Mk 244 Mod 1", id = 3 }, { - dispName = "AN-M132", + dispName = "M135A1", id = 4 }, { - dispName = "AN-M103A1", + dispName = "M136A1", id = 5 }, { - dispName = "Mk 243 Mod 0", + dispName = "AN-M139A1", id = 6 }, { - dispName = "Mk 243 Mod 1", + dispName = "AN-M140A1", id = 7 + }, { + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "s", control = "spinbox", defValue = 4, dimension = "s", - id = "function_delay_ctrl_Mk243Mod1", + id = "function_delay_ctrl_Mk244Mod1", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M135A1", + label = "Airburst Delay", + max = 92, + min = 5, + readOnly = false, + step = 0.1, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 6 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM103A1", + id = "function_delay_ctrl_ANM139A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.1, - id = 0.1 + dispName = 0.01, + id = 0.01, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 6 + id = "NFP_fuze_type_nose", + value = 5 } }, baseDim = "s", control = "spinbox", - defValue = 0.025, - dimension = "ms", - id = "function_delay_ctrl_Mk243Mod0", - label = "Function Delay", - max = 3600000, - min = 0, - readOnly = true, - step = 10, + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M136A1", + label = "Airburst Delay", + max = 30.6, + min = 5, + readOnly = false, + step = 0.2, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 7 } }, baseDim = "s", - control = "spinbox", - defValue = 3600, - dimension = "h", - id = "function_delay_ctrl_ANM123A1", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM140A1", label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, stringIndex = 2, - xCtrl = 170, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_nose", + value = 2 } }, baseDim = "s", control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_ANM132", + defValue = 0.025, + dimension = "ms", + id = "function_delay_ctrl_Mk243Mod0", label = "Function Delay", - max = 1, + max = 1e+15, min = 0, readOnly = true, - step = 2.7777777777778e-06, + step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM100A2", + id = "function_delay_ctrl_ANM103A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 + id = 0, + units = "s" }, { dispName = 0.1, - id = 0.1 + id = 0.1, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0 } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "function_delay_ctrl_ANM115", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 330, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, - values = { { - dispName = 5, - id = 5 - }, { - dispName = 11, - id = 11 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0.025 } }, - xCtrl = 170, - xLbl = 10 + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.025_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 330, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM123A1", + id = "vane_rev_threshold_ctrl_FD_0_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 5 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M136A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0.01 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.01_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "rev", control = "spinbox", defValue = 130, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod0", + id = "vane_rev_threshold_ctrl_Mk244Mod1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -237,17 +351,59 @@ _G["launcher"]["{AN_M57}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0.1_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 2 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 130, + dimension = "rev", + id = "vane_rev_threshold_ctrl_Mk243Mod0", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M135A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -259,16 +415,195 @@ _G["launcher"]["{AN_M57}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "AN-M100A2", + id = 1 + }, { + dispName = "AN-M115", + id = 2 + }, { + dispName = "AN-M123A1", + id = 3 + }, { + dispName = "AN-M132", + id = 4 + }, { + dispName = "M160", + id = 5 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM100A2", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 3 + } }, + baseDim = "s", + control = "spinbox", + defValue = 3600, + dimension = "h", + id = "function_delay_ctrl_ANM123A1", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 2 + } }, + baseDim = "s", + control = "comboList", + defValue = 5, + dimension = "s", + id = "function_delay_ctrl_ANM115", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 5, + id = 5, + units = "s" + }, { + dispName = 11, + id = 11, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 600, + dimension = "min", + id = "function_delay_ctrl_ANM132", + label = "Function Delay", + max = 16666666666.667, + min = 0, + readOnly = true, + step = 0.00016666666666667, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 5 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_M160", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 72, + dimension = "rev", + id = "vane_rev_threshold_ctrl_ANM132", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -277,16 +612,18 @@ _G["launcher"]["{AN_M57}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM100A2", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 2 } }, baseDim = "rev", @@ -295,48 +632,54 @@ _G["launcher"]["{AN_M57}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM115", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_tail", + value = 3 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 6, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM132", + id = "vane_rev_threshold_ctrl_ANM123A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_tail", + value = 5 } }, baseDim = "rev", control = "spinbox", - defValue = 130, + defValue = 720, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod1", + id = "vane_rev_threshold_ctrl_M160", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{AN_M65}.lua b/_G/launcher/{AN_M65}.lua index 71523565..870ffb49 100644 --- a/_G/launcher/{AN_M65}.lua +++ b/_G/launcher/{AN_M65}.lua @@ -18,214 +18,328 @@ _G["launcher"]["{AN_M65}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { - dispName = "AN-M102A2", + dispName = "AN-M103A1", id = 1 }, { - dispName = "AN-M117", + dispName = "Mk 243 Mod 0", id = 2 }, { - dispName = "AN-M125A1", + dispName = "Mk 244 Mod 1", id = 3 }, { - dispName = "AN-M134", + dispName = "M135A1", id = 4 }, { - dispName = "AN-M103A1", + dispName = "M136A1", id = 5 }, { - dispName = "Mk 243 Mod 0", + dispName = "AN-M139A1", id = 6 }, { - dispName = "Mk 243 Mod 1", + dispName = "AN-M140A1", id = 7 + }, { + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "s", control = "spinbox", defValue = 4, dimension = "s", - id = "function_delay_ctrl_Mk243Mod1", + id = "function_delay_ctrl_Mk244Mod1", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M135A1", + label = "Airburst Delay", + max = 92, + min = 5, + readOnly = false, + step = 0.1, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 6 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM103A1", + id = "function_delay_ctrl_ANM139A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.1, - id = 0.1 + dispName = 0.01, + id = 0.01, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 6 + id = "NFP_fuze_type_nose", + value = 5 } }, baseDim = "s", control = "spinbox", - defValue = 0.025, - dimension = "ms", - id = "function_delay_ctrl_Mk243Mod0", - label = "Function Delay", - max = 3600000, - min = 0, - readOnly = true, - step = 10, + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M136A1", + label = "Airburst Delay", + max = 30.6, + min = 5, + readOnly = false, + step = 0.2, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 7 } }, baseDim = "s", - control = "spinbox", - defValue = 3600, - dimension = "h", - id = "function_delay_ctrl_ANM125A1", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM140A1", label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, stringIndex = 2, - xCtrl = 170, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_nose", + value = 2 } }, baseDim = "s", control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_ANM134", + defValue = 0.025, + dimension = "ms", + id = "function_delay_ctrl_Mk243Mod0", label = "Function Delay", - max = 1, + max = 1e+15, min = 0, readOnly = true, - step = 2.7777777777778e-06, + step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM102A2", + id = "function_delay_ctrl_ANM103A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 + id = 0, + units = "s" }, { dispName = 0.1, - id = 0.1 + id = 0.1, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0 } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "function_delay_ctrl_ANM117", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 330, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, - values = { { - dispName = 5, - id = 5 - }, { - dispName = 11, - id = 11 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0.025 } }, - xCtrl = 170, - xLbl = 10 + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.025_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 330, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM125A1", + id = "vane_rev_threshold_ctrl_FD_0_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 5 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M136A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0.01 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.01_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "rev", control = "spinbox", defValue = 130, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod0", + id = "vane_rev_threshold_ctrl_Mk244Mod1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -237,17 +351,59 @@ _G["launcher"]["{AN_M65}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0.1_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 2 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 130, + dimension = "rev", + id = "vane_rev_threshold_ctrl_Mk243Mod0", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M135A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -259,16 +415,195 @@ _G["launcher"]["{AN_M65}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "AN-M102A2", + id = 1 + }, { + dispName = "AN-M117", + id = 2 + }, { + dispName = "AN-M125A1", + id = 3 + }, { + dispName = "AN-M134", + id = 4 + }, { + dispName = "M162", + id = 5 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM102A2", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 3 + } }, + baseDim = "s", + control = "spinbox", + defValue = 3600, + dimension = "h", + id = "function_delay_ctrl_ANM125A1", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 2 + } }, + baseDim = "s", + control = "comboList", + defValue = 5, + dimension = "s", + id = "function_delay_ctrl_ANM117", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 5, + id = 5, + units = "s" + }, { + dispName = 11, + id = 11, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 600, + dimension = "min", + id = "function_delay_ctrl_ANM134", + label = "Function Delay", + max = 16666666666.667, + min = 0, + readOnly = true, + step = 0.00016666666666667, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 5 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_M162", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 72, + dimension = "rev", + id = "vane_rev_threshold_ctrl_ANM134", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -277,16 +612,18 @@ _G["launcher"]["{AN_M65}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM102A2", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 2 } }, baseDim = "rev", @@ -295,48 +632,54 @@ _G["launcher"]["{AN_M65}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM117", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_tail", + value = 3 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 6, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM134", + id = "vane_rev_threshold_ctrl_ANM125A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_tail", + value = 5 } }, baseDim = "rev", control = "spinbox", - defValue = 130, + defValue = 720, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod1", + id = "vane_rev_threshold_ctrl_M162", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{AN_M66}.lua b/_G/launcher/{AN_M66}.lua index 4658f0ab..4cbb5e29 100644 --- a/_G/launcher/{AN_M66}.lua +++ b/_G/launcher/{AN_M66}.lua @@ -18,214 +18,328 @@ _G["launcher"]["{AN_M66}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { - dispName = "AN-M102A2", + dispName = "AN-M103A1", id = 1 }, { - dispName = "AN-M117", + dispName = "Mk 243 Mod 0", id = 2 }, { - dispName = "AN-M125A1", + dispName = "Mk 244 Mod 1", id = 3 }, { - dispName = "AN-M134", + dispName = "M135A1", id = 4 }, { - dispName = "AN-M103A1", + dispName = "M136A1", id = 5 }, { - dispName = "Mk 243 Mod 0", + dispName = "AN-M139A1", id = 6 }, { - dispName = "Mk 243 Mod 1", + dispName = "AN-M140A1", id = 7 + }, { + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "s", control = "spinbox", defValue = 4, dimension = "s", - id = "function_delay_ctrl_Mk243Mod1", + id = "function_delay_ctrl_Mk244Mod1", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M135A1", + label = "Airburst Delay", + max = 92, + min = 5, + readOnly = false, + step = 0.1, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 6 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM103A1", + id = "function_delay_ctrl_ANM139A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.1, - id = 0.1 + dispName = 0.01, + id = 0.01, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 6 + id = "NFP_fuze_type_nose", + value = 5 } }, baseDim = "s", control = "spinbox", - defValue = 0.025, - dimension = "ms", - id = "function_delay_ctrl_Mk243Mod0", - label = "Function Delay", - max = 3600000, - min = 0, - readOnly = true, - step = 10, + defValue = 5, + dimension = "s", + id = "self_destruct_delay_ctrl_M136A1", + label = "Airburst Delay", + max = 30.6, + min = 5, + readOnly = false, + step = 0.2, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 7 } }, baseDim = "s", - control = "spinbox", - defValue = 3600, - dimension = "h", - id = "function_delay_ctrl_ANM125A1", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM140A1", label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, stringIndex = 2, - xCtrl = 170, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_nose", + value = 2 } }, baseDim = "s", control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_ANM134", + defValue = 0.025, + dimension = "ms", + id = "function_delay_ctrl_Mk243Mod0", label = "Function Delay", - max = 1, + max = 1e+15, min = 0, readOnly = true, - step = 2.7777777777778e-06, + step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_ANM102A2", + id = "function_delay_ctrl_ANM103A1", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 + id = 0, + units = "s" }, { dispName = 0.1, - id = 0.1 + id = 0.1, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0 } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "function_delay_ctrl_ANM117", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 330, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, - values = { { - dispName = 5, - id = 5 - }, { - dispName = 11, - id = 11 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 7 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM140A1", + value = 0.025 } }, - xCtrl = 170, - xLbl = 10 + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.025_ANM140A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 330, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM125A1", + id = "vane_rev_threshold_ctrl_FD_0_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 5 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M136A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 6 + }, "and", { + bNot = false, + id = "function_delay_ctrl_ANM139A1", + value = 0.01 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 220, + dimension = "rev", + id = "vane_rev_threshold_ctrl_FD_0.01_ANM139A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 3 } }, baseDim = "rev", control = "spinbox", defValue = 130, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod0", + id = "vane_rev_threshold_ctrl_Mk244Mod1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -237,17 +351,59 @@ _G["launcher"]["{AN_M66}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0.1_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 5 + id = "NFP_fuze_type_nose", + value = 2 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 130, + dimension = "rev", + id = "vane_rev_threshold_ctrl_Mk243Mod0", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 260, + dimension = "rev", + id = "vane_rev_threshold_ctrl_M135A1", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_nose", + value = 1 }, "and", { bNot = false, id = "function_delay_ctrl_ANM103A1", @@ -259,16 +415,195 @@ _G["launcher"]["{AN_M66}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_FD_0_ANM103A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "AN-M102A2", + id = 1 + }, { + dispName = "AN-M117", + id = 2 + }, { + dispName = "AN-M125A1", + id = 3 + }, { + dispName = "AN-M134", + id = 4 + }, { + dispName = "M162", + id = 5 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_ANM102A2", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 3 + } }, + baseDim = "s", + control = "spinbox", + defValue = 3600, + dimension = "h", + id = "function_delay_ctrl_ANM125A1", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 2 + } }, + baseDim = "s", + control = "comboList", + defValue = 5, + dimension = "s", + id = "function_delay_ctrl_ANM117", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 5, + id = 5, + units = "s" + }, { + dispName = 11, + id = 11, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "s", + control = "spinbox", + defValue = 600, + dimension = "min", + id = "function_delay_ctrl_ANM134", + label = "Function Delay", + max = 16666666666.667, + min = 0, + readOnly = true, + step = 0.00016666666666667, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 5 + } }, + baseDim = "s", + control = "comboList", + defValue = 0, + dimension = "s", + id = "function_delay_ctrl_M162", + label = "Function Delay", + stringIndex = 4, + values = { { + dispName = 0, + id = 0, + units = "s" + }, { + dispName = 0.01, + id = 0.01, + units = "s" + }, { + dispName = 0.025, + id = 0.025, + units = "s" + }, { + dispName = 0.1, + id = 0.1, + units = "s" + } }, + wCtrl = 60, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 4 + } }, + baseDim = "rev", + control = "spinbox", + defValue = 72, + dimension = "rev", + id = "vane_rev_threshold_ctrl_ANM134", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -277,16 +612,18 @@ _G["launcher"]["{AN_M66}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM102A2", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 2 } }, baseDim = "rev", @@ -295,48 +632,54 @@ _G["launcher"]["{AN_M66}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_ANM117", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 + id = "NFP_fuze_type_tail", + value = 3 } }, baseDim = "rev", control = "spinbox", - defValue = 8, + defValue = 6, dimension = "rev", - id = "vane_rev_threshold_ctrl_ANM134", + id = "vane_rev_threshold_ctrl_ANM125A1", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 7 + id = "NFP_fuze_type_tail", + value = 5 } }, baseDim = "rev", control = "spinbox", - defValue = 130, + defValue = 720, dimension = "rev", - id = "vane_rev_threshold_ctrl_Mk243Mod1", + id = "vane_rev_threshold_ctrl_M162", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{APU-60-1_R_60M}.lua b/_G/launcher/{APU-60-1_R_60M}.lua index 26439f1e..42c2a3e5 100644 --- a/_G/launcher/{APU-60-1_R_60M}.lua +++ b/_G/launcher/{APU-60-1_R_60M}.lua @@ -1,18 +1,21 @@ _G["launcher"]["{APU-60-1_R_60M}"] = { CLSID = "{APU-60-1_R_60M}", Count = 1, + Cx_pil = 0.00051982421875, Elements = { { IsAdapter = true, ShapeName = "APU-60-1" }, { - ShapeName = "R-60", + ShapeName = "r-60", connector_name = "Point Pilon R60" } }, - NatoName = "(AA-8)", Picture = "r60.png", - Weight = 76, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 75.5, + Weight_Empty = 32, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - displayName = "APU-60-1M with R-60M (AA-8 Aphid) - Infra Red", + category = 4, + displayName = "APU-60-1M with R-60M (AA-8 Aphid-B) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{APU_13MT_R_3S}.lua b/_G/launcher/{APU_13MT_R_3S}.lua new file mode 100644 index 00000000..31f79254 --- /dev/null +++ b/_G/launcher/{APU_13MT_R_3S}.lua @@ -0,0 +1,20 @@ +_G["launcher"]["{APU_13MT_R_3S}"] = { + CLSID = "{APU_13MT_R_3S}", + Count = 1, + Cx_pil = 0.00061015625, + Elements = { "_G/Pylons/apu-13mt.lua", { + Position = { 0.35, -0.135, 0 }, + ShapeName = "R-3S" + } }, + Picture = "medium_missile_IR.png", + PictureBlendColor = "0xffffffff", + Weight = 122.8, + Weight_Empty = 47.5, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 32, "Redacted" }, + category = 4, + displayName = "APU-13MT with R-3S (AA-2 Atoll-B) - IR AAM", + name = "{APU_13MT_R_3S}", + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{APU_60_1_R_60}.lua b/_G/launcher/{APU_60_1_R_60}.lua new file mode 100644 index 00000000..a2a33ae8 --- /dev/null +++ b/_G/launcher/{APU_60_1_R_60}.lua @@ -0,0 +1,21 @@ +_G["launcher"]["{APU_60_1_R_60}"] = { + CLSID = "{APU_60_1_R_60}", + Count = 1, + Cx_pil = 0.00051982421875, + Elements = { { + IsAdapter = true, + ShapeName = "APU-60-1" + }, { + ShapeName = "r-60a", + connector_name = "Point Pilon R60" + } }, + Picture = "r60.png", + Weight = 75, + Weight_Empty = 32, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 32, "Redacted" }, + category = 4, + displayName = "APU-60-1M with R-60 (AA-8 Aphid) - IR AAM", + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{APU_60_2M_R_60_L}.lua b/_G/launcher/{APU_60_2M_R_60_L}.lua new file mode 100644 index 00000000..f06a49dd --- /dev/null +++ b/_G/launcher/{APU_60_2M_R_60_L}.lua @@ -0,0 +1,23 @@ +_G["launcher"]["{APU_60_2M_R_60_L}"] = { + CLSID = "{APU_60_2M_R_60_L}", + Count = 2, + Cx_pil = 0.0012396484375, + Elements = { { + ShapeName = "apu-60-2_L" + }, { + ShapeName = "r-60a", + connector_name = "Point Pilon R60" + }, { + ShapeName = "r-60a", + connector_name = "Point Pilon R60_1" + } }, + Picture = "r60.png", + Weight = 157, + Weight_Empty = 71, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 32, "Redacted" }, + category = 4, + displayName = "APU-60-2M with 2 x R-60 (AA-8 Aphid) - IR AAM", + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{APU_60_2M_R_60_R}.lua b/_G/launcher/{APU_60_2M_R_60_R}.lua new file mode 100644 index 00000000..3644b15b --- /dev/null +++ b/_G/launcher/{APU_60_2M_R_60_R}.lua @@ -0,0 +1,23 @@ +_G["launcher"]["{APU_60_2M_R_60_R}"] = { + CLSID = "{APU_60_2M_R_60_R}", + Count = 2, + Cx_pil = 0.0012396484375, + Elements = { { + ShapeName = "apu-60-2_R" + }, { + ShapeName = "r-60a", + connector_name = "Point Pilon R60" + }, { + ShapeName = "r-60a", + connector_name = "Point Pilon R60_1" + } }, + Picture = "r60.png", + Weight = 157, + Weight_Empty = 71, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 32, "Redacted" }, + category = 4, + displayName = "APU-60-2M with 2 x R-60 (AA-8 Aphid) - IR AAM", + wsTypeOfWeapon = { 4, 4, 7, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}.lua b/_G/launcher/{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}.lua index 316bef39..a1421abe 100644 --- a/_G/launcher/{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}.lua +++ b/_G/launcher/{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}.lua @@ -1,20 +1,23 @@ _G["launcher"]["{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}"] = { CLSID = "{B0DBC591-0F52-4F7D-AD7B-51E67725FB81}", Count = 2, - Cx_pil = 0.0006, + Cx_pil = 0.0012396484375, Elements = { { ShapeName = "apu-60-2_L" }, { - ShapeName = "R-60", + ShapeName = "r-60", connector_name = "Point Pilon R60" }, { - ShapeName = "R-60", + ShapeName = "r-60", connector_name = "Point Pilon R60_1" } }, Picture = "r60.png", - Weight = 148, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 158, + Weight_Empty = 71, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - displayName = "APU-60-2M with 2 x R-60M (AA-8 Aphid) - Infra Red", + category = 4, + displayName = "APU-60-2M with 2 x R-60M (AA-8 Aphid-B) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{B1EF6B0E-3D91-4047-A7A5-A99E7D8B4A8B}.lua b/_G/launcher/{B1EF6B0E-3D91-4047-A7A5-A99E7D8B4A8B}.lua index 1473cd28..f1a1d79e 100644 --- a/_G/launcher/{B1EF6B0E-3D91-4047-A7A5-A99E7D8B4A8B}.lua +++ b/_G/launcher/{B1EF6B0E-3D91-4047-A7A5-A99E7D8B4A8B}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{B1EF6B0E-3D91-4047-A7A5-A99E7D8B4A8B}"] = { ShapeName = "KINGAL" } }, Picture = "Mercury.png", + ShapeName = "KINGAL", Weight = 230, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.KINGAL", attribute = { 4, 15, 44, "Redacted" }, - displayName = "Mercury LLTV Pod" + category = 6, + displayName = "Mercury LLTV Pod", + name = "KINGAL" } \ No newline at end of file diff --git a/_G/launcher/{B4FC81C9-B861-4E87-BBDC-A1158E648EBF}.lua b/_G/launcher/{B4FC81C9-B861-4E87-BBDC-A1158E648EBF}.lua index 84212658..c0d7d92c 100644 --- a/_G/launcher/{B4FC81C9-B861-4E87-BBDC-A1158E648EBF}.lua +++ b/_G/launcher/{B4FC81C9-B861-4E87-BBDC-A1158E648EBF}.lua @@ -14,6 +14,7 @@ _G["launcher"]["{B4FC81C9-B861-4E87-BBDC-A1158E648EBF}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-29T (AS-14 Kedge) - 670kg, ASM, TV Guided", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}.lua b/_G/launcher/{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}.lua index 1d64ee77..dc798036 100644 --- a/_G/launcher/{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}.lua +++ b/_G/launcher/{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}.lua @@ -15,6 +15,7 @@ _G["launcher"]["{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-58U (AS-11 Kilter) - 640kg, ARM, IN & Pas Rdr", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 3, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{B83CB620-5BBE-4BEA-910C-EB605A327EF9}.lua b/_G/launcher/{B83CB620-5BBE-4BEA-910C-EB605A327EF9}.lua index 1a1b6fa8..cc4561ce 100644 --- a/_G/launcher/{B83CB620-5BBE-4BEA-910C-EB605A327EF9}.lua +++ b/_G/launcher/{B83CB620-5BBE-4BEA-910C-EB605A327EF9}.lua @@ -6,13 +6,13 @@ _G["launcher"]["{B83CB620-5BBE-4BEA-910C-EB605A327EF9}"] = { ShapeName = "BRU-42_LS" }, { ShapeName = "ROCKEYE", - connector_name = "Point01" + connector_name = "Point03" }, { ShapeName = "ROCKEYE", connector_name = "Point02" }, { ShapeName = "ROCKEYE", - connector_name = "Point03" + connector_name = "Point01" } }, Picture = "Mk20.png", Weight = 722.25, diff --git a/_G/launcher/{B84DFE16-6AC7-4854-8F6D-34137892E166}.lua b/_G/launcher/{B84DFE16-6AC7-4854-8F6D-34137892E166}.lua deleted file mode 100644 index d6d6c424..00000000 --- a/_G/launcher/{B84DFE16-6AC7-4854-8F6D-34137892E166}.lua +++ /dev/null @@ -1,12 +0,0 @@ -_G["launcher"]["{B84DFE16-6AC7-4854-8F6D-34137892E166}"] = { - CLSID = "{B84DFE16-6AC7-4854-8F6D-34137892E166}", - Count = 51, - Elements = { { - ShapeName = "MK-82" - } }, - Picture = "mk82.png", - Weight = 12291, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 9, "Redacted" }, - displayName = "51 x Mk-82 - 500lb GP Bombs LD" -} \ No newline at end of file diff --git a/_G/launcher/{BCE4E030-38E9-423E-98ED-24BE3DA87C32}.lua b/_G/launcher/{BCE4E030-38E9-423E-98ED-24BE3DA87C32}.lua index 11df673c..e733c2e6 100644 --- a/_G/launcher/{BCE4E030-38E9-423E-98ED-24BE3DA87C32}.lua +++ b/_G/launcher/{BCE4E030-38E9-423E-98ED-24BE3DA87C32}.lua @@ -7,278 +7,5 @@ _G["launcher"]["{BCE4E030-38E9-423E-98ED-24BE3DA87C32}"] = { Weight = 228, _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 5, 9, "Redacted" }, - displayName = "Mk-82 - 500lb GP Bomb LD", - settings = { { - baseDim = "", - control = "comboList", - defValue = 1, - dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", - stringIndex = 1, - values = { { - dispName = "FMU-139", - id = 1 - }, { - dispName = "FMU-152", - id = 2 - }, { - dispName = "M904E4", - id = 3 - }, { - dispName = "M905", - id = 4 - } }, - wCtrl = 355, - xCtrl = 170 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU152AB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.005, - id = 0.005 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.06, - id = 0.06 - }, { - dispName = 0.18, - id = 0.18 - }, { - dispName = 900, - id = 900 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_M905", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.05, - id = 0.05 - }, { - dispName = 0.1, - id = 0.1 - }, { - dispName = 0.25, - id = 0.25 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_M904E4", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.05, - id = 0.05 - }, { - dispName = 0.1, - id = 0.1 - }, { - dispName = 0.25, - id = 0.25 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 1 - } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_FMU139CB_LD", - label = "Function Delay", - stringIndex = 2, - values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.01, - id = 0.01 - }, { - dispName = 0.025, - id = 0.025 - }, { - dispName = 0.06, - id = 0.06 - } }, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "s", - control = "spinbox", - defValue = 2, - dimension = "s", - id = "arm_delay_ctrl_M904E4", - label = "Arm Delay", - max = 18, - min = 2, - readOnly = false, - step = 2, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_FMU152AB_LD", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 5, - id = 5 - }, { - dispName = 6, - id = 6 - }, { - dispName = 7, - id = 7 - }, { - dispName = 8, - id = 8 - }, { - dispName = 10, - id = 10 - }, { - dispName = 14, - id = 14 - }, { - dispName = 21, - id = 21 - } }, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 1 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_FMU139CB_LD", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 6, - id = 6 - }, { - dispName = 7, - id = 7 - }, { - dispName = 10, - id = 10 - }, { - dispName = 14, - id = 14 - }, { - dispName = 20, - id = 20 - } }, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 4 - } }, - baseDim = "s", - control = "comboList", - defValue = 1, - dimension = "s", - id = "arm_delay_ctrl_M905", - label = "Arm Delay", - stringIndex = 2, - values = { { - dispName = 4, - id = 4 - }, { - dispName = 6, - id = 6 - }, { - dispName = 8, - id = 8 - }, { - dispName = 12, - id = 12 - }, { - dispName = 16, - id = 16 - }, { - dispName = 20, - id = 20 - } }, - xCtrl = 465, - xLbl = 285 - } } + displayName = "Mk-82 - 500lb GP Bomb LD" } \ No newline at end of file diff --git a/_G/launcher/{BLU107B_DURANDAL}.lua b/_G/launcher/{BLU107B_DURANDAL}.lua index 98b0087a..bf2972a8 100644 --- a/_G/launcher/{BLU107B_DURANDAL}.lua +++ b/_G/launcher/{BLU107B_DURANDAL}.lua @@ -12,5 +12,5 @@ _G["launcher"]["{BLU107B_DURANDAL}"] = { attribute = { 4, 5, 37, "Redacted" }, category = 1, displayName = "BLU-107/B Durandal - 219kg Concrete Piercing Chute Retarded Bomb w/Booster", - ejectImpulse = 1095 + ejectVelocity = 5 } \ No newline at end of file diff --git a/_G/launcher/{BRU-42_3Mk-82AIR}.lua b/_G/launcher/{BRU-42_3Mk-82AIR}.lua index 60b6923b..51de5755 100644 --- a/_G/launcher/{BRU-42_3Mk-82AIR}.lua +++ b/_G/launcher/{BRU-42_3Mk-82AIR}.lua @@ -6,13 +6,13 @@ _G["launcher"]["{BRU-42_3*Mk-82AIR}"] = { ShapeName = "BRU-42_LS" }, { ShapeName = "MK-82AIR", - connector_name = "Point01" + connector_name = "Point03" }, { ShapeName = "MK-82AIR", connector_name = "Point02" }, { ShapeName = "MK-82AIR", - connector_name = "Point03" + connector_name = "Point01" } }, Picture = "mk82.png", Weight = 782.25, diff --git a/_G/launcher/{BRU-42_LS_3SUU-25_8LUU-2}.lua b/_G/launcher/{BRU-42_LS_3SUU-25_8LUU-2}.lua index 46bf77db..0eb0f231 100644 --- a/_G/launcher/{BRU-42_LS_3SUU-25_8LUU-2}.lua +++ b/_G/launcher/{BRU-42_LS_3SUU-25_8LUU-2}.lua @@ -5,26 +5,62 @@ _G["launcher"]["{BRU-42_LS_3*SUU-25_8*LUU-2}"] = { Elements = { { ShapeName = "BRU-42_LS_(SUU-25)" }, { - Position = { -0.3, -0.1, 0 } + Position = { -1.45, -0.1, -0.265 } }, { - Position = { -0.3, -0.18, -0.08 } + Position = { -1.45, -0.28, -0.265 } }, { - Position = { -0.3, -0.26, 0 } + Position = { -1.45, -0.19, -0.35 } }, { - Position = { -0.3, -0.18, 0.08 } + Position = { -1.45, -0.19, -0.18 } }, { - Position = { -0.3, -0.1, 0 } + Position = { -1.45, -0.1, -0.265 } }, { - pos = { -0.3, -0.18, -0.08 } + Position = { -1.45, -0.28, -0.265 } }, { - Position = { -0.3, -0.26, 0 } + Position = { -1.45, -0.19, -0.35 } }, { - Position = { -0.3, -0.18, 0.08 } + Position = { -1.45, -0.19, -0.18 } + }, { + Position = { -1.45, -0.4, -0.06 } + }, { + Position = { -1.45, -0.4, 0.06 } + }, { + Position = { -1.45, -0.525, -0.06 } + }, { + Position = { -1.45, -0.525, 0.06 } + }, { + Position = { -1.45, -0.4, -0.06 } + }, { + Position = { -1.45, -0.4, 0.06 } + }, { + Position = { -1.45, -0.525, -0.06 } + }, { + Position = { -1.45, -0.525, 0.06 } + }, { + Position = { -1.45, -0.1, 0.265 } + }, { + Position = { -1.45, -0.28, 0.265 } + }, { + Position = { -1.45, -0.19, -0.35 } + }, { + Position = { -1.45, -0.19, 0.18 } + }, { + Position = { -1.45, -0.1, 0.265 } + }, { + Position = { -1.45, -0.28, 0.265 } + }, { + Position = { -1.45, -0.19, -0.35 } + }, { + Position = { -1.45, -0.19, 0.18 } } }, Picture = "L005.png", Weight = 736.65, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, + category = 1, displayName = "BRU-42 with 3 x SUU-25 x 8 LUU-2 - Target Marker Flares", + ejectDirection = { -1, 0, 0 }, + ejectVelocity = 15, wsTypeOfWeapon = { 4, 5, 49, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{BRU_42A_x1_ADM_141A}.lua b/_G/launcher/{BRU_42A_x1_ADM_141A}.lua index 10260ac7..6534bac4 100644 --- a/_G/launcher/{BRU_42A_x1_ADM_141A}.lua +++ b/_G/launcher/{BRU_42A_x1_ADM_141A}.lua @@ -9,7 +9,7 @@ _G["launcher"]["{BRU_42A_x1_ADM_141A}"] = { connector_name = "Point01", payload_CLSID = "{ADM_141A}" } }, - Picture = "agm154.png", + Picture = "ADM-141.png", Weight = 230.8, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", diff --git a/_G/launcher/{BRU_42A_x2_ADM_141A}.lua b/_G/launcher/{BRU_42A_x2_ADM_141A}.lua index 703d941b..5cea76b8 100644 --- a/_G/launcher/{BRU_42A_x2_ADM_141A}.lua +++ b/_G/launcher/{BRU_42A_x2_ADM_141A}.lua @@ -12,7 +12,7 @@ _G["launcher"]["{BRU_42A_x2_ADM_141A}"] = { connector_name = "Point03", payload_CLSID = "{ADM_141A}" } }, - Picture = "agm154.png", + Picture = "ADM-141.png", Weight = 410.8, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", diff --git a/_G/launcher/{BRU_42A_x3_ADM_141A}.lua b/_G/launcher/{BRU_42A_x3_ADM_141A}.lua index 326b877d..00d5e620 100644 --- a/_G/launcher/{BRU_42A_x3_ADM_141A}.lua +++ b/_G/launcher/{BRU_42A_x3_ADM_141A}.lua @@ -12,7 +12,7 @@ _G["launcher"]["{BRU_42A_x3_ADM_141A}"] = { connector_name = "Point03", payload_CLSID = "{ADM_141A}" } }, - Picture = "agm154.png", + Picture = "ADM-141.png", Weight = 590.8, _file = "./CoreMods/aircraft/AircraftWeaponPack/tactical_decoys.lua", _origin = "AircraftWeaponPack", diff --git a/_G/launcher/{British_GP_250LB_Bomb_Mk1}.lua b/_G/launcher/{British_GP_250LB_Bomb_Mk1}.lua index c66f9dcc..907ce774 100644 --- a/_G/launcher/{British_GP_250LB_Bomb_Mk1}.lua +++ b/_G/launcher/{British_GP_250LB_Bomb_Mk1}.lua @@ -18,21 +18,21 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk1}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 19", id = 1 }, { - dispName = "Tail Pistol No. 17 Mk I", - id = 2 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -44,43 +44,31 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk1}"] = { stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 2.5, - id = 2.5 + id = 2.5, + units = "s" }, { dispName = 12, - id = 12 + id = 12, + units = "s" }, { dispName = 15, - id = 15 + id = 15, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_TP17MkI", - label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, - stringIndex = 2, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "rev", @@ -89,17 +77,56 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk1}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_NP19", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "Tail Pistol No. 17 Mk I", + id = 1 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "spinbox", + defValue = 1800, + dimension = "h", + id = "function_delay_ctrl_TP17MkI", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 1 } }, baseDim = "rev", control = "spinbox", @@ -107,12 +134,14 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk1}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP17MkI", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_250LB_Bomb_Mk4_on_Handley_Page_Type_B_Cut_Bar}.lua b/_G/launcher/{British_GP_250LB_Bomb_Mk4_on_Handley_Page_Type_B_Cut_Bar}.lua index d18d49a1..835adb53 100644 --- a/_G/launcher/{British_GP_250LB_Bomb_Mk4_on_Handley_Page_Type_B_Cut_Bar}.lua +++ b/_G/launcher/{British_GP_250LB_Bomb_Mk4_on_Handley_Page_Type_B_Cut_Bar}.lua @@ -22,156 +22,139 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk4_on_Handley_Page_Type_B_Cut_Bar}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_250LB_Bomb_Mk4}.lua b/_G/launcher/{British_GP_250LB_Bomb_Mk4}.lua index 4fe31def..74b29fb9 100644 --- a/_G/launcher/{British_GP_250LB_Bomb_Mk4}.lua +++ b/_G/launcher/{British_GP_250LB_Bomb_Mk4}.lua @@ -18,155 +18,138 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk4}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}.lua b/_G/launcher/{British_GP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}.lua index 1dde6f43..cc4bc8e0 100644 --- a/_G/launcher/{British_GP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}.lua +++ b/_G/launcher/{British_GP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}.lua @@ -28,18 +28,18 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", stringIndex = 1, values = { { dispName = "Tail Pistol No. 17 Mk I", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", @@ -48,16 +48,18 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}"] = { dimension = "h", id = "function_delay_ctrl_TP17MkI", label = "Function Delay", - max = 1, + max = 277777777.77778, min = 0, readOnly = true, step = 2.7777777777778e-06, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -66,13 +68,15 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP17MkI", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_250LB_Bomb_Mk5}.lua b/_G/launcher/{British_GP_250LB_Bomb_Mk5}.lua index 398b3753..bbfddc9a 100644 --- a/_G/launcher/{British_GP_250LB_Bomb_Mk5}.lua +++ b/_G/launcher/{British_GP_250LB_Bomb_Mk5}.lua @@ -18,18 +18,18 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk5}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", stringIndex = 1, values = { { dispName = "Tail Pistol No. 17 Mk I", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", @@ -38,16 +38,18 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk5}"] = { dimension = "h", id = "function_delay_ctrl_TP17MkI", label = "Function Delay", - max = 1, + max = 277777777.77778, min = 0, readOnly = true, step = 2.7777777777778e-06, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -56,12 +58,14 @@ _G["launcher"]["{British_GP_250LB_Bomb_Mk5}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP17MkI", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_500LB_Bomb_Mk1}.lua b/_G/launcher/{British_GP_500LB_Bomb_Mk1}.lua index b5284d5c..f3fe9532 100644 --- a/_G/launcher/{British_GP_500LB_Bomb_Mk1}.lua +++ b/_G/launcher/{British_GP_500LB_Bomb_Mk1}.lua @@ -18,21 +18,21 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk1}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 19", id = 1 }, { - dispName = "Tail Pistol No. 17 Mk I", - id = 2 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -44,43 +44,31 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk1}"] = { stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 2.5, - id = 2.5 + id = 2.5, + units = "s" }, { dispName = 12, - id = 12 + id = 12, + units = "s" }, { dispName = 15, - id = 15 + id = 15, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "s", - control = "spinbox", - defValue = 1800, - dimension = "h", - id = "function_delay_ctrl_TP17MkI", - label = "Function Delay", - max = 1, - min = 0, - readOnly = true, - step = 2.7777777777778e-06, - stringIndex = 2, - xCtrl = 170, - xLbl = 10 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "rev", @@ -89,17 +77,56 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk1}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_NP19", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, + values = { { + dispName = "Tail Pistol No. 17 Mk I", + id = 1 + }, { + dispName = "Plugged", + id = "EMPTY" + } }, + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_tail", + value = 1 + } }, + baseDim = "s", + control = "spinbox", + defValue = 1800, + dimension = "h", + id = "function_delay_ctrl_TP17MkI", + label = "Function Delay", + max = 277777777.77778, + min = 0, + readOnly = true, + step = 2.7777777777778e-06, + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 180, + xLbl = 10 + }, { + VisibilityCondition = { { + id = "NFP_fuze_type_tail", + value = 1 } }, baseDim = "rev", control = "spinbox", @@ -107,12 +134,14 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk1}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP17MkI", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_500LB_Bomb_Mk4_Short_on_Handley_Page_Type_B_Cut_Bar}.lua b/_G/launcher/{British_GP_500LB_Bomb_Mk4_Short_on_Handley_Page_Type_B_Cut_Bar}.lua index a458a664..16b8e2f5 100644 --- a/_G/launcher/{British_GP_500LB_Bomb_Mk4_Short_on_Handley_Page_Type_B_Cut_Bar}.lua +++ b/_G/launcher/{British_GP_500LB_Bomb_Mk4_Short_on_Handley_Page_Type_B_Cut_Bar}.lua @@ -28,156 +28,139 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk4_Short_on_Handley_Page_Type_B_Cut_Bar} control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_500LB_Bomb_Mk4_Short}.lua b/_G/launcher/{British_GP_500LB_Bomb_Mk4_Short}.lua index c3824f68..2b048be3 100644 --- a/_G/launcher/{British_GP_500LB_Bomb_Mk4_Short}.lua +++ b/_G/launcher/{British_GP_500LB_Bomb_Mk4_Short}.lua @@ -18,155 +18,138 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk4_Short}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_500LB_Bomb_Mk4}.lua b/_G/launcher/{British_GP_500LB_Bomb_Mk4}.lua index 0e506505..aec06080 100644 --- a/_G/launcher/{British_GP_500LB_Bomb_Mk4}.lua +++ b/_G/launcher/{British_GP_500LB_Bomb_Mk4}.lua @@ -18,155 +18,138 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk4}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_GP_500LB_Bomb_Mk5}.lua b/_G/launcher/{British_GP_500LB_Bomb_Mk5}.lua index 29c9a022..811624da 100644 --- a/_G/launcher/{British_GP_500LB_Bomb_Mk5}.lua +++ b/_G/launcher/{British_GP_500LB_Bomb_Mk5}.lua @@ -18,18 +18,18 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk5}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", stringIndex = 1, values = { { dispName = "Tail Pistol No. 17 Mk I", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", @@ -38,16 +38,18 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk5}"] = { dimension = "h", id = "function_delay_ctrl_TP17MkI", label = "Function Delay", - max = 1, + max = 277777777.77778, min = 0, readOnly = true, step = 2.7777777777778e-06, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -56,12 +58,14 @@ _G["launcher"]["{British_GP_500LB_Bomb_Mk5}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP17MkI", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_HE_60LBFNo1_3INCHNo1}.lua b/_G/launcher/{British_HE_60LBFNo1_3INCHNo1}.lua index 891c5c5e..d99108db 100644 --- a/_G/launcher/{British_HE_60LBFNo1_3INCHNo1}.lua +++ b/_G/launcher/{British_HE_60LBFNo1_3INCHNo1}.lua @@ -19,18 +19,18 @@ _G["launcher"]["{British_HE_60LBFNo1_3INCHNo1}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Fuze No. 899 Mk I", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -39,16 +39,18 @@ _G["launcher"]["{British_HE_60LBFNo1_3INCHNo1}"] = { dimension = "s", id = "function_delay_ctrl_NFNo899MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -57,13 +59,15 @@ _G["launcher"]["{British_HE_60LBFNo1_3INCHNo1}"] = { dimension = "s", id = "arm_delay_ctrl_NFNo899MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 7, 33, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_HE_60LBSAPNo2_3INCHNo1}.lua b/_G/launcher/{British_HE_60LBSAPNo2_3INCHNo1}.lua index 0762e828..65ba8712 100644 --- a/_G/launcher/{British_HE_60LBSAPNo2_3INCHNo1}.lua +++ b/_G/launcher/{British_HE_60LBSAPNo2_3INCHNo1}.lua @@ -19,7 +19,7 @@ _G["launcher"]["{British_HE_60LBSAPNo2_3INCHNo1}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -29,11 +29,11 @@ _G["launcher"]["{British_HE_60LBSAPNo2_3INCHNo1}"] = { dispName = "Base Fuze No. 865 Mk I", id = 2 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -42,16 +42,18 @@ _G["launcher"]["{British_HE_60LBSAPNo2_3INCHNo1}"] = { dimension = "s", id = "function_delay_ctrl_BFNo878MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -60,16 +62,18 @@ _G["launcher"]["{British_HE_60LBSAPNo2_3INCHNo1}"] = { dimension = "ms", id = "function_delay_ctrl_BFNo865MkI", label = "Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -78,16 +82,18 @@ _G["launcher"]["{British_HE_60LBSAPNo2_3INCHNo1}"] = { dimension = "s", id = "arm_delay_ctrl_BFNo878MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -96,13 +102,15 @@ _G["launcher"]["{British_HE_60LBSAPNo2_3INCHNo1}"] = { dimension = "s", id = "arm_delay_ctrl_BFNo865MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 7, 33, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_MC_250LB_Bomb_Mk1_on_Handley_Page_Type_B_Cut_Bar}.lua b/_G/launcher/{British_MC_250LB_Bomb_Mk1_on_Handley_Page_Type_B_Cut_Bar}.lua index a27865bf..82779ccd 100644 --- a/_G/launcher/{British_MC_250LB_Bomb_Mk1_on_Handley_Page_Type_B_Cut_Bar}.lua +++ b/_G/launcher/{British_MC_250LB_Bomb_Mk1_on_Handley_Page_Type_B_Cut_Bar}.lua @@ -28,156 +28,139 @@ _G["launcher"]["{British_MC_250LB_Bomb_Mk1_on_Handley_Page_Type_B_Cut_Bar}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_MC_250LB_Bomb_Mk1}.lua b/_G/launcher/{British_MC_250LB_Bomb_Mk1}.lua index dac6c838..f30aabab 100644 --- a/_G/launcher/{British_MC_250LB_Bomb_Mk1}.lua +++ b/_G/launcher/{British_MC_250LB_Bomb_Mk1}.lua @@ -18,155 +18,138 @@ _G["launcher"]["{British_MC_250LB_Bomb_Mk1}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_MC_250LB_Bomb_Mk2_on_Handley_Page_Type_B_Cut_Bar}.lua b/_G/launcher/{British_MC_250LB_Bomb_Mk2_on_Handley_Page_Type_B_Cut_Bar}.lua index 84cc178e..d20a111a 100644 --- a/_G/launcher/{British_MC_250LB_Bomb_Mk2_on_Handley_Page_Type_B_Cut_Bar}.lua +++ b/_G/launcher/{British_MC_250LB_Bomb_Mk2_on_Handley_Page_Type_B_Cut_Bar}.lua @@ -28,156 +28,139 @@ _G["launcher"]["{British_MC_250LB_Bomb_Mk2_on_Handley_Page_Type_B_Cut_Bar}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_MC_250LB_Bomb_Mk2}.lua b/_G/launcher/{British_MC_250LB_Bomb_Mk2}.lua index 3b4786bb..4e0c72e5 100644 --- a/_G/launcher/{British_MC_250LB_Bomb_Mk2}.lua +++ b/_G/launcher/{British_MC_250LB_Bomb_Mk2}.lua @@ -18,155 +18,138 @@ _G["launcher"]["{British_MC_250LB_Bomb_Mk2}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_MC_500LB_Bomb_Mk1_Short_on_Handley_Page_Type_B_Cut_Bar}.lua b/_G/launcher/{British_MC_500LB_Bomb_Mk1_Short_on_Handley_Page_Type_B_Cut_Bar}.lua index 54a210b0..40f725c3 100644 --- a/_G/launcher/{British_MC_500LB_Bomb_Mk1_Short_on_Handley_Page_Type_B_Cut_Bar}.lua +++ b/_G/launcher/{British_MC_500LB_Bomb_Mk1_Short_on_Handley_Page_Type_B_Cut_Bar}.lua @@ -28,156 +28,139 @@ _G["launcher"]["{British_MC_500LB_Bomb_Mk1_Short_on_Handley_Page_Type_B_Cut_Bar} control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_MC_500LB_Bomb_Mk1_Short}.lua b/_G/launcher/{British_MC_500LB_Bomb_Mk1_Short}.lua index e5af54b3..f3f3b10a 100644 --- a/_G/launcher/{British_MC_500LB_Bomb_Mk1_Short}.lua +++ b/_G/launcher/{British_MC_500LB_Bomb_Mk1_Short}.lua @@ -18,155 +18,138 @@ _G["launcher"]["{British_MC_500LB_Bomb_Mk1_Short}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_MC_500LB_Bomb_Mk2}.lua b/_G/launcher/{British_MC_500LB_Bomb_Mk2}.lua index e93bc20d..7565b04a 100644 --- a/_G/launcher/{British_MC_500LB_Bomb_Mk2}.lua +++ b/_G/launcher/{British_MC_500LB_Bomb_Mk2}.lua @@ -18,155 +18,138 @@ _G["launcher"]["{British_MC_500LB_Bomb_Mk2}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Pistol No. 27 Mk II", id = 1 }, { - dispName = "Tail Pistol No. 30 Mk III", - id = 2 - }, { - dispName = "Nose Pistol No. 44", - id = 3 + dispName = "Plugged", + id = "EMPTY" } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 + id = "NFP_fuze_type_nose", + value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP44", + id = "function_delay_ctrl_NP27MkII", label = "Function Delay", stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.025, - id = 0.025 + id = 0.025, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 + id = "NFP_fuze_type_nose", + value = 1 } }, - baseDim = "s", - control = "comboList", - defValue = 0, - dimension = "s", - id = "function_delay_ctrl_TP30MkIII", - label = "Function Delay", + baseDim = "rev", + control = "spinbox", + defValue = 7, + dimension = "rev", + id = "vane_rev_threshold_ctrl_NP27MkII", + label = "Arming Vane Revs. Required", + max = 1000000000000, + min = 0, + readOnly = true, + step = 0.01, stringIndex = 2, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 + }, { + baseDim = "", + control = "comboList", + defValue = 1, + dimension = "", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", + stringIndex = 3, values = { { - dispName = 0, - id = 0 - }, { - dispName = 0.12, - id = 0.12 - }, { - dispName = 1, + dispName = "Tail Pistol No. 30 Mk III", id = 1 }, { - dispName = 11, - id = 11 + dispName = "Plugged", + id = "EMPTY" } }, - xCtrl = 170, - xLbl = 10 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", control = "comboList", defValue = 0, dimension = "s", - id = "function_delay_ctrl_NP27MkII", + id = "function_delay_ctrl_TP30MkIII", label = "Function Delay", - stringIndex = 2, + stringIndex = 4, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { - dispName = 0.025, - id = 0.025 + dispName = 0.12, + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP27MkII", - label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 2 - } }, - baseDim = "rev", - control = "spinbox", defValue = 13, dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, - min = 0, - readOnly = true, - step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 - }, { - VisibilityCondition = { { - id = "GUI_fuze_type", - value = 3 - } }, - baseDim = "rev", - control = "spinbox", - defValue = 7, - dimension = "rev", - id = "vane_rev_threshold_ctrl_NP44", - label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, - stringIndex = 2, - xCtrl = 465, - xLbl = 285 + stringIndex = 4, + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_SAP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}.lua b/_G/launcher/{British_SAP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}.lua index 265e12b9..223e3994 100644 --- a/_G/launcher/{British_SAP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}.lua +++ b/_G/launcher/{British_SAP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}.lua @@ -28,18 +28,18 @@ _G["launcher"]["{British_SAP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}"] = control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", stringIndex = 1, values = { { dispName = "Tail Pistol No. 30 Mk III", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", @@ -51,22 +51,27 @@ _G["launcher"]["{British_SAP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}"] = stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.12, - id = 0.12 + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -75,13 +80,15 @@ _G["launcher"]["{British_SAP_250LB_Bomb_Mk5_on_Handley_Page_Type_B_Cut_Bar}"] = dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{British_SAP_250LB_Bomb_Mk5}.lua b/_G/launcher/{British_SAP_250LB_Bomb_Mk5}.lua index a09bbe4f..b3ea02f6 100644 --- a/_G/launcher/{British_SAP_250LB_Bomb_Mk5}.lua +++ b/_G/launcher/{British_SAP_250LB_Bomb_Mk5}.lua @@ -18,18 +18,18 @@ _G["launcher"]["{British_SAP_250LB_Bomb_Mk5}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", stringIndex = 1, values = { { dispName = "Tail Pistol No. 30 Mk III", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", @@ -41,22 +41,27 @@ _G["launcher"]["{British_SAP_250LB_Bomb_Mk5}"] = { stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.12, - id = 0.12 + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -65,12 +70,14 @@ _G["launcher"]["{British_SAP_250LB_Bomb_Mk5}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{British_SAP_500LB_Bomb_Mk5}.lua b/_G/launcher/{British_SAP_500LB_Bomb_Mk5}.lua index aa63616b..5125d323 100644 --- a/_G/launcher/{British_SAP_500LB_Bomb_Mk5}.lua +++ b/_G/launcher/{British_SAP_500LB_Bomb_Mk5}.lua @@ -18,18 +18,18 @@ _G["launcher"]["{British_SAP_500LB_Bomb_Mk5}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_tail", + label = "Tail Fuze Well", stringIndex = 1, values = { { dispName = "Tail Pistol No. 30 Mk III", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "s", @@ -41,22 +41,27 @@ _G["launcher"]["{British_SAP_500LB_Bomb_Mk5}"] = { stringIndex = 2, values = { { dispName = 0, - id = 0 + id = 0, + units = "s" }, { dispName = 0.12, - id = 0.12 + id = 0.12, + units = "s" }, { dispName = 1, - id = 1 + id = 1, + units = "s" }, { dispName = 11, - id = 11 + id = 11, + units = "s" } }, - xCtrl = 170, + wCtrl = 60, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_tail", value = 1 } }, baseDim = "rev", @@ -65,12 +70,14 @@ _G["launcher"]["{British_SAP_500LB_Bomb_Mk5}"] = { dimension = "rev", id = "vane_rev_threshold_ctrl_TP30MkIII", label = "Arming Vane Revs. Required", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } } } \ No newline at end of file diff --git a/_G/launcher/{C8E06185-7CD6-4C90-959F-044679E90751}.lua b/_G/launcher/{C8E06185-7CD6-4C90-959F-044679E90751}.lua index 9b673195..a108215c 100644 --- a/_G/launcher/{C8E06185-7CD6-4C90-959F-044679E90751}.lua +++ b/_G/launcher/{C8E06185-7CD6-4C90-959F-044679E90751}.lua @@ -1,12 +1,16 @@ _G["launcher"]["{C8E06185-7CD6-4C90-959F-044679E90751}"] = { CLSID = "{C8E06185-7CD6-4C90-959F-044679E90751}", + Count = 1, + Cx_pil = 0.00061, Elements = { { - ShapeName = "AIM-120B" + ShapeName = "AIM-120" } }, Picture = "us_AIM-120B.png", PictureBlendColor = "0xffffffff", - Weight = 156, - _file = "Scripts/Database/db_weapons_data.lua", + Weight = 157.85, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim120_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 7, "Redacted" }, - displayName = "AIM-120B AMRAAM - Active Rdr AAM" + category = 4, + displayName = "AIM-120B AMRAAM - Active Radar AAM" } \ No newline at end of file diff --git a/_G/launcher/{CAAC1CFD-6745-416B-AFA4-CB57414856D0}.lua b/_G/launcher/{CAAC1CFD-6745-416B-AFA4-CB57414856D0}.lua index 368e3fe6..32eb7dfc 100644 --- a/_G/launcher/{CAAC1CFD-6745-416B-AFA4-CB57414856D0}.lua +++ b/_G/launcher/{CAAC1CFD-6745-416B-AFA4-CB57414856D0}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{CAAC1CFD-6745-416B-AFA4-CB57414856D0}"] = { ShapeName = "LANTIRN" } }, Picture = "Lantirn.png", + ShapeName = "LANTIRN", Weight = 445, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.LANTIRN", attribute = { 4, 15, 44, "Redacted" }, - displayName = "Lantirn F-16" + category = 6, + displayName = "Lantirn F-16", + name = "LANTIRN" } \ No newline at end of file diff --git a/_G/launcher/{CAE48299-A294-4bad-8EE6-89EFC5DCDF00}.lua b/_G/launcher/{CAE48299-A294-4bad-8EE6-89EFC5DCDF00}.lua index 47fb95be..02f59c11 100644 --- a/_G/launcher/{CAE48299-A294-4bad-8EE6-89EFC5DCDF00}.lua +++ b/_G/launcher/{CAE48299-A294-4bad-8EE6-89EFC5DCDF00}.lua @@ -23,8 +23,12 @@ _G["launcher"]["{CAE48299-A294-4bad-8EE6-89EFC5DCDF00}"] = { } }, Picture = "L005.png", Weight = 130, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/illumination_bombs.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 5, 32, "Redacted" }, + category = 1, displayName = "SUU-25 x 8 LUU-2 - Target Marker Flares", + ejectDirection = { -1, 0, 0 }, + ejectVelocity = 15, wsTypeOfWeapon = { 4, 5, 49, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{CC420_GUN_POD}.lua b/_G/launcher/{CC420_GUN_POD}.lua new file mode 100644 index 00000000..0c8a77bb --- /dev/null +++ b/_G/launcher/{CC420_GUN_POD}.lua @@ -0,0 +1,265 @@ +_G["launcher"]["{CC420_GUN_POD}"] = { + CLSID = "{CC420_GUN_POD}", + Cx_pil = 0.001220703125, + Elements = { { + ShapeName = "CC420-GUN-POD" + } }, + Picture = "DEFA.png", + Weight = 205, + _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", + _origin = "Mirage F1 Assets by Aerges", + attribute = { 4, 15, 46, "Redacted" }, + category = 6, + displayName = "CC420 DEFA-550 gun pod - 30mm Revolver Cannon", + gun_mounts = { { + _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", + _origin = "Mirage F1 Assets by Aerges", + aft_gun_mount = false, + azimuth_initial = 0, + category = 8, + display_name = "DEFA553 Gunpod", + drop_cartridge = 0, + effective_fire_distance = 1500, + effects = { { + arg = 1050, + name = "FireEffect" + }, { + barrel_k = 1.2474, + body_k = 6.6066, + name = "HeatEffectExt", + shot_heat = 7.823 + }, { + name = "SmokeEffect" + } }, + ejector_dir = { 0, -5, 0 }, + ejector_pos = { -1.7, -0.15, 0 }, + elevation_initial = -2, + gun = { + barrels_count = 1, + impulse_vec_rot = { + x = 0, + y = 0, + z = 0 + }, + max_burst_length = 120, + rates = { 1350 }, + recoil_coeff = 0.78, + trigger = { + name = "GunTrigger" + } + }, + muzzle_pos = { 2.213762, -0.346013, -0.000696 }, + muzzle_pos_connector = "GUN_POD_F1", + name = "DEFA_553", + short_name = "DEFA553", + supply = { + count = 180, + get_mass = , + get_mass_ = , + max_burst_length = 180, + mixes = { { 1, 3, 1, 2 } }, + shells = { { + AP_cap_caliber = 30, + Da0 = 0.0008, + Da1 = 0, + Dv0 = 0.004, + _unique_resource_name = "weapons.shells.DEFA553_30HE", + caliber = 30, + cartridge = 0, + cartridge_mass = 0.09, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.75, 0.78, 0.27, 1.65 }, + damage_factor = 639, + display_name = "DEFA553 30mm HE", + explosive = 0.052, + full_scale_time = -1, + j = 0, + k1 = 2e-08, + l = 0, + life_time = 7, + manualWeaponFlag = 21, + mass = 0.245, + model_name = "tracer_bullet_A-10", + name = "DEFA553_30HE", + payload = 0.009599409267122, + payload_type = 0, + piercing_mass = 0.049, + rebound_concrete = <1>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.53, + s = 0, + scale_smoke = 1.5, + silent_self_destruction = false, + smoke_opacity = 0.1, + smoke_tail_life_time = 0.3, + subcalibre = false, + tracer_off = -1, + tracer_on = 0, + type_name = "shell", + v0 = 820, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + }, { + AP_cap_caliber = 30, + Da0 = 0.0008, + Da1 = 0, + Dv0 = 0.004, + _unique_resource_name = "weapons.shells.DEFA553_30AP", + caliber = 30, + cartridge = 0, + cartridge_mass = 0.09, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.75, 0.78, 0.27, 1.65 }, + damage_factor = 639, + display_name = "DEFA553 30mm AP", + explosive = 0.02, + full_scale_time = -1, + j = 0, + k1 = 2e-08, + l = 0, + life_time = 31, + manualWeaponFlag = 21, + mass = 0.275, + model_name = "tracer_bullet_yellow", + name = "DEFA553_30AP", + payload = 0.0036920804873546, + payload_type = 0, + piercing_mass = 0.055, + rebound_concrete = <2>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.57, + s = 0, + scale_smoke = 1.5, + silent_self_destruction = false, + smoke_opacity = 0.1, + smoke_tail_life_time = 0.3, + subcalibre = false, + tracer_off = -1, + tracer_on = 0, + type_name = "shell", + v0 = 790, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + }, { + AP_cap_caliber = 30, + Da0 = 0.0008, + Da1 = 0, + Dv0 = 0.004, + _unique_resource_name = "weapons.shells.DEFA553_30APIT", + caliber = 30, + cartridge = 0, + cartridge_mass = 0.09, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.75, 0.78, 0.27, 1.65 }, + damage_factor = 639, + display_name = "DEFA553 30mm API-T", + explosive = 0.02, + full_scale_time = -1, + j = 0, + k1 = 2e-08, + l = 0, + life_time = 31, + manualWeaponFlag = 21, + mass = 0.275, + model_name = "tracer_bullet_crimson", + name = "DEFA553_30APIT", + payload = 0.0036920804873546, + payload_type = 0, + piercing_mass = 0.055, + rebound_concrete = <3>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.58, + s = 0, + scale_smoke = 1.5, + silent_self_destruction = false, + smoke_opacity = 0.1, + smoke_tail_life_time = 1.5, + subcalibre = false, + tracer_off = 4, + tracer_on = 0, + type_name = "shell", + v0 = 780, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + } } + }, + supply_position = { 2, -0.3, -0.4 } + } }, + kind_of_shipping = 2, + name = "{CC420_GUN_POD}", + shape_table_data = { { + file = "CC420-GUN-POD", + index = "Redacted", + name = "CC420-GUN-POD", + username = "DEFA-553" + } } +} \ No newline at end of file diff --git a/_G/launcher/{D1744B93-2A8A-4C4D-B004-7A09CD8C8F3F}.lua b/_G/launcher/{D1744B93-2A8A-4C4D-B004-7A09CD8C8F3F}.lua index 00746992..840a975b 100644 --- a/_G/launcher/{D1744B93-2A8A-4C4D-B004-7A09CD8C8F3F}.lua +++ b/_G/launcher/{D1744B93-2A8A-4C4D-B004-7A09CD8C8F3F}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{D1744B93-2A8A-4C4D-B004-7A09CD8C8F3F}"] = { ShapeName = "LANTIRN-F14-TARGET" } }, Picture = "Lantirn.png", + ShapeName = "LANTIRN-F14-TARGET", Weight = 200, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.LANTIRN-F14-TARGET", attribute = { 4, 15, 44, "Redacted" }, - displayName = "Lantirn Target Pod" + category = 6, + displayName = "Lantirn Target Pod", + name = "LANTIRN-F14-TARGET" } \ No newline at end of file diff --git a/_G/launcher/{D4A8D9B9-5C45-42e7-BBD2-0E54F8308432}.lua b/_G/launcher/{D4A8D9B9-5C45-42e7-BBD2-0E54F8308432}.lua index 89a959b2..3dd03fa6 100644 --- a/_G/launcher/{D4A8D9B9-5C45-42e7-BBD2-0E54F8308432}.lua +++ b/_G/launcher/{D4A8D9B9-5C45-42e7-BBD2-0E54F8308432}.lua @@ -14,6 +14,7 @@ _G["launcher"]["{D4A8D9B9-5C45-42e7-BBD2-0E54F8308432}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-29L (AS-14 Kedge) - 657kg, ASM, Semi-Act Laser", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF03}.lua b/_G/launcher/{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF03}.lua index f552d51c..5fbced96 100644 --- a/_G/launcher/{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF03}.lua +++ b/_G/launcher/{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF03}.lua @@ -15,6 +15,7 @@ _G["launcher"]["{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF03}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-31P (AS-17 Krypton) - 600kg, ARM, IN & Pas Rdr", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF0A}.lua b/_G/launcher/{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF0A}.lua index f1cfd2aa..70afc2dd 100644 --- a/_G/launcher/{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF0A}.lua +++ b/_G/launcher/{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF0A}.lua @@ -15,6 +15,7 @@ _G["launcher"]["{D8F2C90B-887B-4B9E-9FE2-996BC9E9AF0A}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-31P (AS-17 Krypton) - 600kg, ARM, IN & Pas Rdr", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}.lua b/_G/launcher/{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}.lua index 220e4e86..045d2396 100644 --- a/_G/launcher/{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}.lua +++ b/_G/launcher/{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}"] = { CLSID = "{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}", Count = 2, - Cx_pil = 0.00014, + Cx_pil = 0.0015203125, Elements = { "_G/Pylons/lau-105.lua", { Rotation = { 90, 0, 0 }, ShapeName = "AIM-9", @@ -13,8 +13,8 @@ _G["launcher"]["{DB434044-F5D0-4F1F-9BA9-B73027E18DD3}"] = { } }, Picture = "us_AIM-9L.png", PictureBlendColor = "0xffffffff", - Weight = 201.46, - Weight_Empty = 30, + Weight = 377.46, + Weight_Empty = 206, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{DIS_C-701T}.lua b/_G/launcher/{DIS_C-701T}.lua new file mode 100644 index 00000000..de378871 --- /dev/null +++ b/_G/launcher/{DIS_C-701T}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{DIS_C-701T}"] = { + CLSID = "{DIS_C-701T}", + Count = 1, + Cx_pil = 0.0006265625, + Elements = { { + ShapeName = "c701t" + } }, + Picture = "c701t.png", + Weight = 170, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 8, "Redacted" }, + category = 2, + displayName = "C-701T", + ejectVelocity = 1.5 +} \ No newline at end of file diff --git a/_G/launcher/{DIS_TYPE200A}.lua b/_G/launcher/{DIS_TYPE200A}.lua new file mode 100644 index 00000000..4eb3c435 --- /dev/null +++ b/_G/launcher/{DIS_TYPE200A}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{DIS_TYPE200A}"] = { + CLSID = "{DIS_TYPE200A}", + Count = 1, + Cx_pil = 0.00018, + Elements = { { + DrawArgs = { { 1, 1 } }, + ShapeName = "type-200a" + } }, + Picture = "type200a.png", + Weight = 200, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 37, "Redacted" }, + category = 1, + displayName = "TYPE-200A" +} \ No newline at end of file diff --git a/_G/launcher/{F092B80C-BB54-477E-9408-66DEEF740008}.lua b/_G/launcher/{F092B80C-BB54-477E-9408-66DEEF740008}.lua deleted file mode 100644 index 73e32339..00000000 --- a/_G/launcher/{F092B80C-BB54-477E-9408-66DEEF740008}.lua +++ /dev/null @@ -1,12 +0,0 @@ -_G["launcher"]["{F092B80C-BB54-477E-9408-66DEEF740008}"] = { - CLSID = "{F092B80C-BB54-477E-9408-66DEEF740008}", - Count = 18, - Elements = { { - ShapeName = "MK-84" - } }, - Picture = "FAB250.png", - Weight = 16092, - _file = "Scripts/Database/db_weapons_data.lua", - attribute = { 4, 5, 9, "Redacted" }, - displayName = "Mk 84*18" -} \ No newline at end of file diff --git a/_G/launcher/{F4-2-AIM9P5}.lua b/_G/launcher/{F4-2-AIM9P5}.lua index fc1e7a23..dc4db35c 100644 --- a/_G/launcher/{F4-2-AIM9P5}.lua +++ b/_G/launcher/{F4-2-AIM9P5}.lua @@ -16,7 +16,7 @@ _G["launcher"]["{F4-2-AIM9P5}"] = { } }, Picture = "us_AIM-9P-5.png", PictureBlendColor = "0xffffffff", - Weight = 201, + Weight = 191.4, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{F4920E62-A99A-11d8-9897-000476191836}.lua b/_G/launcher/{F4920E62-A99A-11d8-9897-000476191836}.lua index cd6e214a..344d5064 100644 --- a/_G/launcher/{F4920E62-A99A-11d8-9897-000476191836}.lua +++ b/_G/launcher/{F4920E62-A99A-11d8-9897-000476191836}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{F4920E62-A99A-11d8-9897-000476191836}"] = { ShapeName = "Spear" } }, Picture = "kopyo.png", + ShapeName = "Spear", Weight = 115, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.Spear", attribute = { 4, 15, 44, "Redacted" }, - displayName = "Kopyo radar pod" + category = 6, + displayName = "Kopyo radar pod", + name = "Spear" } \ No newline at end of file diff --git a/_G/launcher/{F75187EF-1D9E-4DA9-84B4-1A1A14A3973A}.lua b/_G/launcher/{F75187EF-1D9E-4DA9-84B4-1A1A14A3973A}.lua index ec67290e..fc5cef58 100644 --- a/_G/launcher/{F75187EF-1D9E-4DA9-84B4-1A1A14A3973A}.lua +++ b/_G/launcher/{F75187EF-1D9E-4DA9-84B4-1A1A14A3973A}.lua @@ -5,8 +5,13 @@ _G["launcher"]["{F75187EF-1D9E-4DA9-84B4-1A1A14A3973A}"] = { ShapeName = "SPS-141" } }, Picture = "SPS141.png", + ShapeName = "SPS-141", Weight = 150, - _file = "Scripts/Database/db_weapons_data.lua", + _file = "./CoreMods/aircraft/AircraftWeaponPack/pods.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.containers.SPS-141", attribute = { 4, 15, 45, "Redacted" }, - displayName = "SPS-141 - ECM Jamming Pod" + category = 6, + displayName = "SPS-141 - ECM Jamming Pod", + name = "SPS-141" } \ No newline at end of file diff --git a/_G/launcher/{FAB_250_DUAL_L}.lua b/_G/launcher/{FAB_250_DUAL_L}.lua index 4d50b2e9..d90fac7e 100644 --- a/_G/launcher/{FAB_250_DUAL_L}.lua +++ b/_G/launcher/{FAB_250_DUAL_L}.lua @@ -19,7 +19,7 @@ _G["launcher"]["{FAB_250_DUAL_L}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x FAB-250", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "{FAB_250_DUAL_L}", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{FAB_250_DUAL_R}.lua b/_G/launcher/{FAB_250_DUAL_R}.lua index 870049e0..07a2a436 100644 --- a/_G/launcher/{FAB_250_DUAL_R}.lua +++ b/_G/launcher/{FAB_250_DUAL_R}.lua @@ -19,6 +19,6 @@ _G["launcher"]["{FAB_250_DUAL_R}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x FAB-250", - ejectImpulse = 140, + 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 50a819ca..4bb76a1a 100644 --- a/_G/launcher/{FAB_500_DUAL_L}.lua +++ b/_G/launcher/{FAB_500_DUAL_L}.lua @@ -22,7 +22,7 @@ _G["launcher"]["{FAB_500_DUAL_L}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x FAB-500", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "{FAB_500_DUAL_L}", wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{FAB_500_DUAL_R}.lua b/_G/launcher/{FAB_500_DUAL_R}.lua index c0de0626..a9d483de 100644 --- a/_G/launcher/{FAB_500_DUAL_R}.lua +++ b/_G/launcher/{FAB_500_DUAL_R}.lua @@ -22,6 +22,6 @@ _G["launcher"]["{FAB_500_DUAL_R}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x FAB-500", - ejectImpulse = 140, + ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{FE382A68-8620-4AC0-BDF5-709BFE3977D7}.lua b/_G/launcher/{FE382A68-8620-4AC0-BDF5-709BFE3977D7}.lua index c1ffd9d1..a8b26551 100644 --- a/_G/launcher/{FE382A68-8620-4AC0-BDF5-709BFE3977D7}.lua +++ b/_G/launcher/{FE382A68-8620-4AC0-BDF5-709BFE3977D7}.lua @@ -15,6 +15,7 @@ _G["launcher"]["{FE382A68-8620-4AC0-BDF5-709BFE3977D7}"] = { _file = "Scripts/Database/db_weapons_data.lua", attribute = { 4, 4, 32, "Redacted" }, displayName = "Kh-58U (AS-11 Kilter) - 640kg, ARM, IN & Pas Rdr", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 3, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{GAR-8}.lua b/_G/launcher/{GAR-8}.lua index 576aab9e..7f02bcd5 100644 --- a/_G/launcher/{GAR-8}.lua +++ b/_G/launcher/{GAR-8}.lua @@ -1,7 +1,7 @@ _G["launcher"]["{GAR-8}"] = { CLSID = "{GAR-8}", Count = 1, - Cx_pil = 0.00014, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, ShapeName = "aero-3b" @@ -11,8 +11,8 @@ _G["launcher"]["{GAR-8}"] = { } }, Picture = "us_AIM-9B.png", PictureBlendColor = "0xffffffff", - Weight = 89.39, - Weight_Empty = 15, + Weight = 115.39, + Weight_Empty = 41, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, diff --git a/_G/launcher/{HSAB-6xAGM-84}.lua b/_G/launcher/{HSAB-6xAGM-84}.lua new file mode 100644 index 00000000..5f58f8c7 --- /dev/null +++ b/_G/launcher/{HSAB-6xAGM-84}.lua @@ -0,0 +1,39 @@ +_G["launcher"]["{HSAB-6xAGM-84}"] = { + CLSID = "{HSAB-6xAGM-84}", + Count = 6, + Cx_pil = 0.005, + Elements = { { + IsAdapter = true, + ShapeName = "b-52_HSAB" + }, { + ShapeName = "AGM-84", + connector_name = "Pylon1" + }, { + ShapeName = "AGM-84", + connector_name = "Pylon3" + }, { + ShapeName = "AGM-84", + connector_name = "Pylon7" + }, { + ShapeName = "AGM-84", + connector_name = "Pylon9" + }, { + ShapeName = "AGM-84", + connector_name = "Pylon2" + }, { + ShapeName = "AGM-84", + connector_name = "Pylon8" + } }, + Picture = "agm84a.png", + Weight = 5054.6, + Weight_Empty = 1088.6, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Aircraft/B_52H.lua", + _origin = "HeavyMetalCore", + attribute = { 4, 4, 32, "Redacted" }, + category = 2, + displayName = "HSAB with 6 x AGM-84", + ejectPitchRate = -10, + ejectVelocity = 2, + name = "{HSAB-6xAGM-84}", + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{20_x_AGM_86C}.lua b/_G/launcher/{KD_20}.lua similarity index 51% rename from _G/launcher/{20_x_AGM_86C}.lua rename to _G/launcher/{KD_20}.lua index e0ca4337..2bfda334 100644 --- a/_G/launcher/{20_x_AGM_86C}.lua +++ b/_G/launcher/{KD_20}.lua @@ -1,14 +1,14 @@ -_G["launcher"]["{20_x_AGM_86C}"] = { - CLSID = "{20_x_AGM_86C}", - Count = 20, +_G["launcher"]["{KD_20}"] = { + CLSID = "{KD_20}", + Count = 1, Elements = { { - ShapeName = "agm-86" + ShapeName = "kd20" } }, - Picture = "AGM86.png", - Weight = 41000, + Picture = "kd20.png", + Weight = 1700, _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 8, "Redacted" }, category = 2, - displayName = "20 x AGM-86C" + displayName = "KD-20" } \ No newline at end of file diff --git a/_G/launcher/{KD_63}.lua b/_G/launcher/{KD_63}.lua new file mode 100644 index 00000000..bd6c8d7f --- /dev/null +++ b/_G/launcher/{KD_63}.lua @@ -0,0 +1,15 @@ +_G["launcher"]["{KD_63}"] = { + CLSID = "{KD_63}", + Count = 1, + Cx_pil = 0.0018, + Elements = { { + ShapeName = "kd63" + } }, + Picture = "kd63.png", + Weight = 2000, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 8, "Redacted" }, + category = 2, + displayName = "KD-63" +} \ No newline at end of file diff --git a/_G/launcher/{LAU-131 - 7 AGR-20 M282}.lua b/_G/launcher/{LAU-131 - 7 AGR-20 M282}.lua index f6120d4c..a94cc52d 100644 --- a/_G/launcher/{LAU-131 - 7 AGR-20 M282}.lua +++ b/_G/launcher/{LAU-131 - 7 AGR-20 M282}.lua @@ -32,7 +32,7 @@ _G["launcher"]["{LAU-131 - 7 AGR-20 M282}"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - category = 2, + category = 3, displayName = 'LAU-131 pod - 7 x 2.75" Hydra, Laser Guided Rkts M282, MPP APKWS', name = "{LAU-131 - 7 AGR-20 M282}", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } diff --git a/_G/launcher/{LAU-131 - 7 AGR-20A}.lua b/_G/launcher/{LAU-131 - 7 AGR-20A}.lua index 94802eaf..0a953c5a 100644 --- a/_G/launcher/{LAU-131 - 7 AGR-20A}.lua +++ b/_G/launcher/{LAU-131 - 7 AGR-20A}.lua @@ -32,7 +32,7 @@ _G["launcher"]["{LAU-131 - 7 AGR-20A}"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - category = 2, + category = 3, displayName = 'LAU-131 pod - 7 x 2.75" Hydra, Laser Guided Rkts M151, HE APKWS', name = "{LAU-131 - 7 AGR-20A}", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } diff --git a/_G/launcher/{LAU-131x3 - 7 AGR-20 M282}.lua b/_G/launcher/{LAU-131x3 - 7 AGR-20 M282}.lua index b1a73dd5..48f9f92f 100644 --- a/_G/launcher/{LAU-131x3 - 7 AGR-20 M282}.lua +++ b/_G/launcher/{LAU-131x3 - 7 AGR-20 M282}.lua @@ -74,7 +74,7 @@ _G["launcher"]["{LAU-131x3 - 7 AGR-20 M282}"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - category = 2, + category = 3, displayName = 'BRU-42 with 3 x LAU-131 pods - 7 x 2.75" Hydra, Laser Guided Rkts M282, MPP APKWS', name = "{LAU-131x3 - 7 AGR-20 M282}", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } diff --git a/_G/launcher/{LAU-131x3 - 7 AGR-20A}.lua b/_G/launcher/{LAU-131x3 - 7 AGR-20A}.lua index 57740497..92be721c 100644 --- a/_G/launcher/{LAU-131x3 - 7 AGR-20A}.lua +++ b/_G/launcher/{LAU-131x3 - 7 AGR-20A}.lua @@ -74,7 +74,7 @@ _G["launcher"]["{LAU-131x3 - 7 AGR-20A}"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, - category = 2, + category = 3, displayName = 'BRU-42 with 3 x LAU-131 pods - 7 x 2.75" Hydra, Laser Guided Rkts M151, HE APKWS', name = "{LAU-131x3 - 7 AGR-20A}", wsTypeOfWeapon = { 4, 4, 8, "Redacted" } diff --git a/_G/launcher/{LAU_7_AGM_122_SIDEARM}.lua b/_G/launcher/{LAU_7_AGM_122_SIDEARM}.lua index a2016830..1d4af0da 100644 --- a/_G/launcher/{LAU_7_AGM_122_SIDEARM}.lua +++ b/_G/launcher/{LAU_7_AGM_122_SIDEARM}.lua @@ -2,10 +2,7 @@ _G["launcher"]["{LAU_7_AGM_122_SIDEARM}"] = { CLSID = "{LAU_7_AGM_122_SIDEARM}", Count = 1, Cx_pil = 0.001959765625, - Elements = { { - IsAdapter = true, - ShapeName = "aero-3b" - }, { + Elements = { "_G/Pylons/aero-3b.lua", { ShapeName = "AIM-9B", connector_name = "Point" } }, diff --git a/_G/launcher/{MOSQUITO_100GAL_SLIPPER_TANK}.lua b/_G/launcher/{MOSQUITO_100GAL_SLIPPER_TANK}.lua index 335e5034..9968c8e1 100644 --- a/_G/launcher/{MOSQUITO_100GAL_SLIPPER_TANK}.lua +++ b/_G/launcher/{MOSQUITO_100GAL_SLIPPER_TANK}.lua @@ -8,7 +8,7 @@ _G["launcher"]["{MOSQUITO_100GAL_SLIPPER_TANK}"] = { PictureBlendColor = "0xffffffff", Weight = 375.3, Weight_Empty = 48, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", _unique_resource_name = "weapons.droptanks.Mosquito_Drop_Tank_100gal", attribute = { 1, 3, 43, "Redacted" }, diff --git a/_G/launcher/{MOSQUITO_50GAL_SLIPPER_TANK}.lua b/_G/launcher/{MOSQUITO_50GAL_SLIPPER_TANK}.lua index 5f486cb8..c6316794 100644 --- a/_G/launcher/{MOSQUITO_50GAL_SLIPPER_TANK}.lua +++ b/_G/launcher/{MOSQUITO_50GAL_SLIPPER_TANK}.lua @@ -8,7 +8,7 @@ _G["launcher"]["{MOSQUITO_50GAL_SLIPPER_TANK}"] = { PictureBlendColor = "0xffffffff", Weight = 187.7, Weight_Empty = 24, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", _unique_resource_name = "weapons.droptanks.Mosquito_Drop_Tank_50gal", attribute = { 1, 3, 43, "Redacted" }, diff --git a/_G/launcher/{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua index 27206c95..1dd01a2d 100644 --- a/_G/launcher/{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua @@ -14,7 +14,7 @@ _G["launcher"]["{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { PictureBlendColor = "0xffffffff", Weight = 174, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, diff --git a/_G/launcher/{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua index 9fc710fa..5099ff36 100644 --- a/_G/launcher/{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua @@ -14,7 +14,7 @@ _G["launcher"]["{MOSSIE_2_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = { PictureBlendColor = "0xffffffff", Weight = 174, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, diff --git a/_G/launcher/{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua index 32068cdd..c35631d9 100644 --- a/_G/launcher/{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua @@ -14,7 +14,7 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { PictureBlendColor = "0xffffffff", Weight = 193.2, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, @@ -25,18 +25,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Fuze No. 899 Mk I", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -45,16 +45,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { dimension = "s", id = "function_delay_ctrl_NFNo899MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -63,13 +65,15 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { dimension = "s", id = "arm_delay_ctrl_NFNo899MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua index b372b032..2321e0d7 100644 --- a/_G/launcher/{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua @@ -14,7 +14,7 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = PictureBlendColor = "0xffffffff", Weight = 193.2, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, @@ -25,18 +25,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Fuze No. 899 Mk I", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -45,16 +45,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = dimension = "s", id = "function_delay_ctrl_NFNo899MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -63,13 +65,15 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = dimension = "s", id = "arm_delay_ctrl_NFNo899MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}.lua index 18e682af..7a0f2dd2 100644 --- a/_G/launcher/{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}.lua @@ -14,7 +14,7 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = PictureBlendColor = "0xffffffff", Weight = 206.2, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, @@ -25,7 +25,7 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -35,11 +35,11 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dispName = "Base Fuze No. 865 Mk I", id = 2 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -48,16 +48,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dimension = "s", id = "function_delay_ctrl_BFNo878MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -66,16 +68,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dimension = "ms", id = "function_delay_ctrl_BFNo865MkI", label = "Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -84,16 +88,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dimension = "s", id = "arm_delay_ctrl_BFNo878MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -102,13 +108,15 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dimension = "s", id = "arm_delay_ctrl_BFNo865MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}.lua index fbcceaff..cbde5bf9 100644 --- a/_G/launcher/{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}.lua @@ -14,7 +14,7 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] PictureBlendColor = "0xffffffff", Weight = 206.2, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, @@ -25,7 +25,7 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -35,11 +35,11 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dispName = "Base Fuze No. 865 Mk I", id = 2 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -48,16 +48,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dimension = "s", id = "function_delay_ctrl_BFNo878MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -66,16 +68,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dimension = "ms", id = "function_delay_ctrl_BFNo865MkI", label = "Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -84,16 +88,18 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dimension = "s", id = "arm_delay_ctrl_BFNo878MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -102,13 +108,15 @@ _G["launcher"]["{MOSSIE_2_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dimension = "s", id = "arm_delay_ctrl_BFNo865MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua index 40bc4146..b5ebf636 100644 --- a/_G/launcher/{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua @@ -20,7 +20,7 @@ _G["launcher"]["{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { PictureBlendColor = "0xffffffff", Weight = 218, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, diff --git a/_G/launcher/{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua index e131c6bb..83f82848 100644 --- a/_G/launcher/{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua @@ -20,7 +20,7 @@ _G["launcher"]["{MOSSIE_4_British_AP_25LBNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = { PictureBlendColor = "0xffffffff", Weight = 218, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, diff --git a/_G/launcher/{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua index 71e67fba..d8c3b8b3 100644 --- a/_G/launcher/{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}.lua @@ -20,7 +20,7 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { PictureBlendColor = "0xffffffff", Weight = 256.4, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, @@ -31,18 +31,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Fuze No. 899 Mk I", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -51,16 +51,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { dimension = "s", id = "function_delay_ctrl_NFNo899MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -69,13 +71,15 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_LEFT_WING_RAILS}"] = { dimension = "s", id = "arm_delay_ctrl_NFNo899MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua index 5a6eefe2..8a4d3f29 100644 --- a/_G/launcher/{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}.lua @@ -20,7 +20,7 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = PictureBlendColor = "0xffffffff", Weight = 256.4, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, @@ -31,18 +31,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", - label = "Fuze Type", + id = "NFP_fuze_type_nose", + label = "Nose Fuze Well", stringIndex = 1, values = { { dispName = "Nose Fuze No. 899 Mk I", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -51,16 +51,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = dimension = "s", id = "function_delay_ctrl_NFNo899MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type_nose", value = 1 } }, baseDim = "s", @@ -69,13 +71,15 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBFNo1_3INCHNo1_ON_RIGHT_WING_RAILS}"] = dimension = "s", id = "arm_delay_ctrl_NFNo899MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}.lua index 36eedaae..319cfa01 100644 --- a/_G/launcher/{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}.lua @@ -20,7 +20,7 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = PictureBlendColor = "0xffffffff", Weight = 282.4, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, @@ -31,7 +31,7 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -41,11 +41,11 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dispName = "Base Fuze No. 865 Mk I", id = 2 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -54,16 +54,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dimension = "s", id = "function_delay_ctrl_BFNo878MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -72,16 +74,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dimension = "ms", id = "function_delay_ctrl_BFNo865MkI", label = "Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -90,16 +94,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dimension = "s", id = "arm_delay_ctrl_BFNo878MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -108,13 +114,15 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_LEFT_WING_RAILS}"] = dimension = "s", id = "arm_delay_ctrl_BFNo865MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}.lua b/_G/launcher/{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}.lua index 991fdc1e..123d9fab 100644 --- a/_G/launcher/{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}.lua +++ b/_G/launcher/{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}.lua @@ -20,7 +20,7 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] PictureBlendColor = "0xffffffff", Weight = 282.4, Weight_Empty = 130, - _file = "./CoreMods/WWII Units/MosquitoFBMkVI/MosquitoFBMkVI.lua", + _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _origin = "World War II AI Units by Eagle Dynamics", attribute = <1>{ 4, 7, 33, "Redacted" }, category = 3, @@ -31,7 +31,7 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -41,11 +41,11 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dispName = "Base Fuze No. 865 Mk I", id = 2 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -54,16 +54,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dimension = "s", id = "function_delay_ctrl_BFNo878MkI", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -72,16 +74,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dimension = "ms", id = "function_delay_ctrl_BFNo865MkI", label = "Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -90,16 +94,18 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dimension = "s", id = "arm_delay_ctrl_BFNo878MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -108,13 +114,15 @@ _G["launcher"]["{MOSSIE_4_British_HE_60LBSAPNo2_3INCHNo1_ON_RIGHT_WING_RAILS}"] dimension = "s", id = "arm_delay_ctrl_BFNo865MkI", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon =
} \ No newline at end of file diff --git a/_G/launcher/{R-13M1}.lua b/_G/launcher/{R-13M1}.lua index 68e1af9e..d90043e3 100644 --- a/_G/launcher/{R-13M1}.lua +++ b/_G/launcher/{R-13M1}.lua @@ -1,21 +1,23 @@ _G["launcher"]["{R-13M1}"] = { CLSID = "{R-13M1}", Count = 1, - Cx_pil = 0.0001, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, ShapeName = "apu-13mt" }, { Position = { 0.35, -0.135, 0 }, - ShapeName = "r-13m1" + ShapeName = "R-13M1" } }, Picture = "medium_missile_IR.png", - Weight = 122.4, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + PictureBlendColor = "0xffffffff", + Weight = 146.8, + Weight_Empty = 55, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-13M1 - AAM, IR guided", + displayName = "APU-13MT with R-13M1 (AA-2 Atoll-D) - IR AAM", name = "{R-13M1}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-13M}.lua b/_G/launcher/{R-13M}.lua index 586b5c6b..61997bac 100644 --- a/_G/launcher/{R-13M}.lua +++ b/_G/launcher/{R-13M}.lua @@ -1,18 +1,23 @@ _G["launcher"]["{R-13M}"] = { CLSID = "{R-13M}", Count = 1, - Cx_pil = 0.0001, - Elements = { "_G/Pylons/apu-13mt.lua", { + Cx_pil = 0.00061015625, + Elements = { { + IsAdapter = true, + ShapeName = "apu-13mt" + }, { Position = { 0.35, -0.135, 0 }, - ShapeName = "r-13m" + ShapeName = "R-13M" } }, Picture = "medium_missile_IR.png", - Weight = 119.7, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + PictureBlendColor = "0xffffffff", + Weight = 143.9, + Weight_Empty = 55, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-13M - AAM, IR guided", + displayName = "APU-13MT with R-13M (AA-2 Atoll-D) - IR AAM", name = "{R-13M}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-3R}.lua b/_G/launcher/{R-3R}.lua index c7bccdf6..a234f39d 100644 --- a/_G/launcher/{R-3R}.lua +++ b/_G/launcher/{R-3R}.lua @@ -1,18 +1,23 @@ _G["launcher"]["{R-3R}"] = { CLSID = "{R-3R}", Count = 1, - Cx_pil = 0.0001, - Elements = { "_G/Pylons/apu-13u-2.lua", { - Position = { 0, -0.165, 0 }, - ShapeName = "r-3r" + Cx_pil = 0.00061015625, + Elements = { { + IsAdapter = true, + ShapeName = "apu-13u-2" + }, { + Position = { 0.3, -0.165, 0 }, + ShapeName = "R-3R" } }, - Picture = "medium_missile_SARH.png", - Weight = 111.5, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + Picture = "medium_missile_IR.png", + PictureBlendColor = "0xffffffff", + Weight = 114.14, + Weight_Empty = 31.3, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-3R - AAM, radar guided", + displayName = "APU-13U-2 with R-3R (AA-2 Atoll-C) - Semi Active AAM", name = "{R-3R}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-3S}.lua b/_G/launcher/{R-3S}.lua index 0ec29925..1198abe6 100644 --- a/_G/launcher/{R-3S}.lua +++ b/_G/launcher/{R-3S}.lua @@ -1,22 +1,20 @@ _G["launcher"]["{R-3S}"] = { CLSID = "{R-3S}", Count = 1, - Cx_pil = 0.0001, - Elements = { { - IsAdapter = true, - Position = { 0, -0.555, 0 }, - ShapeName = "apu-13u-2" - }, { + Cx_pil = 0.00061015625, + Elements = { "_G/Pylons/apu-13u-2.lua", { Position = { 0.3, -0.165, 0 }, - ShapeName = "r-3s" + ShapeName = "R-3S" } }, Picture = "medium_missile_IR.png", - Weight = 103.3, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + PictureBlendColor = "0xffffffff", + Weight = 106.6, + Weight_Empty = 31.3, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-3S - AAM, IR guided", + displayName = "APU-13U-2 with R-3S (AA-2 Atoll-B) - IR AAM", name = "{R-3S}", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-60 2L}.lua b/_G/launcher/{R-60 2L}.lua index c6bd67c9..aa18a1c5 100644 --- a/_G/launcher/{R-60 2L}.lua +++ b/_G/launcher/{R-60 2L}.lua @@ -1,22 +1,23 @@ _G["launcher"]["{R-60 2L}"] = { CLSID = "{R-60 2L}", Count = 2, - Cx_pil = 0.0002, - Elements = { "_G/Pylons/apu-60-2l.lua", { - Position = { 0.58, -0.255, 0 }, - ShapeName = "r-60a" + Cx_pil = 0.0012396484375, + Elements = { { + ShapeName = "apu-60-2_L" }, { - Position = { 0.58, -0.077, -0.13 }, - Rotation = { 90, 0, 0 }, - ShapeName = "r-60a" + ShapeName = "r-60a", + connector_name = "Point Pilon R60" + }, { + ShapeName = "r-60a", + connector_name = "Point Pilon R60_1" } }, Picture = "r60.png", - Weight = 122, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + Weight = 157, + Weight_Empty = 71, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-60 x 2", - name = "{R-60 2L}", + displayName = "APU-60-2M with 2 x R-60 (AA-8 Aphid) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-60 2R}.lua b/_G/launcher/{R-60 2R}.lua index c7880d4b..67ecc073 100644 --- a/_G/launcher/{R-60 2R}.lua +++ b/_G/launcher/{R-60 2R}.lua @@ -1,22 +1,23 @@ _G["launcher"]["{R-60 2R}"] = { CLSID = "{R-60 2R}", Count = 2, - Cx_pil = 0.0002, - Elements = { "_G/Pylons/apu-60-2r.lua", { - Position = { 0.58, -0.255, 0 }, - ShapeName = "r-60a" + Cx_pil = 0.0012396484375, + Elements = { { + ShapeName = "apu-60-2_R" }, { - Position = { 0.58, -0.077, 0.13 }, - Rotation = { -90, 0, 0 }, - ShapeName = "r-60a" + ShapeName = "r-60a", + connector_name = "Point Pilon R60" + }, { + ShapeName = "r-60a", + connector_name = "Point Pilon R60_1" } }, Picture = "r60.png", - Weight = 122, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + Weight = 157, + Weight_Empty = 71, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-60 x 2", - name = "{R-60 2R}", + displayName = "APU-60-2M with 2 x R-60 (AA-8 Aphid) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-60M 2L}.lua b/_G/launcher/{R-60M 2L}.lua index 8092fcb1..c50a7788 100644 --- a/_G/launcher/{R-60M 2L}.lua +++ b/_G/launcher/{R-60M 2L}.lua @@ -1,25 +1,23 @@ _G["launcher"]["{R-60M 2L}"] = { CLSID = "{R-60M 2L}", Count = 2, - Cx_pil = 0.0002, + Cx_pil = 0.0012396484375, Elements = { { - IsAdapter = true, - ShapeName = "apu-60-2l" + ShapeName = "apu-60-2_L" }, { - Position = { 0.6, -0.255, 0 }, - ShapeName = "r-60" + ShapeName = "r-60", + connector_name = "Point Pilon R60" }, { - Position = { 0.6, -0.077, -0.13 }, - Rotation = { 90, 0, 0 }, - ShapeName = "r-60" + ShapeName = "r-60", + connector_name = "Point Pilon R60_1" } }, Picture = "r60.png", - Weight = 122, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + Weight = 158, + Weight_Empty = 71, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-60M x 2", - name = "{R-60M 2L}", + displayName = "APU-60-2M with 2 x R-60M (AA-8 Aphid-B) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-60M 2R}.lua b/_G/launcher/{R-60M 2R}.lua index 1cdb896b..bda51d01 100644 --- a/_G/launcher/{R-60M 2R}.lua +++ b/_G/launcher/{R-60M 2R}.lua @@ -1,25 +1,23 @@ _G["launcher"]["{R-60M 2R}"] = { CLSID = "{R-60M 2R}", Count = 2, - Cx_pil = 0.0002, + Cx_pil = 0.0012396484375, Elements = { { - IsAdapter = true, - ShapeName = "apu-60-2r" + ShapeName = "apu-60-2_R" }, { - Position = { 0.6, -0.255, 0 }, - ShapeName = "r-60" + ShapeName = "r-60", + connector_name = "Point Pilon R60" }, { - Position = { 0.6, -0.077, 0.13 }, - Rotation = { -90, 0, 0 }, - ShapeName = "r-60" + ShapeName = "r-60", + connector_name = "Point Pilon R60_1" } }, Picture = "r60.png", - Weight = 122, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + Weight = 158, + Weight_Empty = 71, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-60M x 2", - name = "{R-60M 2R}", + displayName = "APU-60-2M with 2 x R-60M (AA-8 Aphid-B) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-60M}.lua b/_G/launcher/{R-60M}.lua index d240e673..1e82a9c2 100644 --- a/_G/launcher/{R-60M}.lua +++ b/_G/launcher/{R-60M}.lua @@ -1,22 +1,21 @@ _G["launcher"]["{R-60M}"] = { CLSID = "{R-60M}", Count = 1, - Cx_pil = 0.0001, + Cx_pil = 0.00051982421875, Elements = { { IsAdapter = true, - Position = { 0, -0.155, 0 }, - ShapeName = "apu-60" + ShapeName = "APU-60-1" }, { - Position = { 0.45, -0.17, 0 }, - ShapeName = "r-60" + ShapeName = "r-60", + connector_name = "Point Pilon R60" } }, Picture = "r60.png", - Weight = 58.5, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + Weight = 75.5, + Weight_Empty = 32, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-60M", - name = "{R-60M}", + displayName = "APU-60-1M with R-60M (AA-8 Aphid-B) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R-60}.lua b/_G/launcher/{R-60}.lua index 17a63726..501f8339 100644 --- a/_G/launcher/{R-60}.lua +++ b/_G/launcher/{R-60}.lua @@ -1,18 +1,18 @@ _G["launcher"]["{R-60}"] = { CLSID = "{R-60}", Count = 1, - Cx_pil = 0.0001, - Elements = { "_G/Pylons/apu-60.lua", { - Position = { 0.67, -0.163, 0 }, - ShapeName = "r-60a" + Cx_pil = 0.00051982421875, + Elements = { "_G/Pylons/APU-60-1.lua", { + ShapeName = "r-60a", + connector_name = "Point Pilon R60" } }, Picture = "r60.png", - Weight = 58.5, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + Weight = 75, + Weight_Empty = 32, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "R-60", - name = "{R-60}", + displayName = "APU-60-1M with R-60 (AA-8 Aphid) - IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{RBK_250_PTAB25M_DUAL_L}.lua b/_G/launcher/{RBK_250_PTAB25M_DUAL_L}.lua index f98fb508..d1616635 100644 --- a/_G/launcher/{RBK_250_PTAB25M_DUAL_L}.lua +++ b/_G/launcher/{RBK_250_PTAB25M_DUAL_L}.lua @@ -22,7 +22,7 @@ _G["launcher"]["{RBK_250_PTAB25M_DUAL_L}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x RBK-250 PTAB-2.5M", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "{RBK_250_PTAB25M_DUAL_L}", wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{RBK_250_PTAB25M_DUAL_R}.lua b/_G/launcher/{RBK_250_PTAB25M_DUAL_R}.lua index 7b7815d0..2d3704fc 100644 --- a/_G/launcher/{RBK_250_PTAB25M_DUAL_R}.lua +++ b/_G/launcher/{RBK_250_PTAB25M_DUAL_R}.lua @@ -22,6 +22,6 @@ _G["launcher"]["{RBK_250_PTAB25M_DUAL_R}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x RBK-250 PTAB-2.5M", - ejectImpulse = 140, + 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 60877ea3..29fe0d4d 100644 --- a/_G/launcher/{RBK_500_PTAB105_DUAL_L}.lua +++ b/_G/launcher/{RBK_500_PTAB105_DUAL_L}.lua @@ -23,7 +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", - ejectImpulse = 140, + ejectVelocity = 1.8, name = "{RBK_500_PTAB105_DUAL_L}", wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{RBK_500_PTAB105_DUAL_R}.lua b/_G/launcher/{RBK_500_PTAB105_DUAL_R}.lua index 8064e13e..530b08f5 100644 --- a/_G/launcher/{RBK_500_PTAB105_DUAL_R}.lua +++ b/_G/launcher/{RBK_500_PTAB105_DUAL_R}.lua @@ -23,6 +23,6 @@ _G["launcher"]["{RBK_500_PTAB105_DUAL_R}"] = { attribute = { 4, 5, 32, "Redacted" }, category = 1, displayName = "2 x RBK-500-255 PTAB-10-5", - ejectImpulse = 140, + ejectVelocity = 1.8, wsTypeOfWeapon = { 4, 5, 38, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{R_13M1}.lua b/_G/launcher/{R_13M1}.lua new file mode 100644 index 00000000..929f02e6 --- /dev/null +++ b/_G/launcher/{R_13M1}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{R_13M1}"] = { + CLSID = "{R_13M1}", + Count = 1, + Cx_pil = 0.00041015625, + Elements = { { + ShapeName = "R-13M1" + } }, + Picture = "medium_missile_IR.png", + PictureBlendColor = "0xffffffff", + Weight = 90.6, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "R-13M1 (AA-2 Atoll-D) - IR AAM" +} \ No newline at end of file diff --git a/_G/launcher/{R_13M}.lua b/_G/launcher/{R_13M}.lua new file mode 100644 index 00000000..0f9724af --- /dev/null +++ b/_G/launcher/{R_13M}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{R_13M}"] = { + CLSID = "{R_13M}", + Count = 1, + Cx_pil = 0.00041015625, + Elements = { { + ShapeName = "R-13M" + } }, + Picture = "medium_missile_IR.png", + PictureBlendColor = "0xffffffff", + Weight = 87.7, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "R-13M (AA-2 Atoll-D) - IR AAM" +} \ No newline at end of file diff --git a/_G/launcher/{R_3R}.lua b/_G/launcher/{R_3R}.lua new file mode 100644 index 00000000..bc223e03 --- /dev/null +++ b/_G/launcher/{R_3R}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{R_3R}"] = { + CLSID = "{R_3R}", + Count = 1, + Cx_pil = 0.00041015625, + Elements = { { + ShapeName = "R-3R" + } }, + Picture = "medium_missile_IR.png", + PictureBlendColor = "0xffffffff", + Weight = 82.84, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "R-3R (AA-2 Atoll-C) - Semi Active AAM" +} \ No newline at end of file diff --git a/_G/launcher/{R_3S}.lua b/_G/launcher/{R_3S}.lua new file mode 100644 index 00000000..988f1094 --- /dev/null +++ b/_G/launcher/{R_3S}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{R_3S}"] = { + CLSID = "{R_3S}", + Count = 1, + Cx_pil = 0.00041015625, + Elements = { { + ShapeName = "R-3S" + } }, + Picture = "medium_missile_IR.png", + PictureBlendColor = "0xffffffff", + Weight = 75.3, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "R-3S (AA-2 Atoll-B) - IR AAM" +} \ No newline at end of file diff --git a/_G/launcher/{R_60}.lua b/_G/launcher/{R_60}.lua new file mode 100644 index 00000000..51378e90 --- /dev/null +++ b/_G/launcher/{R_60}.lua @@ -0,0 +1,15 @@ +_G["launcher"]["{R_60}"] = { + CLSID = "{R_60}", + Count = 1, + Cx_pil = 0.00031982421875, + Elements = { { + ShapeName = "r-60a" + } }, + Picture = "r60.png", + Weight = 43, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "R-60 (AA-8 Aphid) - IR AAM" +} \ No newline at end of file diff --git a/_G/launcher/{Rb_24J}.lua b/_G/launcher/{Rb_24J}.lua new file mode 100644 index 00000000..5e36c860 --- /dev/null +++ b/_G/launcher/{Rb_24J}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{Rb_24J}"] = { + CLSID = "{Rb_24J}", + Count = 1, + Cx_pil = 0.00041015625, + Elements = { { + ShapeName = "Rb_24J" + } }, + Picture = "us_AIM-9P.png", + PictureBlendColor = "0xffffffff", + Weight = 80.7, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "RB-24J (AIM-9P3) Sidewinder IR AAM" +} \ No newline at end of file diff --git a/_G/launcher/{Rb_24}.lua b/_G/launcher/{Rb_24}.lua new file mode 100644 index 00000000..94109005 --- /dev/null +++ b/_G/launcher/{Rb_24}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{Rb_24}"] = { + CLSID = "{Rb_24}", + Count = 1, + Cx_pil = 0.00041015625, + Elements = { { + ShapeName = "Rb_24" + } }, + Picture = "us_AIM-9B.png", + PictureBlendColor = "0xffffffff", + Weight = 74.39, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "RB-24 (AIM-9B) Sidewinder IR AAM" +} \ No newline at end of file diff --git a/_G/launcher/{Rb_74}.lua b/_G/launcher/{Rb_74}.lua new file mode 100644 index 00000000..71aa8e80 --- /dev/null +++ b/_G/launcher/{Rb_74}.lua @@ -0,0 +1,16 @@ +_G["launcher"]["{Rb_74}"] = { + CLSID = "{Rb_74}", + Count = 1, + Cx_pil = 0.00041015625, + Elements = { { + ShapeName = "Rb_74" + } }, + Picture = "us_AIM-9L.png", + PictureBlendColor = "0xffffffff", + Weight = 85.73, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 4, 7, "Redacted" }, + category = 4, + displayName = "RB-74 (AIM-9L) Sidewinder IR AAM" +} \ No newline at end of file diff --git a/_G/launcher/{Robot24J}.lua b/_G/launcher/{Robot24J}.lua index 4233dddf..7951fe41 100644 --- a/_G/launcher/{Robot24J}.lua +++ b/_G/launcher/{Robot24J}.lua @@ -1,22 +1,22 @@ _G["launcher"]["{Robot24J}"] = { CLSID = "{Robot24J}", Count = 1, - Cx_pil = 0.00016, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, - Position = { 0, 0, 0 }, ShapeName = "aero-3b" }, { - Position = { 0, -0.125, 0 }, - ShapeName = "aim-9p5" + ShapeName = "Rb_24J", + connector_name = "Point" } }, - Picture = "aim9p.png", - Weight = 119, - Weight_Empty = 37.6, - _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", - _origin = "AJS37 AI by Heatblur Simulations", + Picture = "us_AIM-9P.png", + PictureBlendColor = "0xffffffff", + Weight = 121.7, + Weight_Empty = 41, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "Rb-24J (AIM-9P) Sidewinder IR AAM", + displayName = "LAU-7 with RB-24J (AIM-9P3) Sidewinder IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{Robot24}.lua b/_G/launcher/{Robot24}.lua index 29eae33e..0a050e50 100644 --- a/_G/launcher/{Robot24}.lua +++ b/_G/launcher/{Robot24}.lua @@ -1,18 +1,22 @@ _G["launcher"]["{Robot24}"] = { CLSID = "{Robot24}", Count = 1, - Cx_pil = 0.00016, - Elements = { "_G/Pylons/aero-3b.lua", { - Position = { 0, -0.125, 0 }, - ShapeName = "aim-9b" + Cx_pil = 0.00061015625, + Elements = { { + IsAdapter = true, + ShapeName = "aero-3b" + }, { + ShapeName = "Rb_24", + connector_name = "Point" } }, - Picture = "aim9p.png", - Weight = 112, - Weight_Empty = 37.6, - _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", - _origin = "AJS37 AI by Heatblur Simulations", + Picture = "us_AIM-9B.png", + PictureBlendColor = "0xffffffff", + Weight = 115.39, + Weight_Empty = 41, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "Rb-24 (AIM-9B) Sidewinder IR AAM", + displayName = "LAU-7 with RB-24 (AIM-9B) Sidewinder IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{Robot74}.lua b/_G/launcher/{Robot74}.lua index fb61973b..eb75dd51 100644 --- a/_G/launcher/{Robot74}.lua +++ b/_G/launcher/{Robot74}.lua @@ -1,22 +1,22 @@ _G["launcher"]["{Robot74}"] = { CLSID = "{Robot74}", Count = 1, - Cx_pil = 0.00016, + Cx_pil = 0.00061015625, Elements = { { IsAdapter = true, - Position = { 0, 0, 0 }, ShapeName = "aero-3b" }, { - Position = { 0, -0.1, 0 }, - ShapeName = "AIM-9L" + ShapeName = "Rb_74", + connector_name = "Point" } }, - Picture = "aim9m.png", - Weight = 123, - Weight_Empty = 37.6, - _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", - _origin = "AJS37 AI by Heatblur Simulations", + Picture = "us_AIM-9L.png", + PictureBlendColor = "0xffffffff", + Weight = 126.73, + Weight_Empty = 41, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", attribute = { 4, 4, 32, "Redacted" }, category = 4, - displayName = "Rb-74 (AIM-9L) Sidewinder IR AAM", + displayName = "LAU-7 with RB-74 (AIM-9L) Sidewinder IR AAM", wsTypeOfWeapon = { 4, 4, 7, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{SC_250_T1_L2}.lua b/_G/launcher/{SC_250_T1_L2}.lua index 43dcf89a..d25ee865 100644 --- a/_G/launcher/{SC_250_T1_L2}.lua +++ b/_G/launcher/{SC_250_T1_L2}.lua @@ -18,25 +18,25 @@ _G["launcher"]["{SC_250_T1_L2}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { dispName = "Zünder 25C", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "", control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", label = "Function Delay Mode", stringIndex = 1, values = { { @@ -47,15 +47,15 @@ _G["launcher"]["{SC_250_T1_L2}"] = { id = 2 } }, wCtrl = 75, - xCtrl = 700, - xLbl = 560 + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -64,20 +64,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "s", id = "function_delay_ctrl_oV_VFD_Z25C", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -86,20 +88,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "s", id = "function_delay_ctrl_oV_FFD_Z25C", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -108,20 +112,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "s", id = "function_delay_ctrl_mV_FFD_Z25C", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -130,20 +136,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "ms", id = "function_delay_ctrl_mV_VFD_Z25C", label = "mV Mode Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -152,20 +160,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "s", id = "function_delay_ctrl_Vz_FFD_Z25C", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -174,20 +184,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "s", id = "function_delay_ctrl_Vz_VFD_Z25C", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -196,20 +208,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "ms", id = "arm_delay_ctrl_Strz_VFD_Z25C", label = "Sturz Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -218,20 +232,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "ms", id = "arm_delay_ctrl_Strz_FFD_Z25C", label = "Sturz Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -240,20 +256,22 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "ms", id = "arm_delay_ctrl_Wgrcht_FFD_Z25C", label = "Wagerecht Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -262,12 +280,14 @@ _G["launcher"]["{SC_250_T1_L2}"] = { dimension = "ms", id = "arm_delay_ctrl_Wgrcht_VFD_Z25C", label = "Wagerecht Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/{SC_500_L2}.lua b/_G/launcher/{SC_500_L2}.lua index 34c611d3..d7c758b0 100644 --- a/_G/launcher/{SC_500_L2}.lua +++ b/_G/launcher/{SC_500_L2}.lua @@ -18,7 +18,7 @@ _G["launcher"]["{SC_500_L2}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -28,18 +28,18 @@ _G["launcher"]["{SC_500_L2}"] = { dispName = "Zünder 17", id = 2 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "", control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", label = "Function Delay Mode", stringIndex = 1, values = { { @@ -50,15 +50,15 @@ _G["launcher"]["{SC_500_L2}"] = { id = 2 } }, wCtrl = 75, - xCtrl = 700, - xLbl = 560 + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -67,16 +67,18 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "ms", id = "function_delay_ctrl_oV_VFD_Z38", label = "oV Mode Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -85,20 +87,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "min", id = "function_delay_ctrl_oV_Z17", label = "oV Mode Function Delay", - max = 60, + max = 16666666666.667, min = 0, readOnly = true, step = 0.00016666666666667, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -107,20 +111,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "function_delay_ctrl_oV_FFD_Z38", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -129,20 +135,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "function_delay_ctrl_mV_FFD_Z38", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -151,16 +159,18 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "function_delay_ctrl_mV_VFD_Z38", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -169,20 +179,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "min", id = "function_delay_ctrl_mV_Z17", label = "mV Mode Function Delay", - max = 60, + max = 16666666666.667, min = 0, readOnly = true, step = 0.00016666666666667, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -191,16 +203,18 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "function_delay_ctrl_Vz_FFD_Z38", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -209,20 +223,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "min", id = "function_delay_ctrl_Vz_Z17", label = "Vz Mode Function Delay", - max = 60, + max = 16666666666.667, min = 0, readOnly = true, step = 0.00016666666666667, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -231,20 +247,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "function_delay_ctrl_Vz_VFD_Z38", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -253,16 +271,18 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_FFD_Z38", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -271,20 +291,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_Z17", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -293,20 +315,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_VFD_Z38", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -315,20 +339,22 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_VFD_Z38", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -337,16 +363,18 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_FFD_Z38", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -355,12 +383,14 @@ _G["launcher"]["{SC_500_L2}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_Z17", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/{SD_250_Stg}.lua b/_G/launcher/{SD_250_Stg}.lua index 035279cb..95506af1 100644 --- a/_G/launcher/{SD_250_Stg}.lua +++ b/_G/launcher/{SD_250_Stg}.lua @@ -18,25 +18,25 @@ _G["launcher"]["{SD_250_Stg}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { dispName = "Zünder 38", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "", control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", label = "Function Delay Mode", stringIndex = 1, values = { { @@ -47,15 +47,15 @@ _G["launcher"]["{SD_250_Stg}"] = { id = 2 } }, wCtrl = 75, - xCtrl = 700, - xLbl = 560 + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -64,20 +64,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "ms", id = "function_delay_ctrl_oV_VFD_Z38", label = "oV Mode Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -86,20 +88,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "function_delay_ctrl_oV_FFD_Z38", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -108,20 +112,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "function_delay_ctrl_mV_FFD_Z38", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -130,20 +136,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "function_delay_ctrl_mV_VFD_Z38", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -152,20 +160,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "function_delay_ctrl_Vz_FFD_Z38", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -174,20 +184,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "function_delay_ctrl_Vz_VFD_Z38", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -196,20 +208,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_VFD_Z38", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -218,20 +232,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_FFD_Z38", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -240,20 +256,22 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_FFD_Z38", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -262,12 +280,14 @@ _G["launcher"]["{SD_250_Stg}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_VFD_Z38", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/{SD_500_A}.lua b/_G/launcher/{SD_500_A}.lua index f422fbd8..6e704714 100644 --- a/_G/launcher/{SD_500_A}.lua +++ b/_G/launcher/{SD_500_A}.lua @@ -18,25 +18,25 @@ _G["launcher"]["{SD_500_A}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { dispName = "Zünder 38", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "", control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", label = "Function Delay Mode", stringIndex = 1, values = { { @@ -47,15 +47,15 @@ _G["launcher"]["{SD_500_A}"] = { id = 2 } }, wCtrl = 75, - xCtrl = 700, - xLbl = 560 + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -64,20 +64,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "ms", id = "function_delay_ctrl_oV_VFD_Z38", label = "oV Mode Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -86,20 +88,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "function_delay_ctrl_oV_FFD_Z38", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -108,20 +112,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "function_delay_ctrl_mV_FFD_Z38", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -130,20 +136,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "function_delay_ctrl_mV_VFD_Z38", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -152,20 +160,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "function_delay_ctrl_Vz_FFD_Z38", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -174,20 +184,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "function_delay_ctrl_Vz_VFD_Z38", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -196,20 +208,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_VFD_Z38", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -218,20 +232,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "arm_delay_ctrl_Strz_FFD_Z38", label = "Sturz Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -240,20 +256,22 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_FFD_Z38", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -262,12 +280,14 @@ _G["launcher"]["{SD_500_A}"] = { dimension = "s", id = "arm_delay_ctrl_Wgrcht_VFD_Z38", label = "Wagerecht Mode Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } } } \ No newline at end of file diff --git a/_G/launcher/{Schloss500XIIC1_SC_250_T3_J}.lua b/_G/launcher/{Schloss500XIIC1_SC_250_T3_J}.lua index 9543f0ad..a1b0c0e2 100644 --- a/_G/launcher/{Schloss500XIIC1_SC_250_T3_J}.lua +++ b/_G/launcher/{Schloss500XIIC1_SC_250_T3_J}.lua @@ -20,25 +20,25 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { dispName = "Zünder 25C", id = 1 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "", control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", label = "Function Delay Mode", stringIndex = 1, values = { { @@ -49,15 +49,15 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { id = 2 } }, wCtrl = 75, - xCtrl = 700, - xLbl = 560 + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -66,20 +66,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "s", id = "function_delay_ctrl_oV_VFD_Z25C", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -88,20 +90,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "s", id = "function_delay_ctrl_oV_FFD_Z25C", label = "oV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -110,20 +114,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "s", id = "function_delay_ctrl_mV_FFD_Z25C", label = "mV Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -132,20 +138,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "ms", id = "function_delay_ctrl_mV_VFD_Z25C", label = "mV Mode Function Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 2, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -154,20 +162,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "s", id = "function_delay_ctrl_Vz_FFD_Z25C", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -176,20 +186,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "s", id = "function_delay_ctrl_Vz_VFD_Z25C", label = "Vz Mode Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 700, - xLbl = 560 + wCtrl = 60, + wDim = 30, + xCtrl = 715, + xLbl = 575 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -198,20 +210,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "ms", id = "arm_delay_ctrl_Strz_VFD_Z25C", label = "Sturz Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -220,20 +234,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "ms", id = "arm_delay_ctrl_Strz_FFD_Z25C", label = "Sturz Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 2 } }, baseDim = "s", @@ -242,20 +258,22 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "ms", id = "arm_delay_ctrl_Wgrcht_FFD_Z25C", label = "Wagerecht Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 }, "and", { bNot = false, - id = "GUI_fuze_operation_mode", + id = "NFP_fuze_operation_mode", value = 1 } }, baseDim = "s", @@ -264,13 +282,15 @@ _G["launcher"]["{Schloss500XIIC1_SC_250_T3_J}"] = { dimension = "ms", id = "arm_delay_ctrl_Wgrcht_VFD_Z25C", label = "Wagerecht Mode Arm Delay", - max = 3600000, + max = 1e+15, min = 0, readOnly = true, step = 10, stringIndex = 3, - xCtrl = 465, - xLbl = 265 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 280 } }, wsTypeOfWeapon = { 4, 5, 9, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{TER_9A_2LBDU-50LGB}.lua b/_G/launcher/{TER_9A_2LBDU-50LGB}.lua new file mode 100644 index 00000000..f3da3e5f --- /dev/null +++ b/_G/launcher/{TER_9A_2LBDU-50LGB}.lua @@ -0,0 +1,21 @@ +_G["launcher"]["{TER_9A_2L*BDU-50LGB}"] = { + CLSID = "{TER_9A_2L*BDU-50LGB}", + Count = 2, + Cx_pil = 0.001276, + Elements = { "_G/Pylons/TER-9A.lua", { + ShapeName = "BDU-50LGB", + connector_name = "Point01" + }, { + ShapeName = "BDU-50LGB", + connector_name = "Point02" + } }, + Picture = "gbu12.png", + Weight = 613, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "TER-9A with 2 x BDU-50LGB - 500lb Laser Guided Inert Practice Bomb LD", + name = "{TER_9A_2L*BDU-50LGB}", + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{TER_9A_2RBDU-50LGB}.lua b/_G/launcher/{TER_9A_2RBDU-50LGB}.lua new file mode 100644 index 00000000..b280b753 --- /dev/null +++ b/_G/launcher/{TER_9A_2RBDU-50LGB}.lua @@ -0,0 +1,21 @@ +_G["launcher"]["{TER_9A_2R*BDU-50LGB}"] = { + CLSID = "{TER_9A_2R*BDU-50LGB}", + Count = 2, + Cx_pil = 0.001276, + Elements = { "_G/Pylons/TER-9A.lua", { + ShapeName = "BDU-50LGB", + connector_name = "Point01" + }, { + ShapeName = "BDU-50LGB", + connector_name = "Point03" + } }, + Picture = "gbu12.png", + Weight = 613, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "TER-9A with 2 x BDU-50LGB - 500lb Laser Guided Inert Practice Bomb LD", + name = "{TER_9A_2R*BDU-50LGB}", + wsTypeOfWeapon = { 4, 5, 36, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{TER_9A_3BDU-50HD}.lua b/_G/launcher/{TER_9A_3BDU-50HD}.lua new file mode 100644 index 00000000..f3abf0df --- /dev/null +++ b/_G/launcher/{TER_9A_3BDU-50HD}.lua @@ -0,0 +1,24 @@ +_G["launcher"]["{TER_9A_3*BDU-50HD}"] = { + CLSID = "{TER_9A_3*BDU-50HD}", + Count = 3, + Cx_pil = 0.0015, + Elements = { "_G/Pylons/TER-9A.lua", { + ShapeName = "BDU-50HD", + connector_name = "Point01" + }, { + ShapeName = "BDU-50HD", + connector_name = "Point02" + }, { + ShapeName = "BDU-50HD", + connector_name = "Point03" + } }, + Picture = "BDU-50HD.png", + Weight = 749, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "TER-9A with 3 x BDU-50HD - 500lb Inert Practice Bomb HD", + name = "{TER_9A_3*BDU-50HD}", + wsTypeOfWeapon = { 4, 5, 9, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{TER_9A_3BDU-50LD}.lua b/_G/launcher/{TER_9A_3BDU-50LD}.lua new file mode 100644 index 00000000..20e0c26c --- /dev/null +++ b/_G/launcher/{TER_9A_3BDU-50LD}.lua @@ -0,0 +1,24 @@ +_G["launcher"]["{TER_9A_3*BDU-50LD}"] = { + CLSID = "{TER_9A_3*BDU-50LD}", + Count = 3, + Cx_pil = 0.0012, + Elements = { "_G/Pylons/TER-9A.lua", { + ShapeName = "BDU-50LD", + connector_name = "Point01" + }, { + ShapeName = "BDU-50LD", + connector_name = "Point02" + }, { + ShapeName = "BDU-50LD", + connector_name = "Point03" + } }, + Picture = "BDU-50LD.png", + Weight = 749, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + attribute = { 4, 5, 32, "Redacted" }, + category = 1, + displayName = "TER-9A with 3 x BDU-50LD - 500lb Inert Practice Bomb LD", + name = "{TER_9A_3*BDU-50LD}", + wsTypeOfWeapon = { 4, 5, 9, "Redacted" } +} \ No newline at end of file diff --git a/_G/launcher/{WGr21}.lua b/_G/launcher/{WGr21}.lua index 3457fecf..23a168f9 100644 --- a/_G/launcher/{WGr21}.lua +++ b/_G/launcher/{WGr21}.lua @@ -20,7 +20,7 @@ _G["launcher"]["{WGr21}"] = { control = "comboList", defValue = 1, dimension = "", - id = "GUI_fuze_type", + id = "NFP_fuze_type", label = "Fuze Type", stringIndex = 1, values = { { @@ -30,11 +30,11 @@ _G["launcher"]["{WGr21}"] = { dispName = "Hbgr. Zünder 35 D", id = 2 } }, - wCtrl = 355, - xCtrl = 170 + wCtrl = 360, + xCtrl = 180 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -42,17 +42,19 @@ _G["launcher"]["{WGr21}"] = { defValue = 5.5, dimension = "s", id = "self_destruct_delay_ctrl_ZTZS30", - label = "Self-Destruct Delay", - max = 3600, + label = "Airburst Delay", + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -61,16 +63,18 @@ _G["launcher"]["{WGr21}"] = { dimension = "s", id = "function_delay_ctrl_HBGRZ35D", label = "Function Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 170, + wCtrl = 60, + wDim = 30, + xCtrl = 180, xLbl = 10 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 1 } }, baseDim = "s", @@ -79,16 +83,18 @@ _G["launcher"]["{WGr21}"] = { dimension = "s", id = "arm_delay_ctrl_ZTZS30", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 }, { VisibilityCondition = { { - id = "GUI_fuze_type", + id = "NFP_fuze_type", value = 2 } }, baseDim = "s", @@ -97,13 +103,15 @@ _G["launcher"]["{WGr21}"] = { dimension = "s", id = "arm_delay_ctrl_HBGRZ35D", label = "Arm Delay", - max = 3600, + max = 1000000000000, min = 0, readOnly = true, step = 0.01, stringIndex = 2, - xCtrl = 465, - xLbl = 285 + wCtrl = 60, + wDim = 30, + xCtrl = 480, + xLbl = 290 } }, wsTypeOfWeapon = { 4, 7, 33, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{X-29L}.lua b/_G/launcher/{X-29L}.lua index 08beadc2..7064762d 100644 --- a/_G/launcher/{X-29L}.lua +++ b/_G/launcher/{X-29L}.lua @@ -13,6 +13,7 @@ _G["launcher"]["{X-29L}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "Kh-29L (AS-14 Kedge) - 657kg, ASM, Semi-Act Laser", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{X-29T}.lua b/_G/launcher/{X-29T}.lua index de2363c0..f819aa59 100644 --- a/_G/launcher/{X-29T}.lua +++ b/_G/launcher/{X-29T}.lua @@ -13,6 +13,7 @@ _G["launcher"]["{X-29T}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "Kh-29T (AS-14 Kedge) - 670kg, ASM, TV Guided", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{X-31A}.lua b/_G/launcher/{X-31A}.lua index ade0de6e..9edc1402 100644 --- a/_G/launcher/{X-31A}.lua +++ b/_G/launcher/{X-31A}.lua @@ -14,6 +14,7 @@ _G["launcher"]["{X-31A}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "Kh-31A (AS-17 Krypton) - 610kg, AShM, IN & Act Rdr", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{X-31P}.lua b/_G/launcher/{X-31P}.lua index be0fc1a4..a4bca608 100644 --- a/_G/launcher/{X-31P}.lua +++ b/_G/launcher/{X-31P}.lua @@ -14,6 +14,7 @@ _G["launcher"]["{X-31P}"] = { attribute = { 4, 4, 32, "Redacted" }, category = 2, displayName = "Kh-31P (AS-17 Krypton) - 600kg, ARM, IN & Pas Rdr", - ejectImpulse = 2000, + ejectPitchRate = 0, + ejectVelocity = 4, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/launcher/{Yu_6}.lua b/_G/launcher/{Yu_6}.lua new file mode 100644 index 00000000..f874152d --- /dev/null +++ b/_G/launcher/{Yu_6}.lua @@ -0,0 +1,15 @@ +_G["launcher"]["{Yu_6}"] = { + CLSID = "{Yu_6}", + Count = 1, + Cx_pil = 0.0018, + Elements = { { + ShapeName = "yu6" + } }, + Picture = "agm84a.png", + Weight = 1558, + _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/torpedoes.lua", + _origin = "TechWeaponPack", + attribute = { 4, 8, 11, "Redacted" }, + category = 11, + displayName = "YU-6" +} \ No newline at end of file diff --git a/_G/rockets/ADM_141A.lua b/_G/rockets/ADM_141A.lua index 809f3d34..595dea3d 100644 --- a/_G/rockets/ADM_141A.lua +++ b/_G/rockets/ADM_141A.lua @@ -60,6 +60,7 @@ _G["rockets"]["#Index"] = { turn_point_trigger_dist = 100 }, display_name = "ADM-141A", + display_name_short = "ADM-141A", engine_control = { K = 0, Kd = 0, diff --git a/_G/rockets/ADM_141B.lua b/_G/rockets/ADM_141B.lua index 80814f33..b292af8c 100644 --- a/_G/rockets/ADM_141B.lua +++ b/_G/rockets/ADM_141B.lua @@ -60,6 +60,7 @@ _G["rockets"]["#Index"] = { turn_point_trigger_dist = 100 }, display_name = "ADM-141B", + display_name_short = "ADM-141B", engine_control = { K = 0, Kd = 0, diff --git a/_G/rockets/AGM_114.lua b/_G/rockets/AGM_114.lua index ad6bb5df..42de90a7 100644 --- a/_G/rockets/AGM_114.lua +++ b/_G/rockets/AGM_114.lua @@ -4,7 +4,7 @@ _G["rockets"]["#Index"] = { D_min = 500, Damage = 42.525, Diam = 178, - Escort = 1, + Escort = 0, Fi_excort = 0.44, Fi_rak = 3.14152, Fi_search = 99.9, @@ -72,6 +72,7 @@ _G["rockets"]["#Index"] = { march_start = 0 }, display_name = "AGM-114L Longbow", + display_name_short = "AGM-114L", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A1trim = { 14.1, 14.1, 14.1, 14.1, 14.1, 15.1, 12.6, 10.8, 9.8, 9.1, 8.6, 8.3 }, diff --git a/_G/rockets/AGM_114K.lua b/_G/rockets/AGM_114K.lua index 80556bf0..f49efa6a 100644 --- a/_G/rockets/AGM_114K.lua +++ b/_G/rockets/AGM_114K.lua @@ -75,6 +75,7 @@ _G["rockets"]["#Index"] = { march_start = 0 }, display_name = "AGM-114K Hellfire", + display_name_short = "AGM-114K", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A1trim = { 14.1, 14.1, 14.1, 14.1, 14.1, 15.1, 12.6, 10.8, 9.8, 9.1, 8.6, 8.3 }, diff --git a/_G/rockets/AGM_12A.lua b/_G/rockets/AGM_12A.lua new file mode 100644 index 00000000..c8538a07 --- /dev/null +++ b/_G/rockets/AGM_12A.lua @@ -0,0 +1,149 @@ +_G["rockets"]["#Index"] = { + Cx_pil = 4, + D_max = 13000, + D_min = 1500, + Damage = 113, + Diam = 305, + Escort = 1, + Fi_excort = 0.4, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.1, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 1, + Head_Type = 7, + KillDistance = 0, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7000, 8000, 0, 0, 10000, 10500, 11000, 12000, 200, 0, 0, 7000, 0, 0, 12000, 0, 0, 0, 0, 300, 5000, 6000, 7000, 8500, 10500, 11500, 12500, 11000, 12000, 12500, 400, 5500, 6500, 7500, 8500, 10500, 12500, 12500, 11000, 12000, 12500, 500, 5500, 6500, 7500, 9000, 10500, 12500, 14500, 15500, 15000, 12500, 600, 5500, 6500, 7500, 9000, 11000, 13000, 13000, 15000, 16500, 17000, 700, 6000, 6500, 7500, 9500, 11000, 13000, 15500, 15500, 17500, 18500, 800, 6000, 6500, 7500, 9500, 11500, 13500, 15000, 15500, 18000, 18500, 900, 6000, 6500, 8500, 9500, 11500, 13000, 15000, 16000, 18000, 18500, 1000, 6000, 6500, 8000, 10000, 11500, 13500, 15000, 17000, 17500, 19000, 2000, 9500, 10500, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 3000, 9500, 10500, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 4000, 10000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 5000, 10000, 11000, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 20500, 6000, 10000, 11500, 12500, 14000, 15000, 16500, 17500, 18500, 19500, 21000, 7000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 8000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 9000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 10000, 9500, 11000, 12500, 14000, 15500, 16500, 17500, 18000, 20000, 21000 }, + Life_Time = 30, + M = 263, + Mach_max = 1.8, + MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 500, 500, 500, 750, 500, 0, 0, 0, 200, 2050, 2300, 500, 500, 550, 750, 500, 500, 500, 500, 300, 2000, 500, 500, 500, 500, 750, 500, 500, 500, 500, 400, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 600, 500, 500, 500, 500, 500, 650, 500, 500, 500, 500, 700, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 800, 500, 500, 500, 500, 550, 800, 500, 500, 500, 500, 900, 500, 500, 500, 500, 600, 850, 500, 500, 500, 500, 1000, 500, 500, 500, 500, 600, 800, 500, 500, 500, 500, 2000, 500, 600, 600, 600, 500, 700, 500, 500, 500, 500, 3000, 700, 550, 800, 950, 1200, 500, 750, 650, 500, 500, 4000, 800, 700, 700, 850, 850, 900, 800, 700, 650, 550, 5000, 1000, 800, 900, 1000, 1400, 1100, 900, 800, 700, 700, 6000, 1000, 1000, 1500, 1000, 1500, 1500, 1000, 1000, 1000, 1000, 7000, 2000, 1500, 2000, 2500, 1500, 2000, 1500, 1500, 1000, 1500, 8000, 2500, 2500, 1500, 3500, 1500, 1500, 2500, 1500, 1500, 1500, 9000, 3000, 3000, 3000, 2500, 1500, 2000, 2000, 2500, 1500, 1000, 10000, 3500, 3000, 3500, 4500, 3500, 1500, 2500, 3000, 2500, 2000 }, + Name = "Redacted", + Nr_max = 1.2, + OmViz_max = 99.9, + Range_max = 13000, + Reflection = 0.03, + X_back = -0.922, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Kd = 0.07, + Ki = 0.01, + Kp = 0.07, + delay = 2, + fins_discreet = 0.08, + fins_limit = 1, + max_ctrl_angle = 6.24, + no_ctrl_center_ang = 2e-05, + op_time = 30, + self_destruct_command_timer = 3, + self_destruct_maneuver = 1, + self_destruct_maneuver_cmd_y = 0.3, + self_destruct_maneuver_cmd_z = 0.6, + self_destruct_no_signal_lim = 0.5, + self_destruct_start_timer = 18 + }, + booster = { + custom_smoke_dissipation_factor = 1, + effect_type = 0, + fuel_mass = 41.88, + impulse = 230, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.01, + tail_width = 0.18, + work_time = 2.5 + }, + category = 2, + class_name = "wAmmunitionVikhr", + display_name = "AGM-12A", + display_name_short = "AGM-12A", + fm = { + A = 0.36, + I = 265.38909287667, + I_x = 10, + L = 3.4798, + Ma = 2, + Ma_x = 3, + Mw = 5, + Mw_x = 1.5, + Mx0Ma = { -0.25, -0.11 }, + Sw = 0.465, + caliber = 0.3048, + cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.01, + ideal_fins = true, + mass = 263, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + fuze = { + default_arm_delays = { 2 }, + default_function_altitude = 0 + }, + model = "9M114", + name = "AGM_12A", + scheme = "AGM-12", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AGM_12A", + username = "AGM-12A" + } }, + sigma = { 4, 4, 4 }, + spiral_nav = { + def_cone_max_dist = 22000, + def_cone_near_rad = 10000, + def_cone_near_rad_st = 0, + def_cone_time_stab_rad = 0, + gb_angle = 0.0036, + gb_max_retW = 0.4, + gb_min_dist = 3200, + gb_ret_Kp = 1.1, + gb_use_time = 5.3, + t_cone_near_rad = 10000 + }, + t_acc = 2.5, + t_b = 0, + t_marsh = 0, + user_name = "AGM-12A", + v_mid = 300, + v_min = 170, + warhead = { + caliber = 207, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 45.2, + mass = 45.2, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 9.04 + }, + warhead_air = {}, + wcs = { + activation_delay = 0.75, + base_pulse_length = 0.05, + command_deflection = 0.2, + input_delay = 0.1, + lead_pulse_deadzone = 0.001, + lead_pulse_sensitivity = 0.5, + lifetime = 30, + memory_pulse_sensitivity = 1, + reference_offset = -0.87266462599716, + sustain_pulse_gain_per_cycle = 0.1, + sustain_pulse_sensitity = 1, + sustain_pulse_sentitivity_exponent = 0.2 + }, + wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, + ws_type =
+} \ No newline at end of file diff --git a/_G/rockets/AGM_12B.lua b/_G/rockets/AGM_12B.lua new file mode 100644 index 00000000..9fa14e2a --- /dev/null +++ b/_G/rockets/AGM_12B.lua @@ -0,0 +1,148 @@ +_G["rockets"]["#Index"] = { + Cx_pil = 4, + D_max = 13000, + D_min = 1500, + Damage = 282.5, + Diam = 305, + Escort = 1, + Fi_excort = 0.4, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.1, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 1, + Head_Type = 7, + KillDistance = 0, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7500, 8500, 0, 6000, 9000, 0, 0, 0, 200, 0, 7000, 7500, 0, 0, 9500, 9500, 9000, 0, 0, 300, 5500, 7000, 7500, 10000, 12000, 10000, 10000, 9000, 12000, 9500, 400, 5500, 7000, 8500, 10500, 12500, 10000, 10500, 11500, 12000, 12500, 500, 6000, 7000, 8500, 10500, 12500, 13000, 10500, 11500, 12000, 12500, 600, 6000, 7500, 9000, 11000, 13000, 13000, 10500, 11500, 12000, 13000, 700, 6500, 7500, 9000, 11000, 13000, 14500, 15500, 17500, 18500, 13000, 800, 6500, 7500, 9500, 11000, 13000, 14500, 15500, 17500, 17500, 20000, 900, 6500, 7500, 9500, 11000, 14000, 15500, 16000, 18000, 17500, 20000, 1000, 6500, 8000, 9500, 11500, 14000, 14500, 16500, 17500, 18500, 20000, 2000, 10500, 11500, 12500, 13500, 15000, 15500, 17500, 18500, 19500, 20500, 3000, 11000, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 21000, 4000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 21500, 5000, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 20000, 21000, 21500, 6000, 11500, 12500, 14000, 15000, 16500, 17500, 19000, 20000, 21000, 21500, 7000, 11500, 12500, 14000, 15500, 16500, 18000, 19000, 20000, 21500, 21500, 8000, 11500, 13000, 14000, 15500, 17000, 18000, 19000, 20500, 21500, 21500, 9000, 11000, 12500, 14000, 15500, 17000, 18000, 19000, 20500, 21500, 21500, 10000, 11000, 12500, 14000, 15000, 16500, 18000, 19000, 20000, 21500, 21500 }, + Life_Time = 30, + M = 263, + Mach_max = 1.8, + MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 600, 600, 650, 800, 1050, 500, 500, 500, 500, 200, 650, 600, 500, 650, 700, 1050, 550, 500, 500, 500, 300, 700, 600, 500, 600, 700, 950, 550, 500, 500, 500, 400, 700, 550, 650, 600, 750, 1100, 500, 500, 500, 500, 500, 700, 650, 600, 650, 800, 1150, 500, 500, 500, 500, 600, 750, 650, 700, 600, 750, 1100, 500, 500, 500, 500, 700, 700, 750, 650, 650, 750, 1050, 500, 500, 500, 500, 800, 700, 650, 700, 650, 900, 1100, 550, 500, 500, 500, 900, 650, 650, 650, 700, 850, 1150, 500, 500, 500, 500, 1000, 650, 600, 700, 700, 900, 1100, 500, 500, 500, 500, 2000, 500, 500, 550, 600, 550, 550, 500, 500, 500, 500, 3000, 1250, 700, 650, 900, 650, 500, 600, 650, 600, 600, 4000, 1050, 900, 800, 900, 1100, 1050, 750, 700, 700, 600, 5000, 1000, 1100, 1000, 1400, 1200, 1100, 800, 900, 700, 900, 6000, 1500, 1500, 1500, 2000, 2500, 2000, 1000, 1000, 1000, 1000, 7000, 1500, 2500, 1500, 2000, 2000, 2000, 1500, 1000, 1500, 1000, 8000, 2500, 3000, 3000, 3000, 2000, 2000, 1500, 1500, 1500, 1000, 9000, 500, 3500, 3500, 3500, 2000, 2000, 2000, 2000, 1500, 2000, 10000, 4000, 4000, 4000, 4500, 3500, 1500, 1500, 3000, 2000, 1500 }, + Name = "Redacted", + Nr_max = 1.2, + OmViz_max = 99.9, + Range_max = 13000, + Reflection = 0.03, + X_back = -0.922, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Kd = 0.07, + Ki = 0.01, + Kp = 0.07, + delay = 2, + fins_discreet = 0.08, + fins_limit = 1, + max_ctrl_angle = 6.24, + no_ctrl_center_ang = 2e-05, + op_time = 30, + self_destruct_command_timer = 3, + self_destruct_maneuver = 1, + self_destruct_maneuver_cmd_y = 0.3, + self_destruct_maneuver_cmd_z = 0.6, + self_destruct_no_signal_lim = 0.5, + self_destruct_start_timer = 18 + }, + booster = { + custom_smoke_dissipation_factor = 1, + effect_type = 1, + fuel_mass = 40, + impulse = 270, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.01, + tail_width = 0.18, + work_time = 2 + }, + category = 2, + class_name = "wAmmunitionVikhr", + display_name = "AGM-12B", + display_name_short = "AGM-12B", + fm = { + A = 0.36, + I = 265.38909287667, + I_x = 10, + L = 3.4798, + Ma = 2, + Ma_x = 3, + Mw = 5, + Mw_x = 1.5, + Mx0Ma = { -0.25, -0.11 }, + Sw = 0.465, + caliber = 0.3048, + cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.01, + ideal_fins = true, + mass = 263, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + fuze = { + default_arm_delays = { 2 }, + default_function_altitude = 0 + }, + model = "9M114", + name = "AGM_12B", + scheme = "AGM-12", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AGM_12B", + username = "AGM-12B" + } }, + sigma = { 4, 4, 4 }, + spiral_nav = { + def_cone_max_dist = 22000, + def_cone_near_rad = 10000, + def_cone_near_rad_st = 0, + def_cone_time_stab_rad = 0, + gb_angle = 0.0036, + gb_max_retW = 0.4, + gb_min_dist = 3200, + gb_ret_Kp = 1.1, + gb_use_time = 5.3, + t_cone_near_rad = 10000 + }, + t_acc = 2, + t_b = 0, + t_marsh = 0, + user_name = "AGM-12B", + v_mid = 300, + v_min = 170, + warhead = { + caliber = 207, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 113, + mass = 113, + obj_factors = { 1, 1 }, + other_factors = { 0.5, 0.5, 0.5 }, + piercing_mass = 22.6 + }, + warhead_air = {}, + wcs = { + activation_delay = 0.75, + base_pulse_length = 0.05, + command_deflection = 0.2, + input_delay = 0.1, + lead_pulse_deadzone = 0.001, + lead_pulse_sensitivity = 0.5, + lifetime = 30, + memory_pulse_sensitivity = 1, + reference_offset = -0.87266462599716, + sustain_pulse_gain_per_cycle = 0.1, + sustain_pulse_sensitity = 1, + sustain_pulse_sentitivity_exponent = 0.2 + }, + wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, + ws_type =
+} \ No newline at end of file diff --git a/_G/rockets/AGM_130.lua b/_G/rockets/AGM_130.lua index a8221254..87e2a5ae 100644 --- a/_G/rockets/AGM_130.lua +++ b/_G/rockets/AGM_130.lua @@ -2,7 +2,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 4, D_max = 40000, D_min = 2000, - Damage = 870, + Damage = 874, Diam = 460, Escort = 0, Fi_excort = 0.7, @@ -15,9 +15,11 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, + LaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 27000, 32000, 35000, 37500, 39500, 41000, 43000, 46000, 200, 0, 0, 27500, 32500, 35500, 37500, 39000, 41000, 43500, 46000, 300, 0, 0, 28000, 32500, 35500, 37500, 39500, 41000, 43500, 46500, 400, 0, 0, 29000, 32500, 35500, 38000, 39500, 41500, 44000, 46500, 500, 0, 21000, 29000, 33000, 35500, 38000, 39500, 41500, 44000, 47000, 600, 0, 22500, 29500, 33000, 36000, 38000, 40000, 42000, 44000, 47000, 700, 0, 20500, 30500, 35000, 37500, 40000, 42000, 43500, 46000, 49000, 800, 0, 23000, 31000, 35000, 38000, 40000, 42000, 44000, 46000, 49000, 900, 0, 24000, 31000, 35000, 38000, 40000, 42000, 44000, 46500, 49500, 1000, 0, 22500, 31500, 36500, 39500, 41500, 43500, 45500, 48000, 51000, 2000, 0, 25500, 36000, 41000, 44500, 46500, 49000, 51000, 54000, 57500, 3000, 22500, 30000, 39000, 45000, 49000, 52000, 54500, 56500, 60000, 64000, 4000, 26000, 31000, 40500, 48500, 53000, 56500, 60000, 63000, 67000, 72500, 5000, 29500, 35000, 43500, 52000, 57000, 61500, 64500, 68000, 72500, 79000, 6000, 33000, 39000, 46500, 55500, 61000, 65500, 69000, 73000, 78000, 85500, 7000, 37000, 42500, 50000, 59000, 64000, 68500, 72000, 75500, 81500, 89500, 8000, 40000, 46000, 53000, 60000, 65000, 70000, 73000, 76500, 84000, 92000, 9000, 43500, 51000, 58000, 63500, 68000, 72000, 74000, 78500, 85500, 93000, 10000, 49000, 56000, 61500, 66000, 70500, 72500, 76000, 82500, 90000, 97500, 11000, 53500, 59500, 64000, 68500, 71500, 74000, 79000, 86500, 93500, 100000, 12000, 57000, 62000, 66500, 70500, 74000, 76500, 82500, 90000, 97500, 100000, 13000, 59500, 64500, 68000, 73000, 77000, 79000, 85500, 93000, 100000, 100000, 14000, 62000, 66500, 70000, 75000, 78500, 81500, 88500, 96000, 100000, 100000, 15000, 64000, 66500, 69500, 74500, 79500, 82500, 90000, 98000, 100000, 100000 }, Life_Time = 250, - M = 1312.65, + M = 1323, Mach_max = 0.85, + MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 2200, 2050, 3000, 3100, 3050, 3450, 3900, 4600, 200, 750, 1550, 2200, 2700, 3150, 3600, 4100, 4850, 4550, 5050, 300, 0, 1550, 2350, 2600, 3350, 3400, 3800, 4600, 6750, 5550, 400, 1050, 2200, 2350, 2900, 3200, 3800, 4200, 4600, 6150, 5950, 500, 0, 1800, 2450, 3000, 3500, 3800, 4400, 5000, 6300, 6300, 600, 0, 1900, 2650, 3050, 3600, 4100, 4400, 5200, 6500, 6600, 700, 0, 2100, 2650, 3150, 3650, 4100, 4550, 5350, 6650, 7900, 800, 0, 2050, 2750, 3250, 3750, 4250, 4700, 5400, 6800, 8100, 900, 1550, 2100, 2800, 3350, 3850, 4350, 4850, 5550, 7000, 7350, 1000, 1400, 2150, 2900, 3400, 3950, 4450, 4950, 5700, 7100, 8400, 2000, 1500, 2350, 3100, 3850, 4550, 5200, 5800, 6800, 8150, 9700, 3000, 1500, 2400, 3200, 3900, 4800, 5500, 6200, 7500, 9300, 10800, 4000, 1900, 1900, 4300, 4200, 4500, 5500, 6400, 8100, 10100, 11400, 5000, 2250, 4500, 5000, 5250, 5000, 5500, 6250, 8750, 10750, 12750, 6000, 2500, 5000, 6000, 6500, 6000, 6000, 6500, 9500, 11500, 13500, 7000, 2500, 4500, 6500, 7500, 7000, 7000, 7000, 9500, 12000, 14000, 8000, 2500, 5500, 6000, 8500, 8500, 7500, 8000, 10000, 12500, 14500, 9000, 2500, 6000, 6500, 10500, 9000, 8500, 9000, 10000, 12500, 15000, 10000, 2000, 6000, 8000, 11500, 11000, 10500, 11000, 10500, 13000, 15500, 11000, 2000, 6000, 7500, 14500, 11500, 12000, 11500, 12000, 13500, 16000, 12000, 2000, 6500, 8500, 11000, 12000, 13000, 13500, 13500, 14500, 16500, 13000, 2000, 6000, 9500, 10500, 16000, 8000, 14000, 13500, 16000, 17500, 14000, 2000, 6000, 6000, 11000, 21500, 15000, 17000, 14000, 16000, 18500, 15000, 2500, 4500, 7500, 10000, 14500, 15000, 18000, 16000, 17000, 19500 }, Name = "Redacted", Nr_max = 12, OmViz_max = 99.9, @@ -26,18 +28,144 @@ _G["rockets"]["#Index"] = { X_back = -1.697, Y_back = -0.56, Z_back = 0, - _unique_resource_name = "weapons.missiles.AGM_130", - display_name = "AGM-130", - encyclopediaAnimation = { - args = { 0.01 } + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + ap = { + Ka = 4.186854, + Kd = 620, + Kra = 0.5, + Krd = 0.05, + Ks = 0.05, + Tc = 0.23044046, + Tm = 189.385228, + delay = 0, + fins_limit = 1, + fins_limit_x = 0.1, + gload_limit = 10, + integ_limit = 0.2, + null_roll = 1e-07, + omega_limit = 0.2, + op_time = 999, + tail_control = false }, + category = 2, + class_name = "wAmmunitionSelfHoming", + controller = { + A = 0.15, + Cx0 = 1, + Ka = 5, + Kalt = 0.1, + Kid = 0.01, + Kivv = 0.01, + Klat = 0.1, + Kpd = 0.5, + Kpitch = 0.5, + Kpr = 0.5, + Kpvv = 0.5, + Kyaw = 0.5, + Sw = 0.72, + VVmax = 100, + alignment_turn_rate = 0.034906585039887, + auto_terminal_t = 15, + caliber = 0.457, + dCydA = 0.1, + drift_max = 300, + gps_leveloff_altitude = 914.3999707392, + gps_transition_platform_pitch = -0.78539816339745, + impact_angles_ = { 1.221730476396, 0.26179938779915 }, + impact_auto_terminal_ = { 30, 15 }, + lat_integ_limits = 100, + m_bo = 1125, + mcg_descent_angle = -0.13962634015955, + midcourse_g_bias = 1, + midcourse_glide_pitch = -0.073, + pitch_integ_limit = 10, + rad_alt_max = 2700, + radar_leveloff_altitude = 761.999975616, + separation_g_bias = 1.1, + separation_t = 6, + separation_t1 = 1.75, + t_burnout = 80, + transition_platform_pitch = -0.41887902047864, + vv_integ_limits = 100 + }, + display_name = "AGM-130C-9", + display_name_short = "AGM-130C-9", + engine = { + boost_factor = 1, + boost_tail = 1, + boost_time = 0, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 153.3, + impulse = 205, + mass = 28, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.95, -0.353, 0 } }, + smoke_color = { 0.5, 0.474, 0.443 }, + smoke_transparency = 0.5, + tail_width = 0.052, + work_tail = 1, + work_time = 80 + }, + exhaust = { 0.78, 0.78, 0.78, 0.3 }, + fm = { + A = 0.15, + I = 1732.6513333333, + I_x = 40, + L = 3.91, + Ma = 0.68, + Ma_x = 3, + Mw = 1.116, + Mw_x = 1.5, + Sw = 0.72, + caliber = 0.457, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, + dCydA = { 0.1, 0.036 }, + finsTau = 0.1, + ideal_fins = true, + mass = 1323, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + ins = { + max_deviation_ttg = 92, + max_update_deviation = 0.1 + }, + model = "agm-130", name = "AGM_130", + scheme = "AGM-130", + seeker = { + FOV = 1.8849555921539, + activate_on_update = 0, + delay = 0, + max_lock_dist = 100000, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + max_w_LOS_surf = 0.017, + op_time = 7200 + }, + shape_table_data = { { + file = "agm_130", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AGM_130C_9", + username = "AGM-130C-9" + } }, sigma = { 10, 10, 10 }, t_acc = 5, t_b = 0, t_marsh = 245, + targeting_data = { + char_time = 20.3 + }, + user_name = "AGM-130C-9", v_mid = 272, v_min = 170, - warhead = "_G/warheads/AGM_130.lua", - ws_type = { 4, 4, 8, "Redacted" } + warhead = "_G/warheads/BLU_109.lua", + warhead_air = {}, + wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, + ws_type =
} \ No newline at end of file diff --git a/_G/rockets/AGM_154.lua b/_G/rockets/AGM_154.lua index 1c64c0ca..f43328eb 100644 --- a/_G/rockets/AGM_154.lua +++ b/_G/rockets/AGM_154.lua @@ -30,6 +30,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, add_attributes = { "Cruise missiles" }, display_name = "AGM-154C", + display_name_short = "AGM-154C", encyclopediaAnimation = { args = { [25] = 1 diff --git a/_G/rockets/AGM_154A.lua b/_G/rockets/AGM_154A.lua index 55c2315a..3ced7558 100644 --- a/_G/rockets/AGM_154A.lua +++ b/_G/rockets/AGM_154A.lua @@ -36,24 +36,28 @@ _G["rockets"]["#Index"] = { J_Int_K = 0, J_Power_K = 4, K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, Kg = 6, Ki = 5e-05, - delay = 2, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -71,13 +75,14 @@ _G["rockets"]["#Index"] = { control_block2 = { add_y = 500, can_update_target_pos = 0, - delay = 0.5, + delay = 0.3, max_no_vert_offset_open_h = 90, use_snake_maneuver = 1, vert_offset_before_end_game_k = 0.8, wind_k = 0 }, display_name = "AGM-154A", + display_name_short = "AGM-154A", fm = { A = 0.15, I = 1000, @@ -97,6 +102,8 @@ _G["rockets"]["#Index"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -249,7 +256,13 @@ _G["rockets"]["#Index"] = { trigger_add_time = 1, wind_correction_coeff = 1 }, - scheme = "AGM-154AB", + scheme = "JSOW_AB", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "AGM-154", fire = { 0, 1 }, @@ -259,13 +272,6 @@ _G["rockets"]["#Index"] = { username = "AGM-154A" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 0, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/rockets/AGM_154B.lua b/_G/rockets/AGM_154B.lua index 9ee6b42b..1ea9dfdc 100644 --- a/_G/rockets/AGM_154B.lua +++ b/_G/rockets/AGM_154B.lua @@ -36,24 +36,28 @@ _G["rockets"]["#Index"] = { J_Int_K = 0, J_Power_K = 4, K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, Kg = 6, Ki = 5e-05, + Kx = 0.03, + Kxd = 0, delay = 2, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -78,6 +82,7 @@ _G["rockets"]["#Index"] = { wind_k = 0 }, display_name = "AGM-154B", + display_name_short = "AGM-154B", fm = { A = 0.15, I = 1000, @@ -97,6 +102,8 @@ _G["rockets"]["#Index"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -231,14 +238,14 @@ _G["rockets"]["#Index"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "BLU-108", @@ -371,14 +378,14 @@ _G["rockets"]["#Index"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -403,7 +410,13 @@ _G["rockets"]["#Index"] = { trigger_add_time = 0.5, wind_correction_coeff = 1 }, - scheme = "AGM-154AB", + scheme = "JSOW_AB", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "AGM-154", fire = { 0, 1 }, @@ -413,13 +426,6 @@ _G["rockets"]["#Index"] = { username = "AGM-154B" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 0, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/rockets/AGM_45A.lua b/_G/rockets/AGM_45A.lua index 55011a7f..8c1b8e92 100644 --- a/_G/rockets/AGM_45A.lua +++ b/_G/rockets/AGM_45A.lua @@ -49,6 +49,7 @@ _G["rockets"]["#Index"] = { march_start = 0 }, display_name = "AGM-45A", + display_name_short = "AGM-45A", fm = { A = 0.36, I = 137.211875, diff --git a/_G/rockets/AGM_65A.lua b/_G/rockets/AGM_65A.lua index 8bc4c196..917a209d 100644 --- a/_G/rockets/AGM_65A.lua +++ b/_G/rockets/AGM_65A.lua @@ -39,6 +39,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "AGM-65A", + display_name_short = "AGM-65A", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/rockets/AGM_65B.lua b/_G/rockets/AGM_65B.lua index dcf14e3d..b6b3e3c4 100644 --- a/_G/rockets/AGM_65B.lua +++ b/_G/rockets/AGM_65B.lua @@ -39,6 +39,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "AGM-65B", + display_name_short = "AGM-65B", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/rockets/AGM_65F.lua b/_G/rockets/AGM_65F.lua index 2c812b23..9b8732e5 100644 --- a/_G/rockets/AGM_65F.lua +++ b/_G/rockets/AGM_65F.lua @@ -39,6 +39,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "AGM-65F", + display_name_short = "AGM-65F", exhaust = { 0.75, 0.75, 0.75, 0.1 }, fm = { A = 0.36, diff --git a/_G/rockets/AGM_65L.lua b/_G/rockets/AGM_65L.lua index 9768b6e4..53854c8b 100644 --- a/_G/rockets/AGM_65L.lua +++ b/_G/rockets/AGM_65L.lua @@ -39,6 +39,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionLaserHoming", display_name = "AGM-65L", + display_name_short = "AGM-65L", exhaust = { 0.75, 0.75, 0.75, 0.1 }, fm = { A = 0.36, diff --git a/_G/rockets/AGM_84D.lua b/_G/rockets/AGM_84D.lua index 5040ea2e..6dbca791 100644 --- a/_G/rockets/AGM_84D.lua +++ b/_G/rockets/AGM_84D.lua @@ -94,6 +94,7 @@ _G["rockets"]["#Index"] = { march_start = 0 }, display_name = "AGM-84D", + display_name_short = "AGM-84D", engine_control = { K = 350, Kd = 1, diff --git a/_G/rockets/AGM_84E.lua b/_G/rockets/AGM_84E.lua index efb939ea..06dc837a 100644 --- a/_G/rockets/AGM_84E.lua +++ b/_G/rockets/AGM_84E.lua @@ -22,7 +22,7 @@ _G["rockets"]["#Index"] = { Life_Time = 1850, M = 628, Mach_max = 0.9, - MinLaunchDistData = { 12, 6, 100, 150, 200, 250, 300, 350, 400, 100, 0, 26950, 22325, 22450, 22875, 23250, 23575, 200, 0, 26425, 21800, 21925, 22350, 22725, 23050, 300, 0, 25925, 21275, 21400, 21825, 22175, 22525, 500, 0, 24825, 20150, 20375, 20800, 21150, 21575, 700, 0, 23650, 19025, 19350, 19725, 20075, 20700, 1000, 0, 21750, 17200, 17775, 18075, 18550, 19450, 2000, 0, 15450, 16050, 16500, 16900, 17450, 18200, 3000, 18000, 19550, 20500, 21100, 21500, 22350, 23200, 4000, 21200, 22700, 23600, 24300, 24700, 25600, 26700, 5000, 24000, 25300, 26200, 26900, 27400, 28300, 29400, 6000, 26500, 27500, 28500, 29500, 30000, 30500, 32000, 10000, 34500, 36000, 37500, 38500, 39500, 40500, 41500 }, + MinLaunchDistData = { 12, 7, 100, 150, 200, 250, 300, 350, 400, 100, 0, 26950, 22325, 22450, 22875, 23250, 23575, 200, 0, 26425, 21800, 21925, 22350, 22725, 23050, 300, 0, 25925, 21275, 21400, 21825, 22175, 22525, 500, 0, 24825, 20150, 20375, 20800, 21150, 21575, 700, 0, 23650, 19025, 19350, 19725, 20075, 20700, 1000, 0, 21750, 17200, 17775, 18075, 18550, 19450, 2000, 0, 15450, 16050, 16500, 16900, 17450, 18200, 3000, 18000, 19550, 20500, 21100, 21500, 22350, 23200, 4000, 21200, 22700, 23600, 24300, 24700, 25600, 26700, 5000, 24000, 25300, 26200, 26900, 27400, 28300, 29400, 6000, 26500, 27500, 28500, 29500, 30000, 30500, 32000, 10000, 34500, 36000, 37500, 38500, 39500, 40500, 41500 }, MinLaunchDistData2 = { 20, 7, 100, 150, 200, 250, 300, 350, 400, 500, 0, 14540, 7320, 11250, 8260, 8680, 8970, 600, 0, 11400, 7290, 7780, 8230, 8650, 9040, 700, 0, 7410, 7410, 7890, 8350, 8770, 9160, 800, 0, 7800, 7525, 8025, 8475, 8900, 9300, 900, 0, 8325, 7650, 8125, 8575, 9025, 9425, 1000, 0, 9325, 7725, 8225, 8675, 9100, 9500, 2000, 0, 8800, 8000, 8450, 8900, 9375, 9775, 3000, 0, 6100, 8150, 8200, 8700, 9150, 9600, 4000, 0, 7700, 8400, 8000, 8400, 8800, 8850, 5000, 0, 8000, 8000, 7900, 10300, 8800, 9400, 6000, 9750, 7250, 7250, 8250, 8750, 9000, 9500, 7000, 13250, 7750, 7250, 8500, 8750, 9250, 9750, 8000, 14250, 8250, 8500, 8750, 9250, 9500, 10000, 9000, 15000, 14000, 8750, 9250, 9250, 9750, 10500, 10000, 16000, 14750, 9250, 9500, 10000, 10250, 10750, 11000, 17000, 16000, 14500, 10500, 11000, 11000, 11500, 12000, 18500, 17500, 16000, 11000, 11500, 12000, 12500, 13000, 19500, 19000, 18000, 16500, 12500, 19500, 22500, 14000, 21000, 20500, 20000, 19000, 17500, 27000, 30000, 15000, 22500, 22500, 22000, 22000, 31000, 35500, 38500 }, MinLaunchDistData3 = { 20, 7, 100, 150, 200, 250, 300, 350, 400, 500, 0, 14540, 7320, 7750, 8260, 8680, 8970, 600, 0, 11400, 7290, 7780, 8230, 8650, 9040, 700, 0, 7410, 7410, 7890, 8350, 8770, 9160, 800, 0, 7800, 7525, 8025, 8475, 8900, 9300, 900, 0, 8325, 7650, 8125, 8575, 9025, 9425, 1000, 0, 9325, 7725, 8225, 8675, 9100, 9500, 2000, 0, 8800, 8000, 8450, 8900, 9375, 9775, 3000, 5500, 6100, 8150, 8200, 8700, 9150, 9600, 4000, 7250, 7700, 8400, 8000, 8400, 8800, 8850, 5000, 8900, 8100, 9400, 8200, 8200, 9000, 9400, 6000, 8000, 8500, 12000, 8500, 8750, 9250, 9750, 7000, 10750, 9000, 12000, 9000, 9000, 9500, 10000, 8000, 11750, 9250, 10750, 10000, 9750, 10000, 10500, 9000, 13000, 9750, 10250, 11250, 10000, 10750, 11250, 10000, 14250, 12750, 10500, 13500, 11500, 11750, 12500, 11000, 15000, 14000, 11000, 12500, 15000, 12000, 13500, 12000, 17000, 15500, 12000, 12000, 13000, 14000, 14500, 13000, 18500, 17500, 18000, 13000, 14000, 21000, 24500, 14000, 20000, 20000, 20500, 20500, 14500, 29000, 32000, 15000, 22000, 22500, 23000, 23500, 32500, 37000, 40500 }, Name = "Redacted", diff --git a/_G/rockets/AGM_84H.lua b/_G/rockets/AGM_84H.lua index 49a14a88..4819d9a1 100644 --- a/_G/rockets/AGM_84H.lua +++ b/_G/rockets/AGM_84H.lua @@ -52,10 +52,11 @@ _G["rockets"]["#Index"] = { default_cruise_height = 50, obj_sensor = 0, seeker_activation_dist = 20000, + stab_aim_diff = 0.1, turn_before_point_reach = 1, turn_hor_N = 0.5, turn_max_calc_angle_deg = 90, - turn_point_trigger_dist = 100, + turn_point_trigger_dist = 450, use_horiz_dist = 1 }, controller = { @@ -71,9 +72,9 @@ _G["rockets"]["#Index"] = { Ki_eng = 0.003, Kii_ver = 0.2, Kp_eng = 265, - Kp_hor_err = 240, + Kp_hor_err = 350, Kp_hor_err_croll = 0.06, - Kp_ver = 9, + Kp_ver = 8.2, Kp_ver_st1 = 0.009, Kp_ver_st2 = 0.00018, alg_calc_time = 1.5, @@ -90,12 +91,13 @@ _G["rockets"]["#Index"] = { eng_min_thrust = -100, estimated_N_max = 6, finsLimit = 0.8, - max_roll = 0.8, + max_roll = 0.7, max_start_y_vel = 35, no_alg_vel_k = 10, stab_vel = 237.5 }, display_name = "AGM-84H", + display_name_short = "AGM-84H", final_autopilot = { J_Angle_K = 0.22, J_Angle_W = 0.6, diff --git a/_G/rockets/AGM_84S.lua b/_G/rockets/AGM_84S.lua index 6483fb00..ad3953dd 100644 --- a/_G/rockets/AGM_84S.lua +++ b/_G/rockets/AGM_84S.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.AGM_84S", add_attributes = { "Cruise missiles" }, display_name = "RGM-84D Harpoon", + display_name_short = "RGM-84D Harpoon", encyclopediaAnimation = { args = { 1, [25] = 1 diff --git a/_G/rockets/AGM_86.lua b/_G/rockets/AGM_86.lua index bd275ffa..81e02805 100644 --- a/_G/rockets/AGM_86.lua +++ b/_G/rockets/AGM_86.lua @@ -28,16 +28,168 @@ _G["rockets"]["#Index"] = { X_back = -3.392, Y_back = 0.064, Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", add_attributes = { "Cruise missiles" }, + boost = { + boost_factor = 0, + boost_time = 0, + custom_smoke_dissipation_factor = 0, + fuel_mass = 0, + impulse = 0, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { 0, 0, 0 } }, + smoke_color = { 0, 0, 0 }, + smoke_transparency = 0, + tail_width = 0, + work_time = 0 + }, + category = 2, + class_name = "wAmmunitionCruise", + control_block = { + can_update_target_pos = 0, + default_cruise_height = 55, + obj_sensor = 0, + seeker_activation_dist = 15500, + turn_before_point_reach = 1, + turn_hor_N = 0.8, + turn_max_calc_angle_deg = 90, + turn_point_trigger_dist = 100, + use_horiz_dist = 1 + }, + controller = { + boost_start = 0, + march_start = 0.8 + }, + cruise_autopilot = { + Kd_eng = 0, + Kd_hor = 0, + Kd_ver = 0, + Kd_ver_st1 = 0.015, + Kd_ver_st2 = 5e-05, + Ki_eng = 0.003, + Kii_ver = 0.2, + Kp_eng = 265, + Kp_hor_err = 240, + Kp_hor_err_croll = 0.06, + Kp_ver = 9, + Kp_ver_st1 = 0.009, + Kp_ver_st2 = 0.00018, + alg_calc_time = 1.5, + alg_div_k = 2, + alg_max_sin_climb = 0.8, + alg_points_num = 7, + alg_section_temp_points = 3, + alg_tmp_point_vel_k = 1.5, + alg_vel_k = 6, + auto_terrain_following = 1, + auto_terrain_following_height = 75, + delay = 1, + eng_max_thrust = 3923, + eng_min_thrust = -120, + estimated_N_max = 6, + finsLimit = 0.8, + max_roll = 0.8, + max_start_y_vel = 35, + no_alg_vel_k = 10, + stab_vel = 220 + }, display_name = "AGM-86D", display_name_short = "AGM-86D", + final_autopilot = { + J_Angle_K = 0.18, + J_Angle_W = 0.8, + J_Diff_K = 0.4, + J_FinAngle_K = 0.32, + J_Int_K = 0.001, + J_Power_K = 2.2, + J_Trigger_Vert = 1, + K = 70, + Kg = 4, + Ki = 0, + delay = 0, + finsLimit = 0.8, + hKd = 0.005, + hKp_err = 120, + hKp_err_croll = 0.04, + max_roll = 0.8, + useJumpByDefault = 1 + }, + fm = { + A = 0.08, + I = 4826.3733333333, + L = 6.32, + Ma = 3, + Ma_x = 1.2, + Ma_z = 3, + Mw = 10, + Mw_x = 2.7, + Sw = 1.6, + addDeplSw = 0.8, + caliber = 0.697, + cx_coeff = { 1, 0.3, 0.65, 0.023, 1.6 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.08, + mass = 1450, + maxAoa = 0.2, + no_wings_A_mlt = 7, + wind_sigma = 0, + wind_time = 0, + wingsDeplDelay = 1, + wingsDeplProcTime = 5 + }, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 312, + impulse = 3000, + max_thrust = 3000, + min_fuel_rate = 0.005, + min_thrust = -100, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -2.25, 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 = 999999 + }, + mass = 1450, + model = "agm-86", name = "AGM_86", + play_booster_animation = { + val = 0 + }, + scheme = "sat_cruise_missile", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, + shape_table_data = { { + file = "agm-86", + fire = { 0, 1 }, + index = "Redacted", + life = 2, + name = "AGM-86D", + username = "AGM-86D" + } }, sigma = { 20, 20, 20 }, t_acc = 5, t_b = 0, t_marsh = 10000, + user_name = "AGM-86D", v_mid = 272, v_min = 170, warhead = "_G/warheads/AGM_86.lua", - ws_type = { 4, 4, 8, "Redacted" } + warhead_air = "_G/warheads/AGM_86.lua", + wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, + ws_type =
} \ No newline at end of file diff --git a/_G/rockets/AGM_86C.lua b/_G/rockets/AGM_86C.lua index 11c33aa5..825f2215 100644 --- a/_G/rockets/AGM_86C.lua +++ b/_G/rockets/AGM_86C.lua @@ -89,12 +89,17 @@ _G["rockets"]["#Index"] = { eng_min_thrust = -120, estimated_N_max = 6, finsLimit = 0.8, + glide_height_abs_error = 1, + glide_height_eq_error = 10, + inertial_km_error = 7, max_roll = 0.8, max_start_y_vel = 35, no_alg_vel_k = 10, - stab_vel = 220 + stab_vel = 220, + stab_vel_abs_error = 16 }, display_name = "AGM-86C", + display_name_short = "AGM-86C", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, diff --git a/_G/rockets/AGM_88.lua b/_G/rockets/AGM_88.lua index a284d291..03ff2f48 100644 --- a/_G/rockets/AGM_88.lua +++ b/_G/rockets/AGM_88.lua @@ -2,7 +2,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 4, D_max = 151000, D_min = 3500, - Damage = 66, + Damage = 46.05, Diam = 254, Escort = 0, Fi_excort = 1, @@ -47,6 +47,6 @@ _G["rockets"]["#Index"] = { t_marsh = 10, v_mid = 400, v_min = 170, - warhead = "_G/warheads/AGM_88.lua", + warhead = "_G/warheads/WDU_37B.lua", ws_type = { 4, 4, 8, "Redacted" } } \ No newline at end of file diff --git a/_G/rockets/AGR_20A.lua b/_G/rockets/AGR_20A.lua index 3631c979..90c441ba 100644 --- a/_G/rockets/AGR_20A.lua +++ b/_G/rockets/AGR_20A.lua @@ -44,6 +44,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionLaserHoming", display_name = "HYDRA-70 HE APKWS", + display_name_short = "HYDRA-70 HE APKWS", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, @@ -103,7 +104,7 @@ _G["rockets"]["#Index"] = { t_b = 0, t_marsh = 1.1, user_name = "HYDRA-70 HE APKWS", - v_mid = 500, + v_mid = 350, v_min = 140, warhead = "_G/warheads/HYDRA_70_M151.lua", warhead_air = {}, diff --git a/_G/rockets/AGR_20_M282.lua b/_G/rockets/AGR_20_M282.lua index ea1ed352..5ee7f58c 100644 --- a/_G/rockets/AGR_20_M282.lua +++ b/_G/rockets/AGR_20_M282.lua @@ -44,6 +44,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionLaserHoming", display_name = "HYDRA-70 MPP APKWS", + display_name_short = "HYDRA-70 MPP APKWS", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, @@ -103,7 +104,7 @@ _G["rockets"]["#Index"] = { t_b = 0, t_marsh = 1.1, user_name = "HYDRA-70 MPP APKWS", - v_mid = 500, + v_mid = 350, v_min = 140, warhead = "_G/warheads/HYDRA_70_M282.lua", warhead_air = {}, diff --git a/_G/rockets/AIM-7E-2.lua b/_G/rockets/AIM-7E-2.lua index 2061a296..68014da1 100644 --- a/_G/rockets/AIM-7E-2.lua +++ b/_G/rockets/AIM-7E-2.lua @@ -73,6 +73,7 @@ _G["rockets"]["#Index"] = { }, displayName = "AIM-7E-2 Sparrow Semi-Active Radar", display_name = "AIM-7E-2", + display_name_short = "AIM-7E-2", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/rockets/AIM-7F.lua b/_G/rockets/AIM-7F.lua index a8698df5..237c43fa 100644 --- a/_G/rockets/AIM-7F.lua +++ b/_G/rockets/AIM-7F.lua @@ -78,6 +78,7 @@ _G["rockets"]["#Index"] = { }, displayName = "AIM-7F Sparrow Semi-Active Radar", display_name = "AIM-7F", + display_name_short = "AIM-7F", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/rockets/AIM-7MH.lua b/_G/rockets/AIM-7MH.lua index da6a67ab..fcc52797 100644 --- a/_G/rockets/AIM-7MH.lua +++ b/_G/rockets/AIM-7MH.lua @@ -79,6 +79,7 @@ _G["rockets"]["#Index"] = { }, displayName = "AIM-7MH Sparrow Semi-Active Radar", display_name = "AIM-7MH", + display_name_short = "AIM-7MH", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/rockets/AIM-7P.lua b/_G/rockets/AIM-7P.lua index 65f435ca..9a863afa 100644 --- a/_G/rockets/AIM-7P.lua +++ b/_G/rockets/AIM-7P.lua @@ -79,6 +79,7 @@ _G["rockets"]["#Index"] = { }, displayName = "AIM-7P Sparrow Semi-Active Radar", display_name = "AIM-7P", + display_name_short = "AIM-7P", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/rockets/AIM-9J.lua b/_G/rockets/AIM-9J.lua index 71a924f4..b579b098 100644 --- a/_G/rockets/AIM-9J.lua +++ b/_G/rockets/AIM-9J.lua @@ -1,13 +1,13 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 7000, D_min = 300, Damage = 27.5, Diam = 127, Escort = 0, Fi_excort = 0.7, - Fi_rak = 2.1, - Fi_search = 0.031, + Fi_rak = 1.8, + Fi_search = 0.017, Fi_start = 0.3, H_max = 18000, H_min = -1, @@ -16,28 +16,28 @@ _G["rockets"]["#Index"] = { Head_Type = 1, KillDistance = 7, Life_Time = 40, - M = 76.9, + M = 74.84, Mach_max = 2.5, - ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17800, 0, 0, 0, 0, 1000000000, 40, 0, 0.8, 1000000000, 1000000000, 0, 30, 0, 1.2, 1, 2, 9, -11, -1.4, 10500, 2800, 17000, 5500, 6700, 2000, 2500, 0.55, -0.01, 0.5 }, + ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17170, 0, 0, 0, 0, 1000000000, 40, 0, 0.8, 1000000000, 1000000000, 0, 30, 0, 1.2, 1, 2, 7.34, -7.93, -1.96, 11526, 2805, 19655, 5192.6, 7837.1, 1786.9, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", Nr_max = 22, - OmViz_max = 0.28, + OmViz_max = 0.29, Range_max = 14000, Reflection = 0.03, - SeekerCooled = false, - SeekerSensivityDistance = 5000, - X_back = -1.46, + SeekerCooled = true, + SeekerSensivityDistance = 7000, + X_back = -1.55, Y_back = 0, Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AIM-9J", category = 4, - ccm_k0 = 3, + ccm_k0 = 2, display_name = "AIM-9J", - exhaust = { 0.7, 0.7, 0.7, 1 }, + exhaust = { 1, 1, 1, 1 }, name = "AIM-9J", - nozzle_exit_area = 0.0068, + nozzle_exit_area = 0.005, shape_table_data = { { file = "aim-9J", fire = { 0, 1 }, @@ -48,7 +48,7 @@ _G["rockets"]["#Index"] = { } }, sigma = { 3, 3, 3 }, supersonic_A_coef_skew = 0.25, - t_acc = 5, + t_acc = 2.2, t_b = 0, t_marsh = 0, user_name = "AIM-9J", diff --git a/_G/rockets/AIM-9JULI.lua b/_G/rockets/AIM-9JULI.lua index 3683556e..883505f2 100644 --- a/_G/rockets/AIM-9JULI.lua +++ b/_G/rockets/AIM-9JULI.lua @@ -1,5 +1,5 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 7000, D_min = 300, Damage = 27.5, @@ -16,9 +16,9 @@ _G["rockets"]["#Index"] = { Head_Type = 1, KillDistance = 7, Life_Time = 40, - M = 85.6, + M = 82.3, Mach_max = 2.5, - ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17800, 0, 0, 0, 0, 1000000000, 40, 0, 0.8, 1000000000, 1000000000, 0, 30, 0, 1.2, 1, 2, 9, -11, -1.4, 10500, 2800, 17000, 5500, 6700, 2000, 2500, 0.55, -0.01, 0.5 }, + ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 5, 0, 0, 0, 1000000000, 0, 0, 4.96, 0, 0, 0, 0, 0, 0, 11280, 0, 0, 0, 0, 1000000000, 40, 0, 0.3, 1000000000, 1000000000, 0, 30, 0, 1.2, 1, 2, 8.05, -11.65, -2.08, 16789.4, 4975.8, 28596.1, 9195.1, 11591.9, 3186.5, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", Nr_max = 32, OmViz_max = 0.44, @@ -26,7 +26,7 @@ _G["rockets"]["#Index"] = { Reflection = 0.03, SeekerCooled = true, SeekerSensivityDistance = 20000, - X_back = -1.46, + X_back = -1.6, Y_back = 0, Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", @@ -35,11 +35,11 @@ _G["rockets"]["#Index"] = { category = 4, ccm_k0 = 0.75, display_name = "AIM-9JULI", - exhaust = { 0.7, 0.7, 0.7, 1 }, + exhaust = { 0.7, 0.7, 0.7, 0.1 }, name = "AIM-9JULI", nozzle_exit_area = 0.0068, shape_table_data = { { - file = "aim-9J", + file = "aim-9JULI", fire = { 0, 1 }, index = "Redacted", life = 1, diff --git a/_G/rockets/AIM-9L.lua b/_G/rockets/AIM-9L.lua index f7a6c77a..5daf991a 100644 --- a/_G/rockets/AIM-9L.lua +++ b/_G/rockets/AIM-9L.lua @@ -1,5 +1,5 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 7000, D_min = 300, Damage = 27.5, @@ -26,7 +26,7 @@ _G["rockets"]["#Index"] = { Reflection = 0.03, SeekerCooled = true, SeekerSensivityDistance = 20000, - X_back = -1.66, + X_back = -1.5, Y_back = 0, Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", diff --git a/_G/rockets/AIM-9P.lua b/_G/rockets/AIM-9P.lua index c583fee2..39c56472 100644 --- a/_G/rockets/AIM-9P.lua +++ b/_G/rockets/AIM-9P.lua @@ -1,12 +1,12 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 4000, D_min = 300, Damage = 27.5, Diam = 127, Escort = 0, Fi_excort = 0.7, - Fi_rak = 3.14152, + Fi_rak = 2.1, Fi_search = 0.017, Fi_start = 0.3, H_max = 18000, @@ -15,29 +15,29 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 1, KillDistance = 7, - Life_Time = 30, - M = 85.5, + Life_Time = 40, + M = 74.84, Mach_max = 2.2, - ModelData = { 58, 0.35, 0.04, 0.08, 0.02, 0.05, 1.2, 1.2, 0.5, 0.4, 1.2, 0.29, 0, -1, -1, 3, 0, 0, 0, 1000000000, 0, 0, 8, 0, 0, 0, 0, 0, 0, 18800, 0, 0, 0, 0, 1000000000, 30, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 9000, 4000, 4000, 0.2, 1, 1.4, -3, 0.5 }, + ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17170, 0, 0, 0, 0, 1000000000, 40, 0, 0.3, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 7.34, -7.93, -1.96, 11526, 2805, 19655, 5192.6, 7837.1, 1786.9, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 16, - OmViz_max = 0.35, + Nr_max = 22, + OmViz_max = 0.29, Range_max = 11000, Reflection = 0.03, - SeekerCooled = false, + SeekerCooled = true, SeekerSensivityDistance = 10000, - X_back = -1.5, + X_back = -1.46, Y_back = 0, Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AIM-9P", category = 4, - ccm_k0 = 1, + ccm_k0 = 2, display_name = "AIM-9P", - exhaust = { 0.7, 0.7, 0.7, 1 }, + exhaust = { 1, 1, 1, 1 }, name = "AIM-9P", - nozzle_exit_area = 0.0068, + nozzle_exit_area = 0.005, shape_table_data = { { file = "aim-9p", fire = { 0, 1 }, @@ -48,7 +48,7 @@ _G["rockets"]["#Index"] = { } }, sigma = { 3, 3, 3 }, supersonic_A_coef_skew = 0.25, - t_acc = 3, + t_acc = 2.2, t_b = 0, t_marsh = 0, user_name = "AIM-9P", diff --git a/_G/rockets/AIM-9P3.lua b/_G/rockets/AIM-9P3.lua new file mode 100644 index 00000000..c08ad8c2 --- /dev/null +++ b/_G/rockets/AIM-9P3.lua @@ -0,0 +1,71 @@ +_G["rockets"]["#Index"] = { + Cx_pil = 1.68, + D_max = 4000, + D_min = 300, + Damage = 27.5, + Diam = 127, + Escort = 0, + Fi_excort = 0.7, + Fi_rak = 2.1, + Fi_search = 0.017, + Fi_start = 0.3, + H_max = 18000, + H_min = -1, + H_min_t = 1, + Head_Form = 0, + Head_Type = 1, + KillDistance = 7, + Life_Time = 40, + M = 80.7, + Mach_max = 2.2, + ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 5, 0, 0, 0, 1000000000, 0, 0, 4.84, 0, 0, 0, 0, 0, 0, 11020, 0, 0, 0, 0, 1000000000, 40, 0, 0.3, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 8, -11.1, -2.33, 16700.5, 5040.5, 28498.2, 9345.3, 11466, 3206.3, 2500, 0.55, -0.01, 0.5 }, + Name = "Redacted", + Nr_max = 22, + OmViz_max = 0.29, + Range_max = 11000, + Reflection = 0.03, + SeekerCooled = true, + SeekerSensivityDistance = 10000, + X_back = -1.46, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.missiles.AIM-9P3", + category = 4, + ccm_k0 = 2, + display_name = "AIM-9P3", + exhaust = { 0.7, 0.7, 0.7, 0.1 }, + name = "AIM-9P3", + nozzle_exit_area = 0.005, + shape_table_data = { { + file = "aim-9p5", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AIM-9P3", + username = "AIM-9P3" + } }, + sigma = { 3, 3, 3 }, + supersonic_A_coef_skew = 0.25, + t_acc = 5, + t_b = 0, + t_marsh = 0, + user_name = "AIM-9P3", + v_mid = 350, + v_min = 140, + warhead = { + caliber = 127, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 11, + mass = 11, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 2.2 + }, + wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, + ws_type =
+} \ No newline at end of file diff --git a/_G/rockets/AIM-9P5.lua b/_G/rockets/AIM-9P5.lua index 70630085..9b779549 100644 --- a/_G/rockets/AIM-9P5.lua +++ b/_G/rockets/AIM-9P5.lua @@ -1,11 +1,11 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 4000, D_min = 300, Damage = 27.5, Diam = 127, Escort = 0, - Fi_excort = 0.79, + Fi_excort = 0.7, Fi_rak = 3.14152, Fi_search = 0.031, Fi_start = 0.3, @@ -15,25 +15,25 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 1, KillDistance = 7, - Life_Time = 30, - M = 85.5, + Life_Time = 40, + M = 80.7, Mach_max = 2.2, - ModelData = { 58, 0.35, 0.04, 0.08, 0.02, 0.05, 1.2, 1.2, 0.5, 0.4, 1.2, 0.29, 0, -1, -1, 3, 0, 0, 0, 1000000000, 0, 0, 8, 0, 0, 0, 0, 0, 0, 18800, 0, 0, 0, 0, 1000000000, 30, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 9000, 4000, 4000, 0.2, 1, 1.4, -3, 0.5 }, + ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 5, 0, 0, 0, 1000000000, 0, 0, 4.84, 0, 0, 0, 0, 0, 0, 11020, 0, 0, 0, 0, 1000000000, 40, 0, 0.3, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 8, -11.1, -2.33, 16700.5, 5040.5, 28498.2, 9345.3, 11466, 3206.3, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 16, - OmViz_max = 0.44, + Nr_max = 22, + OmViz_max = 0.38, Range_max = 11000, Reflection = 0.03, SeekerCooled = true, SeekerSensivityDistance = 20000, - X_back = -1.5, + X_back = -1.46, Y_back = 0, Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AIM-9P5", category = 4, - ccm_k0 = 1, + ccm_k0 = 0.75, display_name = "AIM-9P5", exhaust = { 0.7, 0.7, 0.7, 0.1 }, name = "AIM-9P5", @@ -48,7 +48,7 @@ _G["rockets"]["#Index"] = { } }, sigma = { 3, 3, 3 }, supersonic_A_coef_skew = 0.25, - t_acc = 3, + t_acc = 5, t_b = 0, t_marsh = 0, user_name = "AIM-9P5", diff --git a/_G/rockets/AIM_120.lua b/_G/rockets/AIM_120.lua index ede4f0cb..28d11d58 100644 --- a/_G/rockets/AIM_120.lua +++ b/_G/rockets/AIM_120.lua @@ -84,6 +84,7 @@ _G["rockets"]["#Index"] = { }, displayName = "AIM-120B AMRAAM - Active Radar AAM", display_name = "AIM-120B", + display_name_short = "AIM-120B", exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, diff --git a/_G/rockets/AIM_120C.lua b/_G/rockets/AIM_120C.lua index 4c4b6981..7b20a9ab 100644 --- a/_G/rockets/AIM_120C.lua +++ b/_G/rockets/AIM_120C.lua @@ -84,6 +84,7 @@ _G["rockets"]["#Index"] = { }, displayName = "AIM-120C AMRAAM - Active Radar AAM", display_name = "AIM-120C", + display_name_short = "AIM-120C", exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, diff --git a/_G/rockets/AIM_7.lua b/_G/rockets/AIM_7.lua index a7f91547..6be54b5f 100644 --- a/_G/rockets/AIM_7.lua +++ b/_G/rockets/AIM_7.lua @@ -79,6 +79,7 @@ _G["rockets"]["#Index"] = { }, displayName = "AIM-7M Sparrow Semi-Active Radar", display_name = "AIM-7M", + display_name_short = "AIM-7M", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/rockets/AIM_9.lua b/_G/rockets/AIM_9.lua index 744ffa25..7b314e8f 100644 --- a/_G/rockets/AIM_9.lua +++ b/_G/rockets/AIM_9.lua @@ -1,5 +1,5 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 7000, D_min = 300, Damage = 25, @@ -26,7 +26,7 @@ _G["rockets"]["#Index"] = { Reflection = 0.03, SeekerCooled = true, SeekerSensivityDistance = 20000, - X_back = -1.6, + X_back = -1.5, Y_back = 0, Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", diff --git a/_G/rockets/AIM_9X.lua b/_G/rockets/AIM_9X.lua index e9997354..dad0a2eb 100644 --- a/_G/rockets/AIM_9X.lua +++ b/_G/rockets/AIM_9X.lua @@ -1,5 +1,5 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 11000, D_min = 200, Damage = 21.25, @@ -26,7 +26,7 @@ _G["rockets"]["#Index"] = { Reflection = 0.03, SeekerCooled = true, SeekerSensivityDistance = 25000, - X_back = -1.75, + X_back = -1.6, Y_back = 0, Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", diff --git a/_G/rockets/AKD-10.lua b/_G/rockets/AKD-10.lua index 01c604d1..bb6e9a8a 100644 --- a/_G/rockets/AKD-10.lua +++ b/_G/rockets/AKD-10.lua @@ -62,6 +62,7 @@ _G["rockets"]["#Index"] = { march_start = 2.001 }, display_name = "AKD-10", + display_name_short = "AKD-10", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A = 0.6, diff --git a/_G/rockets/ALARM.lua b/_G/rockets/ALARM.lua index 27bf3f9d..687a7c02 100644 --- a/_G/rockets/ALARM.lua +++ b/_G/rockets/ALARM.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { Y_back = -0.109, Z_back = 0, display_name = "ALARM", + display_name_short = "ALARM", exhaust = { 1, 1, 1, 1 }, name = "ALARM", sigma = { 10, 10, 10 }, diff --git a/_G/rockets/AT_6.lua b/_G/rockets/AT_6.lua index 56f0d3e2..1359f60f 100644 --- a/_G/rockets/AT_6.lua +++ b/_G/rockets/AT_6.lua @@ -58,6 +58,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionVikhr", display_name = "9M114 Shturm-V (AT-6 Spiral)", + display_name_short = "9M114 Shturm-V (AT-6 Spiral)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/rockets/Ataka_9M120.lua b/_G/rockets/Ataka_9M120.lua index e37ef2e5..f757c9a2 100644 --- a/_G/rockets/Ataka_9M120.lua +++ b/_G/rockets/Ataka_9M120.lua @@ -58,6 +58,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionVikhr", display_name = "9M120 Ataka (AT-9 Spiral-2)", + display_name_short = "9M120 Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/rockets/Ataka_9M120F.lua b/_G/rockets/Ataka_9M120F.lua index ca5c0c88..f418a8e2 100644 --- a/_G/rockets/Ataka_9M120F.lua +++ b/_G/rockets/Ataka_9M120F.lua @@ -58,6 +58,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionVikhr", display_name = "9M120F Ataka (AT-9 Spiral-2)", + display_name_short = "9M120F Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/rockets/Ataka_9M220.lua b/_G/rockets/Ataka_9M220.lua index 707b371a..dbeb4926 100644 --- a/_G/rockets/Ataka_9M220.lua +++ b/_G/rockets/Ataka_9M220.lua @@ -58,6 +58,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionVikhr", display_name = "9M220O Ataka (AT-9 Spiral-2)", + display_name_short = "9M220O Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/rockets/BGM_109B.lua b/_G/rockets/BGM_109B.lua index 5c927de3..5c25fe5b 100644 --- a/_G/rockets/BGM_109B.lua +++ b/_G/rockets/BGM_109B.lua @@ -28,6 +28,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, add_attributes = { "Cruise missiles" }, display_name = "BGM-109C Tomahawk", + display_name_short = "BGM-109C Tomahawk", encyclopediaAnimation = { args = { [25] = 1 diff --git a/_G/rockets/BK90_MJ1.lua b/_G/rockets/BK90_MJ1.lua index 27d8311f..41e4f5c9 100644 --- a/_G/rockets/BK90_MJ1.lua +++ b/_G/rockets/BK90_MJ1.lua @@ -47,6 +47,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "BK90 MJ1", + display_name_short = "BK90 MJ1", fm = { A = 0.13, I = 270, diff --git a/_G/rockets/BK90_MJ1_MJ2.lua b/_G/rockets/BK90_MJ1_MJ2.lua index 2aeac509..8a1c1153 100644 --- a/_G/rockets/BK90_MJ1_MJ2.lua +++ b/_G/rockets/BK90_MJ1_MJ2.lua @@ -47,6 +47,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "BK90 MJ1-MJ2", + display_name_short = "BK90 MJ1-MJ2", fm = { A = 0.13, I = 270, diff --git a/_G/rockets/BK90_MJ2.lua b/_G/rockets/BK90_MJ2.lua index b7c96e41..e60283c2 100644 --- a/_G/rockets/BK90_MJ2.lua +++ b/_G/rockets/BK90_MJ2.lua @@ -47,6 +47,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "BK90 MJ2", + display_name_short = "BK90 MJ2", fm = { A = 0.13, I = 270, diff --git a/_G/rockets/BRM-1_90MM.lua b/_G/rockets/BRM-1_90MM.lua index 86b92182..d094a36f 100644 --- a/_G/rockets/BRM-1_90MM.lua +++ b/_G/rockets/BRM-1_90MM.lua @@ -45,6 +45,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionLaserHoming", display_name = "BRM-1_90MM", + display_name_short = "BRM-1_90MM", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, diff --git a/_G/rockets/C-701IR.lua b/_G/rockets/C-701IR.lua index 0bfda9b9..647a196b 100644 --- a/_G/rockets/C-701IR.lua +++ b/_G/rockets/C-701IR.lua @@ -64,6 +64,7 @@ _G["rockets"]["#Index"] = { march_start = 0.1 }, display_name = "C-701IR", + display_name_short = "C-701IR", exhaust = { 1, 1, 1, 1 }, fm = { A = 0.36, diff --git a/_G/rockets/C-701T.lua b/_G/rockets/C-701T.lua index d84651d7..79133de6 100644 --- a/_G/rockets/C-701T.lua +++ b/_G/rockets/C-701T.lua @@ -64,6 +64,7 @@ _G["rockets"]["#Index"] = { march_start = 0.1 }, display_name = "C-701T", + display_name_short = "C-701T", exhaust = { 1, 1, 1, 1 }, fm = { A = 0.36, diff --git a/_G/rockets/C-802AK.lua b/_G/rockets/C-802AK.lua index 2cbb862e..c3f69fce 100644 --- a/_G/rockets/C-802AK.lua +++ b/_G/rockets/C-802AK.lua @@ -95,6 +95,7 @@ _G["rockets"]["#Index"] = { march_start = 5 }, display_name = "C802AK (DIS)", + display_name_short = "C802AK (DIS)", engine_control = { K = 265, Kd = 0.01, diff --git a/_G/rockets/CATM_9M.lua b/_G/rockets/CATM_9M.lua index 5a497162..f0f80dab 100644 --- a/_G/rockets/CATM_9M.lua +++ b/_G/rockets/CATM_9M.lua @@ -1,5 +1,5 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 7000, D_min = 300, Damage = 25, diff --git a/_G/rockets/CM-802AKG_AI.lua b/_G/rockets/CM-802AKG_AI.lua index 1a004427..65bfcf57 100644 --- a/_G/rockets/CM-802AKG_AI.lua +++ b/_G/rockets/CM-802AKG_AI.lua @@ -100,6 +100,7 @@ _G["rockets"]["#Index"] = { stab_vel = 237.5 }, display_name = "CM802AKG (DIS) for AI", + display_name_short = "CM802AKG (DIS) for AI", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, diff --git a/_G/rockets/CM_802AKG.lua b/_G/rockets/CM_802AKG.lua index 948fd549..9712d016 100644 --- a/_G/rockets/CM_802AKG.lua +++ b/_G/rockets/CM_802AKG.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 8, D_max = 230000, - D_min = 5000, + D_min = 15000, Damage = 266, Damage_correction_coeff = 0.7, Diam = 360, @@ -16,11 +16,11 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 20, 7, 100, 150, 200, 250, 300, 350, 400, 500, 0, 75790, 83280, 87490, 90390, 93090, 93850, 600, 0, 73690, 81610, 85620, 88750, 91500, 93860, 700, 0, 74170, 82540, 86570, 89730, 92470, 94870, 800, 0, 75175, 83750, 87775, 90975, 93725, 96150, 900, 0, 75925, 84675, 88775, 91975, 94725, 97175, 1000, 0, 76500, 85425, 89550, 92750, 95525, 97975, 2000, 0, 79850, 87125, 91600, 95050, 98075, 100775, 3000, 81550, 87150, 91150, 94750, 97750, 100250, 102700, 4000, 85350, 89850, 93850, 97400, 100900, 103100, 105300, 5000, 87500, 92200, 96300, 100000, 103600, 106300, 108700, 6000, 90000, 94500, 98500, 102250, 106000, 109250, 112000, 7000, 91750, 96500, 101000, 105000, 108750, 112250, 115250, 8000, 93750, 98750, 103250, 107500, 111250, 115000, 118500, 9000, 95750, 101000, 105750, 110000, 114000, 118000, 122000, 10000, 97250, 102750, 108000, 113000, 117250, 121500, 126000, 11000, 98500, 104500, 110500, 115500, 120500, 125500, 130500, 12000, 100000, 106000, 112500, 119000, 124500, 130000, 135500, 13000, 101500, 108000, 115000, 122500, 128500, 136000, 142000, 14000, 103000, 110000, 117500, 126000, 133500, 141500, 148000, 15000, 103500, 112000, 120000, 129500, 139000, 148500, 155000 }, + LaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 0, 0, 205025, 208800, 211725, 214900, 217775, 220750, 224250, 200, 0, 200075, 205325, 208675, 212075, 215225, 218150, 221100, 224625, 300, 0, 200325, 205175, 209000, 212400, 215575, 218525, 221450, 224525, 400, 195575, 200575, 205475, 209350, 212725, 215925, 218900, 221775, 224850, 500, 195800, 200825, 205775, 209675, 213075, 216250, 219225, 222125, 225125, 600, 196000, 200600, 206050, 209950, 213400, 216550, 219500, 222400, 225300, 700, 196200, 200900, 206350, 210300, 213700, 216900, 219850, 222650, 225600, 800, 196400, 201150, 206650, 210650, 214000, 217300, 220150, 222900, 225800, 900, 196650, 201400, 206950, 210950, 214350, 217550, 220400, 223150, 225950, 1000, 196850, 201700, 207200, 211300, 214650, 217900, 220650, 223400, 226250, 2000, 199900, 206300, 210600, 214300, 217300, 219900, 222500, 225000, 228000, 3000, 204800, 209300, 213100, 216700, 219500, 222000, 224200, 226800, 229900, 4000, 207500, 211700, 215100, 218500, 221800, 223900, 226100, 228700, 231900, 5000, 209500, 213500, 217000, 220200, 223800, 226100, 228100, 230700, 234000, 6000, 211250, 215000, 218500, 221750, 225250, 228000, 230250, 232750, 236000, 7000, 213000, 216750, 220250, 223250, 226750, 230250, 232250, 235000, 238250, 7500, 213750, 217500, 220750, 224000, 227250, 230750, 233250, 236000, 240500 }, Life_Time = 1850, M = 670, Mach_max = 0.9, - MinLaunchDistData = { 20, 7, 100, 150, 200, 250, 300, 350, 400, 500, 0, 14540, 7320, 11250, 8260, 8680, 8970, 600, 0, 11400, 7290, 7780, 8230, 8650, 9040, 700, 0, 7410, 7410, 7890, 8350, 8770, 9160, 800, 0, 7800, 7525, 8025, 8475, 8900, 9300, 900, 0, 8325, 7650, 8125, 8575, 9025, 9425, 1000, 0, 9325, 7725, 8225, 8675, 9100, 9500, 2000, 0, 9200, 8100, 8250, 8825, 9225, 9725, 3000, 6050, 6900, 7650, 8200, 8550, 8950, 9350, 4000, 6350, 7000, 7500, 7950, 8300, 8650, 9000, 5000, 6600, 7300, 7100, 8000, 8500, 8800, 9200, 6000, 12750, 7500, 7250, 8250, 8750, 9000, 9500, 7000, 13250, 7750, 7250, 8500, 8750, 9250, 9750, 8000, 14250, 8250, 8500, 8750, 9250, 9500, 10000, 9000, 15000, 14000, 8750, 9250, 9500, 10000, 10500, 10000, 16000, 14750, 9250, 9500, 10000, 10250, 10750, 11000, 17000, 16000, 14500, 10500, 11000, 11000, 11500, 12000, 18500, 17500, 16000, 11000, 11500, 12000, 12500, 13000, 19500, 19000, 18000, 16500, 12500, 19500, 22500, 14000, 21000, 20500, 20000, 19000, 18000, 27000, 30000, 15000, 22500, 22500, 22000, 22000, 31000, 35500, 39000 }, + MinLaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 0, 0, 21700, 21950, 16325, 16775, 17100, 17900, 24150, 200, 0, 21475, 21425, 15950, 16450, 16950, 17450, 17975, 24000, 300, 0, 21250, 15475, 16050, 16600, 17125, 17550, 18125, 18900, 400, 22250, 21025, 15575, 16175, 16725, 17250, 17700, 18300, 19225, 500, 22000, 20800, 15700, 16225, 16850, 17325, 17900, 18475, 19350, 600, 21800, 14950, 15750, 16400, 16950, 17500, 18000, 18550, 19250, 700, 21550, 15000, 15800, 16400, 17000, 17550, 18050, 18650, 19350, 800, 21350, 15100, 15900, 16550, 17100, 17650, 18150, 18700, 19450, 900, 21150, 15150, 16000, 16600, 17150, 17700, 18250, 18800, 19500, 1000, 20900, 15200, 16000, 16650, 17300, 17800, 18300, 18900, 19600, 2000, 14500, 15500, 16200, 16900, 17600, 18200, 18800, 19500, 20000, 3000, 14600, 15100, 16000, 16900, 17300, 18300, 18900, 19600, 21200, 4000, 14800, 15100, 15300, 15600, 15800, 16100, 16600, 19300, 21300, 5000, 14900, 15200, 15500, 15700, 15900, 16200, 16600, 17000, 21300, 6000, 15000, 15500, 15750, 15750, 16000, 16250, 16750, 17000, 17500, 7000, 15250, 15500, 15750, 16000, 16250, 16500, 16500, 17000, 17500, 7500, 15250, 15500, 15750, 16000, 16250, 16500, 16750, 17000, 18000 }, Name = "Redacted", Nr_max = 18, OmViz_max = 99.9, @@ -33,14 +33,14 @@ _G["rockets"]["#Index"] = { _origin = "AircraftWeaponPack", add_attributes = { "Cruise missiles" }, autopilot = { - K = 1.7, + K = 1, Kd = 0, Kdx = 0.001, - Ki = 16, - Ks = 2, + Ki = 30, + Ks = 1, Ksd = 0, Ksi = 0, - Kw = 1.6, + Kw = 4, Kx = 0.04, PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, @@ -48,19 +48,19 @@ _G["rockets"]["#Index"] = { default_glide_height = 1000, delay = 1, dont_climb_on_cruise_height = 0, - fins_limit = 0.61086523819802, - fins_limit_x = 0.34906585039887, + fins_limit = 0.87266462599716, + fins_limit_x = 0.43633231299858, glide_height = 1000, - glide_height_eq_error = 2, + glide_height_eq_error = 0.02, hor_err_limit = 0.5, inertial_km_error = 4, integr_val_limit = 0.5, - max_climb_ang_hdiff = 200, + max_climb_ang_hdiff = 180, max_climb_angle = 0.17453292519943, max_climb_h = 3000, max_climb_vel = 200, max_dive_ang_hdiff = -500, - max_dive_angle = -0.43633231299858, + max_dive_angle = -0.5235987755983, min_climb_h = 10000, min_climb_h_factor = 0.5, min_climb_vel = 120, @@ -71,6 +71,7 @@ _G["rockets"]["#Index"] = { skim_glide_height = 8, use_start_bar_height = 1, vel_proj_div = 6, + vert_ctrl_data = { 100, -0.41887902047864, 115, -0.27925268031909, 130, -0.13962634015955, 145, 0, 185, 0.17453292519943 }, w_limit = 0.087266462599716 }, boost = { @@ -96,15 +97,16 @@ _G["rockets"]["#Index"] = { march_start = 0 }, display_name = "AGM-84E", + display_name_short = "CM-802AKG", engine_control = { - K = 350, + K = 240, Kd = 1, - Ki = 0.001, - default_speed = 220, + Ki = 0.01, + default_speed = 285, speed_delta = 5 }, final_autopilot = { - K = 5.4, + K = 5, K_loft_err = 1, Kd = 0, Ki = 0, @@ -121,27 +123,27 @@ _G["rockets"]["#Index"] = { delay = 1, fins_limit = 0.87266462599716, loft_active_by_default = 0, - loft_angle = 0.1221730476396, + loft_angle = 0.13962634015955, loft_angle_vert = 1, - loft_trig_angle = 0.20943951023932, + loft_trig_angle = 0.24434609527921, op_time = 9999, rotated_WLOS_input = 0, w_limit = 0.26179938779915 }, fm = { A = 0.5, - I = 1378.125, - Kw_x = 0.01, - L = 5.25, + I = 1477.9655625, + L = 5.145, Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, - Sw = 0.95, + Mw_x = 2.6, + Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.39, 0.38, 0.3, 1.31 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, + finsTau = 0.02, mass = 670, maxAoa = 0.3, wind_sigma = 0, @@ -150,17 +152,17 @@ _G["rockets"]["#Index"] = { ins = { aim_sigma = 350, check_AI = 1, - error_coeff = 0.05 + error_coeff = 0.03 }, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 650, - max_thrust = 4000, + fuel_mass = 68, + impulse = 3000, + max_thrust = 5000, min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.5, -0.18, 0 } }, + nozzle_position = { { -2.26, 0, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.03, start_burn_effect = 1, @@ -172,7 +174,7 @@ _G["rockets"]["#Index"] = { 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, + thrust_Tau = 0.0018, work_time = 9999 }, model = "cm802akg", @@ -185,8 +187,6 @@ _G["rockets"]["#Index"] = { max_lock_dist = 30000, 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 = { { @@ -209,8 +209,8 @@ _G["rockets"]["#Index"] = { default_straight_nav_tg_dist = 7000, final_maneuver_trig_v_lim = 3, min_cruise_height = 1000, - min_cruise_height_trigger_mlt = 6.6666666666667, - min_cruise_height_trigger_sum = 11000, + min_cruise_height_trigger_mlt = 8.6363636363636, + min_cruise_height_trigger_sum = 10000, pre_maneuver_glide_height = 1000, trigger_by_path = 1, use_horiz_dist = 1 diff --git a/_G/rockets/C_701T.lua b/_G/rockets/C_701T.lua new file mode 100644 index 00000000..d06a67de --- /dev/null +++ b/_G/rockets/C_701T.lua @@ -0,0 +1,121 @@ +_G["rockets"]["#Index"] = { + Cx_pil = 4, + D_max = 30000, + D_min = 500, + Damage = 75, + Diam = 305, + Escort = 0, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.5, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 13000, 14250, 15000, 16500, 19000, 2000, 14500, 16000, 17000, 18000, 21000, 5000, 16500, 17500, 19000, 21000, 24000, 10000, 17000, 19000, 22000, 25000, 29000 }, + Life_Time = 110, + M = 100, + Mach_max = 1.5, + MinLaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 1500, 1500, 1500, 1750, 1750, 2000, 3500, 3500, 4000, 4500, 5500, 5000, 7000, 8000, 8500, 9000, 9500, 10000, 11000, 13000, 15000, 16000, 17000 }, + Name = "Redacted", + Nr_max = 16, + OmViz_max = 99.9, + PN_autopilot = { + K = 0.015, + K_GBias = 0.15, + Kg = 2, + Ki = 0, + Kx = 0.02, + fins_limit = 0.3 + }, + Range_max = 24076, + Reflection = 0.08, + X_back = -0.9, + Y_back = -0.15, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", + boost = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 12, + impulse = 125, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.13, 0, 0 } }, + smoke_color = { 0.6, 0.6, 0.6 }, + smoke_transparency = 0.8, + tail_width = 0.2, + work_time = 3 + }, + category = 2, + class_name = "wAmmunitionSelfHoming", + display_name = "C-701T", + display_name_short = "C-701T", + exhaust = { 0.75, 0.75, 0.75, 0.1 }, + fm = { + A = 0.36, + I = 52.375408333333, + I_x = 40, + Kw_x = 0.03, + L = 2.507, + Ma = 0.68, + Ma_x = 3, + Mw = 1.116, + Sw = 0.4, + caliber = 0.18, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.1, + mass = 100, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 6, + impulse = 150, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.13, 0, 0 } }, + smoke_color = { 0.6, 0.6, 0.6 }, + smoke_transparency = 0.8, + tail_width = 0.2, + work_time = 6 + }, + mass = 100, + model = "c701t", + name = "C_701T", + scheme = "AGM-65ext", + seeker = { + FOV = 1.0471975511966, + delay = 0, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + max_w_LOS_surf = 0.03, + op_time = 65, + ship_track_board_vis_angle = 1.0471975511966, + ship_track_by_default = 1 + }, + shape_table_data = { { + file = "c701t", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "C_701T", + username = "C-701T" + } }, + sigma = { 5, 5, 5 }, + t_acc = 4, + t_b = 0, + t_marsh = 0, + user_name = "C-701T", + v_mid = 290, + v_min = 50, + warhead = "_G/warheads/C701.lua", + warhead_air = "_G/warheads/C701.lua", + wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, + ws_type =
+} \ No newline at end of file diff --git a/_G/rockets/C_802AK.lua b/_G/rockets/C_802AK.lua index ee6cc947..9b43b462 100644 --- a/_G/rockets/C_802AK.lua +++ b/_G/rockets/C_802AK.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 8, - D_max = 250000, - D_min = 5000, + D_max = 180000, + D_min = 12000, Damage = 380, Diam = 360, Escort = 0, @@ -9,21 +9,21 @@ _G["rockets"]["#Index"] = { Fi_rak = 3.14152, Fi_search = 99.9, Fi_start = 0.35, - H_max = 12000, + H_max = 7500, H_min = -1, H_min_t = 500, Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 19, 8, 200, 250, 300, 350, 400, 450, 500, 550, 100, 155700, 159000, 161800, 164200, 166300, 168400, 170600, 173200, 300, 156400, 159700, 162400, 164700, 166800, 168700, 171100, 173600, 500, 157100, 160200, 162900, 165100, 167000, 169000, 171300, 173900, 700, 157500, 160800, 163200, 165500, 167400, 169400, 171800, 174300, 1000, 158300, 161600, 164000, 166200, 168100, 170000, 172300, 174900, 2000, 160800, 164200, 166300, 168300, 170000, 171900, 174200, 176700, 3000, 163000, 166200, 168600, 170200, 172100, 173900, 176000, 178700, 4000, 164900, 167700, 170800, 172400, 174000, 175900, 178200, 180700, 5000, 166800, 169400, 173000, 174400, 176000, 177800, 180200, 182800, 6000, 168400, 171200, 174400, 176400, 177800, 179800, 182200, 184800, 7000, 170400, 173000, 175400, 178600, 180000, 181800, 184200, 187000, 8000, 171800, 174400, 176800, 180600, 182200, 184000, 186200, 189000, 9000, 173200, 175800, 178400, 181800, 184400, 186200, 188600, 191200, 10000, 175000, 177000, 179500, 182500, 186000, 188000, 190500, 193000, 11000, 176000, 179000, 181000, 184000, 187500, 190500, 193000, 195500, 12000, 177500, 180500, 183000, 186000, 189500, 193000, 195000, 198000, 13000, 179000, 182000, 184500, 188000, 191000, 194500, 197500, 200000, 14000, 181000, 184000, 187000, 190000, 193000, 196000, 199500, 202000, 15000, 182500, 186000, 189000, 192000, 195000, 198000, 201000, 204500 }, + LaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 153750, 158875, 162725, 165775, 168450, 170975, 173325, 175650, 178325, 200, 153525, 159050, 162925, 165925, 168625, 171150, 173500, 175800, 178325, 300, 153750, 159250, 163125, 166175, 168850, 171375, 173700, 176000, 178825, 400, 154000, 159475, 163375, 166350, 169050, 171600, 173925, 176550, 179025, 500, 154250, 159725, 163575, 166575, 169275, 171850, 174150, 176400, 178975, 600, 154450, 159950, 163800, 166750, 169500, 172050, 174350, 176600, 179400, 700, 154550, 160250, 164050, 167050, 169700, 172300, 174600, 176800, 179200, 800, 154800, 160650, 164400, 167350, 170000, 172500, 174750, 177000, 179750, 900, 155300, 161100, 164750, 167600, 170250, 172750, 174950, 177150, 179950, 1000, 155950, 161700, 165150, 167950, 170500, 173000, 175200, 177350, 179950, 2000, 161300, 164300, 167000, 169500, 172000, 174500, 176500, 178900, 181500, 3000, 163500, 166100, 168500, 171000, 173600, 176200, 178200, 180300, 182900, 4000, 165200, 167900, 170100, 172400, 174900, 177800, 179900, 181900, 184600, 5000, 166800, 169500, 171800, 174000, 176300, 179100, 181700, 184500, 187200, 6000, 168000, 170750, 174000, 175500, 178500, 180500, 183750, 186000, 189250, 7000, 170250, 173000, 174750, 177750, 180250, 182750, 185000, 188500, 191250, 7500, 171250, 174000, 176500, 178750, 181250, 183750, 186250, 189000, 192500 }, Life_Time = 100000, M = 600, Mach_max = 0.95, - MinLaunchDistData = { 19, 8, 200, 250, 300, 350, 400, 450, 500, 550, 100, 20200, 20500, 20400, 20700, 21000, 21500, 22300, 22500, 300, 22600, 23000, 23400, 23500, 24100, 24700, 25300, 26100, 500, 23900, 24300, 24900, 25200, 25700, 26400, 27200, 28100, 700, 25000, 25400, 26000, 26600, 26900, 27700, 28600, 29600, 1000, 26200, 26600, 27300, 28100, 28800, 29200, 30200, 31300, 2000, 29400, 29700, 30500, 31500, 32300, 33300, 34300, 35500, 3000, 32000, 32300, 33000, 34000, 35000, 36100, 37500, 38800, 4000, 34300, 34900, 35300, 36200, 37300, 38600, 40100, 41800, 5000, 36800, 37200, 37600, 38400, 39400, 40800, 42400, 44400, 6000, 38800, 39400, 39800, 40600, 41400, 42800, 44800, 46600, 7000, 41200, 41800, 42400, 42800, 43600, 45000, 46800, 49000, 8000, 43600, 44000, 44400, 45000, 45800, 47200, 49000, 51200, 9000, 45800, 46200, 46800, 47200, 48000, 49400, 51400, 53400, 10000, 48000, 48500, 49500, 50000, 50000, 51500, 53500, 56000, 11000, 50500, 51000, 51500, 52500, 52500, 53500, 56000, 58000, 12000, 53000, 53500, 54000, 55000, 56000, 56000, 58000, 60500, 13000, 55500, 56000, 56500, 58000, 59000, 59500, 60500, 62500, 14000, 58000, 59000, 59500, 60500, 62000, 63000, 63000, 65000, 15000, 60500, 61500, 62500, 63500, 65000, 66000, 67000, 67500 }, + MinLaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 17375, 12425, 12575, 12950, 13300, 13650, 14025, 15075, 18225, 200, 11675, 12075, 12350, 12600, 12850, 13275, 13500, 14375, 15400, 300, 11700, 12100, 12350, 12650, 12975, 13275, 13575, 14150, 19250, 400, 11725, 12100, 12400, 12800, 13050, 13400, 13650, 18775, 19175, 500, 11750, 12125, 12475, 12850, 13150, 13500, 13775, 14200, 15875, 600, 11750, 12150, 12550, 12900, 13250, 13600, 13850, 14300, 19700, 700, 11750, 12150, 12600, 13000, 13350, 13650, 13950, 14350, 14850, 800, 11800, 12200, 12700, 13050, 13400, 13700, 14050, 14500, 19650, 900, 11800, 12250, 12700, 13100, 13450, 13800, 14100, 14400, 19400, 1000, 11850, 12250, 12750, 13150, 13500, 13850, 14200, 14600, 17450, 2000, 12400, 12700, 12900, 13200, 13600, 14000, 14400, 19200, 20700, 3000, 12400, 12600, 12800, 12900, 13100, 13300, 14400, 14700, 16100, 4000, 12500, 12700, 12900, 13000, 13200, 13400, 13600, 13700, 15500, 5000, 12600, 12800, 13000, 13200, 13300, 13500, 13700, 23100, 24100, 6000, 12750, 13000, 24750, 13250, 24750, 19500, 22000, 21000, 27750, 7000, 24250, 24250, 13250, 26250, 27000, 27000, 15500, 30500, 29500, 7500, 24750, 25250, 26000, 26250, 28000, 29750, 24000, 22500, 32750 }, Name = "Redacted", Nr_max = 6, OmViz_max = 99.9, - Range_max = 250000, + Range_max = 180000, Reflection = 0.25, X_back = 0, Y_back = 0, @@ -32,14 +32,14 @@ _G["rockets"]["#Index"] = { _origin = "AircraftWeaponPack", add_attributes = { "Cruise missiles" }, autopilot = { - K = 1.8, + K = 1.6, Kd = 0, Kdx = 0.001, - Ki = 16, + Ki = 18, Ks = 2, Ksd = 0, Ksi = 0, - Kw = 1.4, + Kw = 1.6, Kx = 0.04, PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, @@ -92,15 +92,16 @@ _G["rockets"]["#Index"] = { march_start = 0 }, display_name = "C-802AK", + display_name_short = "C-802AK", engine_control = { K = 350, Kd = 1, Ki = 0.001, - default_speed = 220, + default_speed = 285, speed_delta = 5 }, final_autopilot = { - K = 6, + K = 6.4, K_loft_err = 1, Kd = 0, Ki = 0, @@ -116,7 +117,7 @@ _G["rockets"]["#Index"] = { conv_input = 0, delay = 1, fins_limit = 0.87266462599716, - loft_active_by_default = 0, + loft_active_by_default = 1, loft_angle = 0.1221730476396, loft_angle_vert = 1, loft_trig_angle = 0.20943951023932, @@ -126,9 +127,9 @@ _G["rockets"]["#Index"] = { }, fm = { A = 0.5, - I = 1378.125, + I = 1323.55125, Kw_x = 0.01, - L = 5.25, + L = 5.145, Ma = 0.68, Ma_x = 3, Ma_z = 3, @@ -146,13 +147,13 @@ _G["rockets"]["#Index"] = { manualWeaponFlag = 2, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 650, - max_thrust = 4000, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.5, -0.18, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.03, start_burn_effect = 1, @@ -217,7 +218,7 @@ _G["rockets"]["#Index"] = { use_horiz_dist = 1 }, user_name = "C-802AK", - v_mid = 237.5, + v_mid = 290, v_min = 170, warhead = "_G/warheads/C_802A.lua", warhead_air = "_G/warheads/C_802A.lua", diff --git a/_G/rockets/DWS39_MJ1.lua b/_G/rockets/DWS39_MJ1.lua index bc1e86c8..7581aca5 100644 --- a/_G/rockets/DWS39_MJ1.lua +++ b/_G/rockets/DWS39_MJ1.lua @@ -47,6 +47,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "DWS39 MJ1", + display_name_short = "DWS39 MJ1", fm = { A = 0.13, I = 270, diff --git a/_G/rockets/DWS39_MJ1_MJ2.lua b/_G/rockets/DWS39_MJ1_MJ2.lua index 194fb73c..2476fcb1 100644 --- a/_G/rockets/DWS39_MJ1_MJ2.lua +++ b/_G/rockets/DWS39_MJ1_MJ2.lua @@ -47,6 +47,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "DWS39 MJ1-MJ2", + display_name_short = "DWS39 MJ1-MJ2", fm = { A = 0.13, I = 270, diff --git a/_G/rockets/DWS39_MJ2.lua b/_G/rockets/DWS39_MJ2.lua index 3c0d4254..9f72368c 100644 --- a/_G/rockets/DWS39_MJ2.lua +++ b/_G/rockets/DWS39_MJ2.lua @@ -47,6 +47,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "DWS39 MJ2", + display_name_short = "DWS39 MJ2", fm = { A = 0.13, I = 270, diff --git a/_G/rockets/FIM_92C.lua b/_G/rockets/FIM_92C.lua index f1b5ad86..c9efcabb 100644 --- a/_G/rockets/FIM_92C.lua +++ b/_G/rockets/FIM_92C.lua @@ -73,6 +73,7 @@ _G["rockets"]["#Index"] = { march_start = 0.4 }, display_name = "FIM-92C Stinger", + display_name_short = "FIM-92C Stinger", fm = { A = 0.6, I = 2.0408533333333, diff --git a/_G/rockets/GAR-8.lua b/_G/rockets/GAR-8.lua index b33c7758..ad05e1bf 100644 --- a/_G/rockets/GAR-8.lua +++ b/_G/rockets/GAR-8.lua @@ -1,5 +1,5 @@ _G["rockets"]["#Index"] = { - Cx_pil = 1.88, + Cx_pil = 1.68, D_max = 4000, D_min = 300, Damage = 25, @@ -7,33 +7,34 @@ _G["rockets"]["#Index"] = { Escort = 0, Fi_excort = 0.44, Fi_rak = 1.1, - Fi_search = 0.044, - Fi_start = 0.3, + Fi_search = 0.034, + Fi_start = 0.44, H_max = 18000, H_min = -1, H_min_t = 1, Head_Form = 0, Head_Type = 1, KillDistance = 7, - Life_Time = 30, + Life_Time = 24, M = 74.39, - Mach_max = 2.2, - ModelData = { 58, 0.35, 0.04, 0.08, 0.02, 0.05, 1.2, 1.2, 0.5, 0.4, 1.2, 0.29, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17150, 0, 0, 0, 0, 21, 18, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 9000, 4000, 4000, 0.2, 1, 1.4, -3, 0.5 }, + Mach_max = 3.2, + ModelData = { 58, 0.35, 0.0325, 0.069, 0.02, 0.03, 0.4, 0.5, 1.8, 0.1, 1, 0.14, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17170, 0, 0, 0, 0, 24, 21, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 4.65, -10.98, -2.24, 12880, 2916, 21942, 5242, 8937, 1918, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 10, - OmViz_max = 0.2, + Nr_max = 12, + OmViz_max = 0.165, + PN_gain = 3, Range_max = 11000, Reflection = 0.03, SeekerCooled = false, - SeekerSensivityDistance = 4000, - X_back = -1.55, + SeekerSensivityDistance = 5000, + X_back = -1.5, Y_back = 0, Z_back = 0, _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.GAR-8", category = 4, - ccm_k0 = 10, + ccm_k0 = 5, display_name = "AIM-9B", exhaust = { 1, 1, 1, 1 }, name = "GAR-8", @@ -47,7 +48,7 @@ _G["rockets"]["#Index"] = { username = "GAR-8" } }, sigma = { 3, 3, 3 }, - supersonic_A_coef_skew = 0.25, + supersonic_A_coef_skew = 0.2, t_acc = 2.2, t_b = 0, t_marsh = 0, diff --git a/_G/rockets/GB-6-HE.lua b/_G/rockets/GB-6-HE.lua index 46709473..630cf111 100644 --- a/_G/rockets/GB-6-HE.lua +++ b/_G/rockets/GB-6-HE.lua @@ -32,13 +32,18 @@ _G["rockets"]["#Index"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, @@ -46,14 +51,14 @@ _G["rockets"]["#Index"] = { err_aoaz_sign_k = 0.18, err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -69,6 +74,7 @@ _G["rockets"]["#Index"] = { turn_point_trigger_dist = 100 }, display_name = "GB-6-HE", + display_name_short = "GB-6-HE", fm = { A = 0.15, I = 1046.25, @@ -81,13 +87,15 @@ _G["rockets"]["#Index"] = { Sw = 1.2, addDeplSw = 0.6, caliber = 0.3, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.85, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 0.2, mass = 620, maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -96,7 +104,12 @@ _G["rockets"]["#Index"] = { mass = 620, model = "gb6", name = "GB-6-HE", - scheme = "AGM-154C", + scheme = "JSOW_C", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -106,13 +119,6 @@ _G["rockets"]["#Index"] = { username = "GB-6-HE" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/rockets/GB-6-SFW.lua b/_G/rockets/GB-6-SFW.lua index 8a071215..1347f222 100644 --- a/_G/rockets/GB-6-SFW.lua +++ b/_G/rockets/GB-6-SFW.lua @@ -32,28 +32,32 @@ _G["rockets"]["#Index"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, + J_Power_K = 4, + K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 6, Ki = 5e-05, - delay = 2.5, + Kx = 0.03, + Kxd = 0, + delay = 2, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -78,6 +82,7 @@ _G["rockets"]["#Index"] = { wind_k = 1 }, display_name = "GB-6-SFW", + display_name_short = "GB-6-SFW", fm = { A = 0.15, I = 1046.25, @@ -90,13 +95,15 @@ _G["rockets"]["#Index"] = { Sw = 1.2, addDeplSw = 0.6, caliber = 0.3, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.85, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 0.2, mass = 620, maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -230,14 +237,14 @@ _G["rockets"]["#Index"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "MM-06", @@ -369,14 +376,14 @@ _G["rockets"]["#Index"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -401,7 +408,13 @@ _G["rockets"]["#Index"] = { trigger_add_time = 0.5, wind_correction_coeff = 1 }, - scheme = "AGM-154AB", + scheme = "JSOW_AB", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -411,13 +424,6 @@ _G["rockets"]["#Index"] = { username = "GB-6-SFW" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/rockets/GB-6.lua b/_G/rockets/GB-6.lua index c68d23af..1cee3175 100644 --- a/_G/rockets/GB-6.lua +++ b/_G/rockets/GB-6.lua @@ -32,28 +32,32 @@ _G["rockets"]["#Index"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, + J_Power_K = 4, + K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 6, Ki = 5e-05, - delay = 2.5, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -78,6 +82,7 @@ _G["rockets"]["#Index"] = { wind_k = 1 }, display_name = "GB-6", + display_name_short = "GB-6", fm = { A = 0.15, I = 1046.25, @@ -97,6 +102,8 @@ _G["rockets"]["#Index"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -249,7 +256,13 @@ _G["rockets"]["#Index"] = { trigger_add_time = 1, wind_correction_coeff = 1 }, - scheme = "AGM-154AB", + scheme = "JSOW_AB", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -259,13 +272,6 @@ _G["rockets"]["#Index"] = { username = "GB-6" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/rockets/HAWK_RAKETA.lua b/_G/rockets/HAWK_RAKETA.lua index c0d720ce..d9db7224 100644 --- a/_G/rockets/HAWK_RAKETA.lua +++ b/_G/rockets/HAWK_RAKETA.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.HAWK_RAKETA", ccm_k0 = 1, display_name = "MIM-23K Hawk", + display_name_short = "MIM-23K Hawk", exhaust = { 1, 1, 1, 1 }, name = "HAWK_RAKETA", sigma = { 50, 50, 50 }, diff --git a/_G/rockets/HOT2.lua b/_G/rockets/HOT2.lua index 6cc14cf2..86e30aaa 100644 --- a/_G/rockets/HOT2.lua +++ b/_G/rockets/HOT2.lua @@ -56,6 +56,7 @@ _G["rockets"]["#Index"] = { march_start = 0.3 }, display_name = "HOT2", + display_name_short = "HOT2", eng_err = { max_time_interval = 0.9, min_time_interval = 0.1, diff --git a/_G/rockets/HOT3_MBDA.lua b/_G/rockets/HOT3_MBDA.lua index 75e9dc2a..32c0c8f2 100644 --- a/_G/rockets/HOT3_MBDA.lua +++ b/_G/rockets/HOT3_MBDA.lua @@ -56,6 +56,7 @@ _G["rockets"]["#Index"] = { march_start = 0.9 }, display_name = "HOT3", + display_name_short = "HOT3", eng_err = { max_time_interval = 0.9, min_time_interval = 0.1, diff --git a/_G/rockets/Igla_1E.lua b/_G/rockets/Igla_1E.lua index 4793d063..9c050918 100644 --- a/_G/rockets/Igla_1E.lua +++ b/_G/rockets/Igla_1E.lua @@ -61,6 +61,7 @@ _G["rockets"]["#Index"] = { march_start = 0.5 }, display_name = "9M39 Igla", + display_name_short = "9M39 Igla", fm = { A = 0.6, I = 2.49312, diff --git a/_G/rockets/KD-20.lua b/_G/rockets/KD-20.lua index 41bf48d1..193c3c5d 100644 --- a/_G/rockets/KD-20.lua +++ b/_G/rockets/KD-20.lua @@ -98,6 +98,7 @@ _G["rockets"]["#Index"] = { stab_vel = 237.5 }, display_name = "KD-20", + display_name_short = "KD-20", final_autopilot = { J_Angle_K = 0.23, J_Angle_W = 0.4, diff --git a/_G/rockets/KD-63.lua b/_G/rockets/KD-63.lua index e719d4e4..db8c5753 100644 --- a/_G/rockets/KD-63.lua +++ b/_G/rockets/KD-63.lua @@ -103,6 +103,7 @@ _G["rockets"]["#Index"] = { stab_vel = 250 }, display_name = "KD-63", + display_name_short = "KD-63", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, diff --git a/_G/rockets/KD-63B.lua b/_G/rockets/KD-63B.lua index cf682684..34b24a69 100644 --- a/_G/rockets/KD-63B.lua +++ b/_G/rockets/KD-63B.lua @@ -103,6 +103,7 @@ _G["rockets"]["#Index"] = { stab_vel = 250 }, display_name = "KD-63B", + display_name_short = "KD-63B", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, diff --git a/_G/rockets/KD_20.lua b/_G/rockets/KD_20.lua new file mode 100644 index 00000000..325c2c4f --- /dev/null +++ b/_G/rockets/KD_20.lua @@ -0,0 +1,195 @@ +_G["rockets"]["#Index"] = { + Cx_pil = 8, + D_max = 2500000, + D_min = 20000, + Damage = 500, + Diam = 600, + Escort = 0, + Fi_excort = 0.7, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.35, + H_max = 13000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 0, 2500000, 2520000, 2000, 2500000, 2500000, 2510000, 2540000, 7000, 2540000, 2550000, 2550000, 2560000, 12500, 2570000, 2570000, 2580000, 2590000 }, + Life_Time = 10000, + M = 1700, + Mach_max = 0.9, + MinLaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 0, 20000, 21000, 2000, 24000, 25000, 26000, 27000, 7000, 15000, 15000, 16000, 17000, 12500, 16000, 18000, 19000, 20000 }, + Name = "Redacted", + Nr_max = 6, + OmViz_max = 99.9, + Range_max = 2500000, + Reflection = 0.1691, + X_back = -3.392, + Y_back = 0.064, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Cruise missiles" }, + boost = { + boost_factor = 0, + boost_time = 0, + custom_smoke_dissipation_factor = 0, + fuel_mass = 0, + impulse = 0, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { 0, 0, 0 } }, + smoke_color = { 0, 0, 0 }, + smoke_transparency = 0, + tail_width = 0, + work_time = 0 + }, + category = 2, + class_name = "wAmmunitionSelfHoming", + control_block = { + can_update_target_pos = 0, + default_cruise_height = 55, + obj_sensor = 0, + seeker_activation_dist = 15500, + turn_before_point_reach = 1, + turn_hor_N = 0.8, + turn_max_calc_angle_deg = 90, + turn_point_trigger_dist = 100, + use_horiz_dist = 1 + }, + controller = { + boost_start = 0, + march_start = 0.8 + }, + cruise_autopilot = { + Kd_eng = 0, + Kd_hor = 0, + Kd_ver = 0, + Kd_ver_st1 = 0.015, + Kd_ver_st2 = 5e-05, + Ki_eng = 0.003, + Kii_ver = 0.2, + Kp_eng = 265, + Kp_hor_err = 240, + Kp_hor_err_croll = 0.06, + Kp_ver = 9, + Kp_ver_st1 = 0.009, + Kp_ver_st2 = 0.00018, + alg_calc_time = 1.5, + alg_div_k = 2, + alg_max_sin_climb = 0.8, + alg_points_num = 7, + alg_section_temp_points = 3, + alg_tmp_point_vel_k = 1.5, + alg_vel_k = 6, + auto_terrain_following = 1, + auto_terrain_following_height = 75, + delay = 1, + eng_max_thrust = 3923, + eng_min_thrust = -120, + estimated_N_max = 6, + finsLimit = 0.72, + max_roll = 0.8, + max_start_y_vel = 35, + no_alg_vel_k = 10, + stab_vel = 220 + }, + display_name = "KD-20", + display_name_short = "KD-20", + final_autopilot = { + J_Angle_K = 0.18, + J_Angle_W = 0.8, + J_Diff_K = 0.4, + J_FinAngle_K = 0.32, + J_Int_K = 0.001, + J_Power_K = 2.2, + J_Trigger_Vert = 1, + K = 72, + Kg = 4, + Ki = 0, + delay = 0, + finsLimit = 0.72, + hKd = 0.005, + hKp_err = 120, + hKp_err_croll = 0.04, + max_roll = 0.8, + useJumpByDefault = 1 + }, + fm = { + A = 0.08, + I = 6550.6666666667, + L = 6.8, + Ma = 3, + Ma_x = 1.2, + Ma_z = 3, + Mw = 10, + Mw_x = 2.7, + Sw = 1.5, + addDeplSw = 0.8, + caliber = 0.6, + cx_coeff = { 1, 0.3, 0.65, 0.023, 1.6 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.08, + mass = 1700, + maxAoa = 0.2, + no_wings_A_mlt = 7, + wind_sigma = 0, + wind_time = 0, + wingsDeplDelay = 1, + wingsDeplProcTime = 5 + }, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 400, + impulse = 3000, + max_thrust = 3000, + min_fuel_rate = 0.005, + min_thrust = -100, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -2.25, 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 = 999999 + }, + mass = 1700, + model = "kd20", + name = "KD_20", + play_booster_animation = { + val = 0 + }, + scheme = "sat_cruise_missile", + seeker = { + can_update_target_pos = 1, + coalition = 1, + coalition_rnd_coeff = 5 + }, + shape_table_data = { { + file = "kd20", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "KD_20", + username = "KD-20" + } }, + sigma = { 20, 20, 20 }, + t_acc = 5, + t_b = 0, + t_marsh = 10000, + user_name = "KD-20", + v_mid = 220, + v_min = 170, + warhead = "_G/warheads/KD_20.lua", + warhead_air = "_G/warheads/KD_20.lua", + wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, + ws_type =
+} \ No newline at end of file diff --git a/_G/rockets/KONKURS.lua b/_G/rockets/KONKURS.lua index 0dbed6f0..afd2f9e1 100644 --- a/_G/rockets/KONKURS.lua +++ b/_G/rockets/KONKURS.lua @@ -27,6 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = 0, Z_back = 0, display_name = "AT-5 Spandrel", + display_name_short = "AT-5 Spandrel", exhaust = { 0.9, 0.9, 0.9, 0.1 }, name = "KONKURS", sigma = { 4, 4, 4 }, diff --git a/_G/rockets/Kh25MP_PRGS1VP.lua b/_G/rockets/Kh25MP_PRGS1VP.lua index 5d46d01d..6f0b9f1c 100644 --- a/_G/rockets/Kh25MP_PRGS1VP.lua +++ b/_G/rockets/Kh25MP_PRGS1VP.lua @@ -63,6 +63,7 @@ _G["rockets"]["#Index"] = { march_start = 2 }, display_name = "Kh-25MP (AS-12 Kegler)", + display_name_short = "Kh-25MP (AS-12 Kegler)", fm = { A = 0.36, I = 353.65833333333, diff --git a/_G/rockets/Kormoran.lua b/_G/rockets/Kormoran.lua index 9cd8fa5e..a02a4e47 100644 --- a/_G/rockets/Kormoran.lua +++ b/_G/rockets/Kormoran.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.Kormoran", add_attributes = { "Cruise missiles" }, display_name = "AS.34 Kormoran", + display_name_short = "AS.34 Kormoran", exhaust = { 1, 1, 1, 1 }, name = "Kormoran", sigma = { 10, 10, 10 }, diff --git a/_G/rockets/LD-10.lua b/_G/rockets/LD-10.lua index 947a874e..72191377 100644 --- a/_G/rockets/LD-10.lua +++ b/_G/rockets/LD-10.lua @@ -87,6 +87,7 @@ _G["rockets"]["#Index"] = { seeker_add_pitch = -0.34906585039887 }, display_name = "LD-10", + display_name_short = "LD-10", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 4, 6, 10, 15 }, diff --git a/_G/rockets/LS-6-250.lua b/_G/rockets/LS-6-250.lua index 30b7e125..81afa154 100644 --- a/_G/rockets/LS-6-250.lua +++ b/_G/rockets/LS-6-250.lua @@ -31,28 +31,33 @@ _G["rockets"]["#Index"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 1.5, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 3, - K = 250, - Kg = 4, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, err_aoaz_k = 28, err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.8, + err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, - nw_K = 15, - nw_Kg = 12.5, + fins_limit_x = 0.3, + hKp_err = 50, + nw_K = 22, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -60,7 +65,7 @@ _G["rockets"]["#Index"] = { control_block = { can_update_target_pos = 0, default_cruise_height = -1, - obj_sensor = 1, + obj_sensor = 0, seeker_activation_dist = 7000, turn_before_point_reach = 1, turn_hor_N = 2.2, @@ -68,6 +73,7 @@ _G["rockets"]["#Index"] = { turn_point_trigger_dist = 100 }, display_name = "LS-6-250", + display_name_short = "LS-6-250", fm = { A = 0.1, I = 140.94666666667, @@ -80,13 +86,15 @@ _G["rockets"]["#Index"] = { Sw = 1.1, addDeplSw = 0.6, caliber = 0.299, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.82, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 1.2, mass = 275, maxAoa = 0.4, no_wings_A_mlt = 2, - no_wings_cx_coeff = { 1, 0.4, 0.8, 0.1, 1.5 }, + no_wings_cx_coeff = { 1, 0.42, 0.8, 0.1, 1.52 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -95,7 +103,12 @@ _G["rockets"]["#Index"] = { mass = 275, model = "ls-6-250", name = "LS-6-250", - scheme = "AGM-154C", + scheme = "JSOW_C", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "ls-6-250", fire = { 0, 1 }, @@ -105,13 +118,6 @@ _G["rockets"]["#Index"] = { username = "LS-6-250" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/rockets/LS-6-500.lua b/_G/rockets/LS-6-500.lua index 8ec29e0b..77e460a3 100644 --- a/_G/rockets/LS-6-500.lua +++ b/_G/rockets/LS-6-500.lua @@ -31,28 +31,33 @@ _G["rockets"]["#Index"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 3, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 6, - K = 500, - Kg = 8, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, err_aoaz_k = 28, err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.8, + err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, - nw_K = 30, - nw_Kg = 25, + fins_limit_x = 0.3, + hKp_err = 50, + nw_K = 22, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -60,7 +65,7 @@ _G["rockets"]["#Index"] = { control_block = { can_update_target_pos = 0, default_cruise_height = -1, - obj_sensor = 1, + obj_sensor = 0, seeker_activation_dist = 7000, turn_before_point_reach = 1, turn_hor_N = 2.2, @@ -68,6 +73,7 @@ _G["rockets"]["#Index"] = { turn_point_trigger_dist = 100 }, display_name = "LS-6-500", + display_name_short = "LS-6-500", fm = { A = 0.1, I = 417.729375, @@ -80,13 +86,15 @@ _G["rockets"]["#Index"] = { Sw = 1.1, addDeplSw = 0.6, caliber = 0.377, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.82, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 1.2, mass = 525, maxAoa = 0.4, no_wings_A_mlt = 2, - no_wings_cx_coeff = { 1, 0.4, 0.8, 0.1, 1.5 }, + no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -95,7 +103,12 @@ _G["rockets"]["#Index"] = { mass = 525, model = "ls-6", name = "LS-6-500", - scheme = "AGM-154C", + scheme = "JSOW_C", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "ls-6", fire = { 0, 1 }, @@ -105,13 +118,6 @@ _G["rockets"]["#Index"] = { username = "LS-6-500" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/rockets/MALUTKA.lua b/_G/rockets/MALUTKA.lua index 8c6391d2..e5024f6a 100644 --- a/_G/rockets/MALUTKA.lua +++ b/_G/rockets/MALUTKA.lua @@ -27,6 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = 0, Z_back = 0, display_name = "AT-3 Sagger", + display_name_short = "AT-3 Sagger", exhaust = { 0.9, 0.9, 0.9, 0.2 }, name = "MALUTKA", sigma = { 5, 5, 5 }, diff --git a/_G/rockets/MICA_R.lua b/_G/rockets/MICA_R.lua index 7e8a15e2..d30c79f6 100644 --- a/_G/rockets/MICA_R.lua +++ b/_G/rockets/MICA_R.lua @@ -30,6 +30,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.MICA_R", ccm_k0 = 0.2, display_name = "MICA-RF", + display_name_short = "MICA-RF", exhaust = { 1, 1, 1, 1 }, hoj = 1, name = "MICA_R", diff --git a/_G/rockets/MICA_T.lua b/_G/rockets/MICA_T.lua index 60b653db..01c7d081 100644 --- a/_G/rockets/MICA_T.lua +++ b/_G/rockets/MICA_T.lua @@ -32,6 +32,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.MICA_T", ccm_k0 = 0.2, display_name = "MICA-IR", + display_name_short = "MICA-IR", exhaust = { 1, 1, 1, 1 }, name = "MICA_T", nozzle_exit_area = 0.015, diff --git a/_G/rockets/MIM_104.lua b/_G/rockets/MIM_104.lua index 616c075b..9282ee87 100644 --- a/_G/rockets/MIM_104.lua +++ b/_G/rockets/MIM_104.lua @@ -18,7 +18,7 @@ _G["rockets"]["#Index"] = { Life_Time = 300, M = 914, Mach_max = 5, - ModelData = { 58, 0.13, 0.47, 0.8, 0.015, -0.14, 0.7, 0.1, 7.86, 0.1, 0.21, 0.3, 0, 0, 0, 0, 11.5, 0, 0, 1000000000, 0, 0, 0, 41.74, 0, 0, 0, 0, 0, 0, 105000, 0, 0, 0, 1000000000, 100, 0, 0.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + ModelData = { 58, 0.13, 0.47, 0.8, 0.015, -0.14, 0.7, 0.1, 7.86, 0.1, 0.21, 0.3, 0, 0, 0, 11.5, 0, 0, 0, 1000000000, 0, 0, 41.74, 0, 0, 0, 0, 0, 0, 105000, 0, 0, 0, 0, 1000000000, 100, 0, 0.5, 1000000000, 1000000000, 0, 50, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, Name = "Redacted", Nr_max = 25, OmViz_max = 99.9, @@ -31,6 +31,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.MIM_104", ccm_k0 = 0.5, display_name = "MIM-104 Patriot", + display_name_short = "MIM-104 Patriot", exhaust = { 1, 1, 1, 1 }, exhaust_effect_type = 1, name = "MIM_104", diff --git a/_G/rockets/MIM_72G.lua b/_G/rockets/MIM_72G.lua index 137e3066..9601de7f 100644 --- a/_G/rockets/MIM_72G.lua +++ b/_G/rockets/MIM_72G.lua @@ -31,6 +31,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, ccm_k0 = 0.5, display_name = "MIM-72G", + display_name_short = "MIM-72G", exhaust = { 1, 1, 1, 1 }, name = "MIM_72G", sigma = { 10, 10, 10 }, diff --git a/_G/rockets/Matra Super 530D.lua b/_G/rockets/Matra Super 530D.lua index 775a9ba6..2f608565 100644 --- a/_G/rockets/Matra Super 530D.lua +++ b/_G/rockets/Matra Super 530D.lua @@ -79,6 +79,7 @@ _G["rockets"]["#Index"] = { march_start = 2.1 }, display_name = "Super 530D", + display_name_short = "Super 530D", exhaust1 = { 1, 1, 1, 1 }, exhaust2 = { 1, 1, 1, 0.3 }, fm = { diff --git a/_G/rockets/Mistral.lua b/_G/rockets/Mistral.lua index 7fe89922..781860ea 100644 --- a/_G/rockets/Mistral.lua +++ b/_G/rockets/Mistral.lua @@ -73,6 +73,7 @@ _G["rockets"]["#Index"] = { march_start = 0.6 }, display_name = "Mistral", + display_name_short = "Mistral", fm = { A = 0.6, I = 5.39121, diff --git a/_G/rockets/PL-12.lua b/_G/rockets/PL-12.lua index b5c67773..33eb6a1f 100644 --- a/_G/rockets/PL-12.lua +++ b/_G/rockets/PL-12.lua @@ -82,6 +82,7 @@ _G["rockets"]["#Index"] = { march_start = 6.5 }, display_name = "PL-12", + display_name_short = "PL-12", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 27.6, 27.6, 27.6, 27.6, 27.55, 30.38, 31.982, 32.774, 33.234, 33.561, 33.829, 34.07, 34.286, 34.491, 34.687, 34.875, 35.056, 35.232, 35.401, 35.564, 35.721, 35.871, 36.015, 36.151, 36.279, 36.4 }, diff --git a/_G/rockets/P_500.lua b/_G/rockets/P_500.lua index 44669aea..debc2486 100644 --- a/_G/rockets/P_500.lua +++ b/_G/rockets/P_500.lua @@ -28,6 +28,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _unique_resource_name = "weapons.missiles.P_500", display_name = "P-500 (SS-N-12 Sandbox)", + display_name_short = "P-500 (SS-N-12 Sandbox)", exhaust1 = { 1, 1, 1, 1 }, name = "P_500", sigma = { 15, 15, 15 }, diff --git a/_G/rockets/P_60.lua b/_G/rockets/P_60.lua index c0e3936c..dbe5ccad 100644 --- a/_G/rockets/P_60.lua +++ b/_G/rockets/P_60.lua @@ -1,5 +1,5 @@ _G["rockets"]["#Index"] = { - Cx_pil = 2.18, + Cx_pil = 1.31, D_max = 4000, D_min = 200, Damage = 8.75, @@ -14,14 +14,15 @@ _G["rockets"]["#Index"] = { H_min_t = 1, Head_Form = 0, Head_Type = 1, - KillDistance = 3, + KillDistance = 5, Life_Time = 20, - M = 43, + M = 43.5, Mach_max = 2.5, - ModelData = { 58, 0.2, 0.1, 0.1, 0.02, 0.05, 1.2, 1.2, 0.9, 0.8, 1.2, 0.29, 0, -1, -1, 4, 0, 0, 0, 1000000000, 0, 0, 2.6, 0, 0, 0, 0, 0, 0, 6250, 0, 0, 0, 0, 26, 20, 0, 0.35, 1000000000, 1000000000, 0, 80, 0, 1.19, 1, 2, 14, -19, -2, 16000, 5000, 19000, 8000, 13000, 3000, 2500, 0.35, -0.01, 0.5 }, + ModelData = { 58, 0.2, 0.064, 0.1, 0.006, -0.31, 0.1, 0.55, 1.8, 0.2, 1.2, 0.2, 0, -1, -1, 3, 0, 0, 0, 1000000000, 0, 0, 3.9, 0, 0, 0, 0, 0, 0, 8340, 0, 0, 0, 0, 26, 20, 0, 0.35, 1000000000, 1000000000, 0, 80, 0, 1.19, 1, 2, 3.36, -8.93, -1.91, 11270, 2994, 19650, 5656, 7654, 1858, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", Nr_max = 30, OmViz_max = 0.611, + PN_gain = 5, Range_max = 12000, Reflection = 0.03, SeekerCooled = true, @@ -29,18 +30,32 @@ _G["rockets"]["#Index"] = { X_back = -1.16, Y_back = 0, Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.P_60", + category = 4, ccm_k0 = 1, - display_name = "R-60M (AA-8 Aphid-B)", - display_name_short = "R-60M", + display_name = "R-60M", exhaust = { 1, 1, 1, 1 }, name = "P_60", + nozzle_exit_area = 0.0078, + shape_table_data = { { + file = "r-60", + fire = { 1, 1 }, + index = "Redacted", + life = 1, + name = "r-60", + username = "r-60" + } }, sigma = { 3, 3, 3 }, - t_acc = 5, + supersonic_A_coef_skew = 0.25, + t_acc = 3, t_b = 0, t_marsh = 0, + user_name = "R-60M (AA-8 Aphid-B)", v_mid = 400, v_min = 140, warhead = "_G/warheads/P_60.lua", - ws_type = { 4, 4, 7, "Redacted" } + wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, + ws_type =
} \ No newline at end of file diff --git a/_G/rockets/P_700.lua b/_G/rockets/P_700.lua index ce08706b..07a8b2b3 100644 --- a/_G/rockets/P_700.lua +++ b/_G/rockets/P_700.lua @@ -31,6 +31,7 @@ _G["rockets"]["#Index"] = { Z_back_acc = 0, _unique_resource_name = "weapons.missiles.P_700", display_name = "P-700 (SS-N-19 Shipwreck)", + display_name_short = "P-700 (SS-N-19 Shipwreck)", exhaust1 = { 1, 1, 1, 1 }, name = "P_700", sigma = { 15, 15, 15 }, diff --git a/_G/rockets/P_9M117.lua b/_G/rockets/P_9M117.lua index 77ba656f..4fd156e8 100644 --- a/_G/rockets/P_9M117.lua +++ b/_G/rockets/P_9M117.lua @@ -27,6 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = 0, Z_back = 0, display_name = "AT-10 Stabber", + display_name_short = "AT-10 Stabber", exhaust = { 0.9, 0.9, 0.9, 0.1 }, name = "P_9M117", sigma = { 4, 4, 4 }, diff --git a/_G/rockets/P_9M133.lua b/_G/rockets/P_9M133.lua index 76700f5e..1454c3f3 100644 --- a/_G/rockets/P_9M133.lua +++ b/_G/rockets/P_9M133.lua @@ -27,6 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = 0, Z_back = 0, display_name = "AT-14 Spriggan", + display_name_short = "AT-14 Spriggan", exhaust = { 0.9, 0.9, 0.9, 0.1 }, name = "P_9M133", sigma = { 4, 4, 4 }, diff --git a/_G/rockets/R-13M.lua b/_G/rockets/R-13M.lua index 1749e6e2..6e62cfbf 100644 --- a/_G/rockets/R-13M.lua +++ b/_G/rockets/R-13M.lua @@ -1,56 +1,58 @@ _G["rockets"]["#Index"] = { - Cx_pil = 0.001, + Cx_pil = 1.68, D_max = 15000, - D_min = 900, - Damage = 28.05, + D_min = 300, + Damage = 28.25, Diam = 127, Escort = 0, - Fi_excort = 0.61075, - Fi_rak = 2.6175, - Fi_search = 0.08725, - Fi_start = 0.2094, + Fi_excort = 0.7, + Fi_rak = 1.57, + Fi_search = 0.021, + Fi_start = 0.2, H_max = 20000, H_min = -1, H_min_t = 1, Head_Form = 0, Head_Type = 1, - KillDistance = 5, + KillDistance = 5.5, Life_Time = 60, M = 87.7, - Mach_max = 2.5, - ModelData = { 58, 0.35, 0.1, 0.1, 0.02, 0.04, 1.2, 1.2, 0.8, 0.7, 1.2, 0.29, 0, -1, -1, 5, 0, 0, 0, 1000000000, 0, 0, 6, 0, 0, 0, 0, 0, 0, 8280, 0, 0, 0, 0, 61, 60, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 5000, 0.63, 0.53, 0.75, 59, 1, 5000, 1, 0.2, 0.6, 1.4, -3, 0.5 }, + Mach_max = 4, + ModelData = { 58, 0.35, 0.039, 0.084, 0.01, 0.037, 0.15, 0.8, 2.1, 0.1, 1.2, 0.14, 0, -1, -1, 4.5, 0, 0, 0, 1000000000, 0, 0, 6.34, 0, 0, 0, 0, 0, 0, 13066, 0, 0, 0, 0, 60, 55, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 2.65, -11.71, -2.15, 14220, 3833, 22886, 6660, 10322, 2581, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 20, - OmViz_max = 0.349, - PN_coeffs = { 2, 4000, 1, 15000, 0.3 }, - Range_max = 20000, - Reflection = 0.0182, + Nr_max = 18, + OmViz_max = 0.21, + PN_gain = 4, + Range_max = 15000, + Reflection = 0.03, SeekerCooled = true, - SeekerSensivityDistance = 7500, - X_back = -1.396, - Y_back = -0.081, + SeekerSensivityDistance = 8000, + X_back = -1.46, + Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.R-13M", category = 4, - ccm_k0 = 0.66, - display_name = "R-13M - AAM, IR guided", - exhaust = { 0.9, 0.9, 0.9, 0.5 }, + ccm_k0 = 3, + display_name = "R-13M", + exhaust = { 0.7, 0.7, 0.7, 1 }, name = "R-13M", + nozzle_exit_area = 0.005, shape_table_data = { { file = "r-13m", fire = { 0, 1 }, index = "Redacted", life = 1, - name = "r-13_m", + name = "R-13M", username = "R-13M" } }, sigma = { 3, 3, 3 }, - t_acc = 5, + supersonic_A_coef_skew = 0.2, + t_acc = 4.5, t_b = 0, t_marsh = 0, - user_name = "R-13M - AAM, IR guided", + user_name = "R-13M", v_mid = 450, v_min = 140, warhead = { @@ -59,11 +61,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 0, cumulative_factor = 0, cumulative_thickness = 0, - expl_mass = 11.22, - mass = 12.342, + expl_mass = 11.3, + mass = 11.3, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 2.4684 + piercing_mass = 2.26 }, wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, ws_type =
diff --git a/_G/rockets/R-13M1.lua b/_G/rockets/R-13M1.lua index 480fe44f..1b4b445f 100644 --- a/_G/rockets/R-13M1.lua +++ b/_G/rockets/R-13M1.lua @@ -1,57 +1,59 @@ _G["rockets"]["#Index"] = { - Cx_pil = 0.001, + Cx_pil = 1.68, D_max = 15000, D_min = 300, - Damage = 28.05, + Damage = 28.25, Diam = 127, Escort = 0, - Fi_excort = 0.698, - Fi_rak = 2.6175, - Fi_search = 0.08725, - Fi_start = 0.2094, + Fi_excort = 0.7, + Fi_rak = 1.57, + Fi_search = 0.021, + Fi_start = 0.2, H_max = 20000, H_min = -1, H_min_t = 1, Head_Form = 0, Head_Type = 1, - KillDistance = 5, + KillDistance = 5.5, Life_Time = 60, - M = 90.4, - Mach_max = 2.5, - ModelData = { 58, 0.35, 0.1, 0.1, 0.02, 0.04, 1.2, 1.2, 0.8, 0.7, 1.2, 0.29, 0, -1, -1, 5, 0, 0, 0, 1000000000, 0, 0, 6, 0, 0, 0, 0, 0, 0, 8280, 0, 0, 0, 0, 61, 60, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 5200, 0.63, 0.53, 0.75, 59, 1, 5000, 1, 0.2, 0.6, 1.4, -3, 0.5 }, + M = 90.6, + Mach_max = 4, + ModelData = { 58, 0.35, 0.037, 0.086, 0.01, 0.035, 0.15, 0.6, 2.1, 0.2, 1.2, 0.18, 0, -1, -1, 4.5, 0, 0, 0, 1000000000, 0, 0, 6.34, 0, 0, 0, 0, 0, 0, 13066, 0, 0, 0, 0, 60, 55, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 3, -11.71, -2.2, 14368, 3769, 23115, 6552, 10433, 2539, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 35, - OmViz_max = 0.43625, - PN_coeffs = { 2, 4000, 1, 15000, 0.3 }, - Range_max = 20000, - Reflection = 0.0182, + Nr_max = 25, + OmViz_max = 0.35, + PN_gain = 4, + Range_max = 15000, + Reflection = 0.03, SeekerCooled = true, - SeekerSensivityDistance = 7500, - X_back = -1.396, - Y_back = -0.081, + SeekerSensivityDistance = 8000, + X_back = -1.46, + Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.R-13M1", category = 4, - ccm_k0 = 0.66, - display_name = "R-13M1 - AAM, IR guided", - exhaust = { 0.9, 0.9, 0.9, 0.5 }, + ccm_k0 = 2.5, + display_name = "R-13M1", + exhaust = { 0.7, 0.7, 0.7, 1 }, name = "R-13M1", + nozzle_exit_area = 0.005, shape_table_data = { { file = "r-13m1", fire = { 0, 1 }, index = "Redacted", life = 1, - name = "r-13_m1", + name = "R-13M1", username = "R-13M1" } }, sigma = { 3, 3, 3 }, - t_acc = 5.1, + supersonic_A_coef_skew = 0.2, + t_acc = 4.5, t_b = 0, t_marsh = 0, - user_name = "R-13M1 - AAM, IR guided", - v_mid = 460, + user_name = "R-13M1", + v_mid = 450, v_min = 140, warhead = { caliber = 127, @@ -59,11 +61,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 0, cumulative_factor = 0, cumulative_thickness = 0, - expl_mass = 11.22, - mass = 12.342, + expl_mass = 11.3, + mass = 11.3, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 2.4684 + piercing_mass = 2.26 }, wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, ws_type =
diff --git a/_G/rockets/R-3R.lua b/_G/rockets/R-3R.lua index 88c4785f..a6b476d0 100644 --- a/_G/rockets/R-3R.lua +++ b/_G/rockets/R-3R.lua @@ -1,55 +1,58 @@ _G["rockets"]["#Index"] = { - Cx_pil = 0.001, - D_max = 7600, - D_min = 900, + Cx_pil = 1.68, + D_max = 4000, + D_min = 300, Damage = 28.25, Diam = 127, Escort = 1, - Fi_excort = 0.5235, - Fi_rak = 3.141, - Fi_search = 0.08725, - Fi_start = 0.2094, - H_max = 18500, - H_min = 300, - H_min_t = 10, + Fi_excort = 0.49, + Fi_rak = 3.1416, + Fi_search = 0.26, + Fi_start = 0.26, + H_max = 20000, + H_min = -1, + H_min_t = 1, Head_Form = 1, Head_Type = 6, - KillDistance = 5, - Life_Time = 30, - M = 83.5, - Mach_max = 2.2, - ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 0.8, 0.7, 1.2, 0.13, 0, -1, -1, 2.8, 0, 0, 0, 1000000000, 0, 0, 7, 0, 0, 0, 0, 0, 0, 13570, 0, 0, 0, 0, 22, 21, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 6, -8, -1.1, 10000, 2700, 14500, 4500, 7500, 1800, 2500, 0.55, -0.01, 0.5 }, + KillDistance = 8, + Life_Time = 26, + M = 82.84, + Mach_max = 3.5, + ModelData = { 58, 0.35, 0.0325, 0.069, 0.02, 0.03, 0.4, 0.5, 1.8, 0.1, 1, 0.14, 0, -1, -1, 2.3, 0, 0, 0, 1000000000, 0, 0, 8.91, 0, 0, 0, 0, 0, 0, 17500, 0, 0, 0, 0, 26, 21, 0, 0.57, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 7.88, -13.52, -2.26, 13951, 3070, 23673, 5521, 9735, 2011, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 16, - OmViz_max = 0.349, + Nr_max = 11.3, + OmViz_max = 0.1, PN_gain = 3, - Range_max = 5082, - Reflection = 0.0182, - X_back = -1.374, - Y_back = -0.081, + Range_max = 11000, + Reflection = 0.03, + SeekerSensivityDistance = 7000, + X_back = -1.55, + Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.R-3R", category = 4, - ccm_k0 = 0.66, - display_name = "R-3R - AAM, radar guided", - exhaust = { 0.9, 0.9, 0.9, 0.5 }, + ccm_k0 = 5, + display_name = "R-3R", + exhaust = { 1, 1, 1, 1 }, name = "R-3R", + nozzle_exit_area = 0.005, shape_table_data = { { file = "r-3r", fire = { 0, 1 }, index = "Redacted", life = 1, - name = "r-3_r", + name = "R-3R", username = "R-3R" } }, - sigma = { 5, 5, 5 }, - t_acc = 2.45, + sigma = { 3, 3, 3 }, + supersonic_A_coef_skew = 0.2, + t_acc = 2.3, t_b = 0, t_marsh = 0, - user_name = "R-3R - AAM, radar guided", - v_mid = 500, + user_name = "R-3R", + v_mid = 350, v_min = 140, warhead = { caliber = 127, @@ -58,10 +61,10 @@ _G["rockets"]["#Index"] = { cumulative_factor = 0, cumulative_thickness = 0, expl_mass = 11.3, - mass = 12.43, + mass = 11.3, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 2.486 + piercing_mass = 2.26 }, wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, ws_type =
diff --git a/_G/rockets/R-3S.lua b/_G/rockets/R-3S.lua index 58c8b97e..f74cedf9 100644 --- a/_G/rockets/R-3S.lua +++ b/_G/rockets/R-3S.lua @@ -1,57 +1,59 @@ _G["rockets"]["#Index"] = { - Cx_pil = 0.001, - D_max = 7600, - D_min = 900, - Damage = 26.75, + Cx_pil = 1.68, + D_max = 4000, + D_min = 300, + Damage = 28.25, Diam = 127, Escort = 0, - Fi_excort = 0.5235, - Fi_rak = 2.6175, - Fi_search = 0.08725, - Fi_start = 0.2094, - H_max = 18500, - H_min = 100, - H_min_t = 10, + Fi_excort = 0.49, + Fi_rak = 1.1, + Fi_search = 0.029, + Fi_start = 0.49, + H_max = 18000, + H_min = -1, + H_min_t = 1, Head_Form = 0, Head_Type = 1, - KillDistance = 5, - Life_Time = 30, + KillDistance = 7, + Life_Time = 26, M = 75.3, - Mach_max = 2.2, - ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 0.8, 0.7, 1.2, 0.13, 0, -1, -1, 2.8, 0, 0, 0, 1000000000, 0, 0, 7, 0, 0, 0, 0, 0, 0, 13570, 0, 0, 0, 0, 22, 21, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 6, -8, -1.1, 10000, 2700, 14500, 4500, 7500, 1800, 2500, 0.55, -0.01, 0.5 }, + Mach_max = 3.2, + ModelData = { 58, 0.35, 0.0325, 0.069, 0.02, 0.03, 0.4, 0.5, 1.8, 0.1, 1, 0.14, 0, -1, -1, 2.3, 0, 0, 0, 1000000000, 0, 0, 8.91, 0, 0, 0, 0, 0, 0, 17500, 0, 0, 0, 0, 26, 21, 0, 0.57, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 4.42, -11.3, -2.22, 13196, 3147, 22523, 5639, 9184, 2061, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 16, - OmViz_max = 0.349, + Nr_max = 11.3, + OmViz_max = 0.1, PN_gain = 3, - Range_max = 15400, - Reflection = 0.0182, - SeekerCooled = true, - SeekerSensivityDistance = 7500, - X_back = -1.374, - Y_back = -0.081, + Range_max = 11000, + Reflection = 0.03, + SeekerCooled = false, + SeekerSensivityDistance = 5000, + X_back = -1.55, + Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + _file = "./CoreMods/aircraft/AircraftWeaponPack/R3_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.R-3S", category = 4, - ccm_k0 = 0.66, - display_name = "R-3S - AAM, IR guided", - exhaust = { 0.9, 0.9, 0.9, 0.5 }, + ccm_k0 = 5, + display_name = "R-3S", + exhaust = { 1, 1, 1, 1 }, name = "R-3S", + nozzle_exit_area = 0.005, shape_table_data = { { file = "r-3s", fire = { 0, 1 }, index = "Redacted", life = 1, - name = "r-3_s", + name = "R-3S", username = "R-3S" } }, - sigma = { 3, 3, 4 }, - t_acc = 2.45, + sigma = { 3, 3, 3 }, + supersonic_A_coef_skew = 0.2, + t_acc = 2.3, t_b = 0, t_marsh = 0, - user_name = "R-3S - AAM, IR guided", - v_mid = 400, + user_name = "R-3S", + v_mid = 350, v_min = 140, warhead = { caliber = 127, @@ -59,11 +61,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 0, cumulative_factor = 0, cumulative_thickness = 0, - expl_mass = 10.7, - mass = 11.77, + expl_mass = 11.3, + mass = 11.3, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 2.354 + piercing_mass = 2.26 }, wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, ws_type =
diff --git a/_G/rockets/R-60.lua b/_G/rockets/R-60.lua index 08697b22..20c819a5 100644 --- a/_G/rockets/R-60.lua +++ b/_G/rockets/R-60.lua @@ -1,69 +1,71 @@ _G["rockets"]["#Index"] = { - Cx_pil = 0.001, - D_max = 7200, - D_min = 300, - Damage = 15, - Diam = 130, + Cx_pil = 1.31, + D_max = 1500, + D_min = 200, + Damage = 7.5, + Diam = 120, Escort = 0, - Fi_excort = 0.698, - Fi_rak = 2.6175, - Fi_search = 0.08725, - Fi_start = 0.349, - H_max = 24000, + Fi_excort = 0.79, + Fi_rak = 1.5708, + Fi_search = 0.044, + Fi_start = 0.209, + H_max = 20000, H_min = -1, H_min_t = 1, Head_Form = 0, Head_Type = 1, - KillDistance = 3, - Life_Time = 23, - M = 43.5, + KillDistance = 5, + Life_Time = 26, + M = 43, Mach_max = 2.5, - ModelData = { 58, 0.2, 0.1, 0.1, 0.02, 0.04, 1.2, 1.2, 0.8, 0.7, 1.2, 0.29, 0, -1, -1, 4.5, 0, 0, 0, 1000000000, 0, 0, 2.5, 0, 0, 0, 0, 0, 0, 5002.5, 0, 0, 0, 0, 29, 25, 0, 0.3, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 5450, 0.63, 0.53, 0.75, 25, 13000, 6000, 7000, 0.2, 0.6, 1.4, -3, 0.5 }, + ModelData = { 58, 0.2, 0.064, 0.1, 0.006, -0.31, 0.1, 0.55, 1.8, 0.2, 1.2, 0.2, 0, -1, -1, 3, 0, 0, 0, 1000000000, 0, 0, 3.9, 0, 0, 0, 0, 0, 0, 8340, 0, 0, 0, 0, 26, 20, 0, 0.35, 1000000000, 1000000000, 0, 80, 0, 1.19, 1, 2, 3.36, -8.93, -1.91, 11270, 2994, 19650, 5656, 7654, 1858, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", - Nr_max = 40, - OmViz_max = 0.5235, - PN_coeffs = { 2, 4000, 1, 15000, 0.3 }, - Range_max = 11200, - Reflection = 0.0182, - SeekerCooled = true, - SeekerSensivityDistance = 7500, - X_back = -1.166, - Y_back = -0.069, + Nr_max = 30, + OmViz_max = 0.611, + PN_gain = 5, + Range_max = 8000, + Reflection = 0.03, + SeekerCooled = false, + SeekerSensivityDistance = 9487, + X_back = -1.16, + Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/MiG-21BIS/Entry/Aw", - _origin = "MiG-21Bis AI by Magnitude 3 LLC", + _file = "./CoreMods/aircraft/AircraftWeaponPack/R_60.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.R-60", category = 4, - ccm_k0 = 0.66, - display_name = "R-60 - AAM, IR guided", - exhaust = { 0.9, 0.9, 0.9, 0.5 }, + ccm_k0 = 2, + display_name = "R-60", + exhaust = { 1, 1, 1, 1 }, name = "R-60", + nozzle_exit_area = 0.0078, shape_table_data = { { file = "r-60a", - fire = { 0, 1 }, + fire = { 1, 1 }, index = "Redacted", life = 1, - name = "r-60", + name = "R-60a", username = "R-60" } }, sigma = { 3, 3, 3 }, - t_acc = 2.5, + supersonic_A_coef_skew = 0.25, + t_acc = 3, t_b = 0, t_marsh = 0, - user_name = "R-60 - AAM, IR guided", - v_mid = 600, - v_min = 200, + user_name = "R-60 (AA-8 Aphid)", + v_mid = 400, + v_min = 137.2, warhead = { - caliber = 130, + caliber = 120, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, cumulative_factor = 0, cumulative_thickness = 0, - expl_mass = 6, - mass = 6.6, + expl_mass = 3, + mass = 3, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 1.32 + piercing_mass = 0.6 }, wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, ws_type =
diff --git a/_G/rockets/RB75.lua b/_G/rockets/RB75.lua index a2b91c9e..a24b7190 100644 --- a/_G/rockets/RB75.lua +++ b/_G/rockets/RB75.lua @@ -39,6 +39,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "RB-75A", + display_name_short = "RB-75A", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/rockets/RB75B.lua b/_G/rockets/RB75B.lua index 30c5099a..95ebe238 100644 --- a/_G/rockets/RB75B.lua +++ b/_G/rockets/RB75B.lua @@ -39,6 +39,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "RB-75B", + display_name_short = "RB-75B", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/rockets/RB75T.lua b/_G/rockets/RB75T.lua index 09211f6e..924f1193 100644 --- a/_G/rockets/RB75T.lua +++ b/_G/rockets/RB75T.lua @@ -39,6 +39,7 @@ _G["rockets"]["#Index"] = { category = 2, class_name = "wAmmunitionSelfHoming", display_name = "RB-75T", + display_name_short = "RB-75T", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/rockets/REFLEX.lua b/_G/rockets/REFLEX.lua index b91172c4..38ec3edc 100644 --- a/_G/rockets/REFLEX.lua +++ b/_G/rockets/REFLEX.lua @@ -27,6 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = 0, Z_back = 0, display_name = "AT-11 Sniper", + display_name_short = "AT-11 Sniper", exhaust = { 0.9, 0.9, 0.9, 0.1 }, name = "REFLEX", sigma = { 4, 4, 4 }, diff --git a/_G/rockets/RIM_116A.lua b/_G/rockets/RIM_116A.lua index 0c4cc0eb..99fc072c 100644 --- a/_G/rockets/RIM_116A.lua +++ b/_G/rockets/RIM_116A.lua @@ -15,11 +15,11 @@ _G["rockets"]["#Index"] = { Head_Form = 0, Head_Type = 3, IR_seeker = { - FOV = 0.24434609527921, + FOV = 0.034906585039887, GimbLim = 2.2689280275926, ccm_k0 = 0.5, cooled = true, - delay = 0.04, + delay = 3, flag_dist = 150, opTime = 45, sensitivity = 10500, @@ -40,9 +40,9 @@ _G["rockets"]["#Index"] = { _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/ammunition_missiles.lua", _origin = "TechWeaponPack", autopilot = { - K = 60, + K = 64, Kg = 2.4, - Ki = 0, + Ki = 0.0024, delay = 0.5, fin2_coeff = 0.5, finsLimit = 0.4 @@ -67,6 +67,7 @@ _G["rockets"]["#Index"] = { march_start = 0.2 }, display_name = "RIM-116A", + display_name_short = "RIM-116A", fm = { A = 0.6, I = 48.77472, @@ -104,10 +105,13 @@ _G["rockets"]["#Index"] = { name = "RIM_116A", scheme = "passive_plus_IR_homing_missile", seeker = { - FOV = 0.24434609527921, - aim_sigma = 20, - delay = 0.06, - max_w_LOS = 999 + FOV = 0.78539816339745, + aim_sigma = 40, + delay = 0, + max_w_LOS = 999, + op_time = 5, + send_off_data = 1, + turn_off_dist = 1000 }, shape_table_data = { { file = "rim-116", diff --git a/_G/rockets/ROLAND_R.lua b/_G/rockets/ROLAND_R.lua index fc5aa3c8..665730de 100644 --- a/_G/rockets/ROLAND_R.lua +++ b/_G/rockets/ROLAND_R.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.ROLAND_R", ccm_k0 = 0.5, display_name = "XMIM-115 Roland", + display_name_short = "XMIM-115 Roland", exhaust = { 1, 1, 1, 1 }, name = "ROLAND_R", sigma = { 15, 15, 15 }, diff --git a/_G/rockets/Rapier.lua b/_G/rockets/Rapier.lua index 880f356a..d75f9ffb 100644 --- a/_G/rockets/Rapier.lua +++ b/_G/rockets/Rapier.lua @@ -58,6 +58,7 @@ _G["rockets"]["#Index"] = { march_start = 1.001 }, display_name = "Rapier", + display_name_short = "Rapier", err = { max_time_interval = 0.9, min_time_interval = 0.1, diff --git a/_G/rockets/Rb 04E (for A.I.).lua b/_G/rockets/Rb 04E (for A.I.).lua index d8cc979b..751a0897 100644 --- a/_G/rockets/Rb 04E (for A.I.).lua +++ b/_G/rockets/Rb 04E (for A.I.).lua @@ -2,7 +2,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 0.0001, D_max = 32000, D_min = 4000, - Damage = 17500, + Damage = 5625, Diam = 500, Escort = 0, Fi_excort = 0.7, @@ -65,6 +65,7 @@ _G["rockets"]["#Index"] = { march_start = 150 }, display_name = "RB-04E (for A.I.)", + display_name_short = "RB-04E (for A.I.)", engine_control = { K = 265, Kd = 0.01, @@ -160,11 +161,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, - mass = 1400, + expl_mass = 450, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, warhead_air =
, wsTypeOfWeapon = <2>{ 4, 4, 8, "Redacted" }, diff --git a/_G/rockets/Rb 04E.lua b/_G/rockets/Rb 04E.lua index d365a6f1..72f89a7d 100644 --- a/_G/rockets/Rb 04E.lua +++ b/_G/rockets/Rb 04E.lua @@ -2,7 +2,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 0.0001, D_max = 31000, D_min = 5000, - Damage = 17500, + Damage = 5625, Diam = 500, Engine_Type = 1, Escort = 1, @@ -16,7 +16,7 @@ _G["rockets"]["#Index"] = { H_min_t = 0, Head_Form = 1, Head_Type = 4, - KillDistance = 5, + KillDistance = 1, Life_Time = 4500, M = 625, Mach_max = 1.2, @@ -60,11 +60,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, - mass = 1400, + expl_mass = 450, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, ws_type =
diff --git a/_G/rockets/Rb 15F (for A.I.).lua b/_G/rockets/Rb 15F (for A.I.).lua index 5d574626..59c20651 100644 --- a/_G/rockets/Rb 15F (for A.I.).lua +++ b/_G/rockets/Rb 15F (for A.I.).lua @@ -2,7 +2,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 8, D_max = 190000, D_min = 5000, - Damage = 17500, + Damage = 5625, Diam = 343, Escort = 0, Fi_excort = 0.7, @@ -66,6 +66,7 @@ _G["rockets"]["#Index"] = { march_start = 0.01 }, display_name = "RB-15F (for A.I.)", + display_name_short = "RB-15F (for A.I.)", engine_control = { K = 265, Kd = 0.01, @@ -161,11 +162,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, - mass = 1400, + expl_mass = 450, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, warhead_air =
, wsTypeOfWeapon = <2>{ 4, 4, 8, "Redacted" }, diff --git a/_G/rockets/Rb 15F.lua b/_G/rockets/Rb 15F.lua index 1d79aedb..ba1a52bb 100644 --- a/_G/rockets/Rb 15F.lua +++ b/_G/rockets/Rb 15F.lua @@ -2,7 +2,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 0.0001, D_max = 70000, D_min = 2000, - Damage = 17500, + Damage = 3750, Diam = 500, Engine_Type = 5, Escort = 1, @@ -58,11 +58,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, - mass = 1400, + expl_mass = 300, + mass = 300, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 60 }, wsTypeOfWeapon = <1>{ 4, 4, 8, "Redacted" }, ws_type =
diff --git a/_G/rockets/Rb 24.lua b/_G/rockets/Rb 24.lua index f48c8ba5..874b60f2 100644 --- a/_G/rockets/Rb 24.lua +++ b/_G/rockets/Rb 24.lua @@ -1,52 +1,54 @@ _G["rockets"]["#Index"] = { - Cx_pil = 0.4, + Cx_pil = 1.68, D_max = 4000, D_min = 300, - Damage = 19.125, + Damage = 25, Diam = 127, Escort = 0, Fi_excort = 0.44, Fi_rak = 1.1, - Fi_search = 0.044, - Fi_start = 0.3, + Fi_search = 0.034, + Fi_start = 0.44, H_max = 18000, H_min = -1, H_min_t = 1, Head_Form = 0, Head_Type = 1, - KillDistance = 9, - Life_Time = 30, + KillDistance = 7, + Life_Time = 24, M = 74.39, - Mach_max = 2.2, - ModelData = { 58, 0.35, 0.04, 0.08, 0.02, 0.05, 1.2, 1.2, 0.5, 0.4, 1.2, 0.29, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17150, 0, 0, 0, 0, 25, 21.5, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 0, 0, 0, 0, 0, 9000, 4000, 4000, 0.2, 1, 1.4, -3, 0.5 }, + Mach_max = 3.2, + ModelData = { 58, 0.35, 0.0325, 0.069, 0.02, 0.03, 0.4, 0.5, 1.8, 0.1, 1, 0.14, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17170, 0, 0, 0, 0, 24, 21, 0, 0.5, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 4.65, -10.98, -2.24, 12880, 2916, 21942, 5242, 8937, 1918, 2500, 0.35, -0.01, 0.5 }, Name = "Redacted", - NatoName = "(Rb24)", - Nr_max = 10, - OmViz_max = 0.2, + Nr_max = 12, + OmViz_max = 0.165, + PN_gain = 3, Range_max = 11000, Reflection = 0.03, SeekerCooled = false, - SeekerSensivityDistance = 4000, - X_back = -1.55, + SeekerSensivityDistance = 5000, + X_back = -1.5, Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", - _origin = "AJS37 AI by Heatblur Simulations", + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.Rb 24", category = 4, - ccm_k0 = 10, + ccm_k0 = 5, display_name = "RB-24", exhaust = { 1, 1, 1, 1 }, name = "Rb 24", + nozzle_exit_area = 0.005, shape_table_data = { { file = "aim-9b", fire = { 0, 1 }, index = "Redacted", life = 1, - name = "Robot24", - username = "Robot 24" + name = "Rb 24", + username = "Rb 24" } }, sigma = { 3, 3, 3 }, + supersonic_A_coef_skew = 0.2, t_acc = 2.2, t_b = 0, t_marsh = 0, @@ -59,11 +61,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 0, cumulative_factor = 0, cumulative_thickness = 0, - expl_mass = 7.65, - mass = 7.65, + expl_mass = 10, + mass = 10, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 1.53 + piercing_mass = 2 }, wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, ws_type =
diff --git a/_G/rockets/Rb 24J.lua b/_G/rockets/Rb 24J.lua index 27039dd5..1f6b6634 100644 --- a/_G/rockets/Rb 24J.lua +++ b/_G/rockets/Rb 24J.lua @@ -1,52 +1,53 @@ _G["rockets"]["#Index"] = { - Cx_pil = 0.4, - D_max = 7000, + Cx_pil = 1.68, + D_max = 4000, D_min = 300, - Damage = 19.125, + Damage = 27.5, Diam = 127, Escort = 0, Fi_excort = 0.7, - Fi_rak = 3.14152, - Fi_search = 0.031, + Fi_rak = 2.1, + Fi_search = 0.017, Fi_start = 0.3, H_max = 18000, H_min = -1, H_min_t = 1, Head_Form = 0, Head_Type = 1, - KillDistance = 9, + KillDistance = 7, Life_Time = 40, - M = 81.4, + M = 80.7, Mach_max = 2.2, - ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 2.2, 0, 0, 0, 1000000000, 0, 0, 8.45, 0, 0, 0, 0, 0, 0, 17800, 0, 0, 0, 0, 45, 40, 0, 0.3, 1000000000, 1000000000, 0, 30, 0, 1.2, 1, 2, 9, -11, -1.4, 10500, 2800, 17000, 5500, 6700, 2000, 2500, 0.55, -0.01, 0.5 }, + ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 5, 0, 0, 0, 1000000000, 0, 0, 4.84, 0, 0, 0, 0, 0, 0, 11020, 0, 0, 0, 0, 1000000000, 40, 0, 0.3, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 8, -11.1, -2.33, 16700.5, 5040.5, 28498.2, 9345.3, 11466, 3206.3, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", - NatoName = "(Rb24J)", Nr_max = 22, - OmViz_max = 0.28, - Range_max = 14000, + OmViz_max = 0.29, + Range_max = 11000, Reflection = 0.03, - SeekerCooled = false, - SeekerSensivityDistance = 5000, + SeekerCooled = true, + SeekerSensivityDistance = 10000, X_back = -1.46, Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", - _origin = "AJS37 AI by Heatblur Simulations", + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.Rb 24J", category = 4, - ccm_k0 = 3, + ccm_k0 = 2, display_name = "RB-24J", - exhaust = { 0.7, 0.7, 0.7, 1 }, + exhaust = { 0.7, 0.7, 0.7, 0.1 }, name = "Rb 24J", + nozzle_exit_area = 0.005, shape_table_data = { { file = "aim-9p5", fire = { 0, 1 }, index = "Redacted", life = 1, - name = "Robot24J", - username = "Robot 24J" + name = "Rb 24J", + username = "Rb 24J" } }, sigma = { 3, 3, 3 }, + supersonic_A_coef_skew = 0.25, t_acc = 5, t_b = 0, t_marsh = 0, @@ -59,11 +60,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 0, cumulative_factor = 0, cumulative_thickness = 0, - expl_mass = 7.65, - mass = 7.65, + expl_mass = 11, + mass = 11, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 1.53 + piercing_mass = 2.2 }, wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, ws_type =
diff --git a/_G/rockets/Rb 74.lua b/_G/rockets/Rb 74.lua index 68d979e9..7843184e 100644 --- a/_G/rockets/Rb 74.lua +++ b/_G/rockets/Rb 74.lua @@ -1,8 +1,8 @@ _G["rockets"]["#Index"] = { - Cx_pil = 0.4, + Cx_pil = 1.68, D_max = 7000, D_min = 300, - Damage = 39.95, + Damage = 27.5, Diam = 127, Escort = 0, Fi_excort = 0.79, @@ -14,24 +14,23 @@ _G["rockets"]["#Index"] = { H_min_t = 1, Head_Form = 0, Head_Type = 1, - KillDistance = 9, + KillDistance = 7, Life_Time = 60, - M = 85.4, + M = 85.73, Mach_max = 2.7, - ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 5.2, 0, 0, 0, 1000000000, 0, 0, 5.27, 0, 0, 0, 0, 0, 0, 11890, 0, 0, 0, 0, 65, 60, 0, 0.4, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 9, -13, -2.1, 15500, 5500, 27000, 10000, 10500, 3500, 2500, 0.55, -0.01, 0.5 }, + ModelData = { 58, 0.35, 0.049, 0.082, 0.01, 0.001, 0.55, 0.8, 2.5, 0.8, 1.2, 0.13, 0, -1, -1, 5.2, 0, 0, 0, 1000000000, 0, 0, 5.27, 0, 0, 0, 0, 0, 0, 11890, 0, 0, 0, 0, 1000000000, 60, 0, 0.8, 1000000000, 1000000000, 0, 30, 0, 1.19, 1, 2, 9, -13, -2.1, 15500, 5500, 27000, 10000, 10500, 3500, 2500, 0.55, -0.01, 0.5 }, Name = "Redacted", - NatoName = "(Rb74)", Nr_max = 32, OmViz_max = 0.44, Range_max = 14000, - Reflection = 0.0182, + Reflection = 0.03, SeekerCooled = true, SeekerSensivityDistance = 20000, - X_back = -1.66, + X_back = -1.5, Y_back = 0, Z_back = 0, - _file = "./CoreMods/aircraft/AJS37/Entry/Weapons.lua", - _origin = "AJS37 AI by Heatblur Simulations", + _file = "./CoreMods/aircraft/AircraftWeaponPack/aim9_family.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.Rb 74", category = 4, ccm_k0 = 0.75, @@ -40,12 +39,12 @@ _G["rockets"]["#Index"] = { name = "Rb 74", nozzle_exit_area = 0.0068, shape_table_data = { { - file = "AIM-9L", + file = "aim-9L", fire = { 0, 1 }, index = "Redacted", life = 1, - name = "Robot74", - username = "Robot 74" + name = "Rb 74", + username = "Rb 74" } }, sigma = { 3, 3, 3 }, supersonic_A_coef_skew = 0.25, @@ -61,11 +60,11 @@ _G["rockets"]["#Index"] = { concrete_obj_factor = 0, cumulative_factor = 0, cumulative_thickness = 0, - expl_mass = 15.98, - mass = 15.98, + expl_mass = 11, + mass = 11, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 3.196 + piercing_mass = 2.2 }, wsTypeOfWeapon = <1>{ 4, 4, 7, "Redacted" }, ws_type =
diff --git a/_G/rockets/SA3M9M.lua b/_G/rockets/SA3M9M.lua index ff4e44e8..6579b040 100644 --- a/_G/rockets/SA3M9M.lua +++ b/_G/rockets/SA3M9M.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA3M9M", ccm_k0 = 1, display_name = "3M9M Kub (SA-6 Gainful)", + display_name_short = "3M9M Kub (SA-6 Gainful)", exhaust = { 1, 1, 1, 1 }, name = "SA3M9M", sigma = { 50, 50, 50 }, diff --git a/_G/rockets/SA48H6E2.lua b/_G/rockets/SA48H6E2.lua index f0673eb8..341525bc 100644 --- a/_G/rockets/SA48H6E2.lua +++ b/_G/rockets/SA48H6E2.lua @@ -18,10 +18,11 @@ _G["rockets"]["#Index"] = { Life_Time = 200, M = 1780, Mach_max = 8.6, - ModelData = { 58, 2.1, 0.047, 0.092, 0.014, -0.015, 0.72, 1.13, 0.8, 0.01, 0.21, 0.3, 6, 0.4, 0, 0, 11.2, 0, 0, 1000000000, 0, 0, 0, 93.75, 0, 0, 0, 0, 0, 0, 230000, 0, 0, 0, 1000000000, 200, 0, 0.5, 1000000000, 1000000000, 0, 50, 45, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + ModelData = { 58, 2.1, 0.047, 0.092, 0.014, -0.015, 0.72, 1.13, 0.8, 0.01, 0.21, 0.3, 3, 0.9, 0, 11.2, 0, 0, 0, 1000000000, 0, 0, 93.75, 0, 0, 0, 0, 0, 0, 230000, 0, 0, 0, 0, 1000000000, 200, 0, 0.5, 1000000000, 1000000000, 0, 650, 25, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, Name = "Redacted", Nr_max = 25, OmViz_max = 99.9, + PN_gain = 4, Range_max = 150000, Reflection = 0.2, X_back = -3.681, @@ -30,14 +31,15 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA48H6E2", ccm_k0 = 0.5, display_name = "48N6 S-300F (SA-N-6 Grumble)", + display_name_short = "48N6 S-300F (SA-N-6 Grumble)", exhaust = { 1, 1, 1, 1 }, exhaust_effect_type = 1, name = "SA48H6E2", nozzle_exit_area = 0.148, sigma = { 50, 50, 50 }, supersonic_A_coef_skew = 0.17, - t_acc = 12, - t_b = 0, + t_acc = 11.2, + t_b = 0.9, t_marsh = 0, v_mid = 1000, v_min = 170, diff --git a/_G/rockets/SA5B27.lua b/_G/rockets/SA5B27.lua index f9b3e82d..dcd71d0e 100644 --- a/_G/rockets/SA5B27.lua +++ b/_G/rockets/SA5B27.lua @@ -30,6 +30,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA5B27", ccm_k0 = 2, display_name = "5V27 S-125 Neva (SA-3 Goa)", + display_name_short = "5V27 S-125 Neva (SA-3 Goa)", exhaust = { 0.63, 0.67, 0.75, 0.2 }, exhaust_effect_type = 1, name = "SA5B27", diff --git a/_G/rockets/SA5B55.lua b/_G/rockets/SA5B55.lua index 42a5da52..60293367 100644 --- a/_G/rockets/SA5B55.lua +++ b/_G/rockets/SA5B55.lua @@ -14,14 +14,15 @@ _G["rockets"]["#Index"] = { H_min_t = 25, Head_Form = 1, Head_Type = 6, - KillDistance = 30, + KillDistance = 25, Life_Time = 70, M = 1600, Mach_max = 6, - ModelData = { 58, 2, 0.047, 0.092, 0.014, -0.015, 0.72, 1.13, 0.8, 0.01, 0.21, 0.3, 6, -1, 0, 0, 11.2, 0, 0, 1000000000, 0, 0, 0, 94, 0, 0, 0, 0, 0, 0, 200000, 0, 0, 0, 1000000000, 70, 0, 0.5, 1000000000, 1000000000, 0, 50, 30, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + ModelData = { 58, 2, 0.047, 0.092, 0.014, -0.015, 0.72, 1.13, 0.8, 0.01, 0.21, 0.3, 3, 0.9, 0, 10.6, 0, 0, 0, 1000000000, 0, 0, 87.74, 0, 0, 0, 0, 0, 0, 210000, 0, 0, 0, 0, 1000000000, 70, 0, 0.5, 1000000000, 1000000000, 0, 650, 25, 1.19, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, Name = "Redacted", Nr_max = 16, OmViz_max = 99.9, + PN_gain = 4, Range_max = 75000, Reflection = 0.2, X_back = -4.1, @@ -30,14 +31,15 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA5B55", ccm_k0 = 0.5, display_name = "5V55 S-300PS (SA-10B Grumble)", + display_name_short = "5V55 S-300PS (SA-10B Grumble)", exhaust = { 1, 1, 1, 1 }, exhaust_effect_type = 1, name = "SA5B55", nozzle_exit_area = 0.148, sigma = { 50, 50, 50 }, supersonic_A_coef_skew = 0.17, - t_acc = 11.2, - t_b = 0, + t_acc = 10.6, + t_b = 0.9, t_marsh = 0, v_mid = 1000, v_min = 0, diff --git a/_G/rockets/SA9M31.lua b/_G/rockets/SA9M31.lua index 1d49981d..813bcee3 100644 --- a/_G/rockets/SA9M31.lua +++ b/_G/rockets/SA9M31.lua @@ -31,6 +31,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA9M31", ccm_k0 = 1, display_name = "9M31 Strela-1 (SA-9 Gaskin)", + display_name_short = "9M31 Strela-1 (SA-9 Gaskin)", exhaust = { 1, 1, 1, 1 }, name = "SA9M31", sigma = { 5, 5, 5 }, diff --git a/_G/rockets/SA9M311.lua b/_G/rockets/SA9M311.lua index 792651a4..b5e883ee 100644 --- a/_G/rockets/SA9M311.lua +++ b/_G/rockets/SA9M311.lua @@ -31,6 +31,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA9M311", ccm_k0 = 0.5, display_name = "9M311 Tunguska (SA-19 Grison)", + display_name_short = "9M311 Tunguska (SA-19 Grison)", effect_max_length = 10000, exhaust = { 0.7, 0.7, 0.7, 0.5 }, name = "SA9M311", diff --git a/_G/rockets/SA9M33.lua b/_G/rockets/SA9M33.lua index 6d939625..659f692f 100644 --- a/_G/rockets/SA9M33.lua +++ b/_G/rockets/SA9M33.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA9M33", ccm_k0 = 1, display_name = "9M33 Osa (SA-8 Gecko)", + display_name_short = "9M33 Osa (SA-8 Gecko)", exhaust = { 1, 1, 1, 1 }, name = "SA9M33", sigma = { 20, 20, 20 }, diff --git a/_G/rockets/SA9M330.lua b/_G/rockets/SA9M330.lua index e4a86bdb..fa170562 100644 --- a/_G/rockets/SA9M330.lua +++ b/_G/rockets/SA9M330.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA9M330", ccm_k0 = 0.5, display_name = "9M330 Tor (SA-15 Gauntlet)", + display_name_short = "9M330 Tor (SA-15 Gauntlet)", exhaust = { 1, 1, 1, 1 }, name = "SA9M330", sigma = { 15, 15, 15 }, diff --git a/_G/rockets/SA9M333.lua b/_G/rockets/SA9M333.lua index 59312490..38682d33 100644 --- a/_G/rockets/SA9M333.lua +++ b/_G/rockets/SA9M333.lua @@ -31,6 +31,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA9M333", ccm_k0 = 0.5, display_name = "9M333 Strela-10 (SA-13 Gopher)", + display_name_short = "9M333 Strela-10 (SA-13 Gopher)", exhaust = { 1, 1, 1, 1 }, name = "SA9M333", sigma = { 5, 5, 5 }, diff --git a/_G/rockets/SA9M38M1.lua b/_G/rockets/SA9M38M1.lua index c67f86e8..048888d0 100644 --- a/_G/rockets/SA9M38M1.lua +++ b/_G/rockets/SA9M38M1.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SA9M38M1", ccm_k0 = 0.5, display_name = "9M38M1 Buk-M1 (SA-11 Gadfly)", + display_name_short = "9M38M1 Buk-M1 (SA-11 Gadfly)", exhaust = { 1, 1, 1, 1 }, name = "SA9M38M1", sigma = { 25, 25, 25 }, diff --git a/_G/rockets/SCUD_RAKETA.lua b/_G/rockets/SCUD_RAKETA.lua index a0b680dc..5b4ab65b 100644 --- a/_G/rockets/SCUD_RAKETA.lua +++ b/_G/rockets/SCUD_RAKETA.lua @@ -1,7 +1,7 @@ _G["rockets"]["#Index"] = { Cx_pil = 1, - D_max = 320000, - D_min = 50000, + D_max = 285000, + D_min = 45000, Damage = 989, Diam = 880, Escort = 0, @@ -21,12 +21,13 @@ _G["rockets"]["#Index"] = { Name = "Redacted", Nr_max = 17, OmViz_max = 99.9, - Range_max = 320000, + Range_max = 285000, Reflection = 2, X_back = -5.35, Y_back = 0, Z_back = 0, display_name = "Scud R-17", + display_name_short = "Scud R-17", exhaust1 = { 1, 1, 1, 1 }, name = "SCUD_RAKETA", sigma = { 200, 200, 200 }, diff --git a/_G/rockets/SD-10.lua b/_G/rockets/SD-10.lua index 8e7ee9e3..44f0ec8a 100644 --- a/_G/rockets/SD-10.lua +++ b/_G/rockets/SD-10.lua @@ -82,6 +82,7 @@ _G["rockets"]["#Index"] = { march_start = 6.5 }, display_name = "SD-10", + display_name_short = "SD-10", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 27.6, 27.6, 27.6, 27.6, 27.55, 30.38, 31.982, 32.774, 33.234, 33.561, 33.829, 34.07, 34.286, 34.491, 34.687, 34.875, 35.056, 35.232, 35.401, 35.564, 35.721, 35.871, 36.015, 36.151, 36.279, 36.4 }, diff --git a/_G/rockets/SM_2.lua b/_G/rockets/SM_2.lua index 2ee29d50..d12249e9 100644 --- a/_G/rockets/SM_2.lua +++ b/_G/rockets/SM_2.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { _unique_resource_name = "weapons.missiles.SM_2", ccm_k0 = 0.5, display_name = "SM-2", + display_name_short = "SM-2", exhaust = { 1, 1, 1, 1 }, name = "SM_2", sigma = { 50, 50, 50 }, diff --git a/_G/rockets/SVIR.lua b/_G/rockets/SVIR.lua index d89968d4..b724b814 100644 --- a/_G/rockets/SVIR.lua +++ b/_G/rockets/SVIR.lua @@ -27,6 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = 0, Z_back = 0, display_name = "AT-11 Sniper", + display_name_short = "AT-11 Sniper", exhaust = { 0.9, 0.9, 0.9, 0.1 }, name = "SVIR", sigma = { 4, 4, 4 }, diff --git a/_G/rockets/SeaSparrow.lua b/_G/rockets/SeaSparrow.lua index 4791e105..ccbd28cf 100644 --- a/_G/rockets/SeaSparrow.lua +++ b/_G/rockets/SeaSparrow.lua @@ -29,6 +29,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, ccm_k0 = 0.5, display_name = "RIM-7", + display_name_short = "RIM-7", exhaust = { 1, 1, 1, 1 }, loft = 1, name = "SeaSparrow", diff --git a/_G/rockets/Sea_Cat.lua b/_G/rockets/Sea_Cat.lua index 97d738f3..1708fcc9 100644 --- a/_G/rockets/Sea_Cat.lua +++ b/_G/rockets/Sea_Cat.lua @@ -58,6 +58,7 @@ _G["rockets"]["#Index"] = { march_start = 0.8 }, display_name = "GWS-20 Mod. 1 Sea Cat", + display_name_short = "GWS-20 Mod. 1 Sea Cat", err = { max_time_interval = 0.9, min_time_interval = 0, diff --git a/_G/rockets/Sea_Dart.lua b/_G/rockets/Sea_Dart.lua index 763c5d66..e5a4542b 100644 --- a/_G/rockets/Sea_Dart.lua +++ b/_G/rockets/Sea_Dart.lua @@ -68,6 +68,7 @@ _G["rockets"]["#Index"] = { march_start = 2.9 }, display_name = "GWS-30 Sea Dart", + display_name_short = "GWS-30 Sea Dart", fm = { A = 0.36, I = 885.72, diff --git a/_G/rockets/Sea_Eagle.lua b/_G/rockets/Sea_Eagle.lua index 8928efed..aa0eac3b 100644 --- a/_G/rockets/Sea_Eagle.lua +++ b/_G/rockets/Sea_Eagle.lua @@ -28,6 +28,7 @@ _G["rockets"]["#Index"] = { Z_back = 0, _unique_resource_name = "weapons.missiles.Sea_Eagle", display_name = "Sea Eagle", + display_name_short = "Sea Eagle", name = "Sea_Eagle", sigma = { 10, 10, 10 }, t_acc = 6, diff --git a/_G/rockets/Sea_Wolf.lua b/_G/rockets/Sea_Wolf.lua index 62f74b99..706a9057 100644 --- a/_G/rockets/Sea_Wolf.lua +++ b/_G/rockets/Sea_Wolf.lua @@ -58,6 +58,7 @@ _G["rockets"]["#Index"] = { march_start = 0 }, display_name = "GWS-25 Sea Wolf", + display_name_short = "GWS-25 Sea Wolf", err = { max_time_interval = 0.2, min_time_interval = 0, diff --git a/_G/rockets/Vikhr_M.lua b/_G/rockets/Vikhr_M.lua index 5debe10f..71a93595 100644 --- a/_G/rockets/Vikhr_M.lua +++ b/_G/rockets/Vikhr_M.lua @@ -34,9 +34,11 @@ _G["rockets"]["#Index"] = { Kp = 0.078, delay = 0.2, fins_discreet = 0.04, + fins_limit = 3, max_ctrl_angle = 1.35, no_ctrl_center_ang = 4e-05, - op_time = 24 + op_time = 24, + ray_limit_data = { 2, 0.087266462599716, 12, 0.0087266462599716 } }, booster = { custom_smoke_dissipation_factor = 0.8, @@ -57,6 +59,7 @@ _G["rockets"]["#Index"] = { march_start = 0.5 }, display_name = "9M127-1 Vikhr-M", + display_name_short = "9M127-1 Vikhr-M", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/rockets/X_25MR.lua b/_G/rockets/X_25MR.lua index 4193ad76..dc4d25bc 100644 --- a/_G/rockets/X_25MR.lua +++ b/_G/rockets/X_25MR.lua @@ -27,6 +27,7 @@ _G["rockets"]["#Index"] = { Y_back = -0.14, Z_back = 0, display_name = "Kh-25MR", + display_name_short = "Kh-25MR", exhaust = { 0.63, 0.67, 0.75, 0.2 }, name = "X_25MR", sigma = { 5.6, 6, 5.6 }, diff --git a/_G/rockets/X_59M.lua b/_G/rockets/X_59M.lua index fde1a743..5b414d41 100644 --- a/_G/rockets/X_59M.lua +++ b/_G/rockets/X_59M.lua @@ -79,7 +79,7 @@ _G["rockets"]["#Index"] = { impulse = 235, nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -3, -0.196, 0 } }, + nozzle_position = { { -2.85, 0, 0 } }, smoke_color = { 0.9, 0.9, 0.9 }, smoke_transparency = 0.1, tail_width = 0.5, @@ -91,10 +91,11 @@ _G["rockets"]["#Index"] = { default_cruise_height = 100 }, controller = { - boost_start = 0, - march_start = 1 + boost_start = 0.5, + march_start = 1.5 }, display_name = "Kh-59M (AS-18 Kazoo)", + display_name_short = "Kh-59M (AS-18 Kazoo)", engine_control = { K = 240, Kd = 1, @@ -163,11 +164,11 @@ _G["rockets"]["#Index"] = { min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.88, -0.67, 0 } }, + nozzle_position = { { -0.745, -0.475, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.2, start_burn_effect = 1, - start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_delay = { 1, 1.3, 1.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 }, diff --git a/_G/rockets/YJ-12.lua b/_G/rockets/YJ-12.lua index 7867df3f..e5bd07e6 100644 --- a/_G/rockets/YJ-12.lua +++ b/_G/rockets/YJ-12.lua @@ -91,6 +91,7 @@ _G["rockets"]["#Index"] = { march_start = 6.5 }, display_name = "YJ-12", + display_name_short = "YJ-12", exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { K = 60, diff --git a/_G/rockets/YJ-62.lua b/_G/rockets/YJ-62.lua index 9c7b2b06..e2f2cb2a 100644 --- a/_G/rockets/YJ-62.lua +++ b/_G/rockets/YJ-62.lua @@ -71,6 +71,7 @@ _G["rockets"]["#Index"] = { suppres_march = 0.01 }, display_name = "YJ-62", + display_name_short = "YJ-62", engine_control = { K = 235, Kd = 0.01, diff --git a/_G/rockets/YJ-83.lua b/_G/rockets/YJ-83.lua index a48a52a7..7c091bba 100644 --- a/_G/rockets/YJ-83.lua +++ b/_G/rockets/YJ-83.lua @@ -74,6 +74,7 @@ _G["rockets"]["#Index"] = { march_start = 0.01 }, display_name = "YJ-83", + display_name_short = "YJ-83", engine_control = { K = 300, Kd = 0.01, diff --git a/_G/rockets/YJ-83K.lua b/_G/rockets/YJ-83K.lua index 10bfe98a..e21f033e 100644 --- a/_G/rockets/YJ-83K.lua +++ b/_G/rockets/YJ-83K.lua @@ -95,6 +95,7 @@ _G["rockets"]["#Index"] = { march_start = 5 }, display_name = "YJ-83K", + display_name_short = "YJ-83K", engine_control = { K = 265, Kd = 0.01, diff --git a/_G/rockets/YJ-84.lua b/_G/rockets/YJ-84.lua index e4c29aa6..7e0680a3 100644 --- a/_G/rockets/YJ-84.lua +++ b/_G/rockets/YJ-84.lua @@ -74,6 +74,7 @@ _G["rockets"]["#Index"] = { march_start = 0.01 }, display_name = "YJ-84", + display_name_short = "YJ-84", engine_control = { K = 300, Kd = 0.01, diff --git a/_G/torpedoes/G7A_T1.lua b/_G/torpedoes/G7A_T1.lua index f2c15925..4208d2a5 100644 --- a/_G/torpedoes/G7A_T1.lua +++ b/_G/torpedoes/G7A_T1.lua @@ -24,9 +24,9 @@ _G["torpedoes"]["#Index"] = { delay = 2, fins_limit = 0.25, hKp_err_croll = 0, - hor_spir_on_time = 350, - hor_spir_period = 30, - hor_spir_power = 0.4, + hor_spir_on_time = 0, + hor_spir_period = 0, + hor_spir_power = 0, roll_diff_correction = 1, steady_depth = 5, v_vel_limit = 25, @@ -37,7 +37,9 @@ _G["torpedoes"]["#Index"] = { class_name = "wAmmunition", display_name = "G7A_T1", engine = { - thrust = 9900 + data_table = { 6600, 777, 11300, 365, 13600, 222 }, + default_thrust = 11300, + rail_thrust = 6000 }, fm = { A = 0.5, @@ -66,7 +68,7 @@ _G["torpedoes"]["#Index"] = { mass = 1528, model = "Torpedo_G7A_T1", name = "G7A_T1", - scheme = "unguided_torpedo", + scheme = "unguided_preset_torpedo", shape_table_data = { { file = "Torpedo_G7A_T1", fire = { 0, 1 }, diff --git a/_G/warheads/AGM_130.lua b/_G/warheads/AGM_130.lua index 6e5e4af8..9dfcb95b 100644 --- a/_G/warheads/AGM_130.lua +++ b/_G/warheads/AGM_130.lua @@ -1,5 +1,4 @@ _G["warheads"]["AGM_130"] = { - caliber = 460, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, cumulative_factor = 0, diff --git a/_G/warheads/AGM_88.lua b/_G/warheads/AGM_88.lua deleted file mode 100644 index 34551e02..00000000 --- a/_G/warheads/AGM_88.lua +++ /dev/null @@ -1,13 +0,0 @@ -_G["warheads"]["AGM_88"] = { - caliber = 254, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, - default_fuze_delay = 0, - expl_mass = 26.4, - mass = 26.4, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 5.28 -} \ No newline at end of file diff --git a/_G/warheads/C701.lua b/_G/warheads/C701.lua new file mode 100644 index 00000000..873c58d8 --- /dev/null +++ b/_G/warheads/C701.lua @@ -0,0 +1,12 @@ +_G["warheads"]["C701"] = { + caliber = 180, + concrete_factors = { 2, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 2, + cumulative_thickness = 0, + expl_mass = 15, + mass = 29, + obj_factors = { 2, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 5.8 +} \ No newline at end of file diff --git a/_G/warheads/CBU97.lua b/_G/warheads/CBU97.lua index 3941f9e2..3d28bcf4 100644 --- a/_G/warheads/CBU97.lua +++ b/_G/warheads/CBU97.lua @@ -2,11 +2,11 @@ _G["warheads"]["CBU97"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } \ No newline at end of file diff --git a/_G/warheads/C_8.lua b/_G/warheads/C_8.lua index 337d1161..45d558bf 100644 --- a/_G/warheads/C_8.lua +++ b/_G/warheads/C_8.lua @@ -1,13 +1 @@ -_G["warheads"]["C_8"] = { - caliber = 80, - concrete_factors = { 1.52, 1.52, 1.52 }, - concrete_obj_factor = 0.5, - cumulative_factor = 5, - cumulative_thickness = 0.42, - expl_mass = 1.1, - length = 0.515, - mass = 3.6, - obj_factors = { 1.52, 1.52 }, - other_factors = { 1.52, 1.52, 1.52 }, - piercing_mass = 0.72 -} \ No newline at end of file +_G["warheads"]["C_8"] = "_G/warheads/S_8KOM.lua" \ No newline at end of file diff --git a/_G/warheads/C_8CM_RD.lua b/_G/warheads/C_8CM_RD.lua index 4fe31661..0997c811 100644 --- a/_G/warheads/C_8CM_RD.lua +++ b/_G/warheads/C_8CM_RD.lua @@ -1,12 +1 @@ -_G["warheads"]["C_8CM_RD"] = { - caliber = 80, - color = { 1, 0, 0 }, - duration = 300, - expl_mass = 1.36, - flare = false, - intensity = 3, - length = 0.415, - mass = 3.4, - piercing_mass = 0.68, - transparency = 0.8 -} \ No newline at end of file +_G["warheads"]["C_8CM_RD"] = "_G/warheads/S_8TsM_RED.lua" \ No newline at end of file diff --git a/_G/warheads/G7_A.lua b/_G/warheads/G7_A.lua index dbcc43d9..ccf41109 100644 --- a/_G/warheads/G7_A.lua +++ b/_G/warheads/G7_A.lua @@ -1,13 +1,14 @@ _G["warheads"]["G7_A"] = { caliber = 533, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 280, mass = 280, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 56, - time_self_destruct = 430 + time_self_destruct = 777 } \ No newline at end of file diff --git a/_G/warheads/KD_20.lua b/_G/warheads/KD_20.lua new file mode 100644 index 00000000..361156c2 --- /dev/null +++ b/_G/warheads/KD_20.lua @@ -0,0 +1,13 @@ +_G["warheads"]["KD_20"] = { + caliber = 600, + concrete_factors = { 5, 1, 10 }, + concrete_obj_factor = 5, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 200, + mass = 200, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 40 +} \ No newline at end of file diff --git a/_G/warheads/KD_63.lua b/_G/warheads/KD_63.lua new file mode 100644 index 00000000..4e80c140 --- /dev/null +++ b/_G/warheads/KD_63.lua @@ -0,0 +1,13 @@ +_G["warheads"]["KD_63"] = { + caliber = 760, + concrete_factors = { 5, 1, 10 }, + concrete_obj_factor = 5, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 200, + mass = 200, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 40 +} \ No newline at end of file diff --git a/_G/warheads/LTF_5B.lua b/_G/warheads/LTF_5B.lua index 05ad3c2a..12c616c0 100644 --- a/_G/warheads/LTF_5B.lua +++ b/_G/warheads/LTF_5B.lua @@ -1,14 +1,14 @@ _G["warheads"]["LTF_5B"] = { caliber = 450, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 200, mass = 200, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 40, - time_self_destruct = 600, - water_explosion_factor = 10 + time_self_destruct = 600 } \ No newline at end of file diff --git a/_G/warheads/M26HE.lua b/_G/warheads/M26HE.lua new file mode 100644 index 00000000..e45fb456 --- /dev/null +++ b/_G/warheads/M26HE.lua @@ -0,0 +1,12 @@ +_G["warheads"]["M26HE"] = { + caliber = 230, + concrete_factors = { 1, 1, 0.1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 92.5, + mass = 246, + obj_factors = { 0.3, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 49.2 +} \ No newline at end of file diff --git a/_G/warheads/Mark_46.lua b/_G/warheads/Mark_46.lua index 0bc6d5a5..77490284 100644 --- a/_G/warheads/Mark_46.lua +++ b/_G/warheads/Mark_46.lua @@ -1,9 +1,10 @@ _G["warheads"]["Mark_46"] = { caliber = 324, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 50, mass = 50, obj_factors = { 1, 1 }, diff --git a/_G/warheads/S_8KOM.lua b/_G/warheads/S_8KOM.lua index 0d0c2352..d2c2fcb5 100644 --- a/_G/warheads/S_8KOM.lua +++ b/_G/warheads/S_8KOM.lua @@ -1 +1,13 @@ -_G["warheads"]["S_8KOM"] = "_G/warheads/C_8.lua" \ No newline at end of file +_G["warheads"]["S_8KOM"] = { + caliber = 80, + concrete_factors = { 1.52, 1.52, 1.52 }, + concrete_obj_factor = 0.5, + cumulative_factor = 5, + cumulative_thickness = 0.42, + expl_mass = 1.1, + length = 0.515, + mass = 3.6, + obj_factors = { 1.52, 1.52 }, + other_factors = { 1.52, 1.52, 1.52 }, + piercing_mass = 0.72 +} \ No newline at end of file diff --git a/_G/warheads/S_8TsM_RED.lua b/_G/warheads/S_8TsM_RED.lua index c23ce92a..d641081e 100644 --- a/_G/warheads/S_8TsM_RED.lua +++ b/_G/warheads/S_8TsM_RED.lua @@ -1 +1,12 @@ -_G["warheads"]["S_8TsM_RED"] = "_G/warheads/C_8CM_RD.lua" \ No newline at end of file +_G["warheads"]["S_8TsM_RED"] = { + caliber = 80, + color = { 1, 0, 0 }, + duration = 300, + expl_mass = 1.36, + flare = false, + intensity = 3, + length = 0.415, + mass = 3.4, + piercing_mass = 0.68, + transparency = 0.8 +} \ No newline at end of file diff --git a/_G/warheads/Type200A.lua b/_G/warheads/Type200A.lua new file mode 100644 index 00000000..613fe8eb --- /dev/null +++ b/_G/warheads/Type200A.lua @@ -0,0 +1,13 @@ +_G["warheads"]["Type200A"] = { + caliber = 223, + concrete_factors = { 5, 1, 5 }, + concrete_obj_factor = 10, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0.5, + expl_mass = 90, + mass = 130, + obj_factors = { 1, 1, 1 }, + other_factors = { 0.5, 0.5, 1 }, + piercing_mass = 26 +} \ No newline at end of file diff --git a/_G/warheads/WDU_37B.lua b/_G/warheads/WDU_37B.lua new file mode 100644 index 00000000..9a2c7e46 --- /dev/null +++ b/_G/warheads/WDU_37B.lua @@ -0,0 +1,13 @@ +_G["warheads"]["WDU_37B"] = { + caliber = 254, + concrete_factors = { 1.376, 1.376, 1 }, + concrete_obj_factor = 1, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 18.42, + length = 0.56, + mass = 62.48, + obj_factors = { 1.376, 1.376 }, + other_factors = { 1.376, 1.376, 1.376 }, + piercing_mass = 12.496 +} \ No newline at end of file diff --git a/_G/warheads/Yu_6.lua b/_G/warheads/Yu_6.lua new file mode 100644 index 00000000..bcd20a54 --- /dev/null +++ b/_G/warheads/Yu_6.lua @@ -0,0 +1,14 @@ +_G["warheads"]["Yu_6"] = { + caliber = 533, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, + expl_mass = 260, + mass = 260, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 52, + time_self_destruct = 1200 +} \ No newline at end of file diff --git a/_G/weapons_table/aircraft_gunpods/{CC420_GUN_POD}.lua b/_G/weapons_table/aircraft_gunpods/{CC420_GUN_POD}.lua new file mode 100644 index 00000000..e20c7d75 --- /dev/null +++ b/_G/weapons_table/aircraft_gunpods/{CC420_GUN_POD}.lua @@ -0,0 +1,251 @@ +_G["weapons_table"]["aircraft_gunpods"]["{CC420_GUN_POD}"] = { + _unique_resource_name = "weapons.gunmounts.{CC420_GUN_POD}", + display_name = "{CC420_GUN_POD}", + gunpod_name = "{CC420_GUN_POD}", + mounts = { { + _file = "./CoreMods/aircraft/Mirage-F1/Weapons.lua", + _origin = "Mirage F1 Assets by Aerges", + aft_gun_mount = false, + azimuth_initial = 0, + category = 8, + display_name = "DEFA553 Gunpod", + drop_cartridge = 0, + effective_fire_distance = 1500, + effects = { { + arg = 1050, + name = "FireEffect" + }, { + barrel_k = 1.2474, + body_k = 6.6066, + name = "HeatEffectExt", + shot_heat = 7.823 + }, { + name = "SmokeEffect" + } }, + ejector_dir = { 0, -5, 0 }, + ejector_pos = { -1.7, -0.15, 0 }, + elevation_initial = -2, + gun = { + barrels_count = 1, + impulse_vec_rot = { + x = 0, + y = 0, + z = 0 + }, + max_burst_length = 120, + rates = { 1350 }, + recoil_coeff = 0.78, + trigger = { + name = "GunTrigger" + } + }, + muzzle_pos = { 2.213762, -0.346013, -0.000696 }, + muzzle_pos_connector = "GUN_POD_F1", + name = "DEFA_553", + short_name = "DEFA553", + supply = { + count = 180, + get_mass = , + get_mass_ = , + max_burst_length = 180, + mixes = { { 1, 3, 1, 2 } }, + shells = { { + AP_cap_caliber = 30, + Da0 = 0.0008, + Da1 = 0, + Dv0 = 0.004, + _unique_resource_name = "weapons.shells.DEFA553_30HE", + caliber = 30, + cartridge = 0, + cartridge_mass = 0.09, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.75, 0.78, 0.27, 1.65 }, + damage_factor = 639, + display_name = "DEFA553 30mm HE", + explosive = 0.052, + full_scale_time = -1, + j = 0, + k1 = 2e-08, + l = 0, + life_time = 7, + manualWeaponFlag = 21, + mass = 0.245, + model_name = "tracer_bullet_A-10", + name = "DEFA553_30HE", + payload = 0.009599409267122, + payload_type = 0, + piercing_mass = 0.049, + rebound_concrete = <1>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.53, + s = 0, + scale_smoke = 1.5, + silent_self_destruction = false, + smoke_opacity = 0.1, + smoke_tail_life_time = 0.3, + subcalibre = false, + tracer_off = -1, + tracer_on = 0, + type_name = "shell", + v0 = 820, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + }, { + AP_cap_caliber = 30, + Da0 = 0.0008, + Da1 = 0, + Dv0 = 0.004, + _unique_resource_name = "weapons.shells.DEFA553_30AP", + caliber = 30, + cartridge = 0, + cartridge_mass = 0.09, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.75, 0.78, 0.27, 1.65 }, + damage_factor = 639, + display_name = "DEFA553 30mm AP", + explosive = 0.02, + full_scale_time = -1, + j = 0, + k1 = 2e-08, + l = 0, + life_time = 31, + manualWeaponFlag = 21, + mass = 0.275, + model_name = "tracer_bullet_yellow", + name = "DEFA553_30AP", + payload = 0.0036920804873546, + payload_type = 0, + piercing_mass = 0.055, + rebound_concrete = <2>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.57, + s = 0, + scale_smoke = 1.5, + silent_self_destruction = false, + smoke_opacity = 0.1, + smoke_tail_life_time = 0.3, + subcalibre = false, + tracer_off = -1, + tracer_on = 0, + type_name = "shell", + v0 = 790, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + }, { + AP_cap_caliber = 30, + Da0 = 0.0008, + Da1 = 0, + Dv0 = 0.004, + _unique_resource_name = "weapons.shells.DEFA553_30APIT", + caliber = 30, + cartridge = 0, + cartridge_mass = 0.09, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.5, 0.75, 0.78, 0.27, 1.65 }, + damage_factor = 639, + display_name = "DEFA553 30mm API-T", + explosive = 0.02, + full_scale_time = -1, + j = 0, + k1 = 2e-08, + l = 0, + life_time = 31, + manualWeaponFlag = 21, + mass = 0.275, + model_name = "tracer_bullet_crimson", + name = "DEFA553_30APIT", + payload = 0.0036920804873546, + payload_type = 0, + piercing_mass = 0.055, + rebound_concrete = <3>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.58, + s = 0, + scale_smoke = 1.5, + silent_self_destruction = false, + smoke_opacity = 0.1, + smoke_tail_life_time = 1.5, + subcalibre = false, + tracer_off = 4, + tracer_on = 0, + type_name = "shell", + v0 = 780, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 + } } + }, + supply_position = { 2, -0.3, -0.4 } + } }, + name = "{CC420_GUN_POD}", + short_name = "{CC420_GUN_POD}", + ws_type = "Redacted" +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/bombs/250-2.lua b/_G/weapons_table/weapons/bombs/250-2.lua index 8bea81fc..4ecd06bd 100644 --- a/_G/weapons_table/weapons/bombs/250-2.lua +++ b/_G/weapons_table/weapons/bombs/250-2.lua @@ -72,6 +72,7 @@ _G["weapons_table"]["weapons"]["bombs"]["250-2"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "250-2 - 250kg GP Bombs HD", + display_name_short = "250-2 - 250kg GP Bombs HD", mass = 250, model = "250-2", name = "250-2", diff --git a/_G/weapons_table/weapons/bombs/250-3.lua b/_G/weapons_table/weapons/bombs/250-3.lua index 143f1197..4f084120 100644 --- a/_G/weapons_table/weapons/bombs/250-3.lua +++ b/_G/weapons_table/weapons/bombs/250-3.lua @@ -73,6 +73,7 @@ _G["weapons_table"]["weapons"]["bombs"]["250-3"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "250-3 - 250kg GP Bombs LD", + display_name_short = "250-3 - 250kg GP Bombs LD", mass = 250, model = "250-3", name = "250-3", diff --git a/_G/weapons_table/weapons/bombs/AB_250_2_SD_10A.lua b/_G/weapons_table/weapons/bombs/AB_250_2_SD_10A.lua index 7fc2270d..057fc6be 100644 --- a/_G/weapons_table/weapons/bombs/AB_250_2_SD_10A.lua +++ b/_G/weapons_table/weapons/bombs/AB_250_2_SD_10A.lua @@ -230,6 +230,7 @@ _G["weapons_table"]["weapons"]["bombs"]["AB_250_2_SD_10A"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "AB 250-2 SD-10A", + display_name_short = "AB 250-2 SD-10A", mass = 220, model = "AB-250_dropping", name = "AB_250_2_SD_10A", diff --git a/_G/weapons_table/weapons/bombs/AB_250_2_SD_2.lua b/_G/weapons_table/weapons/bombs/AB_250_2_SD_2.lua index 006af725..9ae584f1 100644 --- a/_G/weapons_table/weapons/bombs/AB_250_2_SD_2.lua +++ b/_G/weapons_table/weapons/bombs/AB_250_2_SD_2.lua @@ -227,6 +227,7 @@ _G["weapons_table"]["weapons"]["bombs"]["AB_250_2_SD_2"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "AB 250-2 SD-2", + display_name_short = "AB 250-2 SD-2", mass = 280, model = "AB-250_dropping", name = "AB_250_2_SD_2", diff --git a/_G/weapons_table/weapons/bombs/AB_500_1_SD_10A.lua b/_G/weapons_table/weapons/bombs/AB_500_1_SD_10A.lua index 452b1aaa..38acddcc 100644 --- a/_G/weapons_table/weapons/bombs/AB_500_1_SD_10A.lua +++ b/_G/weapons_table/weapons/bombs/AB_500_1_SD_10A.lua @@ -230,6 +230,7 @@ _G["weapons_table"]["weapons"]["bombs"]["AB_500_1_SD_10A"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "AB 500-1 SD-10A", + display_name_short = "AB 500-1 SD-10A", mass = 470, model = "AB-500-1_dropping", name = "AB_500_1_SD_10A", diff --git a/_G/weapons_table/weapons/bombs/AGM_62.lua b/_G/weapons_table/weapons/bombs/AGM_62.lua index 4809982f..a0fa4cb8 100644 --- a/_G/weapons_table/weapons/bombs/AGM_62.lua +++ b/_G/weapons_table/weapons/bombs/AGM_62.lua @@ -7,12 +7,12 @@ _G["weapons_table"]["weapons"]["bombs"]["AGM_62"] = { client = { PN_autopilot = { K = 0.024, - K_GBias = 0.5, + K_GBias = 0.6, Kg = 2.4, Ki = 0.001, Krx = 2, Kx = 0.02, - fins_limit = 0.5 + fins_limit = 0.6 }, Reflection = 0.3, arming_delay = { @@ -83,12 +83,12 @@ _G["weapons_table"]["weapons"]["bombs"]["AGM_62"] = { server = { PN_autopilot = { K = 0.024, - K_GBias = 0.5, + K_GBias = 0.6, Kg = 2.4, Ki = 0.001, Krx = 2, Kx = 0.02, - fins_limit = 0.5 + fins_limit = 0.6 }, Reflection = 0.3, arming_delay = { diff --git a/_G/weapons_table/weapons/bombs/AN_M30A1.lua b/_G/weapons_table/weapons/bombs/AN_M30A1.lua index 9e042c46..10520025 100644 --- a/_G/weapons_table/weapons/bombs/AN_M30A1.lua +++ b/_G/weapons_table/weapons/bombs/AN_M30A1.lua @@ -75,6 +75,7 @@ _G["weapons_table"]["weapons"]["bombs"]["AN_M30A1"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "AN-M30A1", + display_name_short = "AN-M30A1", mass = 45.8, model = "AN-M30A1", name = "AN_M30A1", diff --git a/_G/weapons_table/weapons/bombs/AN_M57.lua b/_G/weapons_table/weapons/bombs/AN_M57.lua index 56f100ea..f700369e 100644 --- a/_G/weapons_table/weapons/bombs/AN_M57.lua +++ b/_G/weapons_table/weapons/bombs/AN_M57.lua @@ -75,6 +75,7 @@ _G["weapons_table"]["weapons"]["bombs"]["AN_M57"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "AN-M57", + display_name_short = "AN-M57", mass = 113, model = "AN-M57", name = "AN_M57", diff --git a/_G/weapons_table/weapons/bombs/AN_M65.lua b/_G/weapons_table/weapons/bombs/AN_M65.lua index 1c8eaae5..7738e873 100644 --- a/_G/weapons_table/weapons/bombs/AN_M65.lua +++ b/_G/weapons_table/weapons/bombs/AN_M65.lua @@ -75,6 +75,7 @@ _G["weapons_table"]["weapons"]["bombs"]["AN_M65"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "AN-M65", + display_name_short = "AN-M65", mass = 475, model = "AN-M65", name = "AN_M65", diff --git a/_G/weapons_table/weapons/bombs/AN_M66.lua b/_G/weapons_table/weapons/bombs/AN_M66.lua index c5aafd04..15338d21 100644 --- a/_G/weapons_table/weapons/bombs/AN_M66.lua +++ b/_G/weapons_table/weapons/bombs/AN_M66.lua @@ -73,6 +73,7 @@ _G["weapons_table"]["weapons"]["bombs"]["AN_M66"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "AN-M66", + display_name_short = "AN-M66", mass = 977, model = "AN-M66", name = "AN_M66", diff --git a/_G/weapons_table/weapons/bombs/BAP-100.lua b/_G/weapons_table/weapons/bombs/BAP-100.lua index 9db7ad2e..1c215975 100644 --- a/_G/weapons_table/weapons/bombs/BAP-100.lua +++ b/_G/weapons_table/weapons/bombs/BAP-100.lua @@ -92,6 +92,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BAP-100"] = { }, cx = { 1, 0.82, 0.65, 0.142, 2.11 }, display_name = "BAP-100", + display_name_short = "BAP-100", mass = 32.5, model = "BAP-100", name = "BAP-100", diff --git a/_G/weapons_table/weapons/bombs/BAP_100.lua b/_G/weapons_table/weapons/bombs/BAP_100.lua index eb55f6d8..aece4122 100644 --- a/_G/weapons_table/weapons/bombs/BAP_100.lua +++ b/_G/weapons_table/weapons/bombs/BAP_100.lua @@ -91,6 +91,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BAP_100"] = { }, cx = { 1, 0.82, 0.65, 0.142, 2.11 }, display_name = "BAP-100", + display_name_short = "BAP-100", mass = 32.5, model = "M-2000c_BAP100", name = "BAP_100", diff --git a/_G/weapons_table/weapons/bombs/BAT-120.lua b/_G/weapons_table/weapons/bombs/BAT-120.lua index 99aa861e..26b79b41 100644 --- a/_G/weapons_table/weapons/bombs/BAT-120.lua +++ b/_G/weapons_table/weapons/bombs/BAT-120.lua @@ -44,7 +44,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BAT-120"] = { model = "BAT-120", name = "BAT-120", picture = "BAT120x6.png", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "BAT-120", index = "Redacted", @@ -74,6 +74,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BAT-120"] = { }, cx = { 1, 0.82, 0.65, 0.142, 2.11 }, display_name = "BAT-120 ABL", + display_name_short = "BAT-120 ABL", mass = 34, model = "BAT-120", name = "BAT-120", @@ -116,7 +117,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BAT-120"] = { model = "BAT-120", name = "BAT-120", picture = "BAT120x6.png", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "BAT-120", index = "Redacted", diff --git a/_G/weapons_table/weapons/bombs/BDU_45.lua b/_G/weapons_table/weapons/bombs/BDU_45.lua index ad5ced9e..cd25b22f 100644 --- a/_G/weapons_table/weapons/bombs/BDU_45.lua +++ b/_G/weapons_table/weapons/bombs/BDU_45.lua @@ -39,6 +39,10 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_45"] = { wind_sigma = 8, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 10000, hMin = 100, mass = 232, @@ -82,6 +86,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_45"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "BDU-45", + display_name_short = "BDU-45", encyclopediaAnimation = { args = { [0] = 1, @@ -125,6 +130,10 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_45"] = { wind_sigma = 8, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 10000, hMin = 100, mass = 232, diff --git a/_G/weapons_table/weapons/bombs/BDU_45B.lua b/_G/weapons_table/weapons/bombs/BDU_45B.lua index 8d571ed7..4e8f5508 100644 --- a/_G/weapons_table/weapons/bombs/BDU_45B.lua +++ b/_G/weapons_table/weapons/bombs/BDU_45B.lua @@ -36,6 +36,10 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_45B"] = { wind_sigma = 8, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 10000, hMin = 100, mass = 232, @@ -77,6 +81,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_45B"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "BDU-45B", + display_name_short = "BDU-45B", mass = 232, model = "BDU_45B", name = "BDU_45B", @@ -111,6 +116,10 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_45B"] = { wind_sigma = 8, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 10000, hMin = 100, mass = 232, diff --git a/_G/weapons_table/weapons/bombs/BDU_45LGB.lua b/_G/weapons_table/weapons/bombs/BDU_45LGB.lua index ce879374..a72dd295 100644 --- a/_G/weapons_table/weapons/bombs/BDU_45LGB.lua +++ b/_G/weapons_table/weapons/bombs/BDU_45LGB.lua @@ -87,6 +87,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_45LGB"] = { }, cx = { 1.037, 0.74, 0.6, 0.382, 1.34 }, display_name = "BDU-45LGB", + display_name_short = "BDU-45LGB", mass = 277, model = "BDU-50LGB", name = "BDU_45LGB", diff --git a/_G/weapons_table/weapons/bombs/BDU_50HD.lua b/_G/weapons_table/weapons/bombs/BDU_50HD.lua index 2fdb0498..65e3e28d 100644 --- a/_G/weapons_table/weapons/bombs/BDU_50HD.lua +++ b/_G/weapons_table/weapons/bombs/BDU_50HD.lua @@ -29,7 +29,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_50HD"] = { wind_sigma = 8, wind_time = 1000 }, - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", warhead = { caliber = 273, concrete_factors = { 1, 1, 1 }, @@ -81,7 +81,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BDU_50HD"] = { wind_sigma = 8, wind_time = 1000 }, - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", warhead = { caliber = 273, concrete_factors = { 1, 1, 1 }, diff --git a/_G/weapons_table/weapons/bombs/BEER_BOMB.lua b/_G/weapons_table/weapons/bombs/BEER_BOMB.lua index 554fd5af..e2a8312b 100644 --- a/_G/weapons_table/weapons/bombs/BEER_BOMB.lua +++ b/_G/weapons_table/weapons/bombs/BEER_BOMB.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BEER_BOMB"] = { }, cx = { 1, 0.9, 0.6, 0.6, 1.2 }, display_name = '"Beer Bomb"', + display_name_short = '"Beer Bomb"', mass = 100, model = "beer_bomb", name = "BEER_BOMB", diff --git a/_G/weapons_table/weapons/bombs/BELOUGA.lua b/_G/weapons_table/weapons/bombs/BELOUGA.lua index 6d240297..7f0ad622 100644 --- a/_G/weapons_table/weapons/bombs/BELOUGA.lua +++ b/_G/weapons_table/weapons/bombs/BELOUGA.lua @@ -137,6 +137,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BELOUGA"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "Belouga", + display_name_short = "Belouga", mass = 290, model = "BELOUGA", name = "BELOUGA", diff --git a/_G/weapons_table/weapons/bombs/BETAB-500M.lua b/_G/weapons_table/weapons/bombs/BETAB-500M.lua index fcc5452c..3cda10cb 100644 --- a/_G/weapons_table/weapons/bombs/BETAB-500M.lua +++ b/_G/weapons_table/weapons/bombs/BETAB-500M.lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BETAB-500M"] = { }, cx = { 0.1, 0.39, 0.6, 0.668, 1.31 }, display_name = "BETAB-500M - 479 kg, bomb, penetrating", + display_name_short = "BETAB-500M - 479 kg, bomb, penetrating", mass = 479, model = "BETAB-500M", name = "BETAB-500M", diff --git a/_G/weapons_table/weapons/bombs/BETAB-500S.lua b/_G/weapons_table/weapons/bombs/BETAB-500S.lua index 28b1c023..1bb5f882 100644 --- a/_G/weapons_table/weapons/bombs/BETAB-500S.lua +++ b/_G/weapons_table/weapons/bombs/BETAB-500S.lua @@ -88,6 +88,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BETAB-500S"] = { }, cx = { 0.1, 0.39, 0.71, 0.768, 1.31 }, display_name = "BETAB-500S - 425 kg, bomb, penetrating", + display_name_short = "BETAB-500S - 425 kg, bomb, penetrating", mass = 425, model = "BETAB-500S", name = "BETAB-500S", diff --git a/_G/weapons_table/weapons/bombs/BIN_200.lua b/_G/weapons_table/weapons/bombs/BIN_200.lua index 9f104097..6f9df6d0 100644 --- a/_G/weapons_table/weapons/bombs/BIN_200.lua +++ b/_G/weapons_table/weapons/bombs/BIN_200.lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BIN_200"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "BIN-200 - 200kg Napalm Incendiary Bomb", + display_name_short = "BIN-200 - 200kg Napalm Incendiary Bomb", mass = 200, model = "BIN-200", name = "BIN_200", diff --git a/_G/weapons_table/weapons/bombs/BKF_AO2_5RT.lua b/_G/weapons_table/weapons/bombs/BKF_AO2_5RT.lua index 69254865..363bac22 100644 --- a/_G/weapons_table/weapons/bombs/BKF_AO2_5RT.lua +++ b/_G/weapons_table/weapons/bombs/BKF_AO2_5RT.lua @@ -249,6 +249,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BKF_AO2_5RT"] = { }, cx = { 0, 0.9, 0.9, 1, 2 }, display_name = "BKF - 12 x AO-2.5RT", + display_name_short = "BKF - 12 x AO-2.5RT", mass = 76, model = "ao-2_5rt_block2", name = "BKF_AO2_5RT", diff --git a/_G/weapons_table/weapons/bombs/BKF_PTAB2_5KO.lua b/_G/weapons_table/weapons/bombs/BKF_PTAB2_5KO.lua index 6ec98805..ff033dbc 100644 --- a/_G/weapons_table/weapons/bombs/BKF_PTAB2_5KO.lua +++ b/_G/weapons_table/weapons/bombs/BKF_PTAB2_5KO.lua @@ -259,6 +259,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BKF_PTAB2_5KO"] = { }, cx = { 0, 0.9, 0.9, 1, 2 }, display_name = "BKF - 12 x PTAB-2.5KO", + display_name_short = "BKF - 12 x PTAB-2.5KO", mass = 63.2, model = "ptab-2_5ko_block2", name = "BKF_PTAB2_5KO", diff --git a/_G/weapons_table/weapons/bombs/BLG66.lua b/_G/weapons_table/weapons/bombs/BLG66.lua index e8298acc..446bde37 100644 --- a/_G/weapons_table/weapons/bombs/BLG66.lua +++ b/_G/weapons_table/weapons/bombs/BLG66.lua @@ -253,6 +253,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "BLG-66 Belouga AC", + display_name_short = "BLG-66", mass = 305, model = "M2000C_BLG66", name = "BLG66", diff --git a/_G/weapons_table/weapons/bombs/BLG66_BELOUGA.lua b/_G/weapons_table/weapons/bombs/BLG66_BELOUGA.lua index 4d799a60..856f6917 100644 --- a/_G/weapons_table/weapons/bombs/BLG66_BELOUGA.lua +++ b/_G/weapons_table/weapons/bombs/BLG66_BELOUGA.lua @@ -137,6 +137,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BLG66_BELOUGA"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "BLG-66 Belouga", + display_name_short = "BLG-66 Belouga", mass = 290, model = "M2000C_BLG66", name = "BLG66_BELOUGA", diff --git a/_G/weapons_table/weapons/bombs/BR_250.lua b/_G/weapons_table/weapons/bombs/BR_250.lua index 1e19b1b7..cf8b55bb 100644 --- a/_G/weapons_table/weapons/bombs/BR_250.lua +++ b/_G/weapons_table/weapons/bombs/BR_250.lua @@ -66,6 +66,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BR_250"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "BR-250 - 250kg GP Bomb LD", + display_name_short = "BR-250 - 250kg GP Bomb LD", mass = 250, model = "BR-250", name = "BR_250", diff --git a/_G/weapons_table/weapons/bombs/BR_500.lua b/_G/weapons_table/weapons/bombs/BR_500.lua index e9c2c3cb..d53460bb 100644 --- a/_G/weapons_table/weapons/bombs/BR_500.lua +++ b/_G/weapons_table/weapons/bombs/BR_500.lua @@ -66,6 +66,7 @@ _G["weapons_table"]["weapons"]["bombs"]["BR_500"] = { }, cx = { 1, 0.29, 0.71, 0.13, 1.28 }, display_name = "BR-500 - 500kg GP Bomb LD", + display_name_short = "BR-500 - 500kg GP Bomb LD", mass = 500, model = "BR-500", name = "BR_500", diff --git a/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk1.lua b/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk1.lua index 99aedfa6..e692a67d 100644 --- a/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk1.lua +++ b/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk1.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_GP_250LB_Bomb_Mk1"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "250 lb GP Mk.I", + display_name_short = "250 lb GP Mk.I", mass = 104.326, model = "LB_250", name = "British_GP_250LB_Bomb_Mk1", diff --git a/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk4.lua b/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk4.lua index bb171ccf..788781ff 100644 --- a/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk4.lua +++ b/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk4.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_GP_250LB_Bomb_Mk4"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "250 lb GP Mk.IV", + display_name_short = "250 lb GP Mk.IV", mass = 104.326, model = "250_lb_gp_mk_IV", name = "British_GP_250LB_Bomb_Mk4", diff --git a/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk5.lua b/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk5.lua index 67c363c4..b7dffde6 100644 --- a/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk5.lua +++ b/_G/weapons_table/weapons/bombs/British_GP_250LB_Bomb_Mk5.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_GP_250LB_Bomb_Mk5"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "250 lb GP Mk.V", + display_name_short = "250 lb GP Mk.V", mass = 104.326, model = "250_lb_gp_mk_V", name = "British_GP_250LB_Bomb_Mk5", diff --git a/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk1.lua b/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk1.lua index a2709f8a..b9c6cfaf 100644 --- a/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk1.lua +++ b/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk1.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_GP_500LB_Bomb_Mk1"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "500 lb GP Mk.I", + display_name_short = "500 lb GP Mk.I", mass = 213.188, model = "LB_500", name = "British_GP_500LB_Bomb_Mk1", diff --git a/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk4.lua b/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk4.lua index 9fef5ebf..8543b117 100644 --- a/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk4.lua +++ b/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk4.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_GP_500LB_Bomb_Mk4"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "500 lb GP Mk.IV", + display_name_short = "500 lb GP Mk.IV", mass = 213.188, model = "500_lb_gp_mk_IV", name = "British_GP_500LB_Bomb_Mk4", diff --git a/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk4_Short.lua b/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk4_Short.lua index 734d3edc..4b4f42a2 100644 --- a/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk4_Short.lua +++ b/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk4_Short.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_GP_500LB_Bomb_Mk4_Short"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "500 lb GP Short tail", + display_name_short = "500 lb GP Short tail", mass = 207.7, model = "500_lb_gp_st_type", name = "British_GP_500LB_Bomb_Mk4_Short", diff --git a/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk5.lua b/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk5.lua index 9ffdc2b5..efb8560a 100644 --- a/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk5.lua +++ b/_G/weapons_table/weapons/bombs/British_GP_500LB_Bomb_Mk5.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_GP_500LB_Bomb_Mk5"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "500 lb GP Mk.V", + display_name_short = "500 lb GP Mk.V", mass = 213.188, model = "500_lb_gp_mk_V", name = "British_GP_500LB_Bomb_Mk5", diff --git a/_G/weapons_table/weapons/bombs/British_MC_250LB_Bomb_Mk1.lua b/_G/weapons_table/weapons/bombs/British_MC_250LB_Bomb_Mk1.lua index 7ee7aa19..20958e6f 100644 --- a/_G/weapons_table/weapons/bombs/British_MC_250LB_Bomb_Mk1.lua +++ b/_G/weapons_table/weapons/bombs/British_MC_250LB_Bomb_Mk1.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_MC_250LB_Bomb_Mk1"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "250 lb MC Mk.I", + display_name_short = "250 lb MC Mk.I", mass = 102, model = "250_lb_mc_mkI", name = "British_MC_250LB_Bomb_Mk1", diff --git a/_G/weapons_table/weapons/bombs/British_MC_250LB_Bomb_Mk2.lua b/_G/weapons_table/weapons/bombs/British_MC_250LB_Bomb_Mk2.lua index a0d6b86b..01a658ce 100644 --- a/_G/weapons_table/weapons/bombs/British_MC_250LB_Bomb_Mk2.lua +++ b/_G/weapons_table/weapons/bombs/British_MC_250LB_Bomb_Mk2.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_MC_250LB_Bomb_Mk2"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "250 lb MC Mk.II", + display_name_short = "250 lb MC Mk.II", mass = 102, model = "250_lb_mc_mkII", name = "British_MC_250LB_Bomb_Mk2", diff --git a/_G/weapons_table/weapons/bombs/British_MC_500LB_Bomb_Mk1_Short.lua b/_G/weapons_table/weapons/bombs/British_MC_500LB_Bomb_Mk1_Short.lua index dc6a177b..ce06eecb 100644 --- a/_G/weapons_table/weapons/bombs/British_MC_500LB_Bomb_Mk1_Short.lua +++ b/_G/weapons_table/weapons/bombs/British_MC_500LB_Bomb_Mk1_Short.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_MC_500LB_Bomb_Mk1_Short"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "500 lb MC Short tail", + display_name_short = "500 lb MC Short tail", mass = 226.3, model = "500_lb_mc_short_tailed_type", name = "British_MC_500LB_Bomb_Mk1_Short", diff --git a/_G/weapons_table/weapons/bombs/British_MC_500LB_Bomb_Mk2.lua b/_G/weapons_table/weapons/bombs/British_MC_500LB_Bomb_Mk2.lua index e634270e..b492dbe0 100644 --- a/_G/weapons_table/weapons/bombs/British_MC_500LB_Bomb_Mk2.lua +++ b/_G/weapons_table/weapons/bombs/British_MC_500LB_Bomb_Mk2.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_MC_500LB_Bomb_Mk2"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "500 lb MC Mk.II", + display_name_short = "500 lb MC Mk.II", mass = 231.8, model = "500_lb_mc_mkII", name = "British_MC_500LB_Bomb_Mk2", diff --git a/_G/weapons_table/weapons/bombs/British_SAP_250LB_Bomb_Mk5.lua b/_G/weapons_table/weapons/bombs/British_SAP_250LB_Bomb_Mk5.lua index 831a8ca2..c3e20316 100644 --- a/_G/weapons_table/weapons/bombs/British_SAP_250LB_Bomb_Mk5.lua +++ b/_G/weapons_table/weapons/bombs/British_SAP_250LB_Bomb_Mk5.lua @@ -80,6 +80,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_SAP_250LB_Bomb_Mk5"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "250 lb S.A.P.", + display_name_short = "250 lb S.A.P.", mass = 111.13, model = "250_sab", name = "British_SAP_250LB_Bomb_Mk5", diff --git a/_G/weapons_table/weapons/bombs/British_SAP_500LB_Bomb_Mk5.lua b/_G/weapons_table/weapons/bombs/British_SAP_500LB_Bomb_Mk5.lua index aca93fc0..70eecc75 100644 --- a/_G/weapons_table/weapons/bombs/British_SAP_500LB_Bomb_Mk5.lua +++ b/_G/weapons_table/weapons/bombs/British_SAP_500LB_Bomb_Mk5.lua @@ -80,6 +80,7 @@ _G["weapons_table"]["weapons"]["bombs"]["British_SAP_500LB_Bomb_Mk5"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "500 lb S.A.P.", + display_name_short = "500 lb S.A.P.", mass = 222.26, model = "500_sab", name = "British_SAP_500LB_Bomb_Mk5", diff --git a/_G/weapons_table/weapons/bombs/CBU_105.lua b/_G/weapons_table/weapons/bombs/CBU_105.lua index 1f28059d..47c04756 100644 --- a/_G/weapons_table/weapons/bombs/CBU_105.lua +++ b/_G/weapons_table/weapons/bombs/CBU_105.lua @@ -16,7 +16,8 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_105"] = { bomblet_chute_char_time = 98, bomblet_chute_cut_time = 9000, bomblet_chute_open_time = 0.3, - char_time = 20.39, + bomblet_wind_coeff = 1.5, + char_time = 20.395, delay = 1, final_dive = 0.78539816339745, fins_limit = 0.6, @@ -233,14 +234,14 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_105"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "BLU-108", @@ -426,14 +427,14 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_105"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -470,7 +471,8 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_105"] = { bomblet_chute_char_time = 98, bomblet_chute_cut_time = 9000, bomblet_chute_open_time = 0.3, - char_time = 20.39, + bomblet_wind_coeff = 1.5, + char_time = 20.395, delay = 1, final_dive = 0.78539816339745, fins_limit = 0.6, @@ -687,14 +689,14 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_105"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "BLU-108", @@ -880,14 +882,14 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_105"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -904,8 +906,9 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_105"] = { }, sounderName = "Weapons/Bomb", targeting_data = { - bomblet_char_time = 80, - char_time = 20.39 + bomblet_char_time = 72, + char_time = 20.395, + wind_coeff = 1.5 }, type_name = "bomb", ws_type = { 4, 5, 38, "Redacted" } diff --git a/_G/weapons_table/weapons/bombs/CBU_97.lua b/_G/weapons_table/weapons/bombs/CBU_97.lua index cd41e08f..6f2b0cda 100644 --- a/_G/weapons_table/weapons/bombs/CBU_97.lua +++ b/_G/weapons_table/weapons/bombs/CBU_97.lua @@ -209,14 +209,14 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_97"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "BLU-108", @@ -402,14 +402,14 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_97"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -639,14 +639,14 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_97"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "BLU-108", @@ -832,14 +832,14 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_97"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -856,8 +856,9 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_97"] = { }, sounderName = "Weapons/Bomb", targeting_data = { - bomblet_char_time = 80, - char_time = 20.39 + bomblet_char_time = 72, + char_time = 20.395, + wind_coeff = 1.5 }, type_name = "bomb", ws_type = { 4, 5, 38, "Redacted" } diff --git a/_G/weapons_table/weapons/bombs/CBU_99.lua b/_G/weapons_table/weapons/bombs/CBU_99.lua index 4bb856aa..23c3adbb 100644 --- a/_G/weapons_table/weapons/bombs/CBU_99.lua +++ b/_G/weapons_table/weapons/bombs/CBU_99.lua @@ -27,7 +27,7 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_99"] = { default_delay = 1.2, default_open_height = 457 }, - display_name_short = "RBK-500U", + display_name_short = "CBU-99", fm = { I = 101.2986, L = 2.34, @@ -154,6 +154,7 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_99"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "CBU-99 - 490lbs, 247 x HEAT Bomblets", + display_name_short = "CBU-99", mass = 222, model = "CBU_99", name = "CBU_99", @@ -178,7 +179,7 @@ _G["weapons_table"]["weapons"]["bombs"]["CBU_99"] = { default_delay = 1.2, default_open_height = 457 }, - display_name_short = "RBK-500U", + display_name_short = "CBU-99", fm = { I = 101.2986, L = 2.34, diff --git a/_G/weapons_table/weapons/bombs/Durandal.lua b/_G/weapons_table/weapons/bombs/Durandal.lua index afeb60df..9501cc43 100644 --- a/_G/weapons_table/weapons/bombs/Durandal.lua +++ b/_G/weapons_table/weapons/bombs/Durandal.lua @@ -92,6 +92,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Durandal"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "BLU-107/B Durandal", + display_name_short = "BLU-107/B Durandal", mass = 219, model = "Durandal", name = "Durandal", diff --git a/_G/weapons_table/weapons/bombs/FAB-250-M62.lua b/_G/weapons_table/weapons/bombs/FAB-250-M62.lua index b3aef627..12474d9f 100644 --- a/_G/weapons_table/weapons/bombs/FAB-250-M62.lua +++ b/_G/weapons_table/weapons/bombs/FAB-250-M62.lua @@ -66,6 +66,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB-250-M62"] = { }, cx = { 1, 0.39, 0.8, 0.168, 1.31 }, display_name = "FAB-250-M62 GP", + display_name_short = "FAB-250-M62 GP", mass = 227, model = "fab-250-m62", name = "FAB-250-M62", diff --git a/_G/weapons_table/weapons/bombs/FAB-250M54.lua b/_G/weapons_table/weapons/bombs/FAB-250M54.lua index 292216ab..0bc8569b 100644 --- a/_G/weapons_table/weapons/bombs/FAB-250M54.lua +++ b/_G/weapons_table/weapons/bombs/FAB-250M54.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB-250M54"] = { }, cx = { 0.1, 0.29, 0.51, 0.54, 1.28 }, display_name = "FAB-250 M54 - 235 kg, bomb, parachute", + display_name_short = "FAB-250 M54 - 235 kg, bomb, parachute", mass = 235, model = "fab-250-m54", name = "FAB-250M54", diff --git a/_G/weapons_table/weapons/bombs/FAB-250M54TU.lua b/_G/weapons_table/weapons/bombs/FAB-250M54TU.lua index 405e8b41..a109ba06 100644 --- a/_G/weapons_table/weapons/bombs/FAB-250M54TU.lua +++ b/_G/weapons_table/weapons/bombs/FAB-250M54TU.lua @@ -73,6 +73,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB-250M54TU"] = { }, cx = { 0.1, 0.29, 0.61, 0.64, 1.28 }, display_name = "FAB-250 M54 TU - 235 kg, bomb, parachute", + display_name_short = "FAB-250 M54 TU - 235 kg, bomb, parachute", mass = 235, model = "fab-250-m54tu", name = "FAB-250M54TU", diff --git a/_G/weapons_table/weapons/bombs/FAB-500M54.lua b/_G/weapons_table/weapons/bombs/FAB-500M54.lua index 9887d2b2..4a9248ef 100644 --- a/_G/weapons_table/weapons/bombs/FAB-500M54.lua +++ b/_G/weapons_table/weapons/bombs/FAB-500M54.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB-500M54"] = { }, cx = { 0.1, 0.39, 0.6, 0.768, 1.31 }, display_name = "FAB-500 M54 - 474 kg, bomb, free-fall", + display_name_short = "FAB-500 M54 - 474 kg, bomb, free-fall", mass = 474, model = "fab-500-m54", name = "FAB-500M54", diff --git a/_G/weapons_table/weapons/bombs/FAB-500M54TU.lua b/_G/weapons_table/weapons/bombs/FAB-500M54TU.lua index 80554659..01450214 100644 --- a/_G/weapons_table/weapons/bombs/FAB-500M54TU.lua +++ b/_G/weapons_table/weapons/bombs/FAB-500M54TU.lua @@ -73,6 +73,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB-500M54TU"] = { }, cx = { 0.1, 0.39, 0.6, 0.768, 1.31 }, display_name = "FAB-500 M54 TU - 480 kg, bomb, parachute", + display_name_short = "FAB-500 M54 TU - 480 kg, bomb, parachute", mass = 480, model = "fab-500-m54tu", name = "FAB-500M54TU", diff --git a/_G/weapons_table/weapons/bombs/FAB-500SL.lua b/_G/weapons_table/weapons/bombs/FAB-500SL.lua index 71ecb06e..77b78d1a 100644 --- a/_G/weapons_table/weapons/bombs/FAB-500SL.lua +++ b/_G/weapons_table/weapons/bombs/FAB-500SL.lua @@ -73,6 +73,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB-500SL"] = { }, cx = { 0.1, 0.39, 0.6, 0.768, 1.31 }, display_name = "FAB-500 SL - 515 kg, bomb, parachute", + display_name_short = "FAB-500 SL - 515 kg, bomb, parachute", mass = 515, model = "fab-500-sl", name = "FAB-500SL", diff --git a/_G/weapons_table/weapons/bombs/FAB-500TA.lua b/_G/weapons_table/weapons/bombs/FAB-500TA.lua index 620bdb46..496ebb57 100644 --- a/_G/weapons_table/weapons/bombs/FAB-500TA.lua +++ b/_G/weapons_table/weapons/bombs/FAB-500TA.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB-500TA"] = { }, cx = { 0.1, 0.39, 0.6, 0.768, 1.31 }, display_name = "FAB-500 TA - 477 kg, bomb, free-fall", + display_name_short = "FAB-500 TA - 477 kg, bomb, free-fall", mass = 477, model = "fab-500-ta", name = "FAB-500TA", diff --git a/_G/weapons_table/weapons/bombs/FAB_100M.lua b/_G/weapons_table/weapons/bombs/FAB_100M.lua index 44452632..33fe0673 100644 --- a/_G/weapons_table/weapons/bombs/FAB_100M.lua +++ b/_G/weapons_table/weapons/bombs/FAB_100M.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_100M"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "FAB-100M - 100kg GP Bomb LD", + display_name_short = "FAB-100M - 100kg GP Bomb LD", mass = 100, model = "fab100_40x", name = "FAB_100M", diff --git a/_G/weapons_table/weapons/bombs/FAB_100SV.lua b/_G/weapons_table/weapons/bombs/FAB_100SV.lua index 38f57c4e..25d4a6d9 100644 --- a/_G/weapons_table/weapons/bombs/FAB_100SV.lua +++ b/_G/weapons_table/weapons/bombs/FAB_100SV.lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_100SV"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "FAB-100SV", + display_name_short = "FAB-100SV", mass = 100, model = "i16_FAB-100SV", name = "FAB_100SV", diff --git a/_G/weapons_table/weapons/bombs/FAB_50.lua b/_G/weapons_table/weapons/bombs/FAB_50.lua index 22d2320c..d6705440 100644 --- a/_G/weapons_table/weapons/bombs/FAB_50.lua +++ b/_G/weapons_table/weapons/bombs/FAB_50.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["FAB_50"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "FAB-50 - 50kg GP Bomb LD", + display_name_short = "FAB-50 - 50kg GP Bomb LD", mass = 50, model = "fab50_40x", name = "FAB_50", 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 fddc6f9f..eb1488ec 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 @@ -16,8 +16,6 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { ap = { Ka = 4.186854, Kd = 620, - Kpi = 0.01, - Kpp = 0.5, Kra = 0.5, Krd = 0.05, Ks = 0.05, @@ -26,11 +24,10 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { fins_limit = 1, fins_limit_x = 0.1, gload_limit = 10, - integ_limit = 10, + integ_limit = 0.2, null_roll = 1e-07, - omega_limit = 0.1, + omega_limit = 0.2, op_time = 999, - pitch_integ_limit = 10, tail_control = false }, arming_delay = { @@ -44,18 +41,19 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { category = 1, class_name = "wAmmunitionSelfHoming", controller = { - Ka = 5, - Kpitch = 30, - Kyaw = 5, + Ka = 2, + Kpitch = 0.5, + Kyaw = 0.5, auto_terminal_t = 15, - midcourse_g_bias = 1, + midcourse_g_bias = 0.5, midcourse_glide_pitch = -0.073, - separation_g_bias = 1.5, - separation_t = 1.5, - transition_glide_pitch = -0.419 + pitch_integ_limit = 10, + separation_g_bias = 1, + separation_t = 1.75, + transition_platform_pitch = -0.419 }, fm = { - A = 0.36, + A = 0.15, I = 1433.259375, I_x = 40, L = 3.91, @@ -66,7 +64,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { Sw = 0.72, caliber = 0.457, cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - dCydA = { 0.07, 0.036 }, + dCydA = { 0.1, 0.036 }, finsTau = 0.1, ideal_fins = true, mass = 1125, @@ -124,6 +122,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "GBU-15(V)31/B", + display_name_short = "GBU-15(V)31/B", mass = 1125, model = "agm-130", name = "GBU_15_V_31_B", @@ -138,8 +137,6 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { ap = { Ka = 4.186854, Kd = 620, - Kpi = 0.01, - Kpp = 0.5, Kra = 0.5, Krd = 0.05, Ks = 0.05, @@ -148,11 +145,10 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { fins_limit = 1, fins_limit_x = 0.1, gload_limit = 10, - integ_limit = 10, + integ_limit = 0.2, null_roll = 1e-07, - omega_limit = 0.1, + omega_limit = 0.2, op_time = 999, - pitch_integ_limit = 10, tail_control = false }, arming_delay = { @@ -166,18 +162,19 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { category = 1, class_name = "wAmmunitionSelfHoming", controller = { - Ka = 5, - Kpitch = 30, - Kyaw = 5, + Ka = 2, + Kpitch = 0.5, + Kyaw = 0.5, auto_terminal_t = 15, - midcourse_g_bias = 1, + midcourse_g_bias = 0.5, midcourse_glide_pitch = -0.073, - separation_g_bias = 1.5, - separation_t = 1.5, - transition_glide_pitch = -0.419 + pitch_integ_limit = 10, + separation_g_bias = 1, + separation_t = 1.75, + transition_platform_pitch = -0.419 }, fm = { - A = 0.36, + A = 0.15, I = 1433.259375, I_x = 40, L = 3.91, @@ -188,7 +185,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_15_V_31_B"] = { Sw = 0.72, caliber = 0.457, cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, - dCydA = { 0.07, 0.036 }, + dCydA = { 0.1, 0.036 }, finsTau = 0.1, ideal_fins = true, mass = 1125, diff --git a/_G/weapons_table/weapons/bombs/GBU_24.lua b/_G/weapons_table/weapons/bombs/GBU_24.lua index deb646d4..74c691ef 100644 --- a/_G/weapons_table/weapons/bombs/GBU_24.lua +++ b/_G/weapons_table/weapons/bombs/GBU_24.lua @@ -111,6 +111,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_24"] = { }, cx = { 1.037, 0.91, 0.9, 0.382, 1.34 }, display_name = "GBU-24A/B Paveway III", + display_name_short = "GBU-24A/B Paveway III", mass = 1087, model = "GBU-24", name = "GBU_24", diff --git a/_G/weapons_table/weapons/bombs/GBU_31.lua b/_G/weapons_table/weapons/bombs/GBU_31.lua index c05ce806..f6840386 100644 --- a/_G/weapons_table/weapons/bombs/GBU_31.lua +++ b/_G/weapons_table/weapons/bombs/GBU_31.lua @@ -111,6 +111,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_31"] = { }, cx = { 1, 0.45, 0.8, 0.15, 1.55 }, display_name = "GBU-31(V)1/B", + display_name_short = "GBU-31(V)1/B", mass = 925, model = "GBU-31", name = "GBU_31", diff --git a/_G/weapons_table/weapons/bombs/GBU_31_V_2B.lua b/_G/weapons_table/weapons/bombs/GBU_31_V_2B.lua index cf610a57..d4880db1 100644 --- a/_G/weapons_table/weapons/bombs/GBU_31_V_2B.lua +++ b/_G/weapons_table/weapons/bombs/GBU_31_V_2B.lua @@ -111,6 +111,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_31_V_2B"] = { }, cx = { 1, 0.45, 0.8, 0.15, 1.55 }, display_name = "GBU-31(V)2/B", + display_name_short = "GBU-31(V)2/B", mass = 934, model = "GBU-31", name = "GBU_31_V_2B", diff --git a/_G/weapons_table/weapons/bombs/GBU_31_V_3B.lua b/_G/weapons_table/weapons/bombs/GBU_31_V_3B.lua index b3bdece0..fe124b3a 100644 --- a/_G/weapons_table/weapons/bombs/GBU_31_V_3B.lua +++ b/_G/weapons_table/weapons/bombs/GBU_31_V_3B.lua @@ -111,6 +111,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_31_V_3B"] = { }, cx = { 1, 0.45, 0.8, 0.15, 1.55 }, display_name = "GBU-31(V)3/B", + display_name_short = "GBU-31(V)3/B", mass = 961, model = "GBU31_V_3B_BLU109", name = "GBU_31_V_3B", diff --git a/_G/weapons_table/weapons/bombs/GBU_31_V_4B.lua b/_G/weapons_table/weapons/bombs/GBU_31_V_4B.lua index 70761abe..3002ac25 100644 --- a/_G/weapons_table/weapons/bombs/GBU_31_V_4B.lua +++ b/_G/weapons_table/weapons/bombs/GBU_31_V_4B.lua @@ -111,6 +111,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_31_V_4B"] = { }, cx = { 1, 0.45, 0.8, 0.15, 1.55 }, display_name = "GBU-31(V)4/B", + display_name_short = "GBU-31(V)4/B", mass = 970, model = "GBU31_V_3B_BLU109", name = "GBU_31_V_4B", diff --git a/_G/weapons_table/weapons/bombs/GBU_32_V_2B.lua b/_G/weapons_table/weapons/bombs/GBU_32_V_2B.lua index fb03c71d..6cbdefc8 100644 --- a/_G/weapons_table/weapons/bombs/GBU_32_V_2B.lua +++ b/_G/weapons_table/weapons/bombs/GBU_32_V_2B.lua @@ -111,6 +111,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_32_V_2B"] = { }, cx = { 1, 0.45, 0.8, 0.15, 1.55 }, display_name = "GBU-32(V)2/B", + display_name_short = "GBU-32(V)2/B", mass = 467, model = "GBU-32", name = "GBU_32_V_2B", diff --git a/_G/weapons_table/weapons/bombs/GBU_38.lua b/_G/weapons_table/weapons/bombs/GBU_38.lua index 7cce5f65..25561d60 100644 --- a/_G/weapons_table/weapons/bombs/GBU_38.lua +++ b/_G/weapons_table/weapons/bombs/GBU_38.lua @@ -111,6 +111,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_38"] = { }, cx = { 1, 0.45, 0.8, 0.15, 1.55 }, display_name = "GBU-38(V)1/B", + display_name_short = "GBU-38(V)1/B", mass = 253.1, model = "GBU-38", name = "GBU_38", diff --git a/_G/weapons_table/weapons/bombs/GBU_54_V_1B.lua b/_G/weapons_table/weapons/bombs/GBU_54_V_1B.lua index dad511a6..5d7fd59c 100644 --- a/_G/weapons_table/weapons/bombs/GBU_54_V_1B.lua +++ b/_G/weapons_table/weapons/bombs/GBU_54_V_1B.lua @@ -116,6 +116,7 @@ _G["weapons_table"]["weapons"]["bombs"]["GBU_54_V_1B"] = { }, cx = { 1, 0.45, 0.8, 0.15, 1.55 }, display_name = "GBU-54(V)1/B", + display_name_short = "GBU-54(V)1/B", mass = 253.1, model = "GBU-54", name = "GBU_54_V_1B", diff --git a/_G/weapons_table/weapons/bombs/HEBOMB.lua b/_G/weapons_table/weapons/bombs/HEBOMB.lua index 60428d17..69b9080d 100644 --- a/_G/weapons_table/weapons/bombs/HEBOMB.lua +++ b/_G/weapons_table/weapons/bombs/HEBOMB.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["HEBOMB"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "M/71 HE-Bomb", + display_name_short = "M/71 HE-Bomb", mass = 121, model = "SB71LD", name = "HEBOMB", diff --git a/_G/weapons_table/weapons/bombs/HEBOMBD.lua b/_G/weapons_table/weapons/bombs/HEBOMBD.lua index ad107144..413be059 100644 --- a/_G/weapons_table/weapons/bombs/HEBOMBD.lua +++ b/_G/weapons_table/weapons/bombs/HEBOMBD.lua @@ -75,6 +75,7 @@ _G["weapons_table"]["weapons"]["bombs"]["HEBOMBD"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "M/71 HE-Bomb w chute", + display_name_short = "M/71 HE-Bomb w chute", mass = 121, model = "SB71HD", name = "HEBOMBD", diff --git a/_G/weapons_table/weapons/bombs/IAB-500.lua b/_G/weapons_table/weapons/bombs/IAB-500.lua index aa93fa82..5e68fa47 100644 --- a/_G/weapons_table/weapons/bombs/IAB-500.lua +++ b/_G/weapons_table/weapons/bombs/IAB-500.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["IAB-500"] = { }, cx = { 0.1, 0.39, 0.6, 0.768, 1.31 }, display_name = "IAB-500 - 470 kg, bomb, free fall", + display_name_short = "IAB-500 - 470 kg, bomb, free fall", mass = 470, model = "IAB-500", name = "IAB-500", diff --git a/_G/weapons_table/weapons/bombs/KAB_1500LG.lua b/_G/weapons_table/weapons/bombs/KAB_1500LG.lua index 330c9473..a2a59da1 100644 --- a/_G/weapons_table/weapons/bombs/KAB_1500LG.lua +++ b/_G/weapons_table/weapons/bombs/KAB_1500LG.lua @@ -88,6 +88,7 @@ _G["weapons_table"]["weapons"]["bombs"]["KAB_1500LG"] = { }, cx = { 1, 0.4, 0.37, 0.288, 1.31 }, display_name = "KAB-1500LG-Pr", + display_name_short = "KAB-1500LG-Pr", mass = 1525, model = "kab-1500lg", name = "KAB_1500LG", diff --git a/_G/weapons_table/weapons/bombs/KAB_1500T.lua b/_G/weapons_table/weapons/bombs/KAB_1500T.lua index 9d5c44b9..252f43df 100644 --- a/_G/weapons_table/weapons/bombs/KAB_1500T.lua +++ b/_G/weapons_table/weapons/bombs/KAB_1500T.lua @@ -84,6 +84,7 @@ _G["weapons_table"]["weapons"]["bombs"]["KAB_1500T"] = { }, cx = { 1, 0.4, 0.37, 0.288, 1.31 }, display_name = "KAB-1500Kr", + display_name_short = "KAB-1500Kr", mass = 1525, model = "kab-1500t", name = "KAB_1500T", diff --git a/_G/weapons_table/weapons/bombs/KAB_500S.lua b/_G/weapons_table/weapons/bombs/KAB_500S.lua index 734fada2..60b60c4e 100644 --- a/_G/weapons_table/weapons/bombs/KAB_500S.lua +++ b/_G/weapons_table/weapons/bombs/KAB_500S.lua @@ -104,6 +104,7 @@ _G["weapons_table"]["weapons"]["bombs"]["KAB_500S"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "KAB-500S", + display_name_short = "KAB-500S", mass = 500, model = "kab-500s", name = "KAB_500S", diff --git a/_G/weapons_table/weapons/bombs/LS-6-100.lua b/_G/weapons_table/weapons/bombs/LS-6-100.lua index 283e4163..3f99f170 100644 --- a/_G/weapons_table/weapons/bombs/LS-6-100.lua +++ b/_G/weapons_table/weapons/bombs/LS-6-100.lua @@ -115,6 +115,7 @@ _G["weapons_table"]["weapons"]["bombs"]["LS-6-100"] = { }, cx = { 1, 0.45, 0.8, 0.15, 1.55 }, display_name = "LS-6-100", + display_name_short = "LS-6-100", mass = 88, model = "ls-6-100", name = "LS-6-100", diff --git a/_G/weapons_table/weapons/bombs/LUU_2B.lua b/_G/weapons_table/weapons/bombs/LUU_2B.lua index 41dcdcd0..0741b5f3 100644 --- a/_G/weapons_table/weapons/bombs/LUU_2B.lua +++ b/_G/weapons_table/weapons/bombs/LUU_2B.lua @@ -80,6 +80,7 @@ _G["weapons_table"]["weapons"]["bombs"]["LUU_2B"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "LUU-2B Flare", + display_name_short = "LUU-2B Flare", mass = 13.6, model = "luu-2", name = "LUU_2B", diff --git a/_G/weapons_table/weapons/bombs/LYSBOMB.lua b/_G/weapons_table/weapons/bombs/LYSBOMB.lua index 6e3e5a19..fec90c85 100644 --- a/_G/weapons_table/weapons/bombs/LYSBOMB.lua +++ b/_G/weapons_table/weapons/bombs/LYSBOMB.lua @@ -114,6 +114,7 @@ _G["weapons_table"]["weapons"]["bombs"]["LYSBOMB"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "LYSBOMB_CANDLE whatever", + display_name_short = "LYSBOMB_CANDLE whatever", mass = 25, model = "luu-2", name = "LYSBOMB_CANDLE", @@ -222,6 +223,7 @@ _G["weapons_table"]["weapons"]["bombs"]["LYSBOMB"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "LYSBOMB Illumination bomb", + display_name_short = "LYSBOMB Illumination bomb", mass = 25, model = "LYSB71", name = "LYSBOMB", @@ -334,6 +336,7 @@ _G["weapons_table"]["weapons"]["bombs"]["LYSBOMB"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "LYSBOMB_CANDLE whatever", + display_name_short = "LYSBOMB_CANDLE whatever", mass = 25, model = "luu-2", name = "LYSBOMB_CANDLE", diff --git a/_G/weapons_table/weapons/bombs/LYSBOMB_CANDLE.lua b/_G/weapons_table/weapons/bombs/LYSBOMB_CANDLE.lua index 4df0e8a1..b830df02 100644 --- a/_G/weapons_table/weapons/bombs/LYSBOMB_CANDLE.lua +++ b/_G/weapons_table/weapons/bombs/LYSBOMB_CANDLE.lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["LYSBOMB_CANDLE"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "LYSBOMB_CANDLE whatever", + display_name_short = "LYSBOMB_CANDLE whatever", mass = 25, model = "luu-2", name = "LYSBOMB_CANDLE", diff --git a/_G/weapons_table/weapons/bombs/M257_FLARE.lua b/_G/weapons_table/weapons/bombs/M257_FLARE.lua index 8007297f..ddcb6ca5 100644 --- a/_G/weapons_table/weapons/bombs/M257_FLARE.lua +++ b/_G/weapons_table/weapons/bombs/M257_FLARE.lua @@ -80,6 +80,7 @@ _G["weapons_table"]["weapons"]["bombs"]["M257_FLARE"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "M257 Flare", + display_name_short = "M257 Flare", mass = 5, model = "Hydra_M257_Parashute", name = "M257_FLARE", diff --git a/_G/weapons_table/weapons/bombs/MK106.lua b/_G/weapons_table/weapons/bombs/MK106.lua index 06463011..c93b2e47 100644 --- a/_G/weapons_table/weapons/bombs/MK106.lua +++ b/_G/weapons_table/weapons/bombs/MK106.lua @@ -72,6 +72,7 @@ _G["weapons_table"]["weapons"]["bombs"]["MK106"] = { }, cx = { 1, 0.82, 0.65, 0.142, 2.11 }, display_name = "Mk 106", + display_name_short = "Mk 106", mass = 2.27, model = "MK106", name = "MK106", diff --git a/_G/weapons_table/weapons/bombs/MK76.lua b/_G/weapons_table/weapons/bombs/MK76.lua index 3747986a..131bb616 100644 --- a/_G/weapons_table/weapons/bombs/MK76.lua +++ b/_G/weapons_table/weapons/bombs/MK76.lua @@ -72,6 +72,7 @@ _G["weapons_table"]["weapons"]["bombs"]["MK76"] = { }, cx = { 1, 0.82, 0.65, 0.142, 2.11 }, display_name = "Mk 76", + display_name_short = "Mk 76", mass = 11.3, model = "MK76", name = "MK76", diff --git a/_G/weapons_table/weapons/bombs/MK_82AIR.lua b/_G/weapons_table/weapons/bombs/MK_82AIR.lua index 0407dacc..cfcaf917 100644 --- a/_G/weapons_table/weapons/bombs/MK_82AIR.lua +++ b/_G/weapons_table/weapons/bombs/MK_82AIR.lua @@ -34,7 +34,11 @@ _G["weapons_table"]["weapons"]["bombs"]["MK_82AIR"] = { wind_sigma = 8, wind_time = 1000 }, - scheme = "schemes/bombs/bomb-parashute.sch", + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, + scheme = "schemes/bombs/bomb_parachute_v2.sch", warhead = { caliber = 273, concrete_factors = { 1, 1, 1 }, @@ -91,7 +95,11 @@ _G["weapons_table"]["weapons"]["bombs"]["MK_82AIR"] = { wind_sigma = 8, wind_time = 1000 }, - scheme = "schemes/bombs/bomb-parashute.sch", + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, + scheme = "schemes/bombs/bomb_parachute_v2.sch", warhead = { caliber = 273, concrete_factors = { 1, 1, 1 }, diff --git a/_G/weapons_table/weapons/bombs/MK_82SNAKEYE.lua b/_G/weapons_table/weapons/bombs/MK_82SNAKEYE.lua index e20b09d6..ef0d48ce 100644 --- a/_G/weapons_table/weapons/bombs/MK_82SNAKEYE.lua +++ b/_G/weapons_table/weapons/bombs/MK_82SNAKEYE.lua @@ -34,7 +34,11 @@ _G["weapons_table"]["weapons"]["bombs"]["MK_82SNAKEYE"] = { wind_sigma = 8, wind_time = 1000 }, - scheme = "schemes/bombs/bomb-parashute.sch", + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, + scheme = "schemes/bombs/bomb_parachute_v2.sch", warhead = { caliber = 273, concrete_factors = { 1, 1, 1 }, @@ -91,7 +95,11 @@ _G["weapons_table"]["weapons"]["bombs"]["MK_82SNAKEYE"] = { wind_sigma = 8, wind_time = 1000 }, - scheme = "schemes/bombs/bomb-parashute.sch", + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, + scheme = "schemes/bombs/bomb_parachute_v2.sch", warhead = { caliber = 273, concrete_factors = { 1, 1, 1 }, diff --git a/_G/weapons_table/weapons/bombs/Mk_82Y.lua b/_G/weapons_table/weapons/bombs/Mk_82Y.lua index aed549ce..5b821e0b 100644 --- a/_G/weapons_table/weapons/bombs/Mk_82Y.lua +++ b/_G/weapons_table/weapons/bombs/Mk_82Y.lua @@ -40,12 +40,16 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_82Y"] = { wind_sigma = 8, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 10000, hMin = 100, mass = 232, model = "mk-82air", name = "Mk_82Y", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "mk-82air", fire = { 0, 1 }, @@ -55,8 +59,8 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_82Y"] = { username = "Mk-82Y - 500lb GP Chute Retarded HD" } }, targeting_data = { - char_time = 20.31, - chute_char_time = 33.5, + char_time = 20.33, + chute_char_time = 33.2, chute_open_time = 0.2 }, type = 0, @@ -79,6 +83,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_82Y"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "Mk-82Y - 500lb GP Chute Retarded HD", + display_name_short = "Mk-82Y - 500lb GP Chute Retarded HD", mass = 232, model = "mk-82air", name = "Mk_82Y", @@ -116,12 +121,16 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_82Y"] = { wind_sigma = 8, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 10000, hMin = 100, mass = 232, model = "mk-82air", name = "Mk_82Y", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "mk-82air", fire = { 0, 1 }, @@ -131,8 +140,8 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_82Y"] = { username = "Mk-82Y - 500lb GP Chute Retarded HD" } }, targeting_data = { - char_time = 20.31, - chute_char_time = 33.5, + char_time = 20.33, + chute_char_time = 33.2, chute_open_time = 0.2 }, type = 0, @@ -155,8 +164,8 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_82Y"] = { }, sounderName = "Weapons/Bomb", targeting_data = { - char_time = 20.31, - chute_char_time = 33.5, + char_time = 20.33, + chute_char_time = 33.2, chute_open_time = 0.2 }, type_name = "bomb", diff --git a/_G/weapons_table/weapons/bombs/Mk_83CT.lua b/_G/weapons_table/weapons/bombs/Mk_83CT.lua index 50fc5344..53457977 100644 --- a/_G/weapons_table/weapons/bombs/Mk_83CT.lua +++ b/_G/weapons_table/weapons/bombs/Mk_83CT.lua @@ -38,12 +38,16 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_83CT"] = { wind_sigma = 8, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 10000, hMin = 100, mass = 454, model = "mk-82air", name = "Mk_83CT", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "mk-82air", fire = { 0, 1 }, @@ -77,6 +81,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_83CT"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "Mk-83CT", + display_name_short = "Mk-83CT", mass = 454, model = "mk-82air", name = "Mk_83CT", @@ -113,12 +118,16 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_83CT"] = { wind_sigma = 8, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 10000, hMin = 100, mass = 454, model = "mk-82air", name = "Mk_83CT", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "mk-82air", fire = { 0, 1 }, diff --git a/_G/weapons_table/weapons/bombs/Mk_84AIR_GP.lua b/_G/weapons_table/weapons/bombs/Mk_84AIR_GP.lua index 5111b3e1..98ab6243 100644 --- a/_G/weapons_table/weapons/bombs/Mk_84AIR_GP.lua +++ b/_G/weapons_table/weapons/bombs/Mk_84AIR_GP.lua @@ -11,7 +11,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_GP"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -38,12 +38,16 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_GP"] = { wind_sigma = 4, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 2000, hMin = 25, mass = 911.7, model = "mk-84air", name = "Mk_84AIR_GP", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "mk-84air", index = "Redacted", @@ -74,6 +78,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_GP"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "Mk-84 AIR GP HD", + display_name_short = "Mk-84 AIR GP HD", mass = 911.7, model = "mk-84air", name = "Mk_84AIR_GP", @@ -83,7 +88,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_GP"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -110,12 +115,16 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_GP"] = { wind_sigma = 4, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 2000, hMin = 25, mass = 911.7, model = "mk-84air", name = "Mk_84AIR_GP", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "mk-84air", index = "Redacted", diff --git a/_G/weapons_table/weapons/bombs/Mk_84AIR_TP.lua b/_G/weapons_table/weapons/bombs/Mk_84AIR_TP.lua index ae69894b..53273332 100644 --- a/_G/weapons_table/weapons/bombs/Mk_84AIR_TP.lua +++ b/_G/weapons_table/weapons/bombs/Mk_84AIR_TP.lua @@ -11,7 +11,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_TP"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -38,12 +38,16 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_TP"] = { wind_sigma = 4, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 2000, hMin = 25, mass = 911.7, model = "mk-84air_inert", name = "Mk_84AIR_TP", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "mk-84air_inert", index = "Redacted", @@ -74,6 +78,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_TP"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "Mk-84 AIR TP HD", + display_name_short = "Mk-84 AIR TP HD", mass = 911.7, model = "mk-84air_inert", name = "Mk_84AIR_TP", @@ -83,7 +88,7 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_TP"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -110,12 +115,16 @@ _G["weapons_table"]["weapons"]["bombs"]["Mk_84AIR_TP"] = { wind_sigma = 4, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 2000, hMin = 25, mass = 911.7, model = "mk-84air_inert", name = "Mk_84AIR_TP", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "mk-84air_inert", index = "Redacted", diff --git a/_G/weapons_table/weapons/bombs/ODAB-500PM.lua b/_G/weapons_table/weapons/bombs/ODAB-500PM.lua index fc0d70b4..090d8f8d 100644 --- a/_G/weapons_table/weapons/bombs/ODAB-500PM.lua +++ b/_G/weapons_table/weapons/bombs/ODAB-500PM.lua @@ -73,6 +73,7 @@ _G["weapons_table"]["weapons"]["bombs"]["ODAB-500PM"] = { }, cx = { 0.1, 0.39, 0.6, 0.768, 1.31 }, display_name = "ODAB-500PM - 525 kg, bomb, parachute, simulated aerosol", + display_name_short = "ODAB-500PM - 525 kg, bomb, parachute, simulated aerosol", mass = 520, model = "ODAB-500PM", name = "ODAB-500PM", diff --git a/_G/weapons_table/weapons/bombs/OFAB-100 Jupiter.lua b/_G/weapons_table/weapons/bombs/OFAB-100 Jupiter.lua index eecf4c8b..5fd65919 100644 --- a/_G/weapons_table/weapons/bombs/OFAB-100 Jupiter.lua +++ b/_G/weapons_table/weapons/bombs/OFAB-100 Jupiter.lua @@ -75,6 +75,7 @@ _G["weapons_table"]["weapons"]["bombs"]["OFAB-100 Jupiter"] = { }, cx = { 1, 0.32, 0.71, 0.15, 1.28 }, display_name = "OFAB-100 Jupiter - 100kg GP Bomb HD", + display_name_short = "OFAB-100 Jupiter - 100kg GP Bomb HD", mass = 121, model = "ofab-100-110tu", name = "OFAB-100 Jupiter", diff --git a/_G/weapons_table/weapons/bombs/OFAB-100-120TU.lua b/_G/weapons_table/weapons/bombs/OFAB-100-120TU.lua index 6787d552..7ad11dae 100644 --- a/_G/weapons_table/weapons/bombs/OFAB-100-120TU.lua +++ b/_G/weapons_table/weapons/bombs/OFAB-100-120TU.lua @@ -74,6 +74,7 @@ _G["weapons_table"]["weapons"]["bombs"]["OFAB-100-120TU"] = { }, cx = { 0.1, 0.39, 0.58, 0.636, 1.31 }, display_name = "OFAB 100-120 TU - 123 kg, bomb, parachute", + display_name_short = "OFAB 100-120 TU - 123 kg, bomb, parachute", mass = 123, model = "ofab-100-120", name = "OFAB-100-120TU", diff --git a/_G/weapons_table/weapons/bombs/P-50T.lua b/_G/weapons_table/weapons/bombs/P-50T.lua index 52f690c6..79c8bd4d 100644 --- a/_G/weapons_table/weapons/bombs/P-50T.lua +++ b/_G/weapons_table/weapons/bombs/P-50T.lua @@ -76,6 +76,7 @@ _G["weapons_table"]["weapons"]["bombs"]["P-50T"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "P-50T - 50kg Practice Bomb LD", + display_name_short = "P-50T - 50kg Practice Bomb LD", mass = 50, model = "p-50t", name = "P-50T", diff --git a/_G/weapons_table/weapons/bombs/RBK_250_275_AO_1SCH.lua b/_G/weapons_table/weapons/bombs/RBK_250_275_AO_1SCH.lua index 74d17a76..650f0fcb 100644 --- a/_G/weapons_table/weapons/bombs/RBK_250_275_AO_1SCH.lua +++ b/_G/weapons_table/weapons/bombs/RBK_250_275_AO_1SCH.lua @@ -235,6 +235,7 @@ _G["weapons_table"]["weapons"]["bombs"]["RBK_250_275_AO_1SCH"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "RBK-250-275 - 150 x AO-1SCh, 250kg CBU HE/Frag", + display_name_short = "RBK-250", mass = 273, model = "rbk-250", name = "RBK_250_275_AO_1SCH", diff --git a/_G/weapons_table/weapons/bombs/RBK_500U_BETAB_M.lua b/_G/weapons_table/weapons/bombs/RBK_500U_BETAB_M.lua index d68c44eb..68014210 100644 --- a/_G/weapons_table/weapons/bombs/RBK_500U_BETAB_M.lua +++ b/_G/weapons_table/weapons/bombs/RBK_500U_BETAB_M.lua @@ -331,6 +331,7 @@ _G["weapons_table"]["weapons"]["bombs"]["RBK_500U_BETAB_M"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "RBK-500U - 10 x BETAB-M, 500kg Bunker Buster CBU HE/Frag", + display_name_short = "RBK-500U", mass = 427, model = "RBK_500U", name = "RBK_500U_BETAB_M", diff --git a/_G/weapons_table/weapons/bombs/RBK_500U_OAB_2_5RT.lua b/_G/weapons_table/weapons/bombs/RBK_500U_OAB_2_5RT.lua index ee915594..d089d231 100644 --- a/_G/weapons_table/weapons/bombs/RBK_500U_OAB_2_5RT.lua +++ b/_G/weapons_table/weapons/bombs/RBK_500U_OAB_2_5RT.lua @@ -233,6 +233,7 @@ _G["weapons_table"]["weapons"]["bombs"]["RBK_500U_OAB_2_5RT"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "RBK-500U - 126 x OAB-2.5RT, 500kg CBU HE/Frag", + display_name_short = "RBK-500U", mass = 427, model = "RBK_500U", name = "RBK_500U_OAB_2_5RT", diff --git a/_G/weapons_table/weapons/bombs/RN-24.lua b/_G/weapons_table/weapons/bombs/RN-24.lua index 0c44bd50..d629027d 100644 --- a/_G/weapons_table/weapons/bombs/RN-24.lua +++ b/_G/weapons_table/weapons/bombs/RN-24.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["RN-24"] = { }, cx = { 0.1, 0.39, 0.6, 0.768, 1.31 }, display_name = "RN-24 - 470kg, nuclear bomb, free fall", + display_name_short = "RN-24 - 470kg, nuclear bomb, free fall", mass = 470, model = "RN-24", name = "RN-24", diff --git a/_G/weapons_table/weapons/bombs/RN-28.lua b/_G/weapons_table/weapons/bombs/RN-28.lua index df9222c2..45a1d996 100644 --- a/_G/weapons_table/weapons/bombs/RN-28.lua +++ b/_G/weapons_table/weapons/bombs/RN-28.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["bombs"]["RN-28"] = { }, cx = { 0.1, 0.39, 0.6, 0.768, 1.31 }, display_name = "RN-28 - 260 kg, nuclear bomb, free fall", + display_name_short = "RN-28 - 260 kg, nuclear bomb, free fall", mass = 260, model = "RN-28", name = "RN-28", diff --git a/_G/weapons_table/weapons/bombs/SAB_100MN.lua b/_G/weapons_table/weapons/bombs/SAB_100MN.lua index 9e49827e..72a4ccb1 100644 --- a/_G/weapons_table/weapons/bombs/SAB_100MN.lua +++ b/_G/weapons_table/weapons/bombs/SAB_100MN.lua @@ -126,6 +126,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SAB-100 Flare", + display_name_short = "SAB-100 Flare", mass = 5.21, model = "luu-2", name = "SAB_100_FLARE", @@ -232,6 +233,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SAB-100MN", + display_name_short = "SAB-100MN", mass = 106, model = "sab-100", name = "SAB_100MN", @@ -355,6 +357,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100MN"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SAB-100 Flare", + display_name_short = "SAB-100 Flare", mass = 5.21, model = "luu-2", name = "SAB_100_FLARE", diff --git a/_G/weapons_table/weapons/bombs/SAB_100_FLARE.lua b/_G/weapons_table/weapons/bombs/SAB_100_FLARE.lua index 3dc77655..943dfece 100644 --- a/_G/weapons_table/weapons/bombs/SAB_100_FLARE.lua +++ b/_G/weapons_table/weapons/bombs/SAB_100_FLARE.lua @@ -83,6 +83,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_100_FLARE"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SAB-100 Flare", + display_name_short = "SAB-100 Flare", mass = 5.21, model = "luu-2", name = "SAB_100_FLARE", diff --git a/_G/weapons_table/weapons/bombs/SAB_250_200.lua b/_G/weapons_table/weapons/bombs/SAB_250_200.lua index 481b5e5f..65880ad0 100644 --- a/_G/weapons_table/weapons/bombs/SAB_250_200.lua +++ b/_G/weapons_table/weapons/bombs/SAB_250_200.lua @@ -126,6 +126,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SAB-250 Flare", + display_name_short = "SAB-250 Flare", mass = 9.83, model = "luu-2", name = "SAB_250_FLARE", @@ -232,6 +233,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SAB-250-200", + display_name_short = "SAB-250-200", mass = 201, model = "sab-100", name = "SAB_250_200", @@ -355,6 +357,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_200"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SAB-250 Flare", + display_name_short = "SAB-250 Flare", mass = 9.83, model = "luu-2", name = "SAB_250_FLARE", diff --git a/_G/weapons_table/weapons/bombs/SAB_250_FLARE.lua b/_G/weapons_table/weapons/bombs/SAB_250_FLARE.lua index a925fa65..490ba68c 100644 --- a/_G/weapons_table/weapons/bombs/SAB_250_FLARE.lua +++ b/_G/weapons_table/weapons/bombs/SAB_250_FLARE.lua @@ -83,6 +83,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAB_250_FLARE"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SAB-250 Flare", + display_name_short = "SAB-250 Flare", mass = 9.83, model = "luu-2", name = "SAB_250_FLARE", diff --git a/_G/weapons_table/weapons/bombs/SAMP125LD.lua b/_G/weapons_table/weapons/bombs/SAMP125LD.lua index f823b35a..b7ffce9c 100644 --- a/_G/weapons_table/weapons/bombs/SAMP125LD.lua +++ b/_G/weapons_table/weapons/bombs/SAMP125LD.lua @@ -11,7 +11,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP125LD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -33,12 +33,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP125LD"] = { wind_sigma = 30, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 12000, hMin = 50, mass = 120, model = "SAMP_125", name = "SAMP125LD", - scheme = "schemes/bombs/bomb-common-anim.sch", + scheme = "schemes/bombs/bomb_common_v2.sch", shape_table_data = { { file = "SAMP_125", index = "Redacted", @@ -66,6 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP125LD"] = { }, cx = { 1, 0.32, 0.71, 0.15, 1.28 }, display_name = "SAMP-125 LD", + display_name_short = "SAMP-125 LD", mass = 120, model = "SAMP_125", name = "SAMP125LD", @@ -75,7 +80,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP125LD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -97,12 +102,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP125LD"] = { wind_sigma = 30, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 12000, hMin = 50, mass = 120, model = "SAMP_125", name = "SAMP125LD", - scheme = "schemes/bombs/bomb-common-anim.sch", + scheme = "schemes/bombs/bomb_common_v2.sch", shape_table_data = { { file = "SAMP_125", index = "Redacted", diff --git a/_G/weapons_table/weapons/bombs/SAMP250HD.lua b/_G/weapons_table/weapons/bombs/SAMP250HD.lua index 1079db55..451bf92e 100644 --- a/_G/weapons_table/weapons/bombs/SAMP250HD.lua +++ b/_G/weapons_table/weapons/bombs/SAMP250HD.lua @@ -11,7 +11,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250HD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 3.3, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -37,12 +37,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250HD"] = { wind_sigma = 4, wind_time = 1000 }, + fuze = { + default_arm_delays = { 3.3 }, + is_vane_anim_required = true + }, hMax = 2000, hMin = 50, mass = 269, model = "SAMP_250R", name = "SAMP250HD", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "SAMP_250R", index = "Redacted", @@ -72,6 +76,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250HD"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "SAMP-250 HD", + display_name_short = "SAMP-250 HD", mass = 269, model = "SAMP_250R", name = "SAMP250HD", @@ -81,7 +86,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250HD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 3.3, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -107,12 +112,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250HD"] = { wind_sigma = 4, wind_time = 1000 }, + fuze = { + default_arm_delays = { 3.3 }, + is_vane_anim_required = true + }, hMax = 2000, hMin = 50, mass = 269, model = "SAMP_250R", name = "SAMP250HD", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "SAMP_250R", index = "Redacted", diff --git a/_G/weapons_table/weapons/bombs/SAMP250LD.lua b/_G/weapons_table/weapons/bombs/SAMP250LD.lua index a3b2982c..f696c7ac 100644 --- a/_G/weapons_table/weapons/bombs/SAMP250LD.lua +++ b/_G/weapons_table/weapons/bombs/SAMP250LD.lua @@ -11,7 +11,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250LD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -33,12 +33,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250LD"] = { wind_sigma = 30, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 12000, hMin = 50, mass = 245, model = "SAMP_250FB", name = "SAMP250LD", - scheme = "schemes/bombs/bomb-common-anim.sch", + scheme = "schemes/bombs/bomb_common_v2.sch", shape_table_data = { { file = "SAMP_250FB", index = "Redacted", @@ -66,6 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250LD"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "SAMP-250 LD", + display_name_short = "SAMP-250 LD", mass = 245, model = "SAMP_250FB", name = "SAMP250LD", @@ -75,7 +80,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250LD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -97,12 +102,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP250LD"] = { wind_sigma = 30, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 12000, hMin = 50, mass = 245, model = "SAMP_250FB", name = "SAMP250LD", - scheme = "schemes/bombs/bomb-common-anim.sch", + scheme = "schemes/bombs/bomb_common_v2.sch", shape_table_data = { { file = "SAMP_250FB", index = "Redacted", diff --git a/_G/weapons_table/weapons/bombs/SAMP400HD.lua b/_G/weapons_table/weapons/bombs/SAMP400HD.lua index 1f31814c..1fc8888f 100644 --- a/_G/weapons_table/weapons/bombs/SAMP400HD.lua +++ b/_G/weapons_table/weapons/bombs/SAMP400HD.lua @@ -11,7 +11,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400HD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 3.3, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -37,12 +37,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400HD"] = { wind_sigma = 4, wind_time = 1000 }, + fuze = { + default_arm_delays = { 3.3 }, + is_vane_anim_required = true + }, hMax = 2000, hMin = 50, mass = 395, model = "SAMP_400R", name = "SAMP400HD", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "SAMP_400R", index = "Redacted", @@ -72,6 +76,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400HD"] = { }, cx = { 1, 0.29, 0.71, 0.14, 1.28 }, display_name = "SAMP-400 HD", + display_name_short = "SAMP-400 HD", mass = 395, model = "SAMP_400R", name = "SAMP400HD", @@ -81,7 +86,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400HD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 3.3, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -107,12 +112,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400HD"] = { wind_sigma = 4, wind_time = 1000 }, + fuze = { + default_arm_delays = { 3.3 }, + is_vane_anim_required = true + }, hMax = 2000, hMin = 50, mass = 395, model = "SAMP_400R", name = "SAMP400HD", - scheme = "schemes/bombs/bomb-parashute.sch", + scheme = "schemes/bombs/bomb_parachute_v2.sch", shape_table_data = { { file = "SAMP_400R", index = "Redacted", diff --git a/_G/weapons_table/weapons/bombs/SAMP400LD.lua b/_G/weapons_table/weapons/bombs/SAMP400LD.lua index fe6ca7d6..319b05fd 100644 --- a/_G/weapons_table/weapons/bombs/SAMP400LD.lua +++ b/_G/weapons_table/weapons/bombs/SAMP400LD.lua @@ -11,7 +11,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400LD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -33,12 +33,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400LD"] = { wind_sigma = 30, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 12000, hMin = 200, mass = 360, model = "SAMP_400FB", name = "SAMP400LD", - scheme = "schemes/bombs/bomb-common-anim.sch", + scheme = "schemes/bombs/bomb_common_v2.sch", shape_table_data = { { file = "SAMP_400FB", index = "Redacted", @@ -66,6 +70,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400LD"] = { }, cx = { 1, 0.29, 0.71, 0.13, 1.28 }, display_name = "SAMP-400 LD", + display_name_short = "SAMP-400 LD", mass = 360, model = "SAMP_400FB", name = "SAMP400LD", @@ -75,7 +80,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400LD"] = { _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", _origin = "AircraftWeaponPack", arming_delay = { - delay_time = 2, + delay_time = 0.8, enabled = true }, arming_vane = { @@ -97,12 +102,16 @@ _G["weapons_table"]["weapons"]["bombs"]["SAMP400LD"] = { wind_sigma = 30, wind_time = 1000 }, + fuze = { + default_arm_delays = { 2 }, + is_vane_anim_required = true + }, hMax = 12000, hMin = 200, mass = 360, model = "SAMP_400FB", name = "SAMP400LD", - scheme = "schemes/bombs/bomb-common-anim.sch", + scheme = "schemes/bombs/bomb_common_v2.sch", shape_table_data = { { file = "SAMP_400FB", index = "Redacted", diff --git a/_G/weapons_table/weapons/bombs/SC_250_T1_L2.lua b/_G/weapons_table/weapons/bombs/SC_250_T1_L2.lua index e475e4db..1de31fd8 100644 --- a/_G/weapons_table/weapons/bombs/SC_250_T1_L2.lua +++ b/_G/weapons_table/weapons/bombs/SC_250_T1_L2.lua @@ -78,6 +78,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SC_250_T1_L2"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SC 250 Type 1 L2", + display_name_short = "SC 250 Type 1 L2", mass = 250, model = "SC-250L2", name = "SC_250_T1_L2", diff --git a/_G/weapons_table/weapons/bombs/SC_250_T3_J.lua b/_G/weapons_table/weapons/bombs/SC_250_T3_J.lua index 7d784032..096f7f30 100644 --- a/_G/weapons_table/weapons/bombs/SC_250_T3_J.lua +++ b/_G/weapons_table/weapons/bombs/SC_250_T3_J.lua @@ -78,6 +78,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SC_250_T3_J"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SC 250 Type 3 J", + display_name_short = "SC 250 Type 3 J", mass = 250, model = "SC-250", name = "SC_250_T3_J", diff --git a/_G/weapons_table/weapons/bombs/SC_50.lua b/_G/weapons_table/weapons/bombs/SC_50.lua index e1b5e8f1..5f020f4c 100644 --- a/_G/weapons_table/weapons/bombs/SC_50.lua +++ b/_G/weapons_table/weapons/bombs/SC_50.lua @@ -76,6 +76,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SC_50"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "SC 50", + display_name_short = "SC 50", mass = 50, model = "SC50", name = "SC_50", diff --git a/_G/weapons_table/weapons/bombs/SC_500_J.lua b/_G/weapons_table/weapons/bombs/SC_500_J.lua index 3a58cf62..a09f37ac 100644 --- a/_G/weapons_table/weapons/bombs/SC_500_J.lua +++ b/_G/weapons_table/weapons/bombs/SC_500_J.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SC_500_J"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "SC 500 J", + display_name_short = "SC 500 J", mass = 500, model = "SC-500", name = "SC_500_J", diff --git a/_G/weapons_table/weapons/bombs/SC_500_L2.lua b/_G/weapons_table/weapons/bombs/SC_500_L2.lua index 3d254ccf..e2d2ae26 100644 --- a/_G/weapons_table/weapons/bombs/SC_500_L2.lua +++ b/_G/weapons_table/weapons/bombs/SC_500_L2.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SC_500_L2"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "SC 500 L2", + display_name_short = "SC 500 L2", mass = 500, model = "SC-500L2", name = "SC_500_L2", diff --git a/_G/weapons_table/weapons/bombs/SD_250_Stg.lua b/_G/weapons_table/weapons/bombs/SD_250_Stg.lua index 76eda30a..e5149095 100644 --- a/_G/weapons_table/weapons/bombs/SD_250_Stg.lua +++ b/_G/weapons_table/weapons/bombs/SD_250_Stg.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SD_250_Stg"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "SD 250 Stg", + display_name_short = "SD 250 Stg", mass = 250, model = "SD-250Stg", name = "SD_250_Stg", diff --git a/_G/weapons_table/weapons/bombs/SD_500_A.lua b/_G/weapons_table/weapons/bombs/SD_500_A.lua index 56e46cea..4c23f471 100644 --- a/_G/weapons_table/weapons/bombs/SD_500_A.lua +++ b/_G/weapons_table/weapons/bombs/SD_500_A.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["SD_500_A"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "SD 500 A", + display_name_short = "SD 500 A", mass = 500, model = "SD-500A", name = "SD_500_A", diff --git a/_G/weapons_table/weapons/bombs/S_8OM_FLARE.lua b/_G/weapons_table/weapons/bombs/S_8OM_FLARE.lua index bac4e7ff..a0047178 100644 --- a/_G/weapons_table/weapons/bombs/S_8OM_FLARE.lua +++ b/_G/weapons_table/weapons/bombs/S_8OM_FLARE.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["bombs"]["S_8OM_FLARE"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "S-8OM Flare", + display_name_short = "S-8OM Flare", mass = 4.4, model = "s-8_om_parashut", name = "S_8OM_FLARE", diff --git a/_G/weapons_table/weapons/bombs/TYPE-200A.lua b/_G/weapons_table/weapons/bombs/TYPE-200A.lua index 5c0e0cc4..fb6bb9e6 100644 --- a/_G/weapons_table/weapons/bombs/TYPE-200A.lua +++ b/_G/weapons_table/weapons/bombs/TYPE-200A.lua @@ -96,6 +96,7 @@ _G["weapons_table"]["weapons"]["bombs"]["TYPE-200A"] = { }, cx = { 1, 0.39, 0.6, 0.168, 1.31 }, display_name = "TYPE-200A", + display_name_short = "TYPE-200A", mass = 200, model = "type-200a", name = "TYPE-200A", diff --git a/_G/weapons_table/weapons/bombs/Type_200A.lua b/_G/weapons_table/weapons/bombs/Type_200A.lua new file mode 100644 index 00000000..b66fd545 --- /dev/null +++ b/_G/weapons_table/weapons/bombs/Type_200A.lua @@ -0,0 +1,198 @@ +_G["weapons_table"]["weapons"]["bombs"]["Type_200A"] = { + I = 220.833333, + L = 2.5, + Reflection = 0.01, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.bombs.Type_200A", + caliber = 0.223, + client = { + Ag = -20, + Cx = 0.00018, + Reflection = 0.01, + VyHold = -75, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + arming_delay = { + delay_time = 0.8, + enabled = true + }, + arming_vane = { + enabled = false, + velK = 1 + }, + category = 1, + control = { + delay_eng = 10.8, + delay_par = 1 + }, + engine = { + boost_factor = 1, + boost_tail = 1, + boost_time = 0, + fuel_mass = 51.8, + impulse = 170, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -0.85, -0.146, 0 } }, + smoke_color = { 0.6, 0.6, 0.6 }, + smoke_transparency = 0.3, + tail_width = 0.55, + work_tail = 1, + work_time = 1.6 + }, + fm = { + I = 220.833333, + L = 2.5, + Ma = 0.29638, + Mw = 2.769849, + caliber = 0.223, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + cx_factor = 300, + mass = 200, + release_rnd = 0.3, + release_rnd_x = 1, + wind_sigma = 5, + wind_time = 10 + }, + hMax = 5000, + hMin = 60, + mass = 200, + model = "type-200a", + name = "Type_200A", + scheme = "schemes/bombs/bomb-concrete.sch", + shape_table_data = { { + file = "type-200a", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "Type_200A", + username = "TYPE-200A" + } }, + sounderName = "Weapons/BetAB_500ShP", + targeting_data = { + char_time = 20.325, + chute_char_time = 61, + chute_cut_time = 50, + chute_open_time = 1 + }, + type = 1, + user_name = "TYPE-200A", + warhead = { + caliber = 223, + concrete_factors = { 5, 1, 5 }, + concrete_obj_factor = 10, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0.5, + expl_mass = 90, + fantom = 1, + mass = 130, + obj_factors = { 1, 1, 1 }, + other_factors = { 0.5, 0.5, 1 }, + piercing_mass = 26 + }, + wsTypeOfWeapon = { 4, 5, 37, "Redacted" } + }, + cx = { 1, 0.39, 0.6, 0.168, 1.31 }, + display_name = "TYPE-200A", + display_name_short = "TYPE-200A", + mass = 200, + model = "type-200a", + name = "Type_200A", + server = { + Ag = -20, + Cx = 0.00018, + Reflection = 0.01, + VyHold = -75, + _file = "./CoreMods/aircraft/AircraftWeaponPack/common_bombs.lua", + _origin = "AircraftWeaponPack", + arming_delay = { + delay_time = 0.8, + enabled = true + }, + arming_vane = { + enabled = false, + velK = 1 + }, + category = 1, + control = { + delay_eng = 10.8, + delay_par = 1 + }, + engine = { + boost_factor = 1, + boost_tail = 1, + boost_time = 0, + fuel_mass = 51.8, + impulse = 170, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -0.85, -0.146, 0 } }, + smoke_color = { 0.6, 0.6, 0.6 }, + smoke_transparency = 0.3, + tail_width = 0.55, + work_tail = 1, + work_time = 1.6 + }, + fm = { + I = 220.833333, + L = 2.5, + Ma = 0.29638, + Mw = 2.769849, + caliber = 0.223, + cx_coeff = { 1, 0.39, 0.6, 0.168, 1.31 }, + cx_factor = 300, + mass = 200, + release_rnd = 0.3, + release_rnd_x = 1, + wind_sigma = 5, + wind_time = 10 + }, + hMax = 5000, + hMin = 60, + mass = 200, + model = "type-200a", + name = "Type_200A", + scheme = "schemes/bombs/bomb-concrete.sch", + shape_table_data = { { + file = "type-200a", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "Type_200A", + username = "TYPE-200A" + } }, + sounderName = "Weapons/BetAB_500ShP", + targeting_data = { + char_time = 20.325, + chute_char_time = 61, + chute_cut_time = 50, + chute_open_time = 1 + }, + type = 1, + user_name = "TYPE-200A", + warhead = { + caliber = 223, + concrete_factors = { 5, 1, 5 }, + concrete_obj_factor = 10, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0.5, + expl_mass = 90, + fantom = 0, + mass = 130, + obj_factors = { 1, 1, 1 }, + other_factors = { 0.5, 0.5, 1 }, + piercing_mass = 26 + }, + wsTypeOfWeapon = { 4, 5, 37, "Redacted" } + }, + sounderName = "Weapons/BetAB_500ShP", + targeting_data = { + char_time = 20.325, + chute_char_time = 61, + chute_cut_time = 50, + chute_open_time = 1 + }, + type_name = "bomb", + ws_type = { 4, 5, 37, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/ADM_141A.lua b/_G/weapons_table/weapons/missiles/ADM_141A.lua index 3a6bc8b2..f7b7db57 100644 --- a/_G/weapons_table/weapons/missiles/ADM_141A.lua +++ b/_G/weapons_table/weapons/missiles/ADM_141A.lua @@ -64,6 +64,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141A"] = { turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "ADM-141A", engine_control = { K = 0, Kd = 0, @@ -148,6 +149,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141A"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "ADM-141A", + display_name_short = "ADM-141A", encyclopediaAnimation = { args = { [25] = 1 @@ -215,6 +217,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141A"] = { turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "ADM-141A", engine_control = { K = 0, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/ADM_141B.lua b/_G/weapons_table/weapons/missiles/ADM_141B.lua index 4c58ff02..735e558c 100644 --- a/_G/weapons_table/weapons/missiles/ADM_141B.lua +++ b/_G/weapons_table/weapons/missiles/ADM_141B.lua @@ -64,6 +64,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141B"] = { turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "ADM-141B", engine_control = { K = 0, Kd = 0, @@ -148,6 +149,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141B"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "ADM-141B", + display_name_short = "ADM-141B", mass = 180, model = "ADM_141", name = "ADM_141B", @@ -210,6 +212,7 @@ _G["weapons_table"]["weapons"]["missiles"]["ADM_141B"] = { turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "ADM-141B", engine_control = { K = 0, Kd = 0, diff --git a/_G/weapons_table/weapons/missiles/AGM_114.lua b/_G/weapons_table/weapons/missiles/AGM_114.lua index cd5a9365..2c0c0d7f 100644 --- a/_G/weapons_table/weapons/missiles/AGM_114.lua +++ b/_G/weapons_table/weapons/missiles/AGM_114.lua @@ -9,7 +9,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_114"] = { D_max = 8000, D_min = 500, Diam = 178, - Escort = 1, + Escort = 0, Fi_excort = 0.44, Fi_rak = 3.14152, Fi_search = 99.9, @@ -76,6 +76,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_114"] = { march_start = 0 }, display_name = "AGM-114L Longbow", + display_name_short = "AGM-114L", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A1trim = { 14.1, 14.1, 14.1, 14.1, 14.1, 15.1, 12.6, 10.8, 9.8, 9.1, 8.6, 8.3 }, @@ -185,6 +186,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_114"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-114L", + display_name_short = "AGM-114L", mass = 49, model = "agm-114l", name = "AGM_114", @@ -193,7 +195,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_114"] = { D_max = 8000, D_min = 500, Diam = 178, - Escort = 1, + Escort = 0, Fi_excort = 0.44, Fi_rak = 3.14152, Fi_search = 99.9, @@ -260,6 +262,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_114"] = { march_start = 0 }, display_name = "AGM-114L Longbow", + display_name_short = "AGM-114L", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A1trim = { 14.1, 14.1, 14.1, 14.1, 14.1, 15.1, 12.6, 10.8, 9.8, 9.1, 8.6, 8.3 }, diff --git a/_G/weapons_table/weapons/missiles/AGM_114K.lua b/_G/weapons_table/weapons/missiles/AGM_114K.lua index 75066229..90fefa59 100644 --- a/_G/weapons_table/weapons/missiles/AGM_114K.lua +++ b/_G/weapons_table/weapons/missiles/AGM_114K.lua @@ -79,6 +79,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_114K"] = { march_start = 0 }, display_name = "AGM-114K Hellfire", + display_name_short = "AGM-114K", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A1trim = { 14.1, 14.1, 14.1, 14.1, 14.1, 15.1, 12.6, 10.8, 9.8, 9.1, 8.6, 8.3 }, @@ -186,6 +187,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_114K"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-114K", + display_name_short = "AGM-114K", mass = 45.3, model = "agm-114K", name = "AGM_114K", @@ -264,6 +266,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_114K"] = { march_start = 0 }, display_name = "AGM-114K Hellfire", + display_name_short = "AGM-114K", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A1trim = { 14.1, 14.1, 14.1, 14.1, 14.1, 15.1, 12.6, 10.8, 9.8, 9.1, 8.6, 8.3 }, diff --git a/_G/weapons_table/weapons/missiles/AGM_12A.lua b/_G/weapons_table/weapons/missiles/AGM_12A.lua new file mode 100644 index 00000000..89e86567 --- /dev/null +++ b/_G/weapons_table/weapons/missiles/AGM_12A.lua @@ -0,0 +1,311 @@ +_G["weapons_table"]["weapons"]["missiles"]["AGM_12A"] = { + Reflection = 0.03, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.missiles.AGM_12A", + caliber = 0.3048, + client = { + Cx_pil = 4, + D_max = 13000, + D_min = 1500, + Diam = 305, + Escort = 1, + Fi_excort = 0.4, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.1, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 1, + Head_Type = 7, + KillDistance = 0, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7000, 8000, 0, 0, 10000, 10500, 11000, 12000, 200, 0, 0, 7000, 0, 0, 12000, 0, 0, 0, 0, 300, 5000, 6000, 7000, 8500, 10500, 11500, 12500, 11000, 12000, 12500, 400, 5500, 6500, 7500, 8500, 10500, 12500, 12500, 11000, 12000, 12500, 500, 5500, 6500, 7500, 9000, 10500, 12500, 14500, 15500, 15000, 12500, 600, 5500, 6500, 7500, 9000, 11000, 13000, 13000, 15000, 16500, 17000, 700, 6000, 6500, 7500, 9500, 11000, 13000, 15500, 15500, 17500, 18500, 800, 6000, 6500, 7500, 9500, 11500, 13500, 15000, 15500, 18000, 18500, 900, 6000, 6500, 8500, 9500, 11500, 13000, 15000, 16000, 18000, 18500, 1000, 6000, 6500, 8000, 10000, 11500, 13500, 15000, 17000, 17500, 19000, 2000, 9500, 10500, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 3000, 9500, 10500, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 4000, 10000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 5000, 10000, 11000, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 20500, 6000, 10000, 11500, 12500, 14000, 15000, 16500, 17500, 18500, 19500, 21000, 7000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 8000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 9000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 10000, 9500, 11000, 12500, 14000, 15500, 16500, 17500, 18000, 20000, 21000 }, + Life_Time = 30, + M = 263, + Mach_max = 1.8, + MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 500, 500, 500, 750, 500, 0, 0, 0, 200, 2050, 2300, 500, 500, 550, 750, 500, 500, 500, 500, 300, 2000, 500, 500, 500, 500, 750, 500, 500, 500, 500, 400, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 600, 500, 500, 500, 500, 500, 650, 500, 500, 500, 500, 700, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 800, 500, 500, 500, 500, 550, 800, 500, 500, 500, 500, 900, 500, 500, 500, 500, 600, 850, 500, 500, 500, 500, 1000, 500, 500, 500, 500, 600, 800, 500, 500, 500, 500, 2000, 500, 600, 600, 600, 500, 700, 500, 500, 500, 500, 3000, 700, 550, 800, 950, 1200, 500, 750, 650, 500, 500, 4000, 800, 700, 700, 850, 850, 900, 800, 700, 650, 550, 5000, 1000, 800, 900, 1000, 1400, 1100, 900, 800, 700, 700, 6000, 1000, 1000, 1500, 1000, 1500, 1500, 1000, 1000, 1000, 1000, 7000, 2000, 1500, 2000, 2500, 1500, 2000, 1500, 1500, 1000, 1500, 8000, 2500, 2500, 1500, 3500, 1500, 1500, 2500, 1500, 1500, 1500, 9000, 3000, 3000, 3000, 2500, 1500, 2000, 2000, 2500, 1500, 1000, 10000, 3500, 3000, 3500, 4500, 3500, 1500, 2500, 3000, 2500, 2000 }, + Nr_max = 1.2, + OmViz_max = 99.9, + Range_max = 13000, + Reflection = 0.03, + X_back = -0.922, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Kd = 0.07, + Ki = 0.01, + Kp = 0.07, + delay = 2, + fins_discreet = 0.08, + fins_limit = 1, + max_ctrl_angle = 6.24, + no_ctrl_center_ang = 2e-05, + op_time = 30, + self_destruct_command_timer = 3, + self_destruct_maneuver = 1, + self_destruct_maneuver_cmd_y = 0.3, + self_destruct_maneuver_cmd_z = 0.6, + self_destruct_no_signal_lim = 0.5, + self_destruct_start_timer = 18 + }, + booster = { + custom_smoke_dissipation_factor = 1, + effect_type = 0, + fuel_mass = 41.88, + impulse = 230, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.01, + tail_width = 0.18, + work_time = 2.5 + }, + category = 2, + class_name = "wAmmunitionVikhr", + display_name_short = "AGM-12A", + fm = { + A = 0.36, + I = 265.38909287667, + I_x = 10, + L = 3.4798, + Ma = 2, + Ma_x = 3, + Mw = 5, + Mw_x = 1.5, + Mx0Ma = { -0.25, -0.11 }, + Sw = 0.465, + caliber = 0.3048, + cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.01, + ideal_fins = true, + mass = 263, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + fuze = { + default_arm_delays = { 2 }, + default_function_altitude = 0 + }, + model = "9M114", + name = "AGM_12A", + scheme = "schemes/missiles/AGM-12.sch", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AGM_12A", + username = "AGM-12A" + } }, + sigma = { 4, 4, 4 }, + spiral_nav = { + def_cone_max_dist = 22000, + def_cone_near_rad = 10000, + def_cone_near_rad_st = 0, + def_cone_time_stab_rad = 0, + gb_angle = 0.0036, + gb_max_retW = 0.4, + gb_min_dist = 3200, + gb_ret_Kp = 1.1, + gb_use_time = 5.3, + t_cone_near_rad = 10000 + }, + t_acc = 2.5, + t_b = 0, + t_marsh = 0, + user_name = "AGM-12A", + v_mid = 300, + v_min = 170, + warhead = { + caliber = 207, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 45.2, + fantom = 1, + mass = 45.2, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 9.04 + }, + warhead_air = { + fantom = 1 + }, + wcs = { + activation_delay = 0.75, + base_pulse_length = 0.05, + command_deflection = 0.2, + input_delay = 0.1, + lead_pulse_deadzone = 0.001, + lead_pulse_sensitivity = 0.5, + lifetime = 30, + memory_pulse_sensitivity = 1, + reference_offset = -0.87266462599716, + sustain_pulse_gain_per_cycle = 0.1, + sustain_pulse_sensitity = 1, + sustain_pulse_sentitivity_exponent = 0.2 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + display_name = "AGM-12A", + display_name_short = "AGM-12A", + mass = 263, + model = "9M114", + name = "AGM_12A", + server = { + Cx_pil = 4, + D_max = 13000, + D_min = 1500, + Diam = 305, + Escort = 1, + Fi_excort = 0.4, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.1, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 1, + Head_Type = 7, + KillDistance = 0, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7000, 8000, 0, 0, 10000, 10500, 11000, 12000, 200, 0, 0, 7000, 0, 0, 12000, 0, 0, 0, 0, 300, 5000, 6000, 7000, 8500, 10500, 11500, 12500, 11000, 12000, 12500, 400, 5500, 6500, 7500, 8500, 10500, 12500, 12500, 11000, 12000, 12500, 500, 5500, 6500, 7500, 9000, 10500, 12500, 14500, 15500, 15000, 12500, 600, 5500, 6500, 7500, 9000, 11000, 13000, 13000, 15000, 16500, 17000, 700, 6000, 6500, 7500, 9500, 11000, 13000, 15500, 15500, 17500, 18500, 800, 6000, 6500, 7500, 9500, 11500, 13500, 15000, 15500, 18000, 18500, 900, 6000, 6500, 8500, 9500, 11500, 13000, 15000, 16000, 18000, 18500, 1000, 6000, 6500, 8000, 10000, 11500, 13500, 15000, 17000, 17500, 19000, 2000, 9500, 10500, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 3000, 9500, 10500, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 4000, 10000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 5000, 10000, 11000, 12500, 13500, 15000, 16000, 17500, 18500, 19500, 20500, 6000, 10000, 11500, 12500, 14000, 15000, 16500, 17500, 18500, 19500, 21000, 7000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 8000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 9000, 10000, 11500, 12500, 14000, 15500, 16500, 17500, 19000, 20000, 21000, 10000, 9500, 11000, 12500, 14000, 15500, 16500, 17500, 18000, 20000, 21000 }, + Life_Time = 30, + M = 263, + Mach_max = 1.8, + MinLaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 500, 500, 500, 750, 500, 0, 0, 0, 200, 2050, 2300, 500, 500, 550, 750, 500, 500, 500, 500, 300, 2000, 500, 500, 500, 500, 750, 500, 500, 500, 500, 400, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 600, 500, 500, 500, 500, 500, 650, 500, 500, 500, 500, 700, 500, 500, 500, 500, 500, 750, 500, 500, 500, 500, 800, 500, 500, 500, 500, 550, 800, 500, 500, 500, 500, 900, 500, 500, 500, 500, 600, 850, 500, 500, 500, 500, 1000, 500, 500, 500, 500, 600, 800, 500, 500, 500, 500, 2000, 500, 600, 600, 600, 500, 700, 500, 500, 500, 500, 3000, 700, 550, 800, 950, 1200, 500, 750, 650, 500, 500, 4000, 800, 700, 700, 850, 850, 900, 800, 700, 650, 550, 5000, 1000, 800, 900, 1000, 1400, 1100, 900, 800, 700, 700, 6000, 1000, 1000, 1500, 1000, 1500, 1500, 1000, 1000, 1000, 1000, 7000, 2000, 1500, 2000, 2500, 1500, 2000, 1500, 1500, 1000, 1500, 8000, 2500, 2500, 1500, 3500, 1500, 1500, 2500, 1500, 1500, 1500, 9000, 3000, 3000, 3000, 2500, 1500, 2000, 2000, 2500, 1500, 1000, 10000, 3500, 3000, 3500, 4500, 3500, 1500, 2500, 3000, 2500, 2000 }, + Nr_max = 1.2, + OmViz_max = 99.9, + Range_max = 13000, + Reflection = 0.03, + X_back = -0.922, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Kd = 0.07, + Ki = 0.01, + Kp = 0.07, + delay = 2, + fins_discreet = 0.08, + fins_limit = 1, + max_ctrl_angle = 6.24, + no_ctrl_center_ang = 2e-05, + op_time = 30, + self_destruct_command_timer = 3, + self_destruct_maneuver = 1, + self_destruct_maneuver_cmd_y = 0.3, + self_destruct_maneuver_cmd_z = 0.6, + self_destruct_no_signal_lim = 0.5, + self_destruct_start_timer = 18 + }, + booster = { + custom_smoke_dissipation_factor = 1, + effect_type = 0, + fuel_mass = 41.88, + impulse = 230, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.01, + tail_width = 0.18, + work_time = 2.5 + }, + category = 2, + class_name = "wAmmunitionVikhr", + display_name_short = "AGM-12A", + fm = { + A = 0.36, + I = 265.38909287667, + I_x = 10, + L = 3.4798, + Ma = 2, + Ma_x = 3, + Mw = 5, + Mw_x = 1.5, + Mx0Ma = { -0.25, -0.11 }, + Sw = 0.465, + caliber = 0.3048, + cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.01, + ideal_fins = true, + mass = 263, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + fuze = { + default_arm_delays = { 2 }, + default_function_altitude = 0 + }, + model = "9M114", + name = "AGM_12A", + scheme = "schemes/missiles/AGM-12.sch", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AGM_12A", + username = "AGM-12A" + } }, + sigma = { 4, 4, 4 }, + spiral_nav = { + def_cone_max_dist = 22000, + def_cone_near_rad = 10000, + def_cone_near_rad_st = 0, + def_cone_time_stab_rad = 0, + gb_angle = 0.0036, + gb_max_retW = 0.4, + gb_min_dist = 3200, + gb_ret_Kp = 1.1, + gb_use_time = 5.3, + t_cone_near_rad = 10000 + }, + t_acc = 2.5, + t_b = 0, + t_marsh = 0, + user_name = "AGM-12A", + v_mid = 300, + v_min = 170, + warhead = { + caliber = 207, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 45.2, + fantom = 0, + mass = 45.2, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 9.04 + }, + warhead_air = { + fantom = 0 + }, + wcs = { + activation_delay = 0.75, + base_pulse_length = 0.05, + command_deflection = 0.2, + input_delay = 0.1, + lead_pulse_deadzone = 0.001, + lead_pulse_sensitivity = 0.5, + lifetime = 30, + memory_pulse_sensitivity = 1, + reference_offset = -0.87266462599716, + sustain_pulse_gain_per_cycle = 0.1, + sustain_pulse_sensitity = 1, + sustain_pulse_sentitivity_exponent = 0.2 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + sounderName = "Weapons/Missile", + type_name = "missile", + ws_type = { 4, 4, 8, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/AGM_12B.lua b/_G/weapons_table/weapons/missiles/AGM_12B.lua new file mode 100644 index 00000000..5c4bef86 --- /dev/null +++ b/_G/weapons_table/weapons/missiles/AGM_12B.lua @@ -0,0 +1,309 @@ +_G["weapons_table"]["weapons"]["missiles"]["AGM_12B"] = { + Reflection = 0.03, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.missiles.AGM_12B", + caliber = 0.3048, + client = { + Cx_pil = 4, + D_max = 13000, + D_min = 1500, + Diam = 305, + Escort = 1, + Fi_excort = 0.4, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.1, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 1, + Head_Type = 7, + KillDistance = 0, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7500, 8500, 0, 6000, 9000, 0, 0, 0, 200, 0, 7000, 7500, 0, 0, 9500, 9500, 9000, 0, 0, 300, 5500, 7000, 7500, 10000, 12000, 10000, 10000, 9000, 12000, 9500, 400, 5500, 7000, 8500, 10500, 12500, 10000, 10500, 11500, 12000, 12500, 500, 6000, 7000, 8500, 10500, 12500, 13000, 10500, 11500, 12000, 12500, 600, 6000, 7500, 9000, 11000, 13000, 13000, 10500, 11500, 12000, 13000, 700, 6500, 7500, 9000, 11000, 13000, 14500, 15500, 17500, 18500, 13000, 800, 6500, 7500, 9500, 11000, 13000, 14500, 15500, 17500, 17500, 20000, 900, 6500, 7500, 9500, 11000, 14000, 15500, 16000, 18000, 17500, 20000, 1000, 6500, 8000, 9500, 11500, 14000, 14500, 16500, 17500, 18500, 20000, 2000, 10500, 11500, 12500, 13500, 15000, 15500, 17500, 18500, 19500, 20500, 3000, 11000, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 21000, 4000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 21500, 5000, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 20000, 21000, 21500, 6000, 11500, 12500, 14000, 15000, 16500, 17500, 19000, 20000, 21000, 21500, 7000, 11500, 12500, 14000, 15500, 16500, 18000, 19000, 20000, 21500, 21500, 8000, 11500, 13000, 14000, 15500, 17000, 18000, 19000, 20500, 21500, 21500, 9000, 11000, 12500, 14000, 15500, 17000, 18000, 19000, 20500, 21500, 21500, 10000, 11000, 12500, 14000, 15000, 16500, 18000, 19000, 20000, 21500, 21500 }, + Life_Time = 30, + M = 263, + Mach_max = 1.8, + MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 600, 600, 650, 800, 1050, 500, 500, 500, 500, 200, 650, 600, 500, 650, 700, 1050, 550, 500, 500, 500, 300, 700, 600, 500, 600, 700, 950, 550, 500, 500, 500, 400, 700, 550, 650, 600, 750, 1100, 500, 500, 500, 500, 500, 700, 650, 600, 650, 800, 1150, 500, 500, 500, 500, 600, 750, 650, 700, 600, 750, 1100, 500, 500, 500, 500, 700, 700, 750, 650, 650, 750, 1050, 500, 500, 500, 500, 800, 700, 650, 700, 650, 900, 1100, 550, 500, 500, 500, 900, 650, 650, 650, 700, 850, 1150, 500, 500, 500, 500, 1000, 650, 600, 700, 700, 900, 1100, 500, 500, 500, 500, 2000, 500, 500, 550, 600, 550, 550, 500, 500, 500, 500, 3000, 1250, 700, 650, 900, 650, 500, 600, 650, 600, 600, 4000, 1050, 900, 800, 900, 1100, 1050, 750, 700, 700, 600, 5000, 1000, 1100, 1000, 1400, 1200, 1100, 800, 900, 700, 900, 6000, 1500, 1500, 1500, 2000, 2500, 2000, 1000, 1000, 1000, 1000, 7000, 1500, 2500, 1500, 2000, 2000, 2000, 1500, 1000, 1500, 1000, 8000, 2500, 3000, 3000, 3000, 2000, 2000, 1500, 1500, 1500, 1000, 9000, 500, 3500, 3500, 3500, 2000, 2000, 2000, 2000, 1500, 2000, 10000, 4000, 4000, 4000, 4500, 3500, 1500, 1500, 3000, 2000, 1500 }, + Nr_max = 1.2, + OmViz_max = 99.9, + Range_max = 13000, + Reflection = 0.03, + X_back = -0.922, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Kd = 0.07, + Ki = 0.01, + Kp = 0.07, + delay = 2, + fins_discreet = 0.08, + fins_limit = 1, + max_ctrl_angle = 6.24, + no_ctrl_center_ang = 2e-05, + op_time = 30, + self_destruct_command_timer = 3, + self_destruct_maneuver = 1, + self_destruct_maneuver_cmd_y = 0.3, + self_destruct_maneuver_cmd_z = 0.6, + self_destruct_no_signal_lim = 0.5, + self_destruct_start_timer = 18 + }, + booster = { + custom_smoke_dissipation_factor = 1, + effect_type = 1, + fuel_mass = 40, + impulse = 270, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.01, + tail_width = 0.18, + work_time = 2 + }, + category = 2, + class_name = "wAmmunitionVikhr", + display_name_short = "AGM-12B", + fm = { + A = 0.36, + I = 265.38909287667, + I_x = 10, + L = 3.4798, + Ma = 2, + Ma_x = 3, + Mw = 5, + Mw_x = 1.5, + Mx0Ma = { -0.25, -0.11 }, + Sw = 0.465, + caliber = 0.3048, + cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.01, + ideal_fins = true, + mass = 263, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + fuze = { + default_arm_delays = { 2 }, + default_function_altitude = 0 + }, + model = "9M114", + name = "AGM_12B", + scheme = "schemes/missiles/AGM-12.sch", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AGM_12B", + username = "AGM-12B" + } }, + sigma = { 4, 4, 4 }, + spiral_nav = { + def_cone_max_dist = 22000, + def_cone_near_rad = 10000, + def_cone_near_rad_st = 0, + def_cone_time_stab_rad = 0, + gb_angle = 0.0036, + gb_max_retW = 0.4, + gb_min_dist = 3200, + gb_ret_Kp = 1.1, + gb_use_time = 5.3, + t_cone_near_rad = 10000 + }, + t_acc = 2, + t_b = 0, + t_marsh = 0, + user_name = "AGM-12B", + v_mid = 300, + v_min = 170, + warhead = { + caliber = 207, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 113, + fantom = 1, + mass = 113, + obj_factors = { 1, 1 }, + other_factors = { 0.5, 0.5, 0.5 }, + piercing_mass = 22.6 + }, + warhead_air = { + fantom = 1 + }, + wcs = { + activation_delay = 0.75, + base_pulse_length = 0.05, + command_deflection = 0.2, + input_delay = 0.1, + lead_pulse_deadzone = 0.001, + lead_pulse_sensitivity = 0.5, + lifetime = 30, + memory_pulse_sensitivity = 1, + reference_offset = -0.87266462599716, + sustain_pulse_gain_per_cycle = 0.1, + sustain_pulse_sensitity = 1, + sustain_pulse_sentitivity_exponent = 0.2 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + display_name = "AGM-12B", + display_name_short = "AGM-12B", + mass = 263, + model = "9M114", + name = "AGM_12B", + server = { + Cx_pil = 4, + D_max = 13000, + D_min = 1500, + Diam = 305, + Escort = 1, + Fi_excort = 0.4, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.1, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 1, + Head_Type = 7, + KillDistance = 0, + LaunchDistData = { 19, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 7500, 8500, 0, 6000, 9000, 0, 0, 0, 200, 0, 7000, 7500, 0, 0, 9500, 9500, 9000, 0, 0, 300, 5500, 7000, 7500, 10000, 12000, 10000, 10000, 9000, 12000, 9500, 400, 5500, 7000, 8500, 10500, 12500, 10000, 10500, 11500, 12000, 12500, 500, 6000, 7000, 8500, 10500, 12500, 13000, 10500, 11500, 12000, 12500, 600, 6000, 7500, 9000, 11000, 13000, 13000, 10500, 11500, 12000, 13000, 700, 6500, 7500, 9000, 11000, 13000, 14500, 15500, 17500, 18500, 13000, 800, 6500, 7500, 9500, 11000, 13000, 14500, 15500, 17500, 17500, 20000, 900, 6500, 7500, 9500, 11000, 14000, 15500, 16000, 18000, 17500, 20000, 1000, 6500, 8000, 9500, 11500, 14000, 14500, 16500, 17500, 18500, 20000, 2000, 10500, 11500, 12500, 13500, 15000, 15500, 17500, 18500, 19500, 20500, 3000, 11000, 12000, 13000, 14000, 15500, 16500, 18000, 19000, 20000, 21000, 4000, 11000, 12000, 13500, 14500, 16000, 17000, 18000, 19500, 20500, 21500, 5000, 11500, 12500, 13500, 15000, 16000, 17500, 18500, 20000, 21000, 21500, 6000, 11500, 12500, 14000, 15000, 16500, 17500, 19000, 20000, 21000, 21500, 7000, 11500, 12500, 14000, 15500, 16500, 18000, 19000, 20000, 21500, 21500, 8000, 11500, 13000, 14000, 15500, 17000, 18000, 19000, 20500, 21500, 21500, 9000, 11000, 12500, 14000, 15500, 17000, 18000, 19000, 20500, 21500, 21500, 10000, 11000, 12500, 14000, 15000, 16500, 18000, 19000, 20000, 21500, 21500 }, + Life_Time = 30, + M = 263, + Mach_max = 1.8, + MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 650, 600, 600, 650, 800, 1050, 500, 500, 500, 500, 200, 650, 600, 500, 650, 700, 1050, 550, 500, 500, 500, 300, 700, 600, 500, 600, 700, 950, 550, 500, 500, 500, 400, 700, 550, 650, 600, 750, 1100, 500, 500, 500, 500, 500, 700, 650, 600, 650, 800, 1150, 500, 500, 500, 500, 600, 750, 650, 700, 600, 750, 1100, 500, 500, 500, 500, 700, 700, 750, 650, 650, 750, 1050, 500, 500, 500, 500, 800, 700, 650, 700, 650, 900, 1100, 550, 500, 500, 500, 900, 650, 650, 650, 700, 850, 1150, 500, 500, 500, 500, 1000, 650, 600, 700, 700, 900, 1100, 500, 500, 500, 500, 2000, 500, 500, 550, 600, 550, 550, 500, 500, 500, 500, 3000, 1250, 700, 650, 900, 650, 500, 600, 650, 600, 600, 4000, 1050, 900, 800, 900, 1100, 1050, 750, 700, 700, 600, 5000, 1000, 1100, 1000, 1400, 1200, 1100, 800, 900, 700, 900, 6000, 1500, 1500, 1500, 2000, 2500, 2000, 1000, 1000, 1000, 1000, 7000, 1500, 2500, 1500, 2000, 2000, 2000, 1500, 1000, 1500, 1000, 8000, 2500, 3000, 3000, 3000, 2000, 2000, 1500, 1500, 1500, 1000, 9000, 500, 3500, 3500, 3500, 2000, 2000, 2000, 2000, 1500, 2000, 10000, 4000, 4000, 4000, 4500, 3500, 1500, 1500, 3000, 2000, 1500 }, + Nr_max = 1.2, + OmViz_max = 99.9, + Range_max = 13000, + Reflection = 0.03, + X_back = -0.922, + Y_back = 0, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AGM_12.lua", + _origin = "AircraftWeaponPack", + autopilot = { + Kd = 0.07, + Ki = 0.01, + Kp = 0.07, + delay = 2, + fins_discreet = 0.08, + fins_limit = 1, + max_ctrl_angle = 6.24, + no_ctrl_center_ang = 2e-05, + op_time = 30, + self_destruct_command_timer = 3, + self_destruct_maneuver = 1, + self_destruct_maneuver_cmd_y = 0.3, + self_destruct_maneuver_cmd_z = 0.6, + self_destruct_no_signal_lim = 0.5, + self_destruct_start_timer = 18 + }, + booster = { + custom_smoke_dissipation_factor = 1, + effect_type = 1, + fuel_mass = 40, + impulse = 270, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1, 0, 0 } }, + smoke_color = { 0.8, 0.8, 0.8 }, + smoke_transparency = 0.01, + tail_width = 0.18, + work_time = 2 + }, + category = 2, + class_name = "wAmmunitionVikhr", + display_name_short = "AGM-12B", + fm = { + A = 0.36, + I = 265.38909287667, + I_x = 10, + L = 3.4798, + Ma = 2, + Ma_x = 3, + Mw = 5, + Mw_x = 1.5, + Mx0Ma = { -0.25, -0.11 }, + Sw = 0.465, + caliber = 0.3048, + cx_coeff = { 1, 0.34, 0.38, 0.536, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.01, + ideal_fins = true, + mass = 263, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + fuze = { + default_arm_delays = { 2 }, + default_function_altitude = 0 + }, + model = "9M114", + name = "AGM_12B", + scheme = "schemes/missiles/AGM-12.sch", + shape_table_data = { { + file = "9M114", + index = "Redacted", + name = "AGM_12B", + username = "AGM-12B" + } }, + sigma = { 4, 4, 4 }, + spiral_nav = { + def_cone_max_dist = 22000, + def_cone_near_rad = 10000, + def_cone_near_rad_st = 0, + def_cone_time_stab_rad = 0, + gb_angle = 0.0036, + gb_max_retW = 0.4, + gb_min_dist = 3200, + gb_ret_Kp = 1.1, + gb_use_time = 5.3, + t_cone_near_rad = 10000 + }, + t_acc = 2, + t_b = 0, + t_marsh = 0, + user_name = "AGM-12B", + v_mid = 300, + v_min = 170, + warhead = { + caliber = 207, + concrete_factors = { 1, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 113, + fantom = 0, + mass = 113, + obj_factors = { 1, 1 }, + other_factors = { 0.5, 0.5, 0.5 }, + piercing_mass = 22.6 + }, + warhead_air = { + fantom = 0 + }, + wcs = { + activation_delay = 0.75, + base_pulse_length = 0.05, + command_deflection = 0.2, + input_delay = 0.1, + lead_pulse_deadzone = 0.001, + lead_pulse_sensitivity = 0.5, + lifetime = 30, + memory_pulse_sensitivity = 1, + reference_offset = -0.87266462599716, + sustain_pulse_gain_per_cycle = 0.1, + sustain_pulse_sensitity = 1, + sustain_pulse_sentitivity_exponent = 0.2 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + sounderName = "Weapons/Missile", + type_name = "missile", + ws_type = { 4, 4, 8, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/AGM_130.lua b/_G/weapons_table/weapons/missiles/AGM_130.lua new file mode 100644 index 00000000..1eacb4b9 --- /dev/null +++ b/_G/weapons_table/weapons/missiles/AGM_130.lua @@ -0,0 +1,386 @@ +_G["weapons_table"]["weapons"]["missiles"]["AGM_130"] = { + Reflection = 0.2, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.missiles.AGM_130", + caliber = 0.457, + client = { + Cx_pil = 4, + D_max = 40000, + D_min = 2000, + Diam = 460, + Escort = 0, + Fi_excort = 0.7, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.35, + H_max = 24000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 27000, 32000, 35000, 37500, 39500, 41000, 43000, 46000, 200, 0, 0, 27500, 32500, 35500, 37500, 39000, 41000, 43500, 46000, 300, 0, 0, 28000, 32500, 35500, 37500, 39500, 41000, 43500, 46500, 400, 0, 0, 29000, 32500, 35500, 38000, 39500, 41500, 44000, 46500, 500, 0, 21000, 29000, 33000, 35500, 38000, 39500, 41500, 44000, 47000, 600, 0, 22500, 29500, 33000, 36000, 38000, 40000, 42000, 44000, 47000, 700, 0, 20500, 30500, 35000, 37500, 40000, 42000, 43500, 46000, 49000, 800, 0, 23000, 31000, 35000, 38000, 40000, 42000, 44000, 46000, 49000, 900, 0, 24000, 31000, 35000, 38000, 40000, 42000, 44000, 46500, 49500, 1000, 0, 22500, 31500, 36500, 39500, 41500, 43500, 45500, 48000, 51000, 2000, 0, 25500, 36000, 41000, 44500, 46500, 49000, 51000, 54000, 57500, 3000, 22500, 30000, 39000, 45000, 49000, 52000, 54500, 56500, 60000, 64000, 4000, 26000, 31000, 40500, 48500, 53000, 56500, 60000, 63000, 67000, 72500, 5000, 29500, 35000, 43500, 52000, 57000, 61500, 64500, 68000, 72500, 79000, 6000, 33000, 39000, 46500, 55500, 61000, 65500, 69000, 73000, 78000, 85500, 7000, 37000, 42500, 50000, 59000, 64000, 68500, 72000, 75500, 81500, 89500, 8000, 40000, 46000, 53000, 60000, 65000, 70000, 73000, 76500, 84000, 92000, 9000, 43500, 51000, 58000, 63500, 68000, 72000, 74000, 78500, 85500, 93000, 10000, 49000, 56000, 61500, 66000, 70500, 72500, 76000, 82500, 90000, 97500, 11000, 53500, 59500, 64000, 68500, 71500, 74000, 79000, 86500, 93500, 100000, 12000, 57000, 62000, 66500, 70500, 74000, 76500, 82500, 90000, 97500, 100000, 13000, 59500, 64500, 68000, 73000, 77000, 79000, 85500, 93000, 100000, 100000, 14000, 62000, 66500, 70000, 75000, 78500, 81500, 88500, 96000, 100000, 100000, 15000, 64000, 66500, 69500, 74500, 79500, 82500, 90000, 98000, 100000, 100000 }, + Life_Time = 250, + M = 1323, + Mach_max = 0.85, + MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 2200, 2050, 3000, 3100, 3050, 3450, 3900, 4600, 200, 750, 1550, 2200, 2700, 3150, 3600, 4100, 4850, 4550, 5050, 300, 0, 1550, 2350, 2600, 3350, 3400, 3800, 4600, 6750, 5550, 400, 1050, 2200, 2350, 2900, 3200, 3800, 4200, 4600, 6150, 5950, 500, 0, 1800, 2450, 3000, 3500, 3800, 4400, 5000, 6300, 6300, 600, 0, 1900, 2650, 3050, 3600, 4100, 4400, 5200, 6500, 6600, 700, 0, 2100, 2650, 3150, 3650, 4100, 4550, 5350, 6650, 7900, 800, 0, 2050, 2750, 3250, 3750, 4250, 4700, 5400, 6800, 8100, 900, 1550, 2100, 2800, 3350, 3850, 4350, 4850, 5550, 7000, 7350, 1000, 1400, 2150, 2900, 3400, 3950, 4450, 4950, 5700, 7100, 8400, 2000, 1500, 2350, 3100, 3850, 4550, 5200, 5800, 6800, 8150, 9700, 3000, 1500, 2400, 3200, 3900, 4800, 5500, 6200, 7500, 9300, 10800, 4000, 1900, 1900, 4300, 4200, 4500, 5500, 6400, 8100, 10100, 11400, 5000, 2250, 4500, 5000, 5250, 5000, 5500, 6250, 8750, 10750, 12750, 6000, 2500, 5000, 6000, 6500, 6000, 6000, 6500, 9500, 11500, 13500, 7000, 2500, 4500, 6500, 7500, 7000, 7000, 7000, 9500, 12000, 14000, 8000, 2500, 5500, 6000, 8500, 8500, 7500, 8000, 10000, 12500, 14500, 9000, 2500, 6000, 6500, 10500, 9000, 8500, 9000, 10000, 12500, 15000, 10000, 2000, 6000, 8000, 11500, 11000, 10500, 11000, 10500, 13000, 15500, 11000, 2000, 6000, 7500, 14500, 11500, 12000, 11500, 12000, 13500, 16000, 12000, 2000, 6500, 8500, 11000, 12000, 13000, 13500, 13500, 14500, 16500, 13000, 2000, 6000, 9500, 10500, 16000, 8000, 14000, 13500, 16000, 17500, 14000, 2000, 6000, 6000, 11000, 21500, 15000, 17000, 14000, 16000, 18500, 15000, 2500, 4500, 7500, 10000, 14500, 15000, 18000, 16000, 17000, 19500 }, + Nr_max = 12, + OmViz_max = 99.9, + Range_max = 65000, + Reflection = 0.2, + X_back = -1.697, + Y_back = -0.56, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + ap = { + Ka = 4.186854, + Kd = 620, + Kra = 0.5, + Krd = 0.05, + Ks = 0.05, + Tc = 0.23044046, + Tm = 189.385228, + delay = 0, + fins_limit = 1, + fins_limit_x = 0.1, + gload_limit = 10, + integ_limit = 0.2, + null_roll = 1e-07, + omega_limit = 0.2, + op_time = 999, + tail_control = false + }, + category = 2, + class_name = "wAmmunitionSelfHoming", + controller = { + A = 0.15, + Cx0 = 1, + Ka = 5, + Kalt = 0.1, + Kid = 0.01, + Kivv = 0.01, + Klat = 0.1, + Kpd = 0.5, + Kpitch = 0.5, + Kpr = 0.5, + Kpvv = 0.5, + Kyaw = 0.5, + Sw = 0.72, + VVmax = 100, + alignment_turn_rate = 0.034906585039887, + auto_terminal_t = 15, + caliber = 0.457, + dCydA = 0.1, + drift_max = 300, + gps_leveloff_altitude = 914.3999707392, + gps_transition_platform_pitch = -0.78539816339745, + impact_angles_ = { 1.221730476396, 0.26179938779915 }, + impact_auto_terminal_ = { 30, 15 }, + lat_integ_limits = 100, + m_bo = 1125, + mcg_descent_angle = -0.13962634015955, + midcourse_g_bias = 1, + midcourse_glide_pitch = -0.073, + pitch_integ_limit = 10, + rad_alt_max = 2700, + radar_leveloff_altitude = 761.999975616, + separation_g_bias = 1.1, + separation_t = 6, + separation_t1 = 1.75, + t_burnout = 80, + transition_platform_pitch = -0.41887902047864, + vv_integ_limits = 100 + }, + display_name = "AGM-130C-9", + display_name_short = "AGM-130C-9", + engine = { + boost_factor = 1, + boost_tail = 1, + boost_time = 0, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 153.3, + impulse = 205, + mass = 28, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.95, -0.353, 0 } }, + smoke_color = { 0.5, 0.474, 0.443 }, + smoke_transparency = 0.5, + tail_width = 0.052, + work_tail = 1, + work_time = 80 + }, + exhaust = { 0.78, 0.78, 0.78, 0.3 }, + fm = { + A = 0.15, + I = 1732.6513333333, + I_x = 40, + L = 3.91, + Ma = 0.68, + Ma_x = 3, + Mw = 1.116, + Mw_x = 1.5, + Sw = 0.72, + caliber = 0.457, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, + dCydA = { 0.1, 0.036 }, + finsTau = 0.1, + ideal_fins = true, + mass = 1323, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + ins = { + max_deviation_ttg = 92, + max_update_deviation = 0.1 + }, + model = "agm-130", + name = "AGM_130", + scheme = "schemes/missiles/AGM-130.sch", + seeker = { + FOV = 1.8849555921539, + activate_on_update = 0, + delay = 0, + max_lock_dist = 100000, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + max_w_LOS_surf = 0.017, + op_time = 7200 + }, + shape_table_data = { { + file = "agm_130", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AGM_130C_9", + username = "AGM-130C-9" + } }, + sigma = { 10, 10, 10 }, + t_acc = 5, + t_b = 0, + t_marsh = 245, + targeting_data = { + char_time = 20.3 + }, + user_name = "AGM-130C-9", + v_mid = 272, + v_min = 170, + warhead = { + caliber = 457, + concrete_factors = { 5, 1, 10 }, + concrete_obj_factor = 5, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 349.6, + fantom = 1, + mass = 349.6, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 69.92 + }, + warhead_air = { + fantom = 1 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + display_name = "AGM-130C-9", + display_name_short = "AGM-130C-9", + encyclopediaAnimation = { + args = { 0.01, + [4] = 0.01 + } + }, + mass = 1323, + model = "agm-130", + name = "AGM_130", + server = { + Cx_pil = 4, + D_max = 40000, + D_min = 2000, + Diam = 460, + Escort = 0, + Fi_excort = 0.7, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.35, + H_max = 24000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 27000, 32000, 35000, 37500, 39500, 41000, 43000, 46000, 200, 0, 0, 27500, 32500, 35500, 37500, 39000, 41000, 43500, 46000, 300, 0, 0, 28000, 32500, 35500, 37500, 39500, 41000, 43500, 46500, 400, 0, 0, 29000, 32500, 35500, 38000, 39500, 41500, 44000, 46500, 500, 0, 21000, 29000, 33000, 35500, 38000, 39500, 41500, 44000, 47000, 600, 0, 22500, 29500, 33000, 36000, 38000, 40000, 42000, 44000, 47000, 700, 0, 20500, 30500, 35000, 37500, 40000, 42000, 43500, 46000, 49000, 800, 0, 23000, 31000, 35000, 38000, 40000, 42000, 44000, 46000, 49000, 900, 0, 24000, 31000, 35000, 38000, 40000, 42000, 44000, 46500, 49500, 1000, 0, 22500, 31500, 36500, 39500, 41500, 43500, 45500, 48000, 51000, 2000, 0, 25500, 36000, 41000, 44500, 46500, 49000, 51000, 54000, 57500, 3000, 22500, 30000, 39000, 45000, 49000, 52000, 54500, 56500, 60000, 64000, 4000, 26000, 31000, 40500, 48500, 53000, 56500, 60000, 63000, 67000, 72500, 5000, 29500, 35000, 43500, 52000, 57000, 61500, 64500, 68000, 72500, 79000, 6000, 33000, 39000, 46500, 55500, 61000, 65500, 69000, 73000, 78000, 85500, 7000, 37000, 42500, 50000, 59000, 64000, 68500, 72000, 75500, 81500, 89500, 8000, 40000, 46000, 53000, 60000, 65000, 70000, 73000, 76500, 84000, 92000, 9000, 43500, 51000, 58000, 63500, 68000, 72000, 74000, 78500, 85500, 93000, 10000, 49000, 56000, 61500, 66000, 70500, 72500, 76000, 82500, 90000, 97500, 11000, 53500, 59500, 64000, 68500, 71500, 74000, 79000, 86500, 93500, 100000, 12000, 57000, 62000, 66500, 70500, 74000, 76500, 82500, 90000, 97500, 100000, 13000, 59500, 64500, 68000, 73000, 77000, 79000, 85500, 93000, 100000, 100000, 14000, 62000, 66500, 70000, 75000, 78500, 81500, 88500, 96000, 100000, 100000, 15000, 64000, 66500, 69500, 74500, 79500, 82500, 90000, 98000, 100000, 100000 }, + Life_Time = 250, + M = 1323, + Mach_max = 0.85, + MinLaunchDistData = { 24, 10, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 100, 0, 0, 2200, 2050, 3000, 3100, 3050, 3450, 3900, 4600, 200, 750, 1550, 2200, 2700, 3150, 3600, 4100, 4850, 4550, 5050, 300, 0, 1550, 2350, 2600, 3350, 3400, 3800, 4600, 6750, 5550, 400, 1050, 2200, 2350, 2900, 3200, 3800, 4200, 4600, 6150, 5950, 500, 0, 1800, 2450, 3000, 3500, 3800, 4400, 5000, 6300, 6300, 600, 0, 1900, 2650, 3050, 3600, 4100, 4400, 5200, 6500, 6600, 700, 0, 2100, 2650, 3150, 3650, 4100, 4550, 5350, 6650, 7900, 800, 0, 2050, 2750, 3250, 3750, 4250, 4700, 5400, 6800, 8100, 900, 1550, 2100, 2800, 3350, 3850, 4350, 4850, 5550, 7000, 7350, 1000, 1400, 2150, 2900, 3400, 3950, 4450, 4950, 5700, 7100, 8400, 2000, 1500, 2350, 3100, 3850, 4550, 5200, 5800, 6800, 8150, 9700, 3000, 1500, 2400, 3200, 3900, 4800, 5500, 6200, 7500, 9300, 10800, 4000, 1900, 1900, 4300, 4200, 4500, 5500, 6400, 8100, 10100, 11400, 5000, 2250, 4500, 5000, 5250, 5000, 5500, 6250, 8750, 10750, 12750, 6000, 2500, 5000, 6000, 6500, 6000, 6000, 6500, 9500, 11500, 13500, 7000, 2500, 4500, 6500, 7500, 7000, 7000, 7000, 9500, 12000, 14000, 8000, 2500, 5500, 6000, 8500, 8500, 7500, 8000, 10000, 12500, 14500, 9000, 2500, 6000, 6500, 10500, 9000, 8500, 9000, 10000, 12500, 15000, 10000, 2000, 6000, 8000, 11500, 11000, 10500, 11000, 10500, 13000, 15500, 11000, 2000, 6000, 7500, 14500, 11500, 12000, 11500, 12000, 13500, 16000, 12000, 2000, 6500, 8500, 11000, 12000, 13000, 13500, 13500, 14500, 16500, 13000, 2000, 6000, 9500, 10500, 16000, 8000, 14000, 13500, 16000, 17500, 14000, 2000, 6000, 6000, 11000, 21500, 15000, 17000, 14000, 16000, 18500, 15000, 2500, 4500, 7500, 10000, 14500, 15000, 18000, 16000, 17000, 19500 }, + Nr_max = 12, + OmViz_max = 99.9, + Range_max = 65000, + Reflection = 0.2, + X_back = -1.697, + Y_back = -0.56, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/GBU_15.lua", + _origin = "AircraftWeaponPack", + ap = { + Ka = 4.186854, + Kd = 620, + Kra = 0.5, + Krd = 0.05, + Ks = 0.05, + Tc = 0.23044046, + Tm = 189.385228, + delay = 0, + fins_limit = 1, + fins_limit_x = 0.1, + gload_limit = 10, + integ_limit = 0.2, + null_roll = 1e-07, + omega_limit = 0.2, + op_time = 999, + tail_control = false + }, + category = 2, + class_name = "wAmmunitionSelfHoming", + controller = { + A = 0.15, + Cx0 = 1, + Ka = 5, + Kalt = 0.1, + Kid = 0.01, + Kivv = 0.01, + Klat = 0.1, + Kpd = 0.5, + Kpitch = 0.5, + Kpr = 0.5, + Kpvv = 0.5, + Kyaw = 0.5, + Sw = 0.72, + VVmax = 100, + alignment_turn_rate = 0.034906585039887, + auto_terminal_t = 15, + caliber = 0.457, + dCydA = 0.1, + drift_max = 300, + gps_leveloff_altitude = 914.3999707392, + gps_transition_platform_pitch = -0.78539816339745, + impact_angles_ = { 1.221730476396, 0.26179938779915 }, + impact_auto_terminal_ = { 30, 15 }, + lat_integ_limits = 100, + m_bo = 1125, + mcg_descent_angle = -0.13962634015955, + midcourse_g_bias = 1, + midcourse_glide_pitch = -0.073, + pitch_integ_limit = 10, + rad_alt_max = 2700, + radar_leveloff_altitude = 761.999975616, + separation_g_bias = 1.1, + separation_t = 6, + separation_t1 = 1.75, + t_burnout = 80, + transition_platform_pitch = -0.41887902047864, + vv_integ_limits = 100 + }, + display_name = "AGM-130C-9", + display_name_short = "AGM-130C-9", + engine = { + boost_factor = 1, + boost_tail = 1, + boost_time = 0, + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 153.3, + impulse = 205, + mass = 28, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.95, -0.353, 0 } }, + smoke_color = { 0.5, 0.474, 0.443 }, + smoke_transparency = 0.5, + tail_width = 0.052, + work_tail = 1, + work_time = 80 + }, + exhaust = { 0.78, 0.78, 0.78, 0.3 }, + fm = { + A = 0.15, + I = 1732.6513333333, + I_x = 40, + L = 3.91, + Ma = 0.68, + Ma_x = 3, + Mw = 1.116, + Mw_x = 1.5, + Sw = 0.72, + caliber = 0.457, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, + dCydA = { 0.1, 0.036 }, + finsTau = 0.1, + ideal_fins = true, + mass = 1323, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + ins = { + max_deviation_ttg = 92, + max_update_deviation = 0.1 + }, + model = "agm-130", + name = "AGM_130", + scheme = "schemes/missiles/AGM-130.sch", + seeker = { + FOV = 1.8849555921539, + activate_on_update = 0, + delay = 0, + max_lock_dist = 100000, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + max_w_LOS_surf = 0.017, + op_time = 7200 + }, + shape_table_data = { { + file = "agm_130", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "AGM_130C_9", + username = "AGM-130C-9" + } }, + sigma = { 10, 10, 10 }, + t_acc = 5, + t_b = 0, + t_marsh = 245, + targeting_data = { + char_time = 20.3 + }, + user_name = "AGM-130C-9", + v_mid = 272, + v_min = 170, + warhead = { + caliber = 457, + concrete_factors = { 5, 1, 10 }, + concrete_obj_factor = 5, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 349.6, + fantom = 0, + mass = 349.6, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 69.92 + }, + warhead_air = { + fantom = 0 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + sounderName = "Weapons/Missile", + type_name = "missile", + ws_type = { 4, 4, 8, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/AGM_154.lua b/_G/weapons_table/weapons/missiles/AGM_154.lua index 9a61f611..528a9a95 100644 --- a/_G/weapons_table/weapons/missiles/AGM_154.lua +++ b/_G/weapons_table/weapons/missiles/AGM_154.lua @@ -8,10 +8,15 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { J_Diff_K = 3.2, J_Int_K = 0, J_Power_K = 4.8, - K = 200, - Kg = 6, - Ki = 5e-05, - delay = 2, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, @@ -19,14 +24,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { err_aoaz_sign_k = 0.18, err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, control_block = { @@ -42,12 +47,12 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { fm = { A = 0.15, I = 1000, + Kw_x = 0.05, L = 4.06, Ma = 2, Ma_x = 2, Ma_z = 2, Mw = 7, - Mw_x = 1.4, Sw = 1.2, addDeplSw = 0.6, caliber = 0.4, @@ -58,18 +63,18 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, wingsDeplProcTime = 5 }, - scheme = "schemes/missiles/AGM-154C.sch", - simple_seeker = { - FOV = 0.6, - delay = 0, - maxW = 500, - opTime = 9999, - sensitivity = 0 + scheme = "schemes/missiles/JSOW_C.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 }, warhead = { caliber = 330, @@ -110,10 +115,15 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { J_Diff_K = 3.2, J_Int_K = 0, J_Power_K = 4.8, - K = 200, - Kg = 6, - Ki = 5e-05, - delay = 2, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, @@ -121,14 +131,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { err_aoaz_sign_k = 0.18, err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, control_block = { @@ -144,12 +154,12 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { fm = { A = 0.15, I = 1000, + Kw_x = 0.05, L = 4.06, Ma = 2, Ma_x = 2, Ma_z = 2, Mw = 7, - Mw_x = 1.4, Sw = 1.2, addDeplSw = 0.6, caliber = 0.4, @@ -160,18 +170,18 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, wingsDeplProcTime = 5 }, - scheme = "schemes/missiles/AGM-154C.sch", - simple_seeker = { - FOV = 0.6, - delay = 0, - maxW = 500, - opTime = 9999, - sensitivity = 0 + scheme = "schemes/missiles/JSOW_C.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 }, warhead = { caliber = 330, diff --git a/_G/weapons_table/weapons/missiles/AGM_154A.lua b/_G/weapons_table/weapons/missiles/AGM_154A.lua index 9b94d1e6..cb706d76 100644 --- a/_G/weapons_table/weapons/missiles/AGM_154A.lua +++ b/_G/weapons_table/weapons/missiles/AGM_154A.lua @@ -40,24 +40,28 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { J_Int_K = 0, J_Power_K = 4, K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, Kg = 6, Ki = 5e-05, - delay = 2, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -75,12 +79,13 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { control_block2 = { add_y = 500, can_update_target_pos = 0, - delay = 0.5, + delay = 0.3, max_no_vert_offset_open_h = 90, use_snake_maneuver = 1, vert_offset_before_end_game_k = 0.8, wind_k = 0 }, + display_name_short = "AGM-154A", fm = { A = 0.15, I = 1000, @@ -100,6 +105,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -253,7 +260,13 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { trigger_add_time = 1, wind_correction_coeff = 1 }, - scheme = "schemes/missiles/AGM-154AB.sch", + scheme = "schemes/missiles/JSOW_AB.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "AGM-154", fire = { 0, 1 }, @@ -263,13 +276,6 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { username = "AGM-154A" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 0, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, @@ -295,6 +301,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-154A", + display_name_short = "AGM-154A", mass = 485, model = "agm-154", name = "AGM_154A", @@ -334,24 +341,28 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { J_Int_K = 0, J_Power_K = 4, K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, Kg = 6, Ki = 5e-05, - delay = 2, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -369,12 +380,13 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { control_block2 = { add_y = 500, can_update_target_pos = 0, - delay = 0.5, + delay = 0.3, max_no_vert_offset_open_h = 90, use_snake_maneuver = 1, vert_offset_before_end_game_k = 0.8, wind_k = 0 }, + display_name_short = "AGM-154A", fm = { A = 0.15, I = 1000, @@ -394,6 +406,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -547,7 +561,13 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { trigger_add_time = 1, wind_correction_coeff = 1 }, - scheme = "schemes/missiles/AGM-154AB.sch", + scheme = "schemes/missiles/JSOW_AB.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "AGM-154", fire = { 0, 1 }, @@ -557,13 +577,6 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154A"] = { username = "AGM-154A" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 0, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/weapons_table/weapons/missiles/AGM_154B.lua b/_G/weapons_table/weapons/missiles/AGM_154B.lua index 88d0eaac..3daca33f 100644 --- a/_G/weapons_table/weapons/missiles/AGM_154B.lua +++ b/_G/weapons_table/weapons/missiles/AGM_154B.lua @@ -40,24 +40,28 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { J_Int_K = 0, J_Power_K = 4, K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, Kg = 6, Ki = 5e-05, + Kx = 0.03, + Kxd = 0, delay = 2, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -81,6 +85,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { vert_offset_before_end_game_k = 0.8, wind_k = 0 }, + display_name_short = "AGM-154B", fm = { A = 0.15, I = 1000, @@ -100,6 +105,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -234,14 +241,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "BLU-108", @@ -374,14 +381,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -407,7 +414,13 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { trigger_add_time = 0.5, wind_correction_coeff = 1 }, - scheme = "schemes/missiles/AGM-154AB.sch", + scheme = "schemes/missiles/JSOW_AB.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "AGM-154", fire = { 0, 1 }, @@ -417,13 +430,6 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { username = "AGM-154B" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 0, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, @@ -449,6 +455,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-154B", + display_name_short = "AGM-154B", mass = 485, model = "agm-154", name = "AGM_154B", @@ -488,24 +495,28 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { J_Int_K = 0, J_Power_K = 4, K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, Kg = 6, Ki = 5e-05, + Kx = 0.03, + Kxd = 0, delay = 2, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -529,6 +540,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { vert_offset_before_end_game_k = 0.8, wind_k = 0 }, + display_name_short = "AGM-154B", fm = { A = 0.15, I = 1000, @@ -548,6 +560,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -682,14 +696,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "BLU-108", @@ -822,14 +836,14 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -855,7 +869,13 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { trigger_add_time = 0.5, wind_correction_coeff = 1 }, - scheme = "schemes/missiles/AGM-154AB.sch", + scheme = "schemes/missiles/JSOW_AB.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "AGM-154", fire = { 0, 1 }, @@ -865,13 +885,6 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_154B"] = { username = "AGM-154B" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 0, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/weapons_table/weapons/missiles/AGM_45A.lua b/_G/weapons_table/weapons/missiles/AGM_45A.lua index 44e99904..6e575a86 100644 --- a/_G/weapons_table/weapons/missiles/AGM_45A.lua +++ b/_G/weapons_table/weapons/missiles/AGM_45A.lua @@ -52,6 +52,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { controller = { march_start = 0 }, + display_name_short = "AGM-45A", fm = { A = 0.36, I = 137.211875, @@ -167,6 +168,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-45A", + display_name_short = "AGM-45A", mass = 177, model = "agm-45", name = "AGM_45A", @@ -218,6 +220,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_45A"] = { controller = { march_start = 0 }, + display_name_short = "AGM-45A", fm = { A = 0.36, I = 137.211875, diff --git a/_G/weapons_table/weapons/missiles/AGM_65A.lua b/_G/weapons_table/weapons/missiles/AGM_65A.lua index 905385de..aad9cb9f 100644 --- a/_G/weapons_table/weapons/missiles/AGM_65A.lua +++ b/_G/weapons_table/weapons/missiles/AGM_65A.lua @@ -42,6 +42,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65A"] = { _origin = "AircraftWeaponPack", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "AGM-65A", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, @@ -123,6 +124,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65A"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-65A", + display_name_short = "AGM-65A", mass = 210.5, model = "agm-65b", name = "AGM_65A", @@ -164,6 +166,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65A"] = { _origin = "AircraftWeaponPack", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "AGM-65A", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/AGM_65B.lua b/_G/weapons_table/weapons/missiles/AGM_65B.lua index 9b965f5b..958c430e 100644 --- a/_G/weapons_table/weapons/missiles/AGM_65B.lua +++ b/_G/weapons_table/weapons/missiles/AGM_65B.lua @@ -42,6 +42,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65B"] = { _origin = "AircraftWeaponPack", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "AGM-65B", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, @@ -123,6 +124,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65B"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-65B", + display_name_short = "AGM-65B", mass = 210.5, model = "agm-65b", name = "AGM_65B", @@ -164,6 +166,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65B"] = { _origin = "AircraftWeaponPack", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "AGM-65B", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/AGM_65F.lua b/_G/weapons_table/weapons/missiles/AGM_65F.lua index 7b11642b..bcb89019 100644 --- a/_G/weapons_table/weapons/missiles/AGM_65F.lua +++ b/_G/weapons_table/weapons/missiles/AGM_65F.lua @@ -42,6 +42,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65F"] = { _origin = "AircraftWeaponPack", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "AGM-65F", exhaust = { 0.75, 0.75, 0.75, 0.1 }, fm = { A = 0.36, @@ -125,6 +126,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65F"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-65F", + display_name_short = "AGM-65F", mass = 301, model = "AGM-65F", name = "AGM_65F", @@ -166,6 +168,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65F"] = { _origin = "AircraftWeaponPack", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "AGM-65F", exhaust = { 0.75, 0.75, 0.75, 0.1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/AGM_65L.lua b/_G/weapons_table/weapons/missiles/AGM_65L.lua index 2ad30436..62cd6c52 100644 --- a/_G/weapons_table/weapons/missiles/AGM_65L.lua +++ b/_G/weapons_table/weapons/missiles/AGM_65L.lua @@ -42,6 +42,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65L"] = { _origin = "AircraftWeaponPack", category = 2, class_name = "wAmmunitionLaserHoming", + display_name_short = "AGM-65L", exhaust = { 0.75, 0.75, 0.75, 0.1 }, fm = { A = 0.36, @@ -118,6 +119,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65L"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-65L", + display_name_short = "AGM-65L", mass = 292, model = "agm-65l", name = "AGM_65L", @@ -159,6 +161,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_65L"] = { _origin = "AircraftWeaponPack", category = 2, class_name = "wAmmunitionLaserHoming", + display_name_short = "AGM-65L", exhaust = { 0.75, 0.75, 0.75, 0.1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/AGM_84D.lua b/_G/weapons_table/weapons/missiles/AGM_84D.lua index 80037d84..38d0ea6e 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84D.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84D.lua @@ -98,6 +98,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84D"] = { boost_start = 0, march_start = 0 }, + display_name_short = "AGM-84D", engine_control = { K = 350, Kd = 1, @@ -255,6 +256,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84D"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-84D", + display_name_short = "AGM-84D", mass = 540, model = "agm-84d", name = "AGM_84D", @@ -351,6 +353,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84D"] = { boost_start = 0, march_start = 0 }, + display_name_short = "AGM-84D", engine_control = { K = 350, Kd = 1, diff --git a/_G/weapons_table/weapons/missiles/AGM_84H.lua b/_G/weapons_table/weapons/missiles/AGM_84H.lua index 4dd0f42c..c4b9175f 100644 --- a/_G/weapons_table/weapons/missiles/AGM_84H.lua +++ b/_G/weapons_table/weapons/missiles/AGM_84H.lua @@ -57,10 +57,11 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { default_cruise_height = 50, obj_sensor = 0, seeker_activation_dist = 20000, + stab_aim_diff = 0.1, turn_before_point_reach = 1, turn_hor_N = 0.5, turn_max_calc_angle_deg = 90, - turn_point_trigger_dist = 100, + turn_point_trigger_dist = 450, use_horiz_dist = 1 }, controller = { @@ -76,9 +77,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { Ki_eng = 0.003, Kii_ver = 0.2, Kp_eng = 265, - Kp_hor_err = 240, + Kp_hor_err = 350, Kp_hor_err_croll = 0.06, - Kp_ver = 9, + Kp_ver = 8.2, Kp_ver_st1 = 0.009, Kp_ver_st2 = 0.00018, alg_calc_time = 1.5, @@ -95,11 +96,12 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { eng_min_thrust = -100, estimated_N_max = 6, finsLimit = 0.8, - max_roll = 0.8, + max_roll = 0.7, max_start_y_vel = 35, no_alg_vel_k = 10, stab_vel = 237.5 }, + display_name_short = "AGM-84H", final_autopilot = { J_Angle_K = 0.22, J_Angle_W = 0.6, @@ -223,6 +225,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-84H", + display_name_short = "AGM-84H", encyclopediaAnimation = { args = { [25] = 1 @@ -283,10 +286,11 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { default_cruise_height = 50, obj_sensor = 0, seeker_activation_dist = 20000, + stab_aim_diff = 0.1, turn_before_point_reach = 1, turn_hor_N = 0.5, turn_max_calc_angle_deg = 90, - turn_point_trigger_dist = 100, + turn_point_trigger_dist = 450, use_horiz_dist = 1 }, controller = { @@ -302,9 +306,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { Ki_eng = 0.003, Kii_ver = 0.2, Kp_eng = 265, - Kp_hor_err = 240, + Kp_hor_err = 350, Kp_hor_err_croll = 0.06, - Kp_ver = 9, + Kp_ver = 8.2, Kp_ver_st1 = 0.009, Kp_ver_st2 = 0.00018, alg_calc_time = 1.5, @@ -321,11 +325,12 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_84H"] = { eng_min_thrust = -100, estimated_N_max = 6, finsLimit = 0.8, - max_roll = 0.8, + max_roll = 0.7, max_start_y_vel = 35, no_alg_vel_k = 10, stab_vel = 237.5 }, + display_name_short = "AGM-84H", final_autopilot = { J_Angle_K = 0.22, J_Angle_W = 0.6, diff --git a/_G/weapons_table/weapons/missiles/AGM_86.lua b/_G/weapons_table/weapons/missiles/AGM_86.lua index 8c90df78..299539f1 100644 --- a/_G/weapons_table/weapons/missiles/AGM_86.lua +++ b/_G/weapons_table/weapons/missiles/AGM_86.lua @@ -1,9 +1,41 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { Reflection = 0.1691, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", _unique_resource_name = "weapons.missiles.AGM_86", add_attributes = { "Cruise missiles" }, caliber = 0.697, client = { + Cx_pil = 8, + D_max = 2400000, + D_min = 20000, + Diam = 697, + Escort = 0, + Fi_excort = 0.7, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.35, + H_max = 13000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 2375000, 2380000, 2405000, 2000, 2385000, 2390000, 2400000, 2430000, 7000, 2420000, 2420000, 2430000, 2445000, 13000, 2440000, 2440000, 2450000, 2450000 }, + Life_Time = 10000, + M = 1450, + Mach_max = 0.95, + MinLaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 19500, 20500, 22000, 2000, 23500, 25000, 27500, 30500, 7000, 53000, 53500, 58500, 63500, 13000, 93000, 93000, 102000, 105000 }, + Nr_max = 16, + OmViz_max = 99.9, + Range_max = 2400000, + Reflection = 0.1691, + X_back = -3.392, + Y_back = 0.064, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Cruise missiles" }, boost = { boost_factor = 0, boost_time = 0, @@ -17,6 +49,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { tail_width = 0, work_time = 0 }, + category = 2, + class_name = "wAmmunitionCruise", control_block = { can_update_target_pos = 0, default_cruise_height = 55, @@ -65,6 +99,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { no_alg_vel_k = 10, stab_vel = 220 }, + display_name_short = "AGM-86D", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, @@ -130,6 +165,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { thrust_Tau = 0.0017, work_time = 999999 }, + mass = 1450, + model = "agm-86", + name = "AGM_86", play_booster_animation = { val = 0 }, @@ -139,6 +177,21 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { coalition = 2, coalition_rnd_coeff = 5 }, + shape_table_data = { { + file = "agm-86", + fire = { 0, 1 }, + index = "Redacted", + life = 2, + name = "AGM-86D", + username = "AGM-86D" + } }, + sigma = { 20, 20, 20 }, + t_acc = 5, + t_b = 0, + t_marsh = 10000, + user_name = "AGM-86D", + v_mid = 272, + v_min = 170, warhead = { caliber = 697, concrete_factors = { 5, 1, 10 }, @@ -166,13 +219,50 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 36 - } + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-86D", - mass = 1500, + display_name_short = "AGM-86D", + encyclopediaAnimation = { + args = { + [25] = 1 + } + }, + mass = 1450, model = "agm-86", name = "AGM_86", server = { + Cx_pil = 8, + D_max = 2400000, + D_min = 20000, + Diam = 697, + Escort = 0, + Fi_excort = 0.7, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.35, + H_max = 13000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 2375000, 2380000, 2405000, 2000, 2385000, 2390000, 2400000, 2430000, 7000, 2420000, 2420000, 2430000, 2445000, 13000, 2440000, 2440000, 2450000, 2450000 }, + Life_Time = 10000, + M = 1450, + Mach_max = 0.95, + MinLaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 19500, 20500, 22000, 2000, 23500, 25000, 27500, 30500, 7000, 53000, 53500, 58500, 63500, 13000, 93000, 93000, 102000, 105000 }, + Nr_max = 16, + OmViz_max = 99.9, + Range_max = 2400000, + Reflection = 0.1691, + X_back = -3.392, + Y_back = 0.064, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Cruise missiles" }, boost = { boost_factor = 0, boost_time = 0, @@ -186,6 +276,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { tail_width = 0, work_time = 0 }, + category = 2, + class_name = "wAmmunitionCruise", control_block = { can_update_target_pos = 0, default_cruise_height = 55, @@ -234,6 +326,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { no_alg_vel_k = 10, stab_vel = 220 }, + display_name_short = "AGM-86D", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, @@ -299,6 +392,9 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { thrust_Tau = 0.0017, work_time = 999999 }, + mass = 1450, + model = "agm-86", + name = "AGM_86", play_booster_animation = { val = 0 }, @@ -308,6 +404,21 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { coalition = 2, coalition_rnd_coeff = 5 }, + shape_table_data = { { + file = "agm-86", + fire = { 0, 1 }, + index = "Redacted", + life = 2, + name = "AGM-86D", + username = "AGM-86D" + } }, + sigma = { 20, 20, 20 }, + t_acc = 5, + t_b = 0, + t_marsh = 10000, + user_name = "AGM-86D", + v_mid = 272, + v_min = 170, warhead = { caliber = 697, concrete_factors = { 5, 1, 10 }, @@ -335,7 +446,8 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86"] = { obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 36 - } + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, sounderName = "Weapons/Missile", type_name = "missile", diff --git a/_G/weapons_table/weapons/missiles/AGM_86C.lua b/_G/weapons_table/weapons/missiles/AGM_86C.lua index 21331a41..4c3cba60 100644 --- a/_G/weapons_table/weapons/missiles/AGM_86C.lua +++ b/_G/weapons_table/weapons/missiles/AGM_86C.lua @@ -94,11 +94,16 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86C"] = { eng_min_thrust = -120, estimated_N_max = 6, finsLimit = 0.8, + glide_height_abs_error = 1, + glide_height_eq_error = 10, + inertial_km_error = 7, max_roll = 0.8, max_start_y_vel = 35, no_alg_vel_k = 10, - stab_vel = 220 + stab_vel = 220, + stab_vel_abs_error = 16 }, + display_name_short = "AGM-86C", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, @@ -222,6 +227,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86C"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AGM-86C", + display_name_short = "AGM-86C", encyclopediaAnimation = { args = { [25] = 1 @@ -319,11 +325,16 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_86C"] = { eng_min_thrust = -120, estimated_N_max = 6, finsLimit = 0.8, + glide_height_abs_error = 1, + glide_height_eq_error = 10, + inertial_km_error = 7, max_roll = 0.8, max_start_y_vel = 35, no_alg_vel_k = 10, - stab_vel = 220 + stab_vel = 220, + stab_vel_abs_error = 16 }, + display_name_short = "AGM-86C", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, diff --git a/_G/weapons_table/weapons/missiles/AGM_88.lua b/_G/weapons_table/weapons/missiles/AGM_88.lua index b8be4616..a0ba87b9 100644 --- a/_G/weapons_table/weapons/missiles/AGM_88.lua +++ b/_G/weapons_table/weapons/missiles/AGM_88.lua @@ -130,31 +130,31 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { }, warhead = { caliber = 254, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, + concrete_factors = { 1.376, 1.376, 1 }, + concrete_obj_factor = 1, cumulative_factor = 0, cumulative_thickness = 0, - default_fuze_delay = 0, - expl_mass = 26.4, + expl_mass = 18.42, fantom = 1, - mass = 26.4, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 5.28 + length = 0.56, + mass = 62.48, + obj_factors = { 1.376, 1.376 }, + other_factors = { 1.376, 1.376, 1.376 }, + piercing_mass = 12.496 }, warhead_air = { caliber = 254, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, + concrete_factors = { 1.376, 1.376, 1 }, + concrete_obj_factor = 1, cumulative_factor = 0, cumulative_thickness = 0, - default_fuze_delay = 0, - expl_mass = 26.4, + expl_mass = 18.42, fantom = 1, - mass = 26.4, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 5.28 + length = 0.56, + mass = 62.48, + obj_factors = { 1.376, 1.376 }, + other_factors = { 1.376, 1.376, 1.376 }, + piercing_mass = 12.496 } }, display_name = "AGM-88C", @@ -289,31 +289,31 @@ _G["weapons_table"]["weapons"]["missiles"]["AGM_88"] = { }, warhead = { caliber = 254, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, + concrete_factors = { 1.376, 1.376, 1 }, + concrete_obj_factor = 1, cumulative_factor = 0, cumulative_thickness = 0, - default_fuze_delay = 0, - expl_mass = 26.4, + expl_mass = 18.42, fantom = 0, - mass = 26.4, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 5.28 + length = 0.56, + mass = 62.48, + obj_factors = { 1.376, 1.376 }, + other_factors = { 1.376, 1.376, 1.376 }, + piercing_mass = 12.496 }, warhead_air = { caliber = 254, - concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, + concrete_factors = { 1.376, 1.376, 1 }, + concrete_obj_factor = 1, cumulative_factor = 0, cumulative_thickness = 0, - default_fuze_delay = 0, - expl_mass = 26.4, + expl_mass = 18.42, fantom = 0, - mass = 26.4, - obj_factors = { 1, 1 }, - other_factors = { 1, 1, 1 }, - piercing_mass = 5.28 + length = 0.56, + mass = 62.48, + obj_factors = { 1.376, 1.376 }, + other_factors = { 1.376, 1.376, 1.376 }, + piercing_mass = 12.496 } }, sounderName = "Weapons/Missile", diff --git a/_G/weapons_table/weapons/missiles/AGR_20A.lua b/_G/weapons_table/weapons/missiles/AGR_20A.lua index 22f6add1..895e9e8c 100644 --- a/_G/weapons_table/weapons/missiles/AGR_20A.lua +++ b/_G/weapons_table/weapons/missiles/AGR_20A.lua @@ -47,6 +47,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20A"] = { }, category = 2, class_name = "wAmmunitionLaserHoming", + display_name_short = "HYDRA-70 HE APKWS", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, @@ -106,7 +107,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20A"] = { t_b = 0, t_marsh = 1.1, user_name = "HYDRA-70 HE APKWS", - v_mid = 500, + v_mid = 350, v_min = 140, warhead = { caliber = 70, @@ -128,6 +129,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20A"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "HYDRA-70 HE APKWS", + display_name_short = "HYDRA-70 HE APKWS", mass = 15, model = "AGR_20", name = "AGR_20A", @@ -174,6 +176,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20A"] = { }, category = 2, class_name = "wAmmunitionLaserHoming", + display_name_short = "HYDRA-70 HE APKWS", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, @@ -233,7 +236,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20A"] = { t_b = 0, t_marsh = 1.1, user_name = "HYDRA-70 HE APKWS", - v_mid = 500, + v_mid = 350, v_min = 140, warhead = { caliber = 70, diff --git a/_G/weapons_table/weapons/missiles/AGR_20_M282.lua b/_G/weapons_table/weapons/missiles/AGR_20_M282.lua index 0b94a9a8..04f02d92 100644 --- a/_G/weapons_table/weapons/missiles/AGR_20_M282.lua +++ b/_G/weapons_table/weapons/missiles/AGR_20_M282.lua @@ -47,6 +47,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20_M282"] = { }, category = 2, class_name = "wAmmunitionLaserHoming", + display_name_short = "HYDRA-70 MPP APKWS", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, @@ -106,7 +107,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20_M282"] = { t_b = 0, t_marsh = 1.1, user_name = "HYDRA-70 MPP APKWS", - v_mid = 500, + v_mid = 350, v_min = 140, warhead = { caliber = 70, @@ -128,6 +129,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20_M282"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "HYDRA-70 MPP APKWS", + display_name_short = "HYDRA-70 MPP APKWS", mass = 17, model = "AGR_20", name = "AGR_20_M282", @@ -174,6 +176,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20_M282"] = { }, category = 2, class_name = "wAmmunitionLaserHoming", + display_name_short = "HYDRA-70 MPP APKWS", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, @@ -233,7 +236,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AGR_20_M282"] = { t_b = 0, t_marsh = 1.1, user_name = "HYDRA-70 MPP APKWS", - v_mid = 500, + v_mid = 350, v_min = 140, warhead = { caliber = 70, diff --git a/_G/weapons_table/weapons/missiles/AIM-7E-2.lua b/_G/weapons_table/weapons/missiles/AIM-7E-2.lua index a7d6ca84..2de1c382 100644 --- a/_G/weapons_table/weapons/missiles/AIM-7E-2.lua +++ b/_G/weapons_table/weapons/missiles/AIM-7E-2.lua @@ -76,6 +76,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E-2"] = { march_start = 0.2 }, displayName = "AIM-7E-2 Sparrow Semi-Active Radar", + display_name_short = "AIM-7E-2", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, @@ -192,6 +193,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E-2"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "AIM-7E-2", + display_name_short = "AIM-7E-2", mass = 230, model = "aim-7", name = "AIM-7E-2", @@ -267,6 +269,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7E-2"] = { march_start = 0.2 }, displayName = "AIM-7E-2 Sparrow Semi-Active Radar", + display_name_short = "AIM-7E-2", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/weapons_table/weapons/missiles/AIM-7F.lua b/_G/weapons_table/weapons/missiles/AIM-7F.lua index b01cead5..d7a2c456 100644 --- a/_G/weapons_table/weapons/missiles/AIM-7F.lua +++ b/_G/weapons_table/weapons/missiles/AIM-7F.lua @@ -81,6 +81,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { march_start = 3.9 }, displayName = "AIM-7F Sparrow Semi-Active Radar", + display_name_short = "AIM-7F", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, @@ -201,6 +202,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "AIM-7F", + display_name_short = "AIM-7F", mass = 231, model = "AIM-7F", name = "AIM-7F", @@ -281,6 +283,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7F"] = { march_start = 3.9 }, displayName = "AIM-7F Sparrow Semi-Active Radar", + display_name_short = "AIM-7F", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/weapons_table/weapons/missiles/AIM-7MH.lua b/_G/weapons_table/weapons/missiles/AIM-7MH.lua index 643b309c..bfc53790 100644 --- a/_G/weapons_table/weapons/missiles/AIM-7MH.lua +++ b/_G/weapons_table/weapons/missiles/AIM-7MH.lua @@ -82,6 +82,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7MH"] = { march_start = 3.9 }, displayName = "AIM-7MH Sparrow Semi-Active Radar", + display_name_short = "AIM-7MH", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, @@ -199,6 +200,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7MH"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "AIM-7MH", + display_name_short = "AIM-7MH", mass = 231, model = "aim-7", name = "AIM-7MH", @@ -280,6 +282,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7MH"] = { march_start = 3.9 }, displayName = "AIM-7MH Sparrow Semi-Active Radar", + display_name_short = "AIM-7MH", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/weapons_table/weapons/missiles/AIM-7P.lua b/_G/weapons_table/weapons/missiles/AIM-7P.lua index c22afbfa..b1081551 100644 --- a/_G/weapons_table/weapons/missiles/AIM-7P.lua +++ b/_G/weapons_table/weapons/missiles/AIM-7P.lua @@ -82,6 +82,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7P"] = { march_start = 3.9 }, displayName = "AIM-7P Sparrow Semi-Active Radar", + display_name_short = "AIM-7P", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, @@ -200,6 +201,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7P"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "AIM-7P", + display_name_short = "AIM-7P", mass = 231, model = "aim-7", name = "AIM-7P", @@ -281,6 +283,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM-7P"] = { march_start = 3.9 }, displayName = "AIM-7P Sparrow Semi-Active Radar", + display_name_short = "AIM-7P", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/weapons_table/weapons/missiles/AIM_120.lua b/_G/weapons_table/weapons/missiles/AIM_120.lua index e006398a..3326565b 100644 --- a/_G/weapons_table/weapons/missiles/AIM_120.lua +++ b/_G/weapons_table/weapons/missiles/AIM_120.lua @@ -87,6 +87,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { march_start = 2.6 }, displayName = "AIM-120B AMRAAM - Active Radar AAM", + display_name_short = "AIM-120B", exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, @@ -212,6 +213,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "AIM-120B", + display_name_short = "AIM-120B", mass = 157.85, model = "aim-120b", name = "AIM_120", @@ -298,6 +300,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120"] = { march_start = 2.6 }, displayName = "AIM-120B AMRAAM - Active Radar AAM", + display_name_short = "AIM-120B", exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 24, 24, 24, 24, 23.5, 23, 25.16, 27.23, 29.04, 30.6, 31.93, 33.08, 34.07, 34.95, 35.74, 36.45, 37.09, 37.68, 38.2, 38.66, 39.06, 39.39, 39.66, 39.85, 39.96, 40 }, diff --git a/_G/weapons_table/weapons/missiles/AIM_120C.lua b/_G/weapons_table/weapons/missiles/AIM_120C.lua index 041db963..f4e08fd5 100644 --- a/_G/weapons_table/weapons/missiles/AIM_120C.lua +++ b/_G/weapons_table/weapons/missiles/AIM_120C.lua @@ -87,6 +87,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { march_start = 0.4 }, displayName = "AIM-120C AMRAAM - Active Radar AAM", + display_name_short = "AIM-120C", exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, @@ -212,6 +213,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "AIM-120C", + display_name_short = "AIM-120C", mass = 161.48, model = "aim-120c", name = "AIM_120C", @@ -298,6 +300,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_120C"] = { march_start = 0.4 }, displayName = "AIM-120C AMRAAM - Active Radar AAM", + display_name_short = "AIM-120C", exhaust = { 0.8, 0.8, 0.8, 0.05 }, fm = { A1trim = { 28, 28, 28, 28, 28, 31.2, 32.74, 33.39, 33.7, 33.89, 34.04, 34.18, 34.31, 34.44, 34.57, 34.7, 34.83, 34.96, 35.09, 35.22, 35.35, 35.48, 35.61, 35.74, 35.87, 36 }, diff --git a/_G/weapons_table/weapons/missiles/AIM_7.lua b/_G/weapons_table/weapons/missiles/AIM_7.lua index 3542efe1..3b56e96c 100644 --- a/_G/weapons_table/weapons/missiles/AIM_7.lua +++ b/_G/weapons_table/weapons/missiles/AIM_7.lua @@ -82,6 +82,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_7"] = { march_start = 3.9 }, displayName = "AIM-7M Sparrow Semi-Active Radar", + display_name_short = "AIM-7M", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, @@ -199,6 +200,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_7"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "AIM-7M", + display_name_short = "AIM-7M", mass = 231.1, model = "aim-7", name = "AIM_7", @@ -280,6 +282,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AIM_7"] = { march_start = 3.9 }, displayName = "AIM-7M Sparrow Semi-Active Radar", + display_name_short = "AIM-7M", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A1trim = { 10, 10 }, diff --git a/_G/weapons_table/weapons/missiles/AKD-10.lua b/_G/weapons_table/weapons/missiles/AKD-10.lua index 06e1e155..39a59aba 100644 --- a/_G/weapons_table/weapons/missiles/AKD-10.lua +++ b/_G/weapons_table/weapons/missiles/AKD-10.lua @@ -65,6 +65,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AKD-10"] = { boost_start = 0.001, march_start = 2.001 }, + display_name_short = "AKD-10", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A = 0.6, @@ -157,6 +158,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AKD-10"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "AKD-10", + display_name_short = "AKD-10", mass = 48, model = "akd-10", name = "AKD-10", @@ -221,6 +223,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AKD-10"] = { boost_start = 0.001, march_start = 2.001 }, + display_name_short = "AKD-10", exhaust = { 0.9, 0.9, 0.85, 0.1 }, fm = { A = 0.6, diff --git a/_G/weapons_table/weapons/missiles/AT_6.lua b/_G/weapons_table/weapons/missiles/AT_6.lua index 275d0779..2a81b842 100644 --- a/_G/weapons_table/weapons/missiles/AT_6.lua +++ b/_G/weapons_table/weapons/missiles/AT_6.lua @@ -61,6 +61,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { }, category = 2, class_name = "wAmmunitionVikhr", + display_name_short = "9M114 Shturm-V (AT-6 Spiral)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, @@ -166,6 +167,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "9M114 Shturm-V (AT-6 Spiral)", + display_name_short = "9M114 Shturm-V (AT-6 Spiral)", mass = 35.4, model = "9M114", name = "AT_6", @@ -226,6 +228,7 @@ _G["weapons_table"]["weapons"]["missiles"]["AT_6"] = { }, category = 2, class_name = "wAmmunitionVikhr", + display_name_short = "9M114 Shturm-V (AT-6 Spiral)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/weapons_table/weapons/missiles/Ataka_9M120.lua b/_G/weapons_table/weapons/missiles/Ataka_9M120.lua index 2684fcb2..bfc7af3a 100644 --- a/_G/weapons_table/weapons/missiles/Ataka_9M120.lua +++ b/_G/weapons_table/weapons/missiles/Ataka_9M120.lua @@ -61,6 +61,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M120"] = { }, category = 2, class_name = "wAmmunitionVikhr", + display_name_short = "9M120 Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, @@ -167,6 +168,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M120"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "9M120 Ataka (AT-9 Spiral-2)", + display_name_short = "9M120 Ataka (AT-9 Spiral-2)", + encyclopediaAnimation = { + args = { + [0] = 1 + } + }, mass = 42.5, model = "9M120T", name = "Ataka_9M120", @@ -227,6 +234,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M120"] = { }, category = 2, class_name = "wAmmunitionVikhr", + display_name_short = "9M120 Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/weapons_table/weapons/missiles/Ataka_9M120F.lua b/_G/weapons_table/weapons/missiles/Ataka_9M120F.lua index a7ac2b08..6f343040 100644 --- a/_G/weapons_table/weapons/missiles/Ataka_9M120F.lua +++ b/_G/weapons_table/weapons/missiles/Ataka_9M120F.lua @@ -61,6 +61,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M120F"] = { }, category = 2, class_name = "wAmmunitionVikhr", + display_name_short = "9M120F Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, @@ -167,6 +168,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M120F"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "9M120F Ataka (AT-9 Spiral-2)", + display_name_short = "9M120F Ataka (AT-9 Spiral-2)", mass = 42.5, model = "9M120F", name = "Ataka_9M120F", @@ -227,6 +229,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M120F"] = { }, category = 2, class_name = "wAmmunitionVikhr", + display_name_short = "9M120F Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/weapons_table/weapons/missiles/Ataka_9M220.lua b/_G/weapons_table/weapons/missiles/Ataka_9M220.lua index 0508a147..63d9224e 100644 --- a/_G/weapons_table/weapons/missiles/Ataka_9M220.lua +++ b/_G/weapons_table/weapons/missiles/Ataka_9M220.lua @@ -61,6 +61,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M220"] = { }, category = 2, class_name = "wAmmunitionVikhr", + display_name_short = "9M220O Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, @@ -169,6 +170,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M220"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "9M220O Ataka (AT-9 Spiral-2)", + display_name_short = "9M220O Ataka (AT-9 Spiral-2)", mass = 42.5, model = "9M120F", name = "Ataka_9M220", @@ -229,6 +231,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Ataka_9M220"] = { }, category = 2, class_name = "wAmmunitionVikhr", + display_name_short = "9M220O Ataka (AT-9 Spiral-2)", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/weapons_table/weapons/missiles/BK90_MJ1.lua b/_G/weapons_table/weapons/missiles/BK90_MJ1.lua index 49f41809..2b9124fa 100644 --- a/_G/weapons_table/weapons/missiles/BK90_MJ1.lua +++ b/_G/weapons_table/weapons/missiles/BK90_MJ1.lua @@ -50,6 +50,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "BK90 MJ1", fm = { A = 0.13, I = 270, @@ -243,6 +244,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "BK90 MJ1", + display_name_short = "BK90 MJ1", mass = 605, model = "BK_90", name = "BK90_MJ1", @@ -292,6 +294,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "BK90 MJ1", fm = { A = 0.13, I = 270, diff --git a/_G/weapons_table/weapons/missiles/BK90_MJ1_MJ2.lua b/_G/weapons_table/weapons/missiles/BK90_MJ1_MJ2.lua index 032559ca..17268330 100644 --- a/_G/weapons_table/weapons/missiles/BK90_MJ1_MJ2.lua +++ b/_G/weapons_table/weapons/missiles/BK90_MJ1_MJ2.lua @@ -50,6 +50,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1_MJ2"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "BK90 MJ1-MJ2", fm = { A = 0.13, I = 270, @@ -323,6 +324,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1_MJ2"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "BK90 MJ1-MJ2", + display_name_short = "BK90 MJ1-MJ2", mass = 605, model = "BK_90", name = "BK90_MJ1_MJ2", @@ -372,6 +374,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ1_MJ2"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "BK90 MJ1-MJ2", fm = { A = 0.13, I = 270, diff --git a/_G/weapons_table/weapons/missiles/BK90_MJ2.lua b/_G/weapons_table/weapons/missiles/BK90_MJ2.lua index dcc4464e..495f7f39 100644 --- a/_G/weapons_table/weapons/missiles/BK90_MJ2.lua +++ b/_G/weapons_table/weapons/missiles/BK90_MJ2.lua @@ -50,6 +50,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ2"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "BK90 MJ2", fm = { A = 0.13, I = 270, @@ -241,6 +242,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ2"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "BK90 MJ2", + display_name_short = "BK90 MJ2", mass = 605, model = "BK_90", name = "BK90_MJ2", @@ -290,6 +292,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BK90_MJ2"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "BK90 MJ2", fm = { A = 0.13, I = 270, diff --git a/_G/weapons_table/weapons/missiles/BRM-1_90MM.lua b/_G/weapons_table/weapons/missiles/BRM-1_90MM.lua index 7c57cff8..210f252a 100644 --- a/_G/weapons_table/weapons/missiles/BRM-1_90MM.lua +++ b/_G/weapons_table/weapons/missiles/BRM-1_90MM.lua @@ -48,6 +48,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BRM-1_90MM"] = { }, category = 2, class_name = "wAmmunitionLaserHoming", + display_name_short = "BRM-1_90MM", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, @@ -138,6 +139,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BRM-1_90MM"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "BRM-1_90MM", + display_name_short = "BRM-1_90MM", mass = 20, model = "brm1_90", name = "BRM-1_90MM", @@ -185,6 +187,7 @@ _G["weapons_table"]["weapons"]["missiles"]["BRM-1_90MM"] = { }, category = 2, class_name = "wAmmunitionLaserHoming", + display_name_short = "BRM-1_90MM", exhaust = { 0.78, 0.78, 0.78, 0.3 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/C-701IR.lua b/_G/weapons_table/weapons/missiles/C-701IR.lua index cb9f99aa..2f7a0fbb 100644 --- a/_G/weapons_table/weapons/missiles/C-701IR.lua +++ b/_G/weapons_table/weapons/missiles/C-701IR.lua @@ -67,6 +67,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-701IR"] = { boost_start = 0.01, march_start = 0.1 }, + display_name_short = "C-701IR", exhaust = { 1, 1, 1, 1 }, fm = { A = 0.36, @@ -158,6 +159,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-701IR"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "C-701IR", + display_name_short = "C-701IR", mass = 100, model = "c701t", name = "C-701IR", @@ -224,6 +226,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-701IR"] = { boost_start = 0.01, march_start = 0.1 }, + display_name_short = "C-701IR", exhaust = { 1, 1, 1, 1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/C-701T.lua b/_G/weapons_table/weapons/missiles/C-701T.lua index eae0a50a..9f254c99 100644 --- a/_G/weapons_table/weapons/missiles/C-701T.lua +++ b/_G/weapons_table/weapons/missiles/C-701T.lua @@ -67,6 +67,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-701T"] = { boost_start = 0.01, march_start = 0.1 }, + display_name_short = "C-701T", exhaust = { 1, 1, 1, 1 }, fm = { A = 0.36, @@ -158,6 +159,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-701T"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "C-701T", + display_name_short = "C-701T", mass = 100, model = "c701t", name = "C-701T", @@ -224,6 +226,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-701T"] = { boost_start = 0.01, march_start = 0.1 }, + display_name_short = "C-701T", exhaust = { 1, 1, 1, 1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/C-802AK.lua b/_G/weapons_table/weapons/missiles/C-802AK.lua index 7f331388..e5507a7f 100644 --- a/_G/weapons_table/weapons/missiles/C-802AK.lua +++ b/_G/weapons_table/weapons/missiles/C-802AK.lua @@ -99,6 +99,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-802AK"] = { boost_start = 0, march_start = 5 }, + display_name_short = "C802AK (DIS)", engine_control = { K = 265, Kd = 0.01, @@ -256,6 +257,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-802AK"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "C802AK (DIS)", + display_name_short = "C802AK (DIS)", mass = 715, model = "c802ak", name = "C-802AK", @@ -353,6 +355,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C-802AK"] = { boost_start = 0, march_start = 5 }, + display_name_short = "C802AK (DIS)", engine_control = { K = 265, Kd = 0.01, diff --git a/_G/weapons_table/weapons/missiles/CM-802AKG_AI.lua b/_G/weapons_table/weapons/missiles/CM-802AKG_AI.lua index 8d7beae2..9e7ddbed 100644 --- a/_G/weapons_table/weapons/missiles/CM-802AKG_AI.lua +++ b/_G/weapons_table/weapons/missiles/CM-802AKG_AI.lua @@ -104,6 +104,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM-802AKG_AI"] = { no_alg_vel_k = 10, stab_vel = 237.5 }, + display_name_short = "CM802AKG (DIS) for AI", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, @@ -225,6 +226,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM-802AKG_AI"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "CM802AKG (DIS) for AI", + display_name_short = "CM802AKG (DIS) for AI", mass = 715, model = "cm802akg", name = "CM-802AKG_AI", @@ -327,6 +329,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM-802AKG_AI"] = { no_alg_vel_k = 10, stab_vel = 237.5 }, + display_name_short = "CM802AKG (DIS) for AI", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, diff --git a/_G/weapons_table/weapons/missiles/CM_802AKG.lua b/_G/weapons_table/weapons/missiles/CM_802AKG.lua index 8ed3a240..7cb10470 100644 --- a/_G/weapons_table/weapons/missiles/CM_802AKG.lua +++ b/_G/weapons_table/weapons/missiles/CM_802AKG.lua @@ -8,7 +8,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { client = { Cx_pil = 8, D_max = 230000, - D_min = 5000, + D_min = 15000, Damage_correction_coeff = 0.7, Diam = 360, Escort = 0, @@ -22,11 +22,11 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 20, 7, 100, 150, 200, 250, 300, 350, 400, 500, 0, 75790, 83280, 87490, 90390, 93090, 93850, 600, 0, 73690, 81610, 85620, 88750, 91500, 93860, 700, 0, 74170, 82540, 86570, 89730, 92470, 94870, 800, 0, 75175, 83750, 87775, 90975, 93725, 96150, 900, 0, 75925, 84675, 88775, 91975, 94725, 97175, 1000, 0, 76500, 85425, 89550, 92750, 95525, 97975, 2000, 0, 79850, 87125, 91600, 95050, 98075, 100775, 3000, 81550, 87150, 91150, 94750, 97750, 100250, 102700, 4000, 85350, 89850, 93850, 97400, 100900, 103100, 105300, 5000, 87500, 92200, 96300, 100000, 103600, 106300, 108700, 6000, 90000, 94500, 98500, 102250, 106000, 109250, 112000, 7000, 91750, 96500, 101000, 105000, 108750, 112250, 115250, 8000, 93750, 98750, 103250, 107500, 111250, 115000, 118500, 9000, 95750, 101000, 105750, 110000, 114000, 118000, 122000, 10000, 97250, 102750, 108000, 113000, 117250, 121500, 126000, 11000, 98500, 104500, 110500, 115500, 120500, 125500, 130500, 12000, 100000, 106000, 112500, 119000, 124500, 130000, 135500, 13000, 101500, 108000, 115000, 122500, 128500, 136000, 142000, 14000, 103000, 110000, 117500, 126000, 133500, 141500, 148000, 15000, 103500, 112000, 120000, 129500, 139000, 148500, 155000 }, + LaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 0, 0, 205025, 208800, 211725, 214900, 217775, 220750, 224250, 200, 0, 200075, 205325, 208675, 212075, 215225, 218150, 221100, 224625, 300, 0, 200325, 205175, 209000, 212400, 215575, 218525, 221450, 224525, 400, 195575, 200575, 205475, 209350, 212725, 215925, 218900, 221775, 224850, 500, 195800, 200825, 205775, 209675, 213075, 216250, 219225, 222125, 225125, 600, 196000, 200600, 206050, 209950, 213400, 216550, 219500, 222400, 225300, 700, 196200, 200900, 206350, 210300, 213700, 216900, 219850, 222650, 225600, 800, 196400, 201150, 206650, 210650, 214000, 217300, 220150, 222900, 225800, 900, 196650, 201400, 206950, 210950, 214350, 217550, 220400, 223150, 225950, 1000, 196850, 201700, 207200, 211300, 214650, 217900, 220650, 223400, 226250, 2000, 199900, 206300, 210600, 214300, 217300, 219900, 222500, 225000, 228000, 3000, 204800, 209300, 213100, 216700, 219500, 222000, 224200, 226800, 229900, 4000, 207500, 211700, 215100, 218500, 221800, 223900, 226100, 228700, 231900, 5000, 209500, 213500, 217000, 220200, 223800, 226100, 228100, 230700, 234000, 6000, 211250, 215000, 218500, 221750, 225250, 228000, 230250, 232750, 236000, 7000, 213000, 216750, 220250, 223250, 226750, 230250, 232250, 235000, 238250, 7500, 213750, 217500, 220750, 224000, 227250, 230750, 233250, 236000, 240500 }, Life_Time = 1850, M = 670, Mach_max = 0.9, - MinLaunchDistData = { 20, 7, 100, 150, 200, 250, 300, 350, 400, 500, 0, 14540, 7320, 11250, 8260, 8680, 8970, 600, 0, 11400, 7290, 7780, 8230, 8650, 9040, 700, 0, 7410, 7410, 7890, 8350, 8770, 9160, 800, 0, 7800, 7525, 8025, 8475, 8900, 9300, 900, 0, 8325, 7650, 8125, 8575, 9025, 9425, 1000, 0, 9325, 7725, 8225, 8675, 9100, 9500, 2000, 0, 9200, 8100, 8250, 8825, 9225, 9725, 3000, 6050, 6900, 7650, 8200, 8550, 8950, 9350, 4000, 6350, 7000, 7500, 7950, 8300, 8650, 9000, 5000, 6600, 7300, 7100, 8000, 8500, 8800, 9200, 6000, 12750, 7500, 7250, 8250, 8750, 9000, 9500, 7000, 13250, 7750, 7250, 8500, 8750, 9250, 9750, 8000, 14250, 8250, 8500, 8750, 9250, 9500, 10000, 9000, 15000, 14000, 8750, 9250, 9500, 10000, 10500, 10000, 16000, 14750, 9250, 9500, 10000, 10250, 10750, 11000, 17000, 16000, 14500, 10500, 11000, 11000, 11500, 12000, 18500, 17500, 16000, 11000, 11500, 12000, 12500, 13000, 19500, 19000, 18000, 16500, 12500, 19500, 22500, 14000, 21000, 20500, 20000, 19000, 18000, 27000, 30000, 15000, 22500, 22500, 22000, 22000, 31000, 35500, 39000 }, + MinLaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 0, 0, 21700, 21950, 16325, 16775, 17100, 17900, 24150, 200, 0, 21475, 21425, 15950, 16450, 16950, 17450, 17975, 24000, 300, 0, 21250, 15475, 16050, 16600, 17125, 17550, 18125, 18900, 400, 22250, 21025, 15575, 16175, 16725, 17250, 17700, 18300, 19225, 500, 22000, 20800, 15700, 16225, 16850, 17325, 17900, 18475, 19350, 600, 21800, 14950, 15750, 16400, 16950, 17500, 18000, 18550, 19250, 700, 21550, 15000, 15800, 16400, 17000, 17550, 18050, 18650, 19350, 800, 21350, 15100, 15900, 16550, 17100, 17650, 18150, 18700, 19450, 900, 21150, 15150, 16000, 16600, 17150, 17700, 18250, 18800, 19500, 1000, 20900, 15200, 16000, 16650, 17300, 17800, 18300, 18900, 19600, 2000, 14500, 15500, 16200, 16900, 17600, 18200, 18800, 19500, 20000, 3000, 14600, 15100, 16000, 16900, 17300, 18300, 18900, 19600, 21200, 4000, 14800, 15100, 15300, 15600, 15800, 16100, 16600, 19300, 21300, 5000, 14900, 15200, 15500, 15700, 15900, 16200, 16600, 17000, 21300, 6000, 15000, 15500, 15750, 15750, 16000, 16250, 16750, 17000, 17500, 7000, 15250, 15500, 15750, 16000, 16250, 16500, 16500, 17000, 17500, 7500, 15250, 15500, 15750, 16000, 16250, 16500, 16750, 17000, 18000 }, Nr_max = 18, OmViz_max = 99.9, Range_max = 230000, @@ -38,14 +38,14 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { _origin = "AircraftWeaponPack", add_attributes = { "Cruise missiles" }, autopilot = { - K = 1.7, + K = 1, Kd = 0, Kdx = 0.001, - Ki = 16, - Ks = 2, + Ki = 30, + Ks = 1, Ksd = 0, Ksi = 0, - Kw = 1.6, + Kw = 4, Kx = 0.04, PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, @@ -53,19 +53,19 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { default_glide_height = 1000, delay = 1, dont_climb_on_cruise_height = 0, - fins_limit = 0.61086523819802, - fins_limit_x = 0.34906585039887, + fins_limit = 0.87266462599716, + fins_limit_x = 0.43633231299858, glide_height = 1000, - glide_height_eq_error = 2, + glide_height_eq_error = 0.02, hor_err_limit = 0.5, inertial_km_error = 4, integr_val_limit = 0.5, - max_climb_ang_hdiff = 200, + max_climb_ang_hdiff = 180, max_climb_angle = 0.17453292519943, max_climb_h = 3000, max_climb_vel = 200, max_dive_ang_hdiff = -500, - max_dive_angle = -0.43633231299858, + max_dive_angle = -0.5235987755983, min_climb_h = 10000, min_climb_h_factor = 0.5, min_climb_vel = 120, @@ -76,6 +76,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { skim_glide_height = 8, use_start_bar_height = 1, vel_proj_div = 6, + vert_ctrl_data = { 100, -0.41887902047864, 115, -0.27925268031909, 130, -0.13962634015955, 145, 0, 185, 0.17453292519943 }, w_limit = 0.087266462599716 }, boost = { @@ -101,15 +102,16 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { march_start = 0 }, display_name = "AGM-84E", + display_name_short = "CM-802AKG", engine_control = { - K = 350, + K = 240, Kd = 1, - Ki = 0.001, - default_speed = 220, + Ki = 0.01, + default_speed = 285, speed_delta = 5 }, final_autopilot = { - K = 5.4, + K = 5, K_loft_err = 1, Kd = 0, Ki = 0, @@ -126,27 +128,27 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { delay = 1, fins_limit = 0.87266462599716, loft_active_by_default = 0, - loft_angle = 0.1221730476396, + loft_angle = 0.13962634015955, loft_angle_vert = 1, - loft_trig_angle = 0.20943951023932, + loft_trig_angle = 0.24434609527921, op_time = 9999, rotated_WLOS_input = 0, w_limit = 0.26179938779915 }, fm = { A = 0.5, - I = 1378.125, - Kw_x = 0.01, - L = 5.25, + I = 1477.9655625, + L = 5.145, Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, - Sw = 0.95, + Mw_x = 2.6, + Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.39, 0.38, 0.3, 1.31 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, + finsTau = 0.02, mass = 670, maxAoa = 0.3, wind_sigma = 0, @@ -155,17 +157,17 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { ins = { aim_sigma = 350, check_AI = 1, - error_coeff = 0.05 + error_coeff = 0.03 }, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 650, - max_thrust = 4000, + fuel_mass = 68, + impulse = 3000, + max_thrust = 5000, min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.5, -0.18, 0 } }, + nozzle_position = { { -2.26, 0, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.03, start_burn_effect = 1, @@ -177,7 +179,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { 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, + thrust_Tau = 0.0018, work_time = 9999 }, model = "cm802akg", @@ -190,8 +192,6 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { max_lock_dist = 30000, 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 = { { @@ -214,8 +214,8 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { default_straight_nav_tg_dist = 7000, final_maneuver_trig_v_lim = 3, min_cruise_height = 1000, - min_cruise_height_trigger_mlt = 6.6666666666667, - min_cruise_height_trigger_sum = 11000, + min_cruise_height_trigger_mlt = 8.6363636363636, + min_cruise_height_trigger_sum = 10000, pre_maneuver_glide_height = 1000, trigger_by_path = 1, use_horiz_dist = 1 @@ -254,13 +254,14 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "CM-802AKG", + display_name_short = "CM-802AKG", mass = 670, model = "cm802akg", name = "CM_802AKG", server = { Cx_pil = 8, D_max = 230000, - D_min = 5000, + D_min = 15000, Damage_correction_coeff = 0.7, Diam = 360, Escort = 0, @@ -274,11 +275,11 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 20, 7, 100, 150, 200, 250, 300, 350, 400, 500, 0, 75790, 83280, 87490, 90390, 93090, 93850, 600, 0, 73690, 81610, 85620, 88750, 91500, 93860, 700, 0, 74170, 82540, 86570, 89730, 92470, 94870, 800, 0, 75175, 83750, 87775, 90975, 93725, 96150, 900, 0, 75925, 84675, 88775, 91975, 94725, 97175, 1000, 0, 76500, 85425, 89550, 92750, 95525, 97975, 2000, 0, 79850, 87125, 91600, 95050, 98075, 100775, 3000, 81550, 87150, 91150, 94750, 97750, 100250, 102700, 4000, 85350, 89850, 93850, 97400, 100900, 103100, 105300, 5000, 87500, 92200, 96300, 100000, 103600, 106300, 108700, 6000, 90000, 94500, 98500, 102250, 106000, 109250, 112000, 7000, 91750, 96500, 101000, 105000, 108750, 112250, 115250, 8000, 93750, 98750, 103250, 107500, 111250, 115000, 118500, 9000, 95750, 101000, 105750, 110000, 114000, 118000, 122000, 10000, 97250, 102750, 108000, 113000, 117250, 121500, 126000, 11000, 98500, 104500, 110500, 115500, 120500, 125500, 130500, 12000, 100000, 106000, 112500, 119000, 124500, 130000, 135500, 13000, 101500, 108000, 115000, 122500, 128500, 136000, 142000, 14000, 103000, 110000, 117500, 126000, 133500, 141500, 148000, 15000, 103500, 112000, 120000, 129500, 139000, 148500, 155000 }, + LaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 0, 0, 205025, 208800, 211725, 214900, 217775, 220750, 224250, 200, 0, 200075, 205325, 208675, 212075, 215225, 218150, 221100, 224625, 300, 0, 200325, 205175, 209000, 212400, 215575, 218525, 221450, 224525, 400, 195575, 200575, 205475, 209350, 212725, 215925, 218900, 221775, 224850, 500, 195800, 200825, 205775, 209675, 213075, 216250, 219225, 222125, 225125, 600, 196000, 200600, 206050, 209950, 213400, 216550, 219500, 222400, 225300, 700, 196200, 200900, 206350, 210300, 213700, 216900, 219850, 222650, 225600, 800, 196400, 201150, 206650, 210650, 214000, 217300, 220150, 222900, 225800, 900, 196650, 201400, 206950, 210950, 214350, 217550, 220400, 223150, 225950, 1000, 196850, 201700, 207200, 211300, 214650, 217900, 220650, 223400, 226250, 2000, 199900, 206300, 210600, 214300, 217300, 219900, 222500, 225000, 228000, 3000, 204800, 209300, 213100, 216700, 219500, 222000, 224200, 226800, 229900, 4000, 207500, 211700, 215100, 218500, 221800, 223900, 226100, 228700, 231900, 5000, 209500, 213500, 217000, 220200, 223800, 226100, 228100, 230700, 234000, 6000, 211250, 215000, 218500, 221750, 225250, 228000, 230250, 232750, 236000, 7000, 213000, 216750, 220250, 223250, 226750, 230250, 232250, 235000, 238250, 7500, 213750, 217500, 220750, 224000, 227250, 230750, 233250, 236000, 240500 }, Life_Time = 1850, M = 670, Mach_max = 0.9, - MinLaunchDistData = { 20, 7, 100, 150, 200, 250, 300, 350, 400, 500, 0, 14540, 7320, 11250, 8260, 8680, 8970, 600, 0, 11400, 7290, 7780, 8230, 8650, 9040, 700, 0, 7410, 7410, 7890, 8350, 8770, 9160, 800, 0, 7800, 7525, 8025, 8475, 8900, 9300, 900, 0, 8325, 7650, 8125, 8575, 9025, 9425, 1000, 0, 9325, 7725, 8225, 8675, 9100, 9500, 2000, 0, 9200, 8100, 8250, 8825, 9225, 9725, 3000, 6050, 6900, 7650, 8200, 8550, 8950, 9350, 4000, 6350, 7000, 7500, 7950, 8300, 8650, 9000, 5000, 6600, 7300, 7100, 8000, 8500, 8800, 9200, 6000, 12750, 7500, 7250, 8250, 8750, 9000, 9500, 7000, 13250, 7750, 7250, 8500, 8750, 9250, 9750, 8000, 14250, 8250, 8500, 8750, 9250, 9500, 10000, 9000, 15000, 14000, 8750, 9250, 9500, 10000, 10500, 10000, 16000, 14750, 9250, 9500, 10000, 10250, 10750, 11000, 17000, 16000, 14500, 10500, 11000, 11000, 11500, 12000, 18500, 17500, 16000, 11000, 11500, 12000, 12500, 13000, 19500, 19000, 18000, 16500, 12500, 19500, 22500, 14000, 21000, 20500, 20000, 19000, 18000, 27000, 30000, 15000, 22500, 22500, 22000, 22000, 31000, 35500, 39000 }, + MinLaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 0, 0, 21700, 21950, 16325, 16775, 17100, 17900, 24150, 200, 0, 21475, 21425, 15950, 16450, 16950, 17450, 17975, 24000, 300, 0, 21250, 15475, 16050, 16600, 17125, 17550, 18125, 18900, 400, 22250, 21025, 15575, 16175, 16725, 17250, 17700, 18300, 19225, 500, 22000, 20800, 15700, 16225, 16850, 17325, 17900, 18475, 19350, 600, 21800, 14950, 15750, 16400, 16950, 17500, 18000, 18550, 19250, 700, 21550, 15000, 15800, 16400, 17000, 17550, 18050, 18650, 19350, 800, 21350, 15100, 15900, 16550, 17100, 17650, 18150, 18700, 19450, 900, 21150, 15150, 16000, 16600, 17150, 17700, 18250, 18800, 19500, 1000, 20900, 15200, 16000, 16650, 17300, 17800, 18300, 18900, 19600, 2000, 14500, 15500, 16200, 16900, 17600, 18200, 18800, 19500, 20000, 3000, 14600, 15100, 16000, 16900, 17300, 18300, 18900, 19600, 21200, 4000, 14800, 15100, 15300, 15600, 15800, 16100, 16600, 19300, 21300, 5000, 14900, 15200, 15500, 15700, 15900, 16200, 16600, 17000, 21300, 6000, 15000, 15500, 15750, 15750, 16000, 16250, 16750, 17000, 17500, 7000, 15250, 15500, 15750, 16000, 16250, 16500, 16500, 17000, 17500, 7500, 15250, 15500, 15750, 16000, 16250, 16500, 16750, 17000, 18000 }, Nr_max = 18, OmViz_max = 99.9, Range_max = 230000, @@ -290,14 +291,14 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { _origin = "AircraftWeaponPack", add_attributes = { "Cruise missiles" }, autopilot = { - K = 1.7, + K = 1, Kd = 0, Kdx = 0.001, - Ki = 16, - Ks = 2, + Ki = 30, + Ks = 1, Ksd = 0, Ksi = 0, - Kw = 1.6, + Kw = 4, Kx = 0.04, PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, @@ -305,19 +306,19 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { default_glide_height = 1000, delay = 1, dont_climb_on_cruise_height = 0, - fins_limit = 0.61086523819802, - fins_limit_x = 0.34906585039887, + fins_limit = 0.87266462599716, + fins_limit_x = 0.43633231299858, glide_height = 1000, - glide_height_eq_error = 2, + glide_height_eq_error = 0.02, hor_err_limit = 0.5, inertial_km_error = 4, integr_val_limit = 0.5, - max_climb_ang_hdiff = 200, + max_climb_ang_hdiff = 180, max_climb_angle = 0.17453292519943, max_climb_h = 3000, max_climb_vel = 200, max_dive_ang_hdiff = -500, - max_dive_angle = -0.43633231299858, + max_dive_angle = -0.5235987755983, min_climb_h = 10000, min_climb_h_factor = 0.5, min_climb_vel = 120, @@ -328,6 +329,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { skim_glide_height = 8, use_start_bar_height = 1, vel_proj_div = 6, + vert_ctrl_data = { 100, -0.41887902047864, 115, -0.27925268031909, 130, -0.13962634015955, 145, 0, 185, 0.17453292519943 }, w_limit = 0.087266462599716 }, boost = { @@ -353,15 +355,16 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { march_start = 0 }, display_name = "AGM-84E", + display_name_short = "CM-802AKG", engine_control = { - K = 350, + K = 240, Kd = 1, - Ki = 0.001, - default_speed = 220, + Ki = 0.01, + default_speed = 285, speed_delta = 5 }, final_autopilot = { - K = 5.4, + K = 5, K_loft_err = 1, Kd = 0, Ki = 0, @@ -378,27 +381,27 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { delay = 1, fins_limit = 0.87266462599716, loft_active_by_default = 0, - loft_angle = 0.1221730476396, + loft_angle = 0.13962634015955, loft_angle_vert = 1, - loft_trig_angle = 0.20943951023932, + loft_trig_angle = 0.24434609527921, op_time = 9999, rotated_WLOS_input = 0, w_limit = 0.26179938779915 }, fm = { A = 0.5, - I = 1378.125, - Kw_x = 0.01, - L = 5.25, + I = 1477.9655625, + L = 5.145, Ma = 0.68, Ma_x = 3, Ma_z = 3, Mw = 1.116, - Sw = 0.95, + Mw_x = 2.6, + Sw = 0.75, caliber = 0.36, - cx_coeff = { 1, 0.39, 0.38, 0.3, 1.31 }, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, dCydA = { 0.07, 0.036 }, - finsTau = 0.05, + finsTau = 0.02, mass = 670, maxAoa = 0.3, wind_sigma = 0, @@ -407,17 +410,17 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { ins = { aim_sigma = 350, check_AI = 1, - error_coeff = 0.05 + error_coeff = 0.03 }, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 650, - max_thrust = 4000, + fuel_mass = 68, + impulse = 3000, + max_thrust = 5000, min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.5, -0.18, 0 } }, + nozzle_position = { { -2.26, 0, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.03, start_burn_effect = 1, @@ -429,7 +432,7 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { 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, + thrust_Tau = 0.0018, work_time = 9999 }, model = "cm802akg", @@ -442,8 +445,6 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { max_lock_dist = 30000, 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 = { { @@ -466,8 +467,8 @@ _G["weapons_table"]["weapons"]["missiles"]["CM_802AKG"] = { default_straight_nav_tg_dist = 7000, final_maneuver_trig_v_lim = 3, min_cruise_height = 1000, - min_cruise_height_trigger_mlt = 6.6666666666667, - min_cruise_height_trigger_sum = 11000, + min_cruise_height_trigger_mlt = 8.6363636363636, + min_cruise_height_trigger_sum = 10000, pre_maneuver_glide_height = 1000, trigger_by_path = 1, use_horiz_dist = 1 diff --git a/_G/weapons_table/weapons/missiles/C_701T.lua b/_G/weapons_table/weapons/missiles/C_701T.lua new file mode 100644 index 00000000..fe34d22f --- /dev/null +++ b/_G/weapons_table/weapons/missiles/C_701T.lua @@ -0,0 +1,297 @@ +_G["weapons_table"]["weapons"]["missiles"]["C_701T"] = { + Reflection = 0.08, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.missiles.C_701T", + caliber = 0.18, + client = { + Cx_pil = 4, + D_max = 30000, + D_min = 500, + Diam = 305, + Escort = 0, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.5, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 13000, 14250, 15000, 16500, 19000, 2000, 14500, 16000, 17000, 18000, 21000, 5000, 16500, 17500, 19000, 21000, 24000, 10000, 17000, 19000, 22000, 25000, 29000 }, + Life_Time = 110, + M = 100, + Mach_max = 1.5, + MinLaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 1500, 1500, 1500, 1750, 1750, 2000, 3500, 3500, 4000, 4500, 5500, 5000, 7000, 8000, 8500, 9000, 9500, 10000, 11000, 13000, 15000, 16000, 17000 }, + Nr_max = 16, + OmViz_max = 99.9, + PN_autopilot = { + K = 0.015, + K_GBias = 0.15, + Kg = 2, + Ki = 0, + Kx = 0.02, + fins_limit = 0.3 + }, + Range_max = 24076, + Reflection = 0.08, + X_back = -0.9, + Y_back = -0.15, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", + boost = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 12, + impulse = 125, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.13, 0, 0 } }, + smoke_color = { 0.6, 0.6, 0.6 }, + smoke_transparency = 0.8, + tail_width = 0.2, + work_time = 3 + }, + category = 2, + class_name = "wAmmunitionSelfHoming", + display_name_short = "C-701T", + exhaust = { 0.75, 0.75, 0.75, 0.1 }, + fm = { + A = 0.36, + I = 52.375408333333, + I_x = 40, + Kw_x = 0.03, + L = 2.507, + Ma = 0.68, + Ma_x = 3, + Mw = 1.116, + Sw = 0.4, + caliber = 0.18, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.1, + mass = 100, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 6, + impulse = 150, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.13, 0, 0 } }, + smoke_color = { 0.6, 0.6, 0.6 }, + smoke_transparency = 0.8, + tail_width = 0.2, + work_time = 6 + }, + mass = 100, + model = "c701t", + name = "C_701T", + scheme = "schemes/missiles/AGM-65ext.sch", + seeker = { + FOV = 1.0471975511966, + delay = 0, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + max_w_LOS_surf = 0.03, + op_time = 65, + ship_track_board_vis_angle = 1.0471975511966, + ship_track_by_default = 1 + }, + shape_table_data = { { + file = "c701t", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "C_701T", + username = "C-701T" + } }, + sigma = { 5, 5, 5 }, + t_acc = 4, + t_b = 0, + t_marsh = 0, + user_name = "C-701T", + v_mid = 290, + v_min = 50, + warhead = { + caliber = 180, + concrete_factors = { 2, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 2, + cumulative_thickness = 0, + expl_mass = 15, + fantom = 1, + mass = 29, + obj_factors = { 2, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 5.8 + }, + warhead_air = { + caliber = 180, + concrete_factors = { 2, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 2, + cumulative_thickness = 0, + expl_mass = 15, + fantom = 1, + mass = 29, + obj_factors = { 2, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 5.8 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + display_name = "C-701T", + display_name_short = "C-701T", + mass = 100, + model = "c701t", + name = "C_701T", + server = { + Cx_pil = 4, + D_max = 30000, + D_min = 500, + Diam = 305, + Escort = 0, + Fi_excort = 1.05, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.5, + H_max = 10000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 13000, 14250, 15000, 16500, 19000, 2000, 14500, 16000, 17000, 18000, 21000, 5000, 16500, 17500, 19000, 21000, 24000, 10000, 17000, 19000, 22000, 25000, 29000 }, + Life_Time = 110, + M = 100, + Mach_max = 1.5, + MinLaunchDistData = { 4, 5, 100, 165, 230, 300, 400, 50, 1500, 1500, 1500, 1750, 1750, 2000, 3500, 3500, 4000, 4500, 5500, 5000, 7000, 8000, 8500, 9000, 9500, 10000, 11000, 13000, 15000, 16000, 17000 }, + Nr_max = 16, + OmViz_max = 99.9, + PN_autopilot = { + K = 0.015, + K_GBias = 0.15, + Kg = 2, + Ki = 0, + Kx = 0.02, + fins_limit = 0.3 + }, + Range_max = 24076, + Reflection = 0.08, + X_back = -0.9, + Y_back = -0.15, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/AS_Missiles.lua", + _origin = "AircraftWeaponPack", + boost = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 12, + impulse = 125, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.13, 0, 0 } }, + smoke_color = { 0.6, 0.6, 0.6 }, + smoke_transparency = 0.8, + tail_width = 0.2, + work_time = 3 + }, + category = 2, + class_name = "wAmmunitionSelfHoming", + display_name_short = "C-701T", + exhaust = { 0.75, 0.75, 0.75, 0.1 }, + fm = { + A = 0.36, + I = 52.375408333333, + I_x = 40, + Kw_x = 0.03, + L = 2.507, + Ma = 0.68, + Ma_x = 3, + Mw = 1.116, + Sw = 0.4, + caliber = 0.18, + cx_coeff = { 1, 0.39, 0.38, 0.236, 1.31 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.1, + mass = 100, + maxAoa = 0.23, + wind_sigma = 0, + wind_time = 0 + }, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 6, + impulse = 150, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -1.13, 0, 0 } }, + smoke_color = { 0.6, 0.6, 0.6 }, + smoke_transparency = 0.8, + tail_width = 0.2, + work_time = 6 + }, + mass = 100, + model = "c701t", + name = "C_701T", + scheme = "schemes/missiles/AGM-65ext.sch", + seeker = { + FOV = 1.0471975511966, + delay = 0, + max_target_speed = 33, + max_target_speed_rnd_coeff = 10, + max_w_LOS = 0.06, + max_w_LOS_surf = 0.03, + op_time = 65, + ship_track_board_vis_angle = 1.0471975511966, + ship_track_by_default = 1 + }, + shape_table_data = { { + file = "c701t", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "C_701T", + username = "C-701T" + } }, + sigma = { 5, 5, 5 }, + t_acc = 4, + t_b = 0, + t_marsh = 0, + user_name = "C-701T", + v_mid = 290, + v_min = 50, + warhead = { + caliber = 180, + concrete_factors = { 2, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 2, + cumulative_thickness = 0, + expl_mass = 15, + fantom = 0, + mass = 29, + obj_factors = { 2, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 5.8 + }, + warhead_air = { + caliber = 180, + concrete_factors = { 2, 1, 1 }, + concrete_obj_factor = 2, + cumulative_factor = 2, + cumulative_thickness = 0, + expl_mass = 15, + fantom = 0, + mass = 29, + obj_factors = { 2, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 5.8 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + sounderName = "Weapons/Missile", + type_name = "missile", + ws_type = { 4, 4, 8, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/C_802AK.lua b/_G/weapons_table/weapons/missiles/C_802AK.lua index bd2ebc4d..95909c6b 100644 --- a/_G/weapons_table/weapons/missiles/C_802AK.lua +++ b/_G/weapons_table/weapons/missiles/C_802AK.lua @@ -7,28 +7,28 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { caliber = 0.36, client = { Cx_pil = 8, - D_max = 250000, - D_min = 5000, + D_max = 180000, + D_min = 12000, Diam = 360, Escort = 0, Fi_excort = 0.7, Fi_rak = 3.14152, Fi_search = 99.9, Fi_start = 0.35, - H_max = 12000, + H_max = 7500, H_min = -1, H_min_t = 500, Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 19, 8, 200, 250, 300, 350, 400, 450, 500, 550, 100, 155700, 159000, 161800, 164200, 166300, 168400, 170600, 173200, 300, 156400, 159700, 162400, 164700, 166800, 168700, 171100, 173600, 500, 157100, 160200, 162900, 165100, 167000, 169000, 171300, 173900, 700, 157500, 160800, 163200, 165500, 167400, 169400, 171800, 174300, 1000, 158300, 161600, 164000, 166200, 168100, 170000, 172300, 174900, 2000, 160800, 164200, 166300, 168300, 170000, 171900, 174200, 176700, 3000, 163000, 166200, 168600, 170200, 172100, 173900, 176000, 178700, 4000, 164900, 167700, 170800, 172400, 174000, 175900, 178200, 180700, 5000, 166800, 169400, 173000, 174400, 176000, 177800, 180200, 182800, 6000, 168400, 171200, 174400, 176400, 177800, 179800, 182200, 184800, 7000, 170400, 173000, 175400, 178600, 180000, 181800, 184200, 187000, 8000, 171800, 174400, 176800, 180600, 182200, 184000, 186200, 189000, 9000, 173200, 175800, 178400, 181800, 184400, 186200, 188600, 191200, 10000, 175000, 177000, 179500, 182500, 186000, 188000, 190500, 193000, 11000, 176000, 179000, 181000, 184000, 187500, 190500, 193000, 195500, 12000, 177500, 180500, 183000, 186000, 189500, 193000, 195000, 198000, 13000, 179000, 182000, 184500, 188000, 191000, 194500, 197500, 200000, 14000, 181000, 184000, 187000, 190000, 193000, 196000, 199500, 202000, 15000, 182500, 186000, 189000, 192000, 195000, 198000, 201000, 204500 }, + LaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 153750, 158875, 162725, 165775, 168450, 170975, 173325, 175650, 178325, 200, 153525, 159050, 162925, 165925, 168625, 171150, 173500, 175800, 178325, 300, 153750, 159250, 163125, 166175, 168850, 171375, 173700, 176000, 178825, 400, 154000, 159475, 163375, 166350, 169050, 171600, 173925, 176550, 179025, 500, 154250, 159725, 163575, 166575, 169275, 171850, 174150, 176400, 178975, 600, 154450, 159950, 163800, 166750, 169500, 172050, 174350, 176600, 179400, 700, 154550, 160250, 164050, 167050, 169700, 172300, 174600, 176800, 179200, 800, 154800, 160650, 164400, 167350, 170000, 172500, 174750, 177000, 179750, 900, 155300, 161100, 164750, 167600, 170250, 172750, 174950, 177150, 179950, 1000, 155950, 161700, 165150, 167950, 170500, 173000, 175200, 177350, 179950, 2000, 161300, 164300, 167000, 169500, 172000, 174500, 176500, 178900, 181500, 3000, 163500, 166100, 168500, 171000, 173600, 176200, 178200, 180300, 182900, 4000, 165200, 167900, 170100, 172400, 174900, 177800, 179900, 181900, 184600, 5000, 166800, 169500, 171800, 174000, 176300, 179100, 181700, 184500, 187200, 6000, 168000, 170750, 174000, 175500, 178500, 180500, 183750, 186000, 189250, 7000, 170250, 173000, 174750, 177750, 180250, 182750, 185000, 188500, 191250, 7500, 171250, 174000, 176500, 178750, 181250, 183750, 186250, 189000, 192500 }, Life_Time = 100000, M = 600, Mach_max = 0.95, - MinLaunchDistData = { 19, 8, 200, 250, 300, 350, 400, 450, 500, 550, 100, 20200, 20500, 20400, 20700, 21000, 21500, 22300, 22500, 300, 22600, 23000, 23400, 23500, 24100, 24700, 25300, 26100, 500, 23900, 24300, 24900, 25200, 25700, 26400, 27200, 28100, 700, 25000, 25400, 26000, 26600, 26900, 27700, 28600, 29600, 1000, 26200, 26600, 27300, 28100, 28800, 29200, 30200, 31300, 2000, 29400, 29700, 30500, 31500, 32300, 33300, 34300, 35500, 3000, 32000, 32300, 33000, 34000, 35000, 36100, 37500, 38800, 4000, 34300, 34900, 35300, 36200, 37300, 38600, 40100, 41800, 5000, 36800, 37200, 37600, 38400, 39400, 40800, 42400, 44400, 6000, 38800, 39400, 39800, 40600, 41400, 42800, 44800, 46600, 7000, 41200, 41800, 42400, 42800, 43600, 45000, 46800, 49000, 8000, 43600, 44000, 44400, 45000, 45800, 47200, 49000, 51200, 9000, 45800, 46200, 46800, 47200, 48000, 49400, 51400, 53400, 10000, 48000, 48500, 49500, 50000, 50000, 51500, 53500, 56000, 11000, 50500, 51000, 51500, 52500, 52500, 53500, 56000, 58000, 12000, 53000, 53500, 54000, 55000, 56000, 56000, 58000, 60500, 13000, 55500, 56000, 56500, 58000, 59000, 59500, 60500, 62500, 14000, 58000, 59000, 59500, 60500, 62000, 63000, 63000, 65000, 15000, 60500, 61500, 62500, 63500, 65000, 66000, 67000, 67500 }, + MinLaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 17375, 12425, 12575, 12950, 13300, 13650, 14025, 15075, 18225, 200, 11675, 12075, 12350, 12600, 12850, 13275, 13500, 14375, 15400, 300, 11700, 12100, 12350, 12650, 12975, 13275, 13575, 14150, 19250, 400, 11725, 12100, 12400, 12800, 13050, 13400, 13650, 18775, 19175, 500, 11750, 12125, 12475, 12850, 13150, 13500, 13775, 14200, 15875, 600, 11750, 12150, 12550, 12900, 13250, 13600, 13850, 14300, 19700, 700, 11750, 12150, 12600, 13000, 13350, 13650, 13950, 14350, 14850, 800, 11800, 12200, 12700, 13050, 13400, 13700, 14050, 14500, 19650, 900, 11800, 12250, 12700, 13100, 13450, 13800, 14100, 14400, 19400, 1000, 11850, 12250, 12750, 13150, 13500, 13850, 14200, 14600, 17450, 2000, 12400, 12700, 12900, 13200, 13600, 14000, 14400, 19200, 20700, 3000, 12400, 12600, 12800, 12900, 13100, 13300, 14400, 14700, 16100, 4000, 12500, 12700, 12900, 13000, 13200, 13400, 13600, 13700, 15500, 5000, 12600, 12800, 13000, 13200, 13300, 13500, 13700, 23100, 24100, 6000, 12750, 13000, 24750, 13250, 24750, 19500, 22000, 21000, 27750, 7000, 24250, 24250, 13250, 26250, 27000, 27000, 15500, 30500, 29500, 7500, 24750, 25250, 26000, 26250, 28000, 29750, 24000, 22500, 32750 }, Nr_max = 6, OmViz_max = 99.9, - Range_max = 250000, + Range_max = 180000, Reflection = 0.25, X_back = 0, Y_back = 0, @@ -37,14 +37,14 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { _origin = "AircraftWeaponPack", add_attributes = { "Cruise missiles" }, autopilot = { - K = 1.8, + K = 1.6, Kd = 0, Kdx = 0.001, - Ki = 16, + Ki = 18, Ks = 2, Ksd = 0, Ksi = 0, - Kw = 1.4, + Kw = 1.6, Kx = 0.04, PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, @@ -96,15 +96,16 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { boost_start = 0, march_start = 0 }, + display_name_short = "C-802AK", engine_control = { K = 350, Kd = 1, Ki = 0.001, - default_speed = 220, + default_speed = 285, speed_delta = 5 }, final_autopilot = { - K = 6, + K = 6.4, K_loft_err = 1, Kd = 0, Ki = 0, @@ -120,7 +121,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { conv_input = 0, delay = 1, fins_limit = 0.87266462599716, - loft_active_by_default = 0, + loft_active_by_default = 1, loft_angle = 0.1221730476396, loft_angle_vert = 1, loft_trig_angle = 0.20943951023932, @@ -130,9 +131,9 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { }, fm = { A = 0.5, - I = 1378.125, + I = 1323.55125, Kw_x = 0.01, - L = 5.25, + L = 5.145, Ma = 0.68, Ma_x = 3, Ma_z = 3, @@ -150,13 +151,13 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { manualWeaponFlag = 2, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 650, - max_thrust = 4000, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.5, -0.18, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.03, start_burn_effect = 1, @@ -221,7 +222,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { use_horiz_dist = 1 }, user_name = "C-802AK", - v_mid = 237.5, + v_mid = 290, v_min = 170, warhead = { caliber = 360, @@ -254,33 +255,34 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "C-802AK", + display_name_short = "C-802AK", mass = 600, model = "c802ak", name = "C_802AK", server = { Cx_pil = 8, - D_max = 250000, - D_min = 5000, + D_max = 180000, + D_min = 12000, Diam = 360, Escort = 0, Fi_excort = 0.7, Fi_rak = 3.14152, Fi_search = 99.9, Fi_start = 0.35, - H_max = 12000, + H_max = 7500, H_min = -1, H_min_t = 500, Head_Form = 0, Head_Type = 5, KillDistance = 0, - LaunchDistData = { 19, 8, 200, 250, 300, 350, 400, 450, 500, 550, 100, 155700, 159000, 161800, 164200, 166300, 168400, 170600, 173200, 300, 156400, 159700, 162400, 164700, 166800, 168700, 171100, 173600, 500, 157100, 160200, 162900, 165100, 167000, 169000, 171300, 173900, 700, 157500, 160800, 163200, 165500, 167400, 169400, 171800, 174300, 1000, 158300, 161600, 164000, 166200, 168100, 170000, 172300, 174900, 2000, 160800, 164200, 166300, 168300, 170000, 171900, 174200, 176700, 3000, 163000, 166200, 168600, 170200, 172100, 173900, 176000, 178700, 4000, 164900, 167700, 170800, 172400, 174000, 175900, 178200, 180700, 5000, 166800, 169400, 173000, 174400, 176000, 177800, 180200, 182800, 6000, 168400, 171200, 174400, 176400, 177800, 179800, 182200, 184800, 7000, 170400, 173000, 175400, 178600, 180000, 181800, 184200, 187000, 8000, 171800, 174400, 176800, 180600, 182200, 184000, 186200, 189000, 9000, 173200, 175800, 178400, 181800, 184400, 186200, 188600, 191200, 10000, 175000, 177000, 179500, 182500, 186000, 188000, 190500, 193000, 11000, 176000, 179000, 181000, 184000, 187500, 190500, 193000, 195500, 12000, 177500, 180500, 183000, 186000, 189500, 193000, 195000, 198000, 13000, 179000, 182000, 184500, 188000, 191000, 194500, 197500, 200000, 14000, 181000, 184000, 187000, 190000, 193000, 196000, 199500, 202000, 15000, 182500, 186000, 189000, 192000, 195000, 198000, 201000, 204500 }, + LaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 153750, 158875, 162725, 165775, 168450, 170975, 173325, 175650, 178325, 200, 153525, 159050, 162925, 165925, 168625, 171150, 173500, 175800, 178325, 300, 153750, 159250, 163125, 166175, 168850, 171375, 173700, 176000, 178825, 400, 154000, 159475, 163375, 166350, 169050, 171600, 173925, 176550, 179025, 500, 154250, 159725, 163575, 166575, 169275, 171850, 174150, 176400, 178975, 600, 154450, 159950, 163800, 166750, 169500, 172050, 174350, 176600, 179400, 700, 154550, 160250, 164050, 167050, 169700, 172300, 174600, 176800, 179200, 800, 154800, 160650, 164400, 167350, 170000, 172500, 174750, 177000, 179750, 900, 155300, 161100, 164750, 167600, 170250, 172750, 174950, 177150, 179950, 1000, 155950, 161700, 165150, 167950, 170500, 173000, 175200, 177350, 179950, 2000, 161300, 164300, 167000, 169500, 172000, 174500, 176500, 178900, 181500, 3000, 163500, 166100, 168500, 171000, 173600, 176200, 178200, 180300, 182900, 4000, 165200, 167900, 170100, 172400, 174900, 177800, 179900, 181900, 184600, 5000, 166800, 169500, 171800, 174000, 176300, 179100, 181700, 184500, 187200, 6000, 168000, 170750, 174000, 175500, 178500, 180500, 183750, 186000, 189250, 7000, 170250, 173000, 174750, 177750, 180250, 182750, 185000, 188500, 191250, 7500, 171250, 174000, 176500, 178750, 181250, 183750, 186250, 189000, 192500 }, Life_Time = 100000, M = 600, Mach_max = 0.95, - MinLaunchDistData = { 19, 8, 200, 250, 300, 350, 400, 450, 500, 550, 100, 20200, 20500, 20400, 20700, 21000, 21500, 22300, 22500, 300, 22600, 23000, 23400, 23500, 24100, 24700, 25300, 26100, 500, 23900, 24300, 24900, 25200, 25700, 26400, 27200, 28100, 700, 25000, 25400, 26000, 26600, 26900, 27700, 28600, 29600, 1000, 26200, 26600, 27300, 28100, 28800, 29200, 30200, 31300, 2000, 29400, 29700, 30500, 31500, 32300, 33300, 34300, 35500, 3000, 32000, 32300, 33000, 34000, 35000, 36100, 37500, 38800, 4000, 34300, 34900, 35300, 36200, 37300, 38600, 40100, 41800, 5000, 36800, 37200, 37600, 38400, 39400, 40800, 42400, 44400, 6000, 38800, 39400, 39800, 40600, 41400, 42800, 44800, 46600, 7000, 41200, 41800, 42400, 42800, 43600, 45000, 46800, 49000, 8000, 43600, 44000, 44400, 45000, 45800, 47200, 49000, 51200, 9000, 45800, 46200, 46800, 47200, 48000, 49400, 51400, 53400, 10000, 48000, 48500, 49500, 50000, 50000, 51500, 53500, 56000, 11000, 50500, 51000, 51500, 52500, 52500, 53500, 56000, 58000, 12000, 53000, 53500, 54000, 55000, 56000, 56000, 58000, 60500, 13000, 55500, 56000, 56500, 58000, 59000, 59500, 60500, 62500, 14000, 58000, 59000, 59500, 60500, 62000, 63000, 63000, 65000, 15000, 60500, 61500, 62500, 63500, 65000, 66000, 67000, 67500 }, + MinLaunchDistData = { 17, 9, 100, 150, 200, 250, 300, 350, 400, 450, 500, 100, 17375, 12425, 12575, 12950, 13300, 13650, 14025, 15075, 18225, 200, 11675, 12075, 12350, 12600, 12850, 13275, 13500, 14375, 15400, 300, 11700, 12100, 12350, 12650, 12975, 13275, 13575, 14150, 19250, 400, 11725, 12100, 12400, 12800, 13050, 13400, 13650, 18775, 19175, 500, 11750, 12125, 12475, 12850, 13150, 13500, 13775, 14200, 15875, 600, 11750, 12150, 12550, 12900, 13250, 13600, 13850, 14300, 19700, 700, 11750, 12150, 12600, 13000, 13350, 13650, 13950, 14350, 14850, 800, 11800, 12200, 12700, 13050, 13400, 13700, 14050, 14500, 19650, 900, 11800, 12250, 12700, 13100, 13450, 13800, 14100, 14400, 19400, 1000, 11850, 12250, 12750, 13150, 13500, 13850, 14200, 14600, 17450, 2000, 12400, 12700, 12900, 13200, 13600, 14000, 14400, 19200, 20700, 3000, 12400, 12600, 12800, 12900, 13100, 13300, 14400, 14700, 16100, 4000, 12500, 12700, 12900, 13000, 13200, 13400, 13600, 13700, 15500, 5000, 12600, 12800, 13000, 13200, 13300, 13500, 13700, 23100, 24100, 6000, 12750, 13000, 24750, 13250, 24750, 19500, 22000, 21000, 27750, 7000, 24250, 24250, 13250, 26250, 27000, 27000, 15500, 30500, 29500, 7500, 24750, 25250, 26000, 26250, 28000, 29750, 24000, 22500, 32750 }, Nr_max = 6, OmViz_max = 99.9, - Range_max = 250000, + Range_max = 180000, Reflection = 0.25, X_back = 0, Y_back = 0, @@ -289,14 +291,14 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { _origin = "AircraftWeaponPack", add_attributes = { "Cruise missiles" }, autopilot = { - K = 1.8, + K = 1.6, Kd = 0, Kdx = 0.001, - Ki = 16, + Ki = 18, Ks = 2, Ksd = 0, Ksi = 0, - Kw = 1.4, + Kw = 1.6, Kx = 0.04, PN_dist_data = { 2000, 0, 500, 0 }, altim_vel_k = 4, @@ -348,15 +350,16 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { boost_start = 0, march_start = 0 }, + display_name_short = "C-802AK", engine_control = { K = 350, Kd = 1, Ki = 0.001, - default_speed = 220, + default_speed = 285, speed_delta = 5 }, final_autopilot = { - K = 6, + K = 6.4, K_loft_err = 1, Kd = 0, Ki = 0, @@ -372,7 +375,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { conv_input = 0, delay = 1, fins_limit = 0.87266462599716, - loft_active_by_default = 0, + loft_active_by_default = 1, loft_angle = 0.1221730476396, loft_angle_vert = 1, loft_trig_angle = 0.20943951023932, @@ -382,9 +385,9 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { }, fm = { A = 0.5, - I = 1378.125, + I = 1323.55125, Kw_x = 0.01, - L = 5.25, + L = 5.145, Ma = 0.68, Ma_x = 3, Ma_z = 3, @@ -402,13 +405,13 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { manualWeaponFlag = 2, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 180, - impulse = 650, - max_thrust = 4000, + fuel_mass = 50, + impulse = 3300, + max_thrust = 6000, min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -2.5, -0.18, 0 } }, + nozzle_position = { { -1.7, 0, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.03, start_burn_effect = 1, @@ -473,7 +476,7 @@ _G["weapons_table"]["weapons"]["missiles"]["C_802AK"] = { use_horiz_dist = 1 }, user_name = "C-802AK", - v_mid = 237.5, + v_mid = 290, v_min = 170, warhead = { caliber = 360, diff --git a/_G/weapons_table/weapons/missiles/DWS39_MJ1.lua b/_G/weapons_table/weapons/missiles/DWS39_MJ1.lua index a7f85942..f9de8d43 100644 --- a/_G/weapons_table/weapons/missiles/DWS39_MJ1.lua +++ b/_G/weapons_table/weapons/missiles/DWS39_MJ1.lua @@ -50,6 +50,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ1"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "DWS39 MJ1", fm = { A = 0.13, I = 270, @@ -246,6 +247,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ1"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "DWS39 MJ1", + display_name_short = "DWS39 MJ1", mass = 605, model = "BK_90", name = "DWS39_MJ1", @@ -295,6 +297,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ1"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "DWS39 MJ1", fm = { A = 0.13, I = 270, diff --git a/_G/weapons_table/weapons/missiles/DWS39_MJ1_MJ2.lua b/_G/weapons_table/weapons/missiles/DWS39_MJ1_MJ2.lua index 97215bb1..103ce014 100644 --- a/_G/weapons_table/weapons/missiles/DWS39_MJ1_MJ2.lua +++ b/_G/weapons_table/weapons/missiles/DWS39_MJ1_MJ2.lua @@ -50,6 +50,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ1_MJ2"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "DWS39 MJ1-MJ2", fm = { A = 0.13, I = 270, @@ -328,6 +329,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ1_MJ2"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "DWS39 MJ1-MJ2", + display_name_short = "DWS39 MJ1-MJ2", mass = 605, model = "BK_90", name = "DWS39_MJ1_MJ2", @@ -377,6 +379,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ1_MJ2"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "DWS39 MJ1-MJ2", fm = { A = 0.13, I = 270, diff --git a/_G/weapons_table/weapons/missiles/DWS39_MJ2.lua b/_G/weapons_table/weapons/missiles/DWS39_MJ2.lua index 527b829e..89ed7b3a 100644 --- a/_G/weapons_table/weapons/missiles/DWS39_MJ2.lua +++ b/_G/weapons_table/weapons/missiles/DWS39_MJ2.lua @@ -50,6 +50,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ2"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "DWS39 MJ2", fm = { A = 0.13, I = 270, @@ -244,6 +245,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ2"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "DWS39 MJ2", + display_name_short = "DWS39 MJ2", mass = 605, model = "BK_90", name = "DWS39_MJ2", @@ -293,6 +295,7 @@ _G["weapons_table"]["weapons"]["missiles"]["DWS39_MJ2"] = { }, category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "DWS39 MJ2", fm = { A = 0.13, I = 270, diff --git a/_G/weapons_table/weapons/missiles/FIM_92C.lua b/_G/weapons_table/weapons/missiles/FIM_92C.lua index cdbf269b..57095bad 100644 --- a/_G/weapons_table/weapons/missiles/FIM_92C.lua +++ b/_G/weapons_table/weapons/missiles/FIM_92C.lua @@ -76,6 +76,7 @@ _G["weapons_table"]["weapons"]["missiles"]["FIM_92C"] = { march2_start = 3.1, march_start = 0.4 }, + display_name_short = "FIM-92C Stinger", fm = { A = 0.6, I = 2.0408533333333, @@ -189,6 +190,7 @@ _G["weapons_table"]["weapons"]["missiles"]["FIM_92C"] = { wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, display_name = "FIM-92C Stinger", + display_name_short = "FIM-92C Stinger", mass = 10.1, model = "fim-92", name = "FIM_92C", @@ -264,6 +266,7 @@ _G["weapons_table"]["weapons"]["missiles"]["FIM_92C"] = { march2_start = 3.1, march_start = 0.4 }, + display_name_short = "FIM-92C Stinger", fm = { A = 0.6, I = 2.0408533333333, diff --git a/_G/weapons_table/weapons/missiles/GB-6-HE.lua b/_G/weapons_table/weapons/missiles/GB-6-HE.lua index b1245ab6..24b58856 100644 --- a/_G/weapons_table/weapons/missiles/GB-6-HE.lua +++ b/_G/weapons_table/weapons/missiles/GB-6-HE.lua @@ -36,13 +36,18 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, @@ -50,14 +55,14 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { err_aoaz_sign_k = 0.18, err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -72,6 +77,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "GB-6-HE", fm = { A = 0.15, I = 1046.25, @@ -84,13 +90,15 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { Sw = 1.2, addDeplSw = 0.6, caliber = 0.3, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.85, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 0.2, mass = 620, maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -99,7 +107,12 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { mass = 620, model = "gb6", name = "GB-6-HE", - scheme = "schemes/missiles/AGM-154C.sch", + scheme = "schemes/missiles/JSOW_C.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -109,13 +122,6 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { username = "GB-6-HE" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, @@ -151,6 +157,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "GB-6-HE", + display_name_short = "GB-6-HE", mass = 620, model = "gb6", name = "GB-6-HE", @@ -186,13 +193,18 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, @@ -200,14 +212,14 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { err_aoaz_sign_k = 0.18, err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -222,6 +234,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "GB-6-HE", fm = { A = 0.15, I = 1046.25, @@ -234,13 +247,15 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { Sw = 1.2, addDeplSw = 0.6, caliber = 0.3, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.85, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 0.2, mass = 620, maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -249,7 +264,12 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { mass = 620, model = "gb6", name = "GB-6-HE", - scheme = "schemes/missiles/AGM-154C.sch", + scheme = "schemes/missiles/JSOW_C.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -259,13 +279,6 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-HE"] = { username = "GB-6-HE" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/weapons_table/weapons/missiles/GB-6-SFW.lua b/_G/weapons_table/weapons/missiles/GB-6-SFW.lua index 40f0b2a6..68a8e226 100644 --- a/_G/weapons_table/weapons/missiles/GB-6-SFW.lua +++ b/_G/weapons_table/weapons/missiles/GB-6-SFW.lua @@ -36,28 +36,32 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, + J_Power_K = 4, + K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 6, Ki = 5e-05, - delay = 2.5, + Kx = 0.03, + Kxd = 0, + delay = 2, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -81,6 +85,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { vert_offset_before_end_game_k = 0.8, wind_k = 1 }, + display_name_short = "GB-6-SFW", fm = { A = 0.15, I = 1046.25, @@ -93,13 +98,15 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { Sw = 1.2, addDeplSw = 0.6, caliber = 0.3, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.85, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 0.2, mass = 620, maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -233,14 +240,14 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "MM-06", @@ -372,14 +379,14 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -405,7 +412,13 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { trigger_add_time = 0.5, wind_correction_coeff = 1 }, - scheme = "schemes/missiles/AGM-154AB.sch", + scheme = "schemes/missiles/JSOW_AB.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -415,13 +428,6 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { username = "GB-6-SFW" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, @@ -447,6 +453,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "GB-6-SFW", + display_name_short = "GB-6-SFW", mass = 620, model = "gb6", name = "GB-6-SFW", @@ -482,28 +489,32 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, + J_Power_K = 4, + K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 6, Ki = 5e-05, - delay = 2.5, + Kx = 0.03, + Kxd = 0, + delay = 2, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -527,6 +538,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { vert_offset_before_end_game_k = 0.8, wind_k = 1 }, + display_name_short = "GB-6-SFW", fm = { A = 0.15, I = 1046.25, @@ -539,13 +551,15 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { Sw = 1.2, addDeplSw = 0.6, caliber = 0.3, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.85, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 0.2, mass = 620, maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -679,14 +693,14 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 1, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, display_name = "MM-06", @@ -818,14 +832,14 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { caliber = 80, concrete_factors = { 1, 1, 1 }, concrete_obj_factor = 0, - cumulative_factor = 3, + cumulative_factor = 4, cumulative_thickness = 0.65, - expl_mass = 3, + expl_mass = 0.3, fantom = 0, mass = 4.6, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 0.92 + piercing_mass = 4.6 } }, sounderName = "Weapons/ClusterBomblets", @@ -851,7 +865,13 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { trigger_add_time = 0.5, wind_correction_coeff = 1 }, - scheme = "schemes/missiles/AGM-154AB.sch", + scheme = "schemes/missiles/JSOW_AB.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -861,13 +881,6 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6-SFW"] = { username = "GB-6-SFW" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/weapons_table/weapons/missiles/GB-6.lua b/_G/weapons_table/weapons/missiles/GB-6.lua index a165eaf4..3f375a62 100644 --- a/_G/weapons_table/weapons/missiles/GB-6.lua +++ b/_G/weapons_table/weapons/missiles/GB-6.lua @@ -36,28 +36,32 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, + J_Power_K = 4, + K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 6, Ki = 5e-05, - delay = 2.5, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -81,6 +85,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { vert_offset_before_end_game_k = 0.8, wind_k = 1 }, + display_name_short = "GB-6", fm = { A = 0.15, I = 1046.25, @@ -100,6 +105,8 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -253,7 +260,13 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { trigger_add_time = 1, wind_correction_coeff = 1 }, - scheme = "schemes/missiles/AGM-154AB.sch", + scheme = "schemes/missiles/JSOW_AB.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -263,13 +276,6 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { username = "GB-6" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, @@ -295,6 +301,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "GB-6", + display_name_short = "GB-6", mass = 620, model = "gb6", name = "GB-6", @@ -330,28 +337,32 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 4, + J_Diff_K = 3, J_Int_K = 0, - J_Power_K = 7, - K = 500, - Kg = 10, + J_Power_K = 4, + K = 200, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 6, Ki = 5e-05, - delay = 2.5, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, - err_aoaz_k = 28, - err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.84, + err_aoaz_k = 0, + err_aoaz_sign_k = 0, + err_new_wlos_k = 1, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, + fins_limit_x = 0.3, + hKp_err = 50, nw_K = 22, - nw_Kg = 2, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -375,6 +386,7 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { vert_offset_before_end_game_k = 0.8, wind_k = 1 }, + display_name_short = "GB-6", fm = { A = 0.15, I = 1046.25, @@ -394,6 +406,8 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { maxAoa = 0.4, no_wings_A_mlt = 2, no_wings_cx_coeff = { 1, 0.5, 0.8, 0.1, 1.6 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -547,7 +561,13 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { trigger_add_time = 1, wind_correction_coeff = 1 }, - scheme = "schemes/missiles/AGM-154AB.sch", + scheme = "schemes/missiles/JSOW_AB.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5, + target_point_always_on_surface = 0 + }, shape_table_data = { { file = "gb6", fire = { 0, 1 }, @@ -557,13 +577,6 @@ _G["weapons_table"]["weapons"]["missiles"]["GB-6"] = { username = "GB-6" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/weapons_table/weapons/missiles/HOT2.lua b/_G/weapons_table/weapons/missiles/HOT2.lua index 02bd2cc4..60ecd70e 100644 --- a/_G/weapons_table/weapons/missiles/HOT2.lua +++ b/_G/weapons_table/weapons/missiles/HOT2.lua @@ -59,6 +59,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HOT2"] = { boost_start = 0, march_start = 0.3 }, + display_name_short = "HOT2", eng_err = { max_time_interval = 0.9, min_time_interval = 0.1, @@ -145,6 +146,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HOT2"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "HOT2", + display_name_short = "HOT2", mass = 23.5, model = "hot3", name = "HOT2", @@ -203,6 +205,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HOT2"] = { boost_start = 0, march_start = 0.3 }, + display_name_short = "HOT2", eng_err = { max_time_interval = 0.9, min_time_interval = 0.1, diff --git a/_G/weapons_table/weapons/missiles/HOT3_MBDA.lua b/_G/weapons_table/weapons/missiles/HOT3_MBDA.lua index 3e7bf841..14908556 100644 --- a/_G/weapons_table/weapons/missiles/HOT3_MBDA.lua +++ b/_G/weapons_table/weapons/missiles/HOT3_MBDA.lua @@ -59,6 +59,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HOT3_MBDA"] = { boost_start = 0, march_start = 0.9 }, + display_name_short = "HOT3", eng_err = { max_time_interval = 0.9, min_time_interval = 0.1, @@ -147,6 +148,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HOT3_MBDA"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "HOT3", + display_name_short = "HOT3", mass = 24.5, model = "hot3", name = "HOT3_MBDA", @@ -205,6 +207,7 @@ _G["weapons_table"]["weapons"]["missiles"]["HOT3_MBDA"] = { boost_start = 0, march_start = 0.9 }, + display_name_short = "HOT3", eng_err = { max_time_interval = 0.9, min_time_interval = 0.1, diff --git a/_G/weapons_table/weapons/missiles/Igla_1E.lua b/_G/weapons_table/weapons/missiles/Igla_1E.lua index 8dca9be1..2d264511 100644 --- a/_G/weapons_table/weapons/missiles/Igla_1E.lua +++ b/_G/weapons_table/weapons/missiles/Igla_1E.lua @@ -64,6 +64,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Igla_1E"] = { march2_start = 1.9, march_start = 0.5 }, + display_name_short = "9M39 Igla", fm = { A = 0.6, I = 2.49312, @@ -185,6 +186,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Igla_1E"] = { wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, display_name = "9M39 Igla", + display_name_short = "9M39 Igla", mass = 10.8, model = "9M39", name = "Igla_1E", @@ -248,6 +250,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Igla_1E"] = { march2_start = 1.9, march_start = 0.5 }, + display_name_short = "9M39 Igla", fm = { A = 0.6, I = 2.49312, diff --git a/_G/weapons_table/weapons/missiles/KD-20.lua b/_G/weapons_table/weapons/missiles/KD-20.lua index 33a88063..d956a919 100644 --- a/_G/weapons_table/weapons/missiles/KD-20.lua +++ b/_G/weapons_table/weapons/missiles/KD-20.lua @@ -103,6 +103,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-20"] = { stab_vel = 237.5 }, display_name = "KD-20", + display_name_short = "KD-20", final_autopilot = { J_Angle_K = 0.23, J_Angle_W = 0.4, @@ -220,6 +221,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-20"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "KD-20", + display_name_short = "KD-20", mass = 1700, model = "kd20", name = "KD-20", @@ -321,6 +323,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-20"] = { stab_vel = 237.5 }, display_name = "KD-20", + display_name_short = "KD-20", final_autopilot = { J_Angle_K = 0.23, J_Angle_W = 0.4, diff --git a/_G/weapons_table/weapons/missiles/KD-63.lua b/_G/weapons_table/weapons/missiles/KD-63.lua index 19dadbbd..8cf93eb9 100644 --- a/_G/weapons_table/weapons/missiles/KD-63.lua +++ b/_G/weapons_table/weapons/missiles/KD-63.lua @@ -2,7 +2,6 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-63"] = { Reflection = 0.121, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Loadouts/mils_kd63.lua", _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", - _unique_resource_name = "weapons.missiles.KD-63", add_attributes = { "Cruise missiles" }, caliber = 0.76, client = { @@ -107,6 +106,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-63"] = { no_alg_vel_k = 10, stab_vel = 250 }, + display_name_short = "KD-63", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, @@ -228,6 +228,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-63"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "KD-63", + display_name_short = "KD-63", mass = 2000, model = "kd63", name = "KD-63", @@ -333,6 +334,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-63"] = { no_alg_vel_k = 10, stab_vel = 250 }, + display_name_short = "KD-63", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, diff --git a/_G/weapons_table/weapons/missiles/KD-63B.lua b/_G/weapons_table/weapons/missiles/KD-63B.lua index 132c5296..83bacd51 100644 --- a/_G/weapons_table/weapons/missiles/KD-63B.lua +++ b/_G/weapons_table/weapons/missiles/KD-63B.lua @@ -107,6 +107,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-63B"] = { no_alg_vel_k = 10, stab_vel = 250 }, + display_name_short = "KD-63B", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, @@ -228,6 +229,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-63B"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "KD-63B", + display_name_short = "KD-63B", mass = 2000, model = "kd63b", name = "KD-63B", @@ -333,6 +335,7 @@ _G["weapons_table"]["weapons"]["missiles"]["KD-63B"] = { no_alg_vel_k = 10, stab_vel = 250 }, + display_name_short = "KD-63B", final_autopilot = { J_Angle_K = 0.18, J_Angle_W = 0.8, diff --git a/_G/weapons_table/weapons/missiles/KD_20.lua b/_G/weapons_table/weapons/missiles/KD_20.lua new file mode 100644 index 00000000..eb56bbe2 --- /dev/null +++ b/_G/weapons_table/weapons/missiles/KD_20.lua @@ -0,0 +1,455 @@ +_G["weapons_table"]["weapons"]["missiles"]["KD_20"] = { + Reflection = 0.1691, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + _unique_resource_name = "weapons.missiles.KD_20", + add_attributes = { "Cruise missiles" }, + caliber = 0.6, + client = { + Cx_pil = 8, + D_max = 2500000, + D_min = 20000, + Diam = 600, + Escort = 0, + Fi_excort = 0.7, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.35, + H_max = 13000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 0, 2500000, 2520000, 2000, 2500000, 2500000, 2510000, 2540000, 7000, 2540000, 2550000, 2550000, 2560000, 12500, 2570000, 2570000, 2580000, 2590000 }, + Life_Time = 10000, + M = 1700, + Mach_max = 0.9, + MinLaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 0, 20000, 21000, 2000, 24000, 25000, 26000, 27000, 7000, 15000, 15000, 16000, 17000, 12500, 16000, 18000, 19000, 20000 }, + Nr_max = 6, + OmViz_max = 99.9, + Range_max = 2500000, + Reflection = 0.1691, + X_back = -3.392, + Y_back = 0.064, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Cruise missiles" }, + boost = { + boost_factor = 0, + boost_time = 0, + custom_smoke_dissipation_factor = 0, + fuel_mass = 0, + impulse = 0, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { 0, 0, 0 } }, + smoke_color = { 0, 0, 0 }, + smoke_transparency = 0, + tail_width = 0, + work_time = 0 + }, + category = 2, + class_name = "wAmmunitionSelfHoming", + control_block = { + can_update_target_pos = 0, + default_cruise_height = 55, + obj_sensor = 0, + seeker_activation_dist = 15500, + turn_before_point_reach = 1, + turn_hor_N = 0.8, + turn_max_calc_angle_deg = 90, + turn_point_trigger_dist = 100, + use_horiz_dist = 1 + }, + controller = { + boost_start = 0, + march_start = 0.8 + }, + cruise_autopilot = { + Kd_eng = 0, + Kd_hor = 0, + Kd_ver = 0, + Kd_ver_st1 = 0.015, + Kd_ver_st2 = 5e-05, + Ki_eng = 0.003, + Kii_ver = 0.2, + Kp_eng = 265, + Kp_hor_err = 240, + Kp_hor_err_croll = 0.06, + Kp_ver = 9, + Kp_ver_st1 = 0.009, + Kp_ver_st2 = 0.00018, + alg_calc_time = 1.5, + alg_div_k = 2, + alg_max_sin_climb = 0.8, + alg_points_num = 7, + alg_section_temp_points = 3, + alg_tmp_point_vel_k = 1.5, + alg_vel_k = 6, + auto_terrain_following = 1, + auto_terrain_following_height = 75, + delay = 1, + eng_max_thrust = 3923, + eng_min_thrust = -120, + estimated_N_max = 6, + finsLimit = 0.72, + max_roll = 0.8, + max_start_y_vel = 35, + no_alg_vel_k = 10, + stab_vel = 220 + }, + display_name_short = "KD-20", + final_autopilot = { + J_Angle_K = 0.18, + J_Angle_W = 0.8, + J_Diff_K = 0.4, + J_FinAngle_K = 0.32, + J_Int_K = 0.001, + J_Power_K = 2.2, + J_Trigger_Vert = 1, + K = 72, + Kg = 4, + Ki = 0, + delay = 0, + finsLimit = 0.72, + hKd = 0.005, + hKp_err = 120, + hKp_err_croll = 0.04, + max_roll = 0.8, + useJumpByDefault = 1 + }, + fm = { + A = 0.08, + I = 6550.6666666667, + L = 6.8, + Ma = 3, + Ma_x = 1.2, + Ma_z = 3, + Mw = 10, + Mw_x = 2.7, + Sw = 1.5, + addDeplSw = 0.8, + caliber = 0.6, + cx_coeff = { 1, 0.3, 0.65, 0.023, 1.6 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.08, + mass = 1700, + maxAoa = 0.2, + no_wings_A_mlt = 7, + wind_sigma = 0, + wind_time = 0, + wingsDeplDelay = 1, + wingsDeplProcTime = 5 + }, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 400, + impulse = 3000, + max_thrust = 3000, + min_fuel_rate = 0.005, + min_thrust = -100, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -2.25, 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 = 999999 + }, + mass = 1700, + model = "kd20", + name = "KD_20", + play_booster_animation = { + val = 0 + }, + scheme = "schemes/missiles/sat_cruise_missile.sch", + seeker = { + can_update_target_pos = 1, + coalition = 1, + coalition_rnd_coeff = 5 + }, + shape_table_data = { { + file = "kd20", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "KD_20", + username = "KD-20" + } }, + sigma = { 20, 20, 20 }, + t_acc = 5, + t_b = 0, + t_marsh = 10000, + user_name = "KD-20", + v_mid = 220, + v_min = 170, + warhead = { + caliber = 600, + concrete_factors = { 5, 1, 10 }, + concrete_obj_factor = 5, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 200, + fantom = 1, + mass = 200, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 40 + }, + warhead_air = { + caliber = 600, + concrete_factors = { 5, 1, 10 }, + concrete_obj_factor = 5, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 200, + fantom = 1, + mass = 200, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 40 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + display_name = "KD-20", + display_name_short = "KD-20", + encyclopediaAnimation = { + args = { + [25] = 1 + } + }, + mass = 1700, + model = "kd20", + name = "KD_20", + server = { + Cx_pil = 8, + D_max = 2500000, + D_min = 20000, + Diam = 600, + Escort = 0, + Fi_excort = 0.7, + Fi_rak = 3.14152, + Fi_search = 99.9, + Fi_start = 0.35, + H_max = 13000, + H_min = -1, + H_min_t = 0, + Head_Form = 0, + Head_Type = 5, + KillDistance = 0, + LaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 0, 2500000, 2520000, 2000, 2500000, 2500000, 2510000, 2540000, 7000, 2540000, 2550000, 2550000, 2560000, 12500, 2570000, 2570000, 2580000, 2590000 }, + Life_Time = 10000, + M = 1700, + Mach_max = 0.9, + MinLaunchDistData = { 4, 4, 100, 125, 175, 250, 500, 0, 0, 20000, 21000, 2000, 24000, 25000, 26000, 27000, 7000, 15000, 15000, 16000, 17000, 12500, 16000, 18000, 19000, 20000 }, + Nr_max = 6, + OmViz_max = 99.9, + Range_max = 2500000, + Reflection = 0.1691, + X_back = -3.392, + Y_back = 0.064, + Z_back = 0, + _file = "./CoreMods/aircraft/AircraftWeaponPack/cruise_missiles.lua", + _origin = "AircraftWeaponPack", + add_attributes = { "Cruise missiles" }, + boost = { + boost_factor = 0, + boost_time = 0, + custom_smoke_dissipation_factor = 0, + fuel_mass = 0, + impulse = 0, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { 0, 0, 0 } }, + smoke_color = { 0, 0, 0 }, + smoke_transparency = 0, + tail_width = 0, + work_time = 0 + }, + category = 2, + class_name = "wAmmunitionSelfHoming", + control_block = { + can_update_target_pos = 0, + default_cruise_height = 55, + obj_sensor = 0, + seeker_activation_dist = 15500, + turn_before_point_reach = 1, + turn_hor_N = 0.8, + turn_max_calc_angle_deg = 90, + turn_point_trigger_dist = 100, + use_horiz_dist = 1 + }, + controller = { + boost_start = 0, + march_start = 0.8 + }, + cruise_autopilot = { + Kd_eng = 0, + Kd_hor = 0, + Kd_ver = 0, + Kd_ver_st1 = 0.015, + Kd_ver_st2 = 5e-05, + Ki_eng = 0.003, + Kii_ver = 0.2, + Kp_eng = 265, + Kp_hor_err = 240, + Kp_hor_err_croll = 0.06, + Kp_ver = 9, + Kp_ver_st1 = 0.009, + Kp_ver_st2 = 0.00018, + alg_calc_time = 1.5, + alg_div_k = 2, + alg_max_sin_climb = 0.8, + alg_points_num = 7, + alg_section_temp_points = 3, + alg_tmp_point_vel_k = 1.5, + alg_vel_k = 6, + auto_terrain_following = 1, + auto_terrain_following_height = 75, + delay = 1, + eng_max_thrust = 3923, + eng_min_thrust = -120, + estimated_N_max = 6, + finsLimit = 0.72, + max_roll = 0.8, + max_start_y_vel = 35, + no_alg_vel_k = 10, + stab_vel = 220 + }, + display_name_short = "KD-20", + final_autopilot = { + J_Angle_K = 0.18, + J_Angle_W = 0.8, + J_Diff_K = 0.4, + J_FinAngle_K = 0.32, + J_Int_K = 0.001, + J_Power_K = 2.2, + J_Trigger_Vert = 1, + K = 72, + Kg = 4, + Ki = 0, + delay = 0, + finsLimit = 0.72, + hKd = 0.005, + hKp_err = 120, + hKp_err_croll = 0.04, + max_roll = 0.8, + useJumpByDefault = 1 + }, + fm = { + A = 0.08, + I = 6550.6666666667, + L = 6.8, + Ma = 3, + Ma_x = 1.2, + Ma_z = 3, + Mw = 10, + Mw_x = 2.7, + Sw = 1.5, + addDeplSw = 0.8, + caliber = 0.6, + cx_coeff = { 1, 0.3, 0.65, 0.023, 1.6 }, + dCydA = { 0.07, 0.036 }, + finsTau = 0.08, + mass = 1700, + maxAoa = 0.2, + no_wings_A_mlt = 7, + wind_sigma = 0, + wind_time = 0, + wingsDeplDelay = 1, + wingsDeplProcTime = 5 + }, + march = { + custom_smoke_dissipation_factor = 0.2, + fuel_mass = 400, + impulse = 3000, + max_thrust = 3000, + min_fuel_rate = 0.005, + min_thrust = -100, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -2.25, 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 = 999999 + }, + mass = 1700, + model = "kd20", + name = "KD_20", + play_booster_animation = { + val = 0 + }, + scheme = "schemes/missiles/sat_cruise_missile.sch", + seeker = { + can_update_target_pos = 1, + coalition = 1, + coalition_rnd_coeff = 5 + }, + shape_table_data = { { + file = "kd20", + fire = { 0, 1 }, + index = "Redacted", + life = 1, + name = "KD_20", + username = "KD-20" + } }, + sigma = { 20, 20, 20 }, + t_acc = 5, + t_b = 0, + t_marsh = 10000, + user_name = "KD-20", + v_mid = 220, + v_min = 170, + warhead = { + caliber = 600, + concrete_factors = { 5, 1, 10 }, + concrete_obj_factor = 5, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 200, + fantom = 0, + mass = 200, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 40 + }, + warhead_air = { + caliber = 600, + concrete_factors = { 5, 1, 10 }, + concrete_obj_factor = 5, + cumulative_factor = 0, + cumulative_thickness = 0, + default_fuze_delay = 0, + expl_mass = 200, + fantom = 0, + mass = 200, + obj_factors = { 1, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 40 + }, + wsTypeOfWeapon = { 4, 4, 8, "Redacted" } + }, + sounderName = "Weapons/Missile", + type_name = "missile", + ws_type = { 4, 4, 8, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/missiles/Kh25MP_PRGS1VP.lua b/_G/weapons_table/weapons/missiles/Kh25MP_PRGS1VP.lua index a5db6b2e..b0d68e31 100644 --- a/_G/weapons_table/weapons/missiles/Kh25MP_PRGS1VP.lua +++ b/_G/weapons_table/weapons/missiles/Kh25MP_PRGS1VP.lua @@ -66,6 +66,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { boost_start = 0, march_start = 2 }, + display_name_short = "Kh-25MP (AS-12 Kegler)", fm = { A = 0.36, I = 353.65833333333, @@ -169,6 +170,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "Kh-25MP (AS-12 Kegler)", + display_name_short = "Kh-25MP (AS-12 Kegler)", mass = 310, model = "X-25MP", name = "Kh25MP_PRGS1VP", @@ -234,6 +236,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Kh25MP_PRGS1VP"] = { boost_start = 0, march_start = 2 }, + display_name_short = "Kh-25MP (AS-12 Kegler)", fm = { A = 0.36, I = 353.65833333333, diff --git a/_G/weapons_table/weapons/missiles/LD-10.lua b/_G/weapons_table/weapons/missiles/LD-10.lua index 243ed064..a7e9032b 100644 --- a/_G/weapons_table/weapons/missiles/LD-10.lua +++ b/_G/weapons_table/weapons/missiles/LD-10.lua @@ -90,6 +90,7 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { conv = { seeker_add_pitch = -0.34906585039887 }, + display_name_short = "LD-10", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 4, 6, 10, 15 }, @@ -209,6 +210,7 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "LD-10", + display_name_short = "LD-10", mass = 199, model = "ld10", name = "LD-10", @@ -298,6 +300,7 @@ _G["weapons_table"]["weapons"]["missiles"]["LD-10"] = { conv = { seeker_add_pitch = -0.34906585039887 }, + display_name_short = "LD-10", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 4, 6, 10, 15 }, diff --git a/_G/weapons_table/weapons/missiles/LS-6-250.lua b/_G/weapons_table/weapons/missiles/LS-6-250.lua index 37f4a4be..350a1351 100644 --- a/_G/weapons_table/weapons/missiles/LS-6-250.lua +++ b/_G/weapons_table/weapons/missiles/LS-6-250.lua @@ -35,28 +35,33 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 1.5, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 3, - K = 250, - Kg = 4, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, err_aoaz_k = 28, err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.8, + err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, - nw_K = 15, - nw_Kg = 12.5, + fins_limit_x = 0.3, + hKp_err = 50, + nw_K = 22, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -64,13 +69,14 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { control_block = { can_update_target_pos = 0, default_cruise_height = -1, - obj_sensor = 1, + obj_sensor = 0, seeker_activation_dist = 7000, turn_before_point_reach = 1, turn_hor_N = 2.2, turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "LS-6-250", fm = { A = 0.1, I = 140.94666666667, @@ -83,13 +89,15 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { Sw = 1.1, addDeplSw = 0.6, caliber = 0.299, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.82, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 1.2, mass = 275, maxAoa = 0.4, no_wings_A_mlt = 2, - no_wings_cx_coeff = { 1, 0.4, 0.8, 0.1, 1.5 }, + no_wings_cx_coeff = { 1, 0.42, 0.8, 0.1, 1.52 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -98,7 +106,12 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { mass = 275, model = "ls-6-250", name = "LS-6-250", - scheme = "schemes/missiles/AGM-154C.sch", + scheme = "schemes/missiles/JSOW_C.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "ls-6-250", fire = { 0, 1 }, @@ -108,13 +121,6 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { username = "LS-6-250" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, @@ -150,6 +156,7 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "LS-6-250", + display_name_short = "LS-6-250", mass = 275, model = "ls-6-250", name = "LS-6-250", @@ -184,28 +191,33 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 1.5, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 3, - K = 250, - Kg = 4, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, err_aoaz_k = 28, err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.8, + err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, - nw_K = 15, - nw_Kg = 12.5, + fins_limit_x = 0.3, + hKp_err = 50, + nw_K = 22, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -213,13 +225,14 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { control_block = { can_update_target_pos = 0, default_cruise_height = -1, - obj_sensor = 1, + obj_sensor = 0, seeker_activation_dist = 7000, turn_before_point_reach = 1, turn_hor_N = 2.2, turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "LS-6-250", fm = { A = 0.1, I = 140.94666666667, @@ -232,13 +245,15 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { Sw = 1.1, addDeplSw = 0.6, caliber = 0.299, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.82, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 1.2, mass = 275, maxAoa = 0.4, no_wings_A_mlt = 2, - no_wings_cx_coeff = { 1, 0.4, 0.8, 0.1, 1.5 }, + no_wings_cx_coeff = { 1, 0.42, 0.8, 0.1, 1.52 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -247,7 +262,12 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { mass = 275, model = "ls-6-250", name = "LS-6-250", - scheme = "schemes/missiles/AGM-154C.sch", + scheme = "schemes/missiles/JSOW_C.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "ls-6-250", fire = { 0, 1 }, @@ -257,13 +277,6 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-250"] = { username = "LS-6-250" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/weapons_table/weapons/missiles/LS-6-500.lua b/_G/weapons_table/weapons/missiles/LS-6-500.lua index 2f44d1aa..d6b3450f 100644 --- a/_G/weapons_table/weapons/missiles/LS-6-500.lua +++ b/_G/weapons_table/weapons/missiles/LS-6-500.lua @@ -35,28 +35,33 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 3, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 6, - K = 500, - Kg = 8, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, err_aoaz_k = 28, err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.8, + err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, - nw_K = 30, - nw_Kg = 25, + fins_limit_x = 0.3, + hKp_err = 50, + nw_K = 22, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -64,13 +69,14 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { control_block = { can_update_target_pos = 0, default_cruise_height = -1, - obj_sensor = 1, + obj_sensor = 0, seeker_activation_dist = 7000, turn_before_point_reach = 1, turn_hor_N = 2.2, turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "LS-6-500", fm = { A = 0.1, I = 417.729375, @@ -83,13 +89,15 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { Sw = 1.1, addDeplSw = 0.6, caliber = 0.377, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.82, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 1.2, mass = 525, maxAoa = 0.4, no_wings_A_mlt = 2, - no_wings_cx_coeff = { 1, 0.4, 0.8, 0.1, 1.5 }, + no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -98,7 +106,12 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { mass = 525, model = "ls-6", name = "LS-6-500", - scheme = "schemes/missiles/AGM-154C.sch", + scheme = "schemes/missiles/JSOW_C.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "ls-6", fire = { 0, 1 }, @@ -108,13 +121,6 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { username = "LS-6-500" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, @@ -150,6 +156,7 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "LS-6-500", + display_name_short = "LS-6-500", mass = 525, model = "ls-6", name = "LS-6-500", @@ -184,28 +191,33 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { _origin = "China Asset Pack by Deka Ironwork Simulations and Eagle Dynamics", autopilot = { J_Angle_W = 0.1, - J_Diff_K = 3, + J_Diff_K = 3.2, J_Int_K = 0, - J_Power_K = 6, - K = 500, - Kg = 8, - Ki = 5e-05, - delay = 2.5, + J_Power_K = 4.8, + K = 150, + K_err_mlt = 5, + K_roll_diff_mlt = 5, + Kg = 5, + Ki = 0, + Kp_hor_err = 240, + Kx = 0.03, + Kxd = 0, + delay = 0.5, egm_Angle_K = 0.2, egm_FinAngle_K = 0.3, egm_add_power_K = 0.2, err_aoaz_k = 28, err_aoaz_sign_k = 0.18, - err_new_wlos_k = 0.8, + err_new_wlos_k = 0.84, finsLimit = 0.8, - hKd = -0.008, - hKp_err = 460, - hKp_err_croll = 0.012, - max_roll = 1.3, - nw_K = 30, - nw_Kg = 25, + fins_limit_x = 0.3, + hKp_err = 50, + nw_K = 22, + nw_Kg = 1.8, nw_Ki = 0, + roll_limit = 1.3, useJumpByDefault = 0, + w_limit = 1.3, wings_depl_fins_limit_K = 0.3 }, category = 2, @@ -213,13 +225,14 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { control_block = { can_update_target_pos = 0, default_cruise_height = -1, - obj_sensor = 1, + obj_sensor = 0, seeker_activation_dist = 7000, turn_before_point_reach = 1, turn_hor_N = 2.2, turn_max_calc_angle_deg = 90, turn_point_trigger_dist = 100 }, + display_name_short = "LS-6-500", fm = { A = 0.1, I = 417.729375, @@ -232,13 +245,15 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { Sw = 1.1, addDeplSw = 0.6, caliber = 0.377, - cx_coeff = { 1, 0.8, 0.8, 0.15, 1.5 }, + cx_coeff = { 1, 0.82, 0.8, 0.15, 1.5 }, dCydA = { 0.07, 0.036 }, finsTau = 1.2, mass = 525, maxAoa = 0.4, no_wings_A_mlt = 2, - no_wings_cx_coeff = { 1, 0.4, 0.8, 0.1, 1.5 }, + no_wings_cx_coeff = { 1, 0.45, 0.8, 0.1, 1.55 }, + release_rnd = 0.3, + release_rnd_x = 0, wind_sigma = 0, wind_time = 0, wingsDeplDelay = 9999, @@ -247,7 +262,12 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { mass = 525, model = "ls-6", name = "LS-6-500", - scheme = "schemes/missiles/AGM-154C.sch", + scheme = "schemes/missiles/JSOW_C.sch", + seeker = { + can_update_target_pos = 1, + coalition = 2, + coalition_rnd_coeff = 5 + }, shape_table_data = { { file = "ls-6", fire = { 0, 1 }, @@ -257,13 +277,6 @@ _G["weapons_table"]["weapons"]["missiles"]["LS-6-500"] = { username = "LS-6-500" } }, sigma = { 20, 20, 20 }, - simple_seeker = { - FOV = 0.6, - delay = 2.5, - maxW = 500, - opTime = 9999, - sensitivity = 0 - }, t_acc = 0, t_b = 0, t_marsh = 0, diff --git a/_G/weapons_table/weapons/missiles/Matra Super 530D.lua b/_G/weapons_table/weapons/missiles/Matra Super 530D.lua index 445db92c..2a9c96be 100644 --- a/_G/weapons_table/weapons/missiles/Matra Super 530D.lua +++ b/_G/weapons_table/weapons/missiles/Matra Super 530D.lua @@ -82,6 +82,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Matra Super 530D"] = { boost_start = 0.1, march_start = 2.1 }, + display_name_short = "Super 530D", exhaust1 = { 1, 1, 1, 1 }, exhaust2 = { 1, 1, 1, 0.3 }, fm = { @@ -202,6 +203,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Matra Super 530D"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "Super 530D", + display_name_short = "Super 530D", mass = 270, model = "SUPER-530", name = "Matra Super 530D", @@ -283,6 +285,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Matra Super 530D"] = { boost_start = 0.1, march_start = 2.1 }, + display_name_short = "Super 530D", exhaust1 = { 1, 1, 1, 1 }, exhaust2 = { 1, 1, 1, 0.3 }, fm = { diff --git a/_G/weapons_table/weapons/missiles/Mistral.lua b/_G/weapons_table/weapons/missiles/Mistral.lua index 9c4c974d..96405795 100644 --- a/_G/weapons_table/weapons/missiles/Mistral.lua +++ b/_G/weapons_table/weapons/missiles/Mistral.lua @@ -75,6 +75,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { march2_start = 0, march_start = 0.6 }, + display_name_short = "Mistral", fm = { A = 0.6, I = 5.39121, @@ -185,6 +186,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, display_name = "Mistral", + display_name_short = "Mistral", mass = 18.7, model = "mistral_missile", name = "Mistral", @@ -260,6 +262,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Mistral"] = { march2_start = 0, march_start = 0.6 }, + display_name_short = "Mistral", fm = { A = 0.6, I = 5.39121, diff --git a/_G/weapons_table/weapons/missiles/PL-12.lua b/_G/weapons_table/weapons/missiles/PL-12.lua index d9c34b7c..7ea22672 100644 --- a/_G/weapons_table/weapons/missiles/PL-12.lua +++ b/_G/weapons_table/weapons/missiles/PL-12.lua @@ -85,6 +85,7 @@ _G["weapons_table"]["weapons"]["missiles"]["PL-12"] = { boost_start = 0.5, march_start = 6.5 }, + display_name_short = "PL-12", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 27.6, 27.6, 27.6, 27.6, 27.55, 30.38, 31.982, 32.774, 33.234, 33.561, 33.829, 34.07, 34.286, 34.491, 34.687, 34.875, 35.056, 35.232, 35.401, 35.564, 35.721, 35.871, 36.015, 36.151, 36.279, 36.4 }, @@ -208,6 +209,7 @@ _G["weapons_table"]["weapons"]["missiles"]["PL-12"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "PL-12", + display_name_short = "PL-12", mass = 199, model = "pl12", name = "PL-12", @@ -292,6 +294,7 @@ _G["weapons_table"]["weapons"]["missiles"]["PL-12"] = { boost_start = 0.5, march_start = 6.5 }, + display_name_short = "PL-12", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 27.6, 27.6, 27.6, 27.6, 27.55, 30.38, 31.982, 32.774, 33.234, 33.561, 33.829, 34.07, 34.286, 34.491, 34.687, 34.875, 35.056, 35.232, 35.401, 35.564, 35.721, 35.871, 36.015, 36.151, 36.279, 36.4 }, diff --git a/_G/weapons_table/weapons/missiles/RB75.lua b/_G/weapons_table/weapons/missiles/RB75.lua index bfaf23b5..3ef0688d 100644 --- a/_G/weapons_table/weapons/missiles/RB75.lua +++ b/_G/weapons_table/weapons/missiles/RB75.lua @@ -42,6 +42,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75"] = { _origin = "AJS37 AI by Heatblur Simulations", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "RB-75A", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, @@ -123,6 +124,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "RB-75A", + display_name_short = "RB-75A", mass = 210.5, model = "RB75", name = "RB75", @@ -164,6 +166,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75"] = { _origin = "AJS37 AI by Heatblur Simulations", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "RB-75A", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/RB75B.lua b/_G/weapons_table/weapons/missiles/RB75B.lua index 15a68a42..33cd5043 100644 --- a/_G/weapons_table/weapons/missiles/RB75B.lua +++ b/_G/weapons_table/weapons/missiles/RB75B.lua @@ -42,6 +42,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75B"] = { _origin = "AJS37 AI by Heatblur Simulations", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "RB-75B", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, @@ -123,6 +124,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75B"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "RB-75B", + display_name_short = "RB-75B", mass = 210.5, model = "RB75B", name = "RB75B", @@ -164,6 +166,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75B"] = { _origin = "AJS37 AI by Heatblur Simulations", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "RB-75B", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/RB75T.lua b/_G/weapons_table/weapons/missiles/RB75T.lua index c20e6e69..c3c91bb0 100644 --- a/_G/weapons_table/weapons/missiles/RB75T.lua +++ b/_G/weapons_table/weapons/missiles/RB75T.lua @@ -42,6 +42,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75T"] = { _origin = "AJS37 AI by Heatblur Simulations", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "RB-75T", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, @@ -123,6 +124,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75T"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "RB-75T", + display_name_short = "RB-75T", mass = 295, model = "RB75T", name = "RB75T", @@ -164,6 +166,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RB75T"] = { _origin = "AJS37 AI by Heatblur Simulations", category = 2, class_name = "wAmmunitionSelfHoming", + display_name_short = "RB-75T", exhaust = { 0.7, 0.7, 0.7, 0.1 }, fm = { A = 0.36, diff --git a/_G/weapons_table/weapons/missiles/RIM_116A.lua b/_G/weapons_table/weapons/missiles/RIM_116A.lua index aa8e5624..fdf83b78 100644 --- a/_G/weapons_table/weapons/missiles/RIM_116A.lua +++ b/_G/weapons_table/weapons/missiles/RIM_116A.lua @@ -20,11 +20,11 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { Head_Form = 0, Head_Type = 3, IR_seeker = { - FOV = 0.24434609527921, + FOV = 0.034906585039887, GimbLim = 2.2689280275926, ccm_k0 = 0.5, cooled = true, - delay = 0.04, + delay = 3, flag_dist = 150, opTime = 45, sensitivity = 10500, @@ -44,9 +44,9 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/ammunition_missiles.lua", _origin = "TechWeaponPack", autopilot = { - K = 60, + K = 64, Kg = 2.4, - Ki = 0, + Ki = 0.0024, delay = 0.5, fin2_coeff = 0.5, finsLimit = 0.4 @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { boost_start = 0, march_start = 0.2 }, + display_name_short = "RIM-116A", fm = { A = 0.6, I = 48.77472, @@ -107,10 +108,13 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { name = "RIM_116A", scheme = "schemes/missiles/passive_plus_IR_homing_missile.sch", seeker = { - FOV = 0.24434609527921, - aim_sigma = 20, - delay = 0.06, - max_w_LOS = 999 + FOV = 0.78539816339745, + aim_sigma = 40, + delay = 0, + max_w_LOS = 999, + op_time = 5, + send_off_data = 1, + turn_off_dist = 1000 }, shape_table_data = { { file = "rim-116", @@ -161,6 +165,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, display_name = "RIM-116A", + display_name_short = "RIM-116A", mass = 73.6, model = "rim-116", name = "RIM_116A", @@ -180,11 +185,11 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { Head_Form = 0, Head_Type = 3, IR_seeker = { - FOV = 0.24434609527921, + FOV = 0.034906585039887, GimbLim = 2.2689280275926, ccm_k0 = 0.5, cooled = true, - delay = 0.04, + delay = 3, flag_dist = 150, opTime = 45, sensitivity = 10500, @@ -204,9 +209,9 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/ammunition_missiles.lua", _origin = "TechWeaponPack", autopilot = { - K = 60, + K = 64, Kg = 2.4, - Ki = 0, + Ki = 0.0024, delay = 0.5, fin2_coeff = 0.5, finsLimit = 0.4 @@ -230,6 +235,7 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { boost_start = 0, march_start = 0.2 }, + display_name_short = "RIM-116A", fm = { A = 0.6, I = 48.77472, @@ -267,10 +273,13 @@ _G["weapons_table"]["weapons"]["missiles"]["RIM_116A"] = { name = "RIM_116A", scheme = "schemes/missiles/passive_plus_IR_homing_missile.sch", seeker = { - FOV = 0.24434609527921, - aim_sigma = 20, - delay = 0.06, - max_w_LOS = 999 + FOV = 0.78539816339745, + aim_sigma = 40, + delay = 0, + max_w_LOS = 999, + op_time = 5, + send_off_data = 1, + turn_off_dist = 1000 }, shape_table_data = { { file = "rim-116", diff --git a/_G/weapons_table/weapons/missiles/Rapier.lua b/_G/weapons_table/weapons/missiles/Rapier.lua index 6e63c709..24d9f660 100644 --- a/_G/weapons_table/weapons/missiles/Rapier.lua +++ b/_G/weapons_table/weapons/missiles/Rapier.lua @@ -62,6 +62,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rapier"] = { march_start = 1.001 }, display_name = "Rapier", + display_name_short = "Rapier", err = { max_time_interval = 0.9, min_time_interval = 0.1, @@ -156,6 +157,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rapier"] = { wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, display_name = "Rapier", + display_name_short = "Rapier", mass = 45, model = "rapier_fsa_missile", name = "Rapier", @@ -217,6 +219,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rapier"] = { march_start = 1.001 }, display_name = "Rapier", + display_name_short = "Rapier", err = { max_time_interval = 0.9, min_time_interval = 0.1, diff --git a/_G/weapons_table/weapons/missiles/Rb 04E (for A.I.).lua b/_G/weapons_table/weapons/missiles/Rb 04E (for A.I.).lua index 29bd78b0..31b178ce 100644 --- a/_G/weapons_table/weapons/missiles/Rb 04E (for A.I.).lua +++ b/_G/weapons_table/weapons/missiles/Rb 04E (for A.I.).lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 04E (for A.I.)"] = { boost_start = 3, march_start = 150 }, + display_name_short = "RB-04E (for A.I.)", engine_control = { K = 265, Kd = 0.01, @@ -164,12 +165,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 04E (for A.I.)"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, + expl_mass = 450, fantom = 1, - mass = 1400, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, warhead_air = { caliber = 500, @@ -177,16 +178,17 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 04E (for A.I.)"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, + expl_mass = 450, fantom = 1, - mass = 1400, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "RB-04E (for A.I.)", + display_name_short = "RB-04E (for A.I.)", mass = 661, model = "Rb04AI", name = "Rb 04E (for A.I.)", @@ -254,6 +256,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 04E (for A.I.)"] = { boost_start = 3, march_start = 150 }, + display_name_short = "RB-04E (for A.I.)", engine_control = { K = 265, Kd = 0.01, @@ -349,12 +352,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 04E (for A.I.)"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, + expl_mass = 450, fantom = 0, - mass = 1400, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, warhead_air = { caliber = 500, @@ -362,12 +365,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 04E (for A.I.)"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, + expl_mass = 450, fantom = 0, - mass = 1400, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, diff --git a/_G/weapons_table/weapons/missiles/Rb 15F (for A.I.).lua b/_G/weapons_table/weapons/missiles/Rb 15F (for A.I.).lua index 9c03f626..621507ca 100644 --- a/_G/weapons_table/weapons/missiles/Rb 15F (for A.I.).lua +++ b/_G/weapons_table/weapons/missiles/Rb 15F (for A.I.).lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 15F (for A.I.)"] = { boost_start = 0.001, march_start = 0.01 }, + display_name_short = "RB-15F (for A.I.)", engine_control = { K = 265, Kd = 0.01, @@ -165,12 +166,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 15F (for A.I.)"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, + expl_mass = 450, fantom = 1, - mass = 1400, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, warhead_air = { caliber = 500, @@ -178,16 +179,17 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 15F (for A.I.)"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, + expl_mass = 450, fantom = 1, - mass = 1400, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "RB-15F (for A.I.)", + display_name_short = "RB-15F (for A.I.)", mass = 560, model = "Rb15FAI", name = "Rb 15F (for A.I.)", @@ -256,6 +258,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 15F (for A.I.)"] = { boost_start = 0.001, march_start = 0.01 }, + display_name_short = "RB-15F (for A.I.)", engine_control = { K = 265, Kd = 0.01, @@ -351,12 +354,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 15F (for A.I.)"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, + expl_mass = 450, fantom = 0, - mass = 1400, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, warhead_air = { caliber = 500, @@ -364,12 +367,12 @@ _G["weapons_table"]["weapons"]["missiles"]["Rb 15F (for A.I.)"] = { concrete_obj_factor = 5, cumulative_factor = 5, cumulative_thickness = 0, - expl_mass = 1400, + expl_mass = 450, fantom = 0, - mass = 1400, + mass = 450, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, - piercing_mass = 280 + piercing_mass = 90 }, wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, diff --git a/_G/weapons_table/weapons/missiles/SCUD_RAKETA.lua b/_G/weapons_table/weapons/missiles/SCUD_RAKETA.lua index d12b313c..ad67134d 100644 --- a/_G/weapons_table/weapons/missiles/SCUD_RAKETA.lua +++ b/_G/weapons_table/weapons/missiles/SCUD_RAKETA.lua @@ -5,16 +5,16 @@ _G["weapons_table"]["weapons"]["missiles"]["SCUD_RAKETA"] = { client = { autopilot = { Areq_limit = 3, - K = 3, + K = 3.095, Kconv = 1, - Kd = 7, - Ki = 5.5, - Kr = 0.1, - Krd = 0.1, - Kri = 0, - delay = 1, + Kd = 6.98, + Ki = 5.48, + Kr = 0.16, + Krd = 0.16, + Kri = 0.001, + delay = 0.6, fins_limit = 0.5, - fins_limit_x = 0.1, + fins_limit_x = 0.16, omega_ctrl = 1 }, booster = { @@ -31,8 +31,8 @@ _G["weapons_table"]["weapons"]["missiles"]["SCUD_RAKETA"] = { work_time = 3 }, control_block = { - abs_err = 50, - aim_data = { 55, 63989.2, -116.91, -21.23, 2.59, -25.06, -47.69, -28, -7.69, 34.91, 645.15, 1884.05, 45.96, 561.79, 372.86, 15.44, 578.31, 55.5, 64069.1, -118.49, -20.66, 3.05, -25.35, -47.62, -25.25, -7.62, 34.68, 647.3, 1931.96, 49.13, 545.23, 386.62, 15.61, 572.44, 56, 64131.5, -120.06, -20.17, 3.6, -25.74, -47.56, -22.43, -7.57, 34.33, 649.92, 1981.14, 57.31, 522.61, 399.38, 15.74, 571.53, 56.5, 64171, -117.03, -19.51, 8.82, -21.47, -42.84, -14.81, -7.49, 32.76, 659.19, 2029.08, 54.83, 503.3, 415.11, 11.27, 560.74, 57, 64197.9, -124.81, -20.26, 5.05, -27.93, -48.78, -17.8, -7.46, 33.75, 661.43, 2078.19, 59.91, 478.04, 430.03, 16.14, 559.51, 57.5, 64199.9, -121.95, -18.35, 10.48, -23.47, -42.75, -13.02, -7.44, 28.81, 673.65, 2128.62, 64.06, 456.13, 443.83, 11.6, 553.54, 58, 64186.3, -126.55, -17.77, 6.37, -26.71, -46.95, -10.1, -7.35, 33.12, 681.44, 2179.45, 66.85, 428.51, 458.85, 16.43, 552.13, 58.5, 64149.7, -130.05, -19, 6.59, -29.3, -43.99, -7.19, -7.33, 32.69, 692.39, 2225.18, 73.15, 405.41, 476.7, 16.62, 545.84, 59, 64090.8, -125.12, -16.66, 11.95, -23.08, -42.1, 0.57, -7.34, 27.8, 705.81, 2275.08, 71.6, 380.32, 495.97, 12.17, 539.56, 59.5, 64017, -132.82, -18.1, 7.49, -29.56, -48.24, -1.88, -7.32, 32.08, 714.69, 2325.33, 83.33, 344.17, 513.54, 16.91, 537.75, 60, 63911.4, -130.52, -15.51, 14.82, -24.02, -40.24, 4.18, -7.3, 27.09, 734.62, 2373.98, 82.25, 318.98, 535.32, 12.52, 526.47, 60.5, 63782.4, -132.11, -14.67, 9.76, -24.7, -41.78, 7.69, -7.27, 26.72, 757.09, 2427.89, 89.83, 281.62, 553.73, 12.7, 524.53, 61, 63627.9, -133.37, -15.7, 8.31, -26.44, -41.54, 9.27, -7.21, 30.82, 778.74, 2485.65, 96.43, 241.94, 571.4, 17.43, 517.43, 61.5, 63440.6, -130.61, -15.24, 15.01, -25.6, -41.23, 12.71, -7.2, 25.87, 813.91, 2542.35, 103.65, 204.77, 588.67, 12.98, 510.55, 62, 63231.3, -138.22, -14.61, 9.94, -27.37, -42.5, 16.21, -7.17, 29.96, 843.67, 2608.04, 111.39, 157.48, 596.53, 17.47, 507.96, 62.5, 62987.9, -137.9, -13.66, 11.83, -26.01, -40.87, 21.12, -7.13, 29.42, 881.06, 2666.15, 119.21, 116.69, 613.18, 17.55, 500.65, 63, 62717.5, -139.73, -12.87, 10.93, -28.02, -40.79, 23.23, -7.15, 28.93, 921.33, 2746.28, 128.03, 70.65, 608.69, 17.32, 493.06, 63.5, 62417.4, -143.06, -16.85, 11.85, -28.78, -41.95, 27.01, -7.2, 28.47, 955.23, 2805.56, 136.81, 22.09, 624.4, 17.37, 490.06, 64, 62082.5, -144.52, -11.53, 17.46, -29.23, -41.58, 31.08, -7.28, 23.52, 989.93, 2878.05, 146.25, -22.67, 631.94, 12.85, 482.34, 64.5, 61721.6, -150.31, -14.78, 13.96, -34.1, -41.43, 30.7, -7.31, 27.39, 1020.66, 2938.44, 155.89, -77.72, 648.02, 17.26, 478.77, 65, 61320.9, -147.54, -9.29, 20.19, -30.24, -36.28, 39.87, -7.38, 22.48, 1056.39, 2990.72, 161.6, -126.55, 667.43, 12.92, 466.17, 65.5, 60893, -148.54, -7.45, 16.72, -30.86, -41.02, 43.63, -7.41, 26.23, 1087.51, 3048.4, 171.89, -179.98, 689.06, 17.29, 462.36, 66, 60433.2, -154.96, -10.8, 17.24, -35.9, -41.4, 43.19, -7.59, 25.62, 1115.57, 3107.1, 188.41, -238.91, 714.02, 17.39, 453.59, 66.5, 59936, -155.88, -8.71, 18.78, -32.32, -41.55, 47.52, -7.7, 25.05, 1147.07, 3160.95, 199.75, -294.75, 730.7, 17.18, 449.49, 67, 59401.6, -153.57, -3.21, 20.2, -33.41, -37.93, 55.72, -7.89, 20.26, 1186.63, 3220.46, 208.21, -351.68, 751.73, 12.95, 436.3, 67.5, 58837.6, -159.12, -5.66, 21.62, -34.53, -42.84, 59.51, -8.06, 23.87, 1212.79, 3281.63, 221.84, -413.85, 767.97, 17.02, 431.56, 68, 58235, -160.42, -3.72, 23.13, -35.78, -43.7, 63.26, -8.27, 23.28, 1246.79, 3342.44, 236.12, -474.52, 785.49, 16.91, 426.8, 68.5, 57593.7, -157.55, -1.53, 24.8, -37.26, -41.57, 66.78, -8.53, 18.65, 1279.33, 3403.15, 247.21, -534.46, 801.75, 12.7, 413.21, 69, 56920.1, -162.59, 2, 26.8, -39.01, -46.55, 70.12, -8.83, 22.12, 1307.97, 3464.32, 267.35, -599.39, 817.93, 16.58, 407.81, 69.5, 56207.1, -163.38, 0.09, 25.08, -41, -48.54, 73.3, -9.14, 21.54, 1337.74, 3525.41, 285.85, -659, 832.61, 16.36, 402.33, 70, 55452, -164.03, 7.45, 31.54, -43.24, -47.01, 76.34, -9.48, 20.96, 1369.81, 3585.62, 298.87, -721.51, 848.45, 16.14, 392.57, 70.5, 54659.1, -164.58, 11.2, 34.31, -41.89, -49.67, 83.18, -9.98, 16.55, 1399.02, 3647.22, 318.49, -788.56, 863.87, 15.88, 382.55, 71, 53827.6, -165.23, 15.18, 37.21, -45.94, -52.37, 82.59, -10.4, 19.81, 1431.51, 3707.88, 339.25, -856.04, 879.15, 15.58, 376.33, 71.5, 52953.6, -166.15, 19.12, 37.42, -47.04, -54.98, 89.82, -10.92, 19.23, 1465.03, 3765.45, 360.22, -920.13, 895.1, 15.31, 365.98, 72, 52041.1, -167.43, 16.16, 39.88, -53.15, -57.36, 90.61, -11.53, 18.64, 1496.3, 3821.15, 387.29, -988.19, 917.55, 15.08, 355.35, 72.5, 51083.2, -169.19, 26.42, 42.15, -51.95, -56.07, 97.87, -12.2, 18.04, 1532.91, 3876.65, 408.51, -1054.02, 934.1, 14.8, 348.59, 73, 50086.7, -167.23, 26.32, 40.89, -53.7, -57.6, 99.19, -12.98, 17.42, 1568.68, 3935.89, 434.68, -1122.25, 955.4, 14.53, 337.62, 73.5, 49048.6, -172.82, 25.01, 43.01, -55.4, -58.87, 99.85, -13.78, 16.8, 1602.16, 3990.57, 461.98, -1190.33, 975.75, 14.33, 330.34, 74, 47969.1, -176.29, 27.72, 48.97, -58.62, -65.11, 108.53, -14.61, 16.18, 1632.25, 4048.3, 495.34, -1255.42, 992.74, 13.95, 319.27, 74.5, 46848, -177.98, 30.23, 47.29, -59.13, -61.75, 113.41, -15.6, 15.61, 1675.86, 4108.05, 526.58, -1326.22, 1012.23, 13.69, 311.46, 75, 45686, -181.24, 32.51, 49.31, -60.78, -69, 115.74, -16.61, 14.97, 1706.45, 4173.27, 566.43, -1390.41, 1020.71, 13.26, 300.03, 55, 81350.5, -114.16, -27.64, 5.31, -27.49, -51.34, -57.94, -7.85, 42.62, 650.11, 2445.66, 46.65, 781.9, 747.59, 16.76, 677.05, 55.5, 81574.6, -116.75, -26.94, 6.04, -22.3, -51.21, -53.8, -7.81, 36.67, 652.76, 2511.27, 50.94, 751.31, 769.29, 16.98, 665.95, 56, 81778.2, -125.01, -26.22, 1.19, -28.44, -56.73, -55.13, -7.69, 41.89, 651.88, 2581.31, 61.42, 718.5, 788.45, 22.73, 666.46, 56.5, 81949.3, -122.04, -25.37, 1.98, -23.37, -51.03, -45.06, -7.64, 40.36, 659.4, 2649.16, 65.19, 683.73, 809.45, 22.88, 661.15, 57, 82094, -126.08, -25.81, 3.13, -25.23, -52.16, -41.7, -7.53, 41.09, 671.8, 2716.62, 65.84, 641.48, 831.6, 23.07, 655.47, 57.5, 82209.2, -129.03, -23.72, 9.81, -25.72, -50.83, -35.44, -7.52, 35.06, 685.3, 2784.9, 71.38, 602.79, 853.76, 17.6, 649.75, 58, 82300.3, -135.69, -28.53, 5.05, -30.15, -55.97, -36.43, -7.44, 40.22, 699.77, 2852.84, 81.2, 556.32, 878.2, 23.5, 643.32, 58.5, 82351.8, -134.73, -23.9, 11.26, -27.39, -52.05, -26.07, -7.43, 33.98, 718.62, 2915.75, 77.87, 519.71, 904.86, 18.09, 637.55, 59, 82381.3, -141.07, -26.74, 6.7, -31.52, -55.57, -26.55, -7.36, 39.17, 735.06, 2980.09, 87.99, 469.09, 934.99, 24.01, 630.76, 59.5, 82374.4, -145.41, -22.45, 7.19, -28.16, -51.61, -16.89, -7.35, 38.62, 757.38, 3047.51, 91.48, 422.72, 964.07, 24.26, 624.2, 60, 82334.3, -143.64, -18.89, 10.95, -27.32, -53.34, -13.39, -7.32, 38.06, 775.49, 3113.3, 101.89, 372.94, 996.12, 24.55, 617.38, 60.5, 82260.6, -152.2, -23.38, 10.62, -34.14, -55.37, -8.13, -7.3, 37.52, 801.58, 3188.33, 112.07, 315.44, 1022.55, 24.7, 616.08, 61, 82143.9, -148.68, -24.53, 9.01, -30.66, -54.94, -5.22, -7.26, 36.85, 832.91, 3267.38, 115.57, 258.23, 1047.71, 24.79, 602.72, 61.5, 81986.9, -151.18, -18.31, 11.66, -29.67, -48.88, -0.32, -7.19, 36.28, 869.96, 3343.9, 125.11, 206.24, 1073.35, 24.92, 595.28, 62, 81794.5, -155.09, -17.52, 11.05, -31.81, -50.29, 4.47, -7.19, 35.65, 915.08, 3433.27, 135.28, 152.21, 1087.1, 24.92, 587.48, 62.5, 81562.7, -154.96, -16.31, 13.42, -30.17, -48.22, 11.04, -7.16, 34.92, 958.14, 3511.27, 139.96, 88.77, 1112.05, 25.07, 579.44, 63, 81294.1, -157.45, -20.84, 12.36, -32.65, -48.02, 14.19, -7.22, 34.26, 1000.19, 3622.19, 157.43, 24.22, 1109.3, 24.77, 570.98, 63.5, 80980.2, -161.86, -14.67, 19.05, -33.6, -49.37, 24.9, -7.31, 28.15, 1057.56, 3701.27, 163.39, -38.39, 1132.73, 24.86, 562.7, 64, 80630.9, -169.43, -19.03, 15.05, -34.21, -48.88, 24.96, -7.36, 32.94, 1094.33, 3799.56, 181.4, -113.07, 1146.39, 24.79, 559.55, 64.5, 80234.9, -171.44, -17.55, 16.26, -34.84, -48.62, 30.47, -7.44, 32.2, 1137.37, 3882, 194.19, -184.42, 1170.82, 24.83, 550.54, 65, 79791.7, -168.32, -10.69, 18.65, -35.53, -47.57, 36.98, -7.48, 31.47, 1186.94, 3954.18, 202.14, -253.98, 1199.52, 24.9, 535.76, 65.5, 79311.3, -175.27, -13.72, 14.46, -36.36, -48.05, 42.19, -7.65, 30.68, 1225.41, 4035.11, 215.99, -329.57, 1231.61, 25, 531.88, 66, 78782.3, -178.25, -12.46, 15.21, -37.37, -48.5, 47.49, -7.84, 29.89, 1276.73, 4111.06, 231.74, -412.35, 1266.6, 25.12, 522.2, 66.5, 78203.2, -174.46, -9.8, 22.55, -38.29, -48.69, 58.65, -7.95, 29.15, 1326.83, 4186.57, 241.75, -486.45, 1295.2, 25.12, 512.61, 67, 77584.7, -182.5, -8.09, 19.19, -39.75, -49.44, 58.86, -8.24, 28.39, 1365.81, 4268.24, 263.92, -572.84, 1326.1, 30.36, 507.85, 67.5, 76909.8, -179.37, -5.83, 26.29, -36.04, -45.19, 69.33, -8.52, 22.45, 1420.11, 4352.33, 276.9, -650.5, 1351.2, 25.04, 492.23, 68, 76193.4, -186.6, -3.31, 28.29, -42.89, -51.51, 69.38, -8.78, 26.87, 1463.19, 4436.5, 296.03, -742.35, 1378.06, 24.95, 487.03, 68.5, 75424.6, -188.49, -0.44, 30.52, -44.87, -54.01, 79.35, -9.11, 26.13, 1504.76, 4520.49, 316.34, -828.46, 1403.18, 24.81, 476.25, 69, 74606.3, -190.14, -0.92, 28.13, -47.19, -55.27, 79.01, -9.57, 25.38, 1551.84, 4605.64, 337.97, -921.03, 1428.21, 29.66, 470.52, 69.5, 73734.7, -191.56, 1.84, 31.16, -49.84, -57.9, 88.46, -9.97, 24.64, 1595.16, 4691.02, 362.8, -1012.15, 1451.47, 24.43, 459.31, 70, 72811.1, -192.78, 6.34, 34.54, -52.82, -61.02, 92.7, -10.52, 23.92, 1641.77, 4774.64, 385.57, -1107.01, 1476.11, 29.07, 447.73, 70.5, 71830.7, -193.93, 11.3, 38.27, -51.32, -59.68, 96.97, -11.09, 23.2, 1689.75, 4862.11, 407.24, -1198.15, 1501.17, 23.96, 436.18, 71, 70797.9, -195.18, 16.57, 42.18, -56.51, -63.27, 101.41, -11.75, 22.48, 1731.86, 4946.62, 435.09, -1295.09, 1525.33, 28.39, 429.37, 71.5, 69707.2, -196.81, 21.81, 42.63, -58.19, -66.77, 106.31, -12.47, 21.75, 1780.36, 5027.36, 468.24, -1392.78, 1550.5, 23.37, 417.36, 72, 68563.8, -203.51, 22.86, 46, -66.11, -70, 107.72, -13.29, 21.02, 1830.98, 5105.68, 499.8, -1491.15, 1583.26, 27.68, 409.9, 72.5, 67358.5, -206.18, 31.61, 49.14, -64.68, -68.47, 117.55, -14.22, 20.28, 1879.11, 5182.36, 533.14, -1586.96, 1607.5, 27.18, 397.42, 73, 66095.4, -204.02, 36.21, 52.26, -62.68, -70.6, 124.21, -15.22, 19.52, 1935.66, 5263.83, 563.86, -1686.36, 1639.03, 22.36, 384.89, 73.5, 64779.6, -207.24, 34.57, 55.14, -69.45, -72.44, 125.34, -16.34, 18.76, 1989.42, 5337.79, 600.46, -1790.15, 1667.68, 26.29, 376.63, 74, 63402.4, -212.48, 38.18, 62.9, -73.96, -76.58, 136.85, -17.52, 13.79, 2038.5, 5420.3, 641.59, -1885.73, 1695.76, 21.74, 359.35, 74.5, 61967.6, -210.92, 45.66, 65.1, -70.51, -72.45, 143.54, -18.82, 13.2, 2100.95, 5503.8, 684.11, -1984.88, 1722.71, 21.22, 350.78, 75, 60480, -219.86, 44.6, 63.74, -76.96, -86.29, 147.01, -20.19, 16.55, 2142.29, 5593.89, 737.93, -2087.66, 1738.36, 24.8, 341.63, 55, 92309, -114.65, -31.69, -2.79, -28.19, -61.63, -81.31, -7.95, 46.88, 628.43, 2800.67, 48.51, 978.07, 987.71, 27.13, 737.44, 55.5, 92647.9, -117.77, -30.89, -1.89, -22.46, -61.41, -76.19, -7.82, 46.45, 617.57, 2877.31, 53.43, 946.03, 1015.4, 27.43, 726.27, 56, 92955.3, -120.93, -30.03, 5.3, -22.97, -54.97, -70.89, -7.78, 39.71, 622.61, 2956.73, 58.79, 904.96, 1041.46, 21.41, 721.73, 56.5, 93236.7, -124.15, -35.33, 0.01, -29.84, -61.02, -71.66, -7.64, 50.77, 624.6, 3036.24, 69.7, 855.46, 1069.45, 27.93, 716.34, 57, 93479.6, -128.62, -35.5, 1.25, -25.39, -61.94, -60.92, -7.6, 44.95, 633.25, 3115.37, 70.29, 810.06, 1097.46, 28.18, 711.08, 57.5, 93687.6, -132.19, -33.4, 2.42, -26.03, -60.66, -60.03, -7.49, 44.47, 656.15, 3196.52, 76.7, 768.34, 1124.78, 28.4, 705.79, 58, 93860.2, -133.91, -26.09, 3.49, -24.99, -53.82, -48.01, -7.39, 43.88, 673.97, 3278.24, 75.61, 717.74, 1153.86, 28.65, 693.35, 58.5, 93998.5, -132.86, -26.92, 4.27, -27.91, -55.42, -42.17, -7.38, 43.18, 697.22, 3352.29, 84.37, 665.33, 1186.94, 28.95, 687.31, 59, 94103.8, -140.5, -30.27, 5.54, -32.83, -59.55, -42.2, -7.37, 42.62, 717.56, 3429.18, 89.86, 603.47, 1224.02, 29.32, 687.64, 59.5, 94166.1, -139.19, -25.2, 12.52, -28.94, -54.9, -30.74, -7.35, 41.97, 744.56, 3509.23, 93.81, 546.05, 1259.52, 29.62, 674.35, 60, 94195.6, -150.54, -27.22, 10.75, -34.48, -57.13, -25.7, -7.36, 41.3, 766.6, 3587.69, 105.5, 484.63, 1298.59, 29.96, 674.05, 60.5, 94180, -154.5, -25.95, 10.52, -29.95, -59.59, -19.35, -7.28, 40.63, 789.97, 3675.75, 117.09, 412.05, 1330.62, 30.11, 659.98, 61, 94119.8, -157.1, -20.8, 8.88, -32.24, -59.04, -15.56, -7.27, 39.85, 826.2, 3766.03, 121.14, 342.7, 1364.62, 30.37, 652.42, 61.5, 94011.5, -160.37, -20.08, 11.84, -31.26, -52.2, -9.55, -7.21, 39.18, 862.97, 3859.95, 132.78, 270.4, 1397.08, 30.51, 644.58, 62, 93857.5, -165.32, -25.43, 11.32, -33.71, -53.75, -3.43, -7.24, 38.45, 912.5, 3964.32, 145.03, 190.51, 1413.14, 30.28, 636.23, 62.5, 93653.9, -165.76, -24.02, 14.06, -32.01, -57.7, 4.53, -7.23, 37.62, 961.26, 4057.26, 157.39, 113.24, 1444.83, 30.41, 627.55, 63, 93398, -169.07, -16.58, 12.99, -34.87, -51.28, 8.69, -7.24, 36.86, 1021.37, 4183.83, 171.35, 35.05, 1444.15, 29.99, 618.88, 63.5, 93092.6, -168.27, -15.8, 14.41, -29.86, -52.85, 21.26, -7.29, 36.15, 1086.36, 4279.17, 179.02, -51.76, 1473.84, 30.06, 609.76, 64, 92743.1, -177.29, -20.66, 10.04, -36.85, -58.53, 21.8, -7.45, 35.36, 1134.78, 4395.07, 200.18, -137.11, 1490.58, 36.03, 606.38, 64.5, 92330.9, -173.72, -12.79, 17.65, -37.65, -52.13, 34.46, -7.49, 34.53, 1196.08, 4492.32, 209.05, -222.92, 1520.57, 29.88, 590.19, 65, 91876.1, -182.64, -17.25, 14.31, -38.5, -51.03, 35.82, -7.66, 33.71, 1249.93, 4577.58, 224.6, -313.36, 1555.81, 30, 586.37, 65.5, 91365.1, -184.59, -14.51, 21.82, -39.48, -51.61, 41.94, -7.8, 32.82, 1302.47, 4672.51, 240.7, -404.55, 1595.12, 30.15, 575.97, 66, 90803.5, -188.21, -13.04, 16.65, -40.69, -52.2, 48.13, -8.05, 31.93, 1357.76, 4761.87, 258.98, -498.09, 1638.17, 36.37, 565.1, 66.5, 90183.4, -190.15, -9.97, 25.02, -41.8, -52.47, 55.02, -8.22, 31.1, 1417.92, 4850.1, 276.71, -593.91, 1673.53, 30.38, 554.32, 67, 89510.7, -193.52, -8, 27.21, -43.51, -53.37, 61.46, -8.51, 30.24, 1471.46, 4946.98, 296.45, -691.87, 1711.5, 30.43, 543.08, 67.5, 88778.2, -196.13, -5.39, 29.38, -39.39, -48.64, 73.54, -8.81, 29.39, 1530.4, 5045.42, 311.65, -791.96, 1743.81, 30.42, 525.54, 68, 87996.5, -204.51, -8.29, 25.9, -47.22, -55.86, 73.82, -9.22, 28.54, 1582.83, 5145.07, 333.97, -902.5, 1777.52, 36.2, 526.06, 68.5, 87147.8, -201.15, 0.82, 34.31, -43.82, -53.05, 85.37, -9.59, 27.71, 1639.31, 5244.98, 357.74, -1006.55, 1809.05, 30.28, 508.18, 69, 86240.9, -203.31, 6.05, 37.37, -46.59, -54.61, 90.92, -10.11, 26.88, 1696.15, 5345.97, 377.32, -1112.62, 1839.3, 30.05, 496.17, 69.5, 85277.2, -205.25, 9.16, 35.2, -49.76, -57.78, 96.2, -10.61, 26.06, 1748.91, 5447.19, 406.36, -1222.86, 1868.7, 29.85, 489.76, 70, 84246.5, -206.96, 14.25, 44.67, -53.32, -61.5, 101.27, -11.24, 25.26, 1805.41, 5546.55, 433.1, -1337.55, 1898.83, 29.55, 477.28, 70.5, 83154.7, -214.05, 14.44, 43.47, -57.26, -65.63, 106.38, -11.96, 24.45, 1863.7, 5649.65, 464.05, -1453.73, 1929.83, 29.3, 464.38, 71, 81995.5, -210.35, 20.5, 48.01, -57.85, -69.83, 117.04, -12.71, 23.65, 1920.83, 5750.72, 491.33, -1571.11, 1960.62, 29, 457.27, 71.5, 80773.6, -217.84, 26.57, 48.58, -65.31, -73.95, 117.51, -13.62, 22.85, 1974.33, 5846.69, 530.11, -1689.67, 1991.62, 33.96, 443.87, 72, 79484, -220.53, 27.78, 52.51, -69.24, -77.76, 119.33, -14.56, 22.05, 2035.74, 5938.4, 566.9, -1809.08, 2032.25, 33.61, 436.04, 72.5, 78121.4, -223.96, 37.89, 56.18, -67.75, -76.08, 135.94, -15.67, 21.23, 2099.73, 6031.71, 606.28, -1925.64, 2063.91, 33.18, 422.52, 73, 76690.6, -221.82, 43.22, 64.84, -70.7, -73.68, 143.72, -16.9, 15.41, 2168.04, 6132.58, 643.11, -2046.41, 2104.1, 27.88, 408.94, 73.5, 75197.4, -225.91, 41.35, 63.22, -73.63, -80.87, 145.12, -18.12, 19.56, 2233.16, 6224.7, 686.68, -2172.35, 2138.49, 32.24, 400.18, 74, 73636.4, -237.2, 45.56, 67.35, -83.91, -90.64, 153.6, -19.51, 18.73, 2288.01, 6321.37, 739.59, -2294.08, 2170.11, 31.55, 386, 74.5, 72002.3, -235.68, 49.45, 70.08, -80.01, -85.87, 161.54, -21.08, 17.98, 2363.48, 6419.2, 789.21, -2420.02, 2203.22, 30.82, 376.77, 75, 70300.7, -246.22, 53.02, 73.35, -82.91, -97.25, 170.41, -22.69, 17.13, 2419.4, 6525.6, 852.19, -2540.96, 2220.82, 29.92, 362.34, 55, 106747.3, -107.27, -37.37, -6.42, -21.64, -67.07, -118.73, -8, 52.28, 579.45, 3263.69, 43.1, 1279.07, 1311.49, 33.6, 803.8, 55.5, 107255, -111.11, -36.45, -5.29, -22.19, -66.69, -112.35, -7.87, 51.72, 565.69, 3354.51, 48.77, 1230.42, 1348.71, 34.06, 800.09, 56, 107724.1, -115.01, -35.38, -4.16, -22.72, -66.35, -105.76, -7.75, 51.12, 563.88, 3448.4, 54.89, 1178.32, 1384.14, 34.44, 788.24, 56.5, 108153.5, -118.97, -34.25, -2.99, -23.4, -58.99, -98.98, -7.7, 49.81, 565.83, 3543.75, 60.73, 1130.71, 1420.25, 34.8, 783.86, 57, 108543.1, -123.95, -33.95, -1.59, -25.1, -59.59, -85.87, -7.59, 49.85, 584.37, 3639.63, 68.36, 1073.3, 1455.94, 35.11, 778.8, 57.5, 108890.4, -121.15, -31.79, -0.19, -25.99, -58.45, -84.79, -7.47, 49.21, 604.93, 3737.71, 75.86, 1012.44, 1490.88, 35.39, 765.8, 58, 109201.6, -130.89, -37.67, -5.99, -32.42, -65.02, -77.68, -7.46, 48.49, 620.33, 3836.34, 82.33, 948.61, 1528.11, 35.71, 767.5, 58.5, 109463.5, -136.84, -38.14, 2.28, -28.26, -66.56, -70.49, -7.45, 47.67, 649.43, 3926.2, 92.19, 882.38, 1570.23, 36.11, 761.35, 59, 109678.1, -138.96, -27.75, 3.83, -27.11, -57.27, -62.88, -7.37, 46.95, 682.14, 4022.65, 92.04, 819.45, 1615.33, 36.5, 747.37, 59.5, 109854.9, -144.75, -28.72, 4.81, -29.77, -58.97, -56.37, -7.4, 46.16, 701.02, 4118.47, 103.64, 739.83, 1658.35, 36.8, 740.05, 60, 109984.9, -151.27, -30.57, 3.24, -36.39, -61.98, -49.3, -7.41, 45.35, 728.19, 4212.95, 109.73, 662.39, 1707.71, 37.26, 732.54, 60.5, 110068.9, -156.53, -29.03, 3.19, -38.93, -65.11, -41.64, -7.37, 44.53, 755.66, 4319.52, 123.23, 578.92, 1750.58, 44.76, 724.62, 61, 110091.4, -159.74, -22.94, 8.77, -34.28, -57.26, -29.54, -7.32, 43.59, 798.2, 4430.88, 128.51, 491.53, 1792.94, 37.84, 708.99, 61.5, 110062.8, -163.67, -22.03, 12.11, -33.28, -56.57, -22.22, -7.28, 42.77, 842.02, 4540.73, 142.01, 400.55, 1834.58, 38.04, 700.26, 62, 109978.5, -169.52, -28.1, 11.65, -36.05, -58.23, -14.78, -7.37, 41.89, 886.44, 4666.34, 156.53, 307.85, 1859.62, 37.92, 698.76, 62.5, 109834, -177.58, -26.44, 7.62, -41.39, -62.83, -12.42, -7.3, 48.07, 945.24, 4779.31, 171.28, 203.39, 1900.05, 45.26, 689.03, 63, 109626, -174.49, -25.02, 13.71, -37.5, -62.55, 0.02, -7.44, 39.99, 1010.58, 4931.75, 187.93, 104.93, 1902.65, 37.58, 671.49, 63.5, 109357.9, -180.96, -24.03, 15.4, -38.9, -57.17, 7.81, -7.52, 39.16, 1082.22, 5047.47, 204.45, -5.11, 1941.16, 37.69, 661.27, 64, 109028.6, -184.55, -22.45, 17.52, -39.87, -56.61, 15.99, -7.66, 38.21, 1150.2, 5187.14, 222.27, -109.32, 1964.31, 44.54, 658.25, 64.5, 108630.7, -188.07, -20.43, 19.27, -33.84, -56.35, 24.12, -7.77, 37.24, 1226.37, 5306.3, 233.5, -223.13, 2003.24, 37.47, 639.92, 65, 108177.9, -191.93, -18.42, 15.55, -42, -62.12, 33.46, -7.91, 43.28, 1289.51, 5410.35, 252.46, -341.61, 2048.47, 44.6, 635.76, 65.5, 107654.9, -201.79, -22.19, 17.33, -43.26, -62.8, 41.18, -8.12, 42.21, 1359.28, 5526.14, 272.09, -460.53, 2096.94, 44.63, 624.02, 66, 107061.5, -199.61, -13.46, 25.41, -44.77, -56.57, 48.96, -8.44, 34.22, 1438.41, 5635.23, 287.32, -581.6, 2150.45, 37.84, 612.32, 66.5, 106402.6, -202.43, -9.85, 28.23, -39.33, -56.96, 57.5, -8.72, 33.26, 1508.91, 5743.96, 309.01, -696.7, 2195.27, 37.84, 600.12, 67, 105678.3, -213.73, -7.51, 24.08, -48.28, -58.09, 65.49, -9.07, 32.28, 1585.54, 5861.5, 332.91, -826.42, 2243.02, 44.66, 587.39, 67.5, 104881.4, -210.32, -4.44, 26.73, -43.65, -59.47, 73.01, -9.48, 31.31, 1653.38, 5982.34, 358.23, -951.33, 2282.7, 44.52, 574.71, 68, 104018.1, -220.41, -7.72, 29.59, -52.75, -61.13, 80.48, -9.95, 30.35, 1725.91, 6103.34, 384.93, -1088.69, 2324.9, 44.38, 561.55, 68.5, 103080.9, -223.61, -3.78, 32.76, -48.97, -58.05, 94.14, -10.4, 29.41, 1796.6, 6223.83, 406.63, -1218.84, 2365.15, 44.19, 548.41, 69, 102073, -226.5, 2.44, 36.48, -52.31, -66.47, 100.91, -11.08, 28.47, 1867.82, 6345.4, 436.78, -1357.91, 2405.12, 43.93, 541.85, 69.5, 100989.9, -229.11, 6.18, 40.66, -56.1, -63.75, 107.38, -11.65, 27.55, 1934.13, 6471.45, 471.83, -1489.04, 2443.72, 43.7, 528.17, 70, 99832.3, -231.46, 12.27, 45.35, -60.37, -68.22, 113.6, -12.45, 26.63, 2005.06, 6594.32, 504.12, -1638.49, 2482.76, 43.3, 514.06, 70.5, 98594.2, -233.73, 19.01, 50.51, -65.08, -73.17, 119.87, -13.3, 25.74, 2078.03, 6718.96, 534.76, -1777.31, 2519.69, 42.69, 506.69, 71, 97274.6, -236.16, 26.15, 55.91, -65.87, -72.06, 132.55, -14.23, 24.84, 2156.07, 6842.01, 573.97, -1924.07, 2561.32, 36.26, 485.87, 71.5, 95878.8, -239.11, 33.31, 56.65, -74.74, -77.13, 139.57, -15.34, 23.94, 2223.67, 6959.89, 614.36, -2072.49, 2600.96, 41.95, 477.81, 72, 94400.9, -242.75, 34.78, 61.36, -73.52, -81.85, 141.88, -16.45, 23.04, 2300.49, 7074.49, 658.92, -2227.96, 2653.07, 41.63, 463.09, 72.5, 92840.7, -253.12, 40.87, 65.77, -77.85, -85.97, 149.77, -17.8, 22.12, 2380.66, 7188.02, 706.18, -2380.31, 2692.68, 41.03, 454.21, 73, 91191.3, -245.24, 53.07, 70.18, -81.44, -83.43, 165.06, -19.25, 21.19, 2465.86, 7309.31, 750.47, -2531.93, 2741.95, 40.54, 439.29, 73.5, 89465.6, -256.17, 45.28, 74.25, -85.02, -91.92, 166.99, -20.81, 20.26, 2547.52, 7422.86, 803.01, -2689.62, 2787.72, 39.97, 429.87, 74, 87651.8, -264.42, 55.91, 79.22, -91.81, -98.13, 182.76, -22.4, 19.34, 2622.62, 7542.24, 861.24, -2836.81, 2829.6, 39.3, 414.61, 74.5, 85754.5, -268.48, 60.55, 82.55, -92.79, -92.8, 186.92, -24.28, 18.51, 2716.64, 7662.7, 926.59, -2999.9, 2873.6, 38.61, 398.9, 75, 83774.8, -275.95, 59.58, 81.27, -96.35, -111.78, 197.66, -26.27, 17.57, 2787.43, 7793.97, 1002.39, -3151.91, 2898.35, 42.86, 388.66, 55, 122687.3, -96.51, -43.69, -10.7, -20.98, -72.84, -155.41, -8.07, 58.06, 511.34, 3768.21, 42.83, 1642.49, 1678.44, 41.06, 879.02, 55.5, 123404.8, -108.89, -50.43, -17.16, -29.56, -72.42, -155.64, -7.91, 65.24, 486.04, 3879.55, 49.64, 1582.23, 1722.96, 41.54, 875.1, 56, 124067.7, -105.56, -49.07, -7.85, -22.28, -72.01, -139.84, -7.84, 56.65, 483.32, 3992.81, 56.83, 1525.65, 1766.25, 41.96, 862.83, 56.5, 124690.6, -118.19, -47.69, -14.35, -31.06, -71.65, -139.61, -7.8, 63.5, 477.04, 4106.42, 64.07, 1457.89, 1811.79, 50.4, 858.04, 57, 125257.1, -115.61, -46.84, -12.82, -24.64, -63.96, -123.9, -7.74, 55.05, 499.36, 4219.4, 64.37, 1394.92, 1858.27, 42.88, 853.25, 57.5, 125781, -120.78, -44.66, -11.17, -25.84, -71.07, -122.66, -7.66, 54.26, 516.32, 4340.66, 73.34, 1319.61, 1901.79, 51.26, 838.68, 58, 126253.1, -132.55, -43.08, -9.51, -33.6, -70.49, -113.97, -7.53, 61.47, 544.06, 4455.21, 89.12, 1248.79, 1948.78, 51.7, 832.62, 58.5, 126665.7, -123.01, -35.01, 0.06, -20.39, -63.77, -97.11, -7.54, 52.41, 579.69, 4564.14, 83.97, 1175, 2000.79, 44.09, 817.61, 59, 127038.5, -142.37, -39.72, -6.21, -27.67, -69.82, -96.04, -7.52, 51.54, 611.2, 4675.12, 100.33, 1088.44, 2058.32, 52.8, 818.98, 59.5, 127348.9, -140.95, -32.26, 3.23, -30.52, -63.35, -79.75, -7.56, 50.59, 643.51, 4790.86, 105.38, 998.83, 2114.37, 45.17, 802.71, 60, 127611.9, -149.27, -33.91, 1.92, -30.15, -67.21, -70.23, -7.59, 49.61, 676.48, 4904.8, 112.3, 903.22, 2175.45, 45.75, 794.51, 60.5, 127821.1, -156.13, -32.15, 10.22, -33.59, -71.04, -52.88, -7.53, 48.62, 700.14, 5033.93, 119.85, 799.96, 2228.41, 46.09, 786.17, 61, 127964.9, -160.09, -25.04, 8.64, -36.36, -70.21, -46.59, -7.56, 47.51, 741.59, 5168.73, 134.63, 700.29, 2280.36, 46.39, 768.36, 61.5, 128047.1, -173.03, -32.13, 4.19, -35.36, -69.37, -45.9, -7.48, 54.68, 776.89, 5300.82, 150.52, 579.72, 2332.71, 54.82, 767.31, 62, 128054.1, -171.76, -30.82, 11.97, -38.45, -71.07, -28.79, -7.63, 45.49, 838.14, 5450.95, 167.61, 464.99, 2365.81, 54.68, 748.53, 62.5, 127988.9, -173.25, -28.93, 15.53, -36.53, -68.19, -17.51, -7.67, 44.33, 899.94, 5587.65, 185.1, 344.77, 2416.68, 46.74, 738.26, 63, 127855.7, -186.35, -27.28, 14.45, -40.21, -67.85, -10.89, -7.82, 43.26, 978.41, 5770.56, 204.84, 222.81, 2422.87, 54.19, 727.22, 63.5, 127642.1, -185.93, -18.02, 16.43, -33.78, -61.65, -1.49, -7.83, 42.27, 1064.74, 5910.48, 216.33, 95.44, 2470.92, 46.19, 716.33, 64, 127363.1, -190.44, -24.27, 10.84, -43.03, -61.02, 8.34, -8.03, 41.16, 1139.95, 6078.55, 237.52, -41.8, 2502.41, 54, 704.22, 64.5, 127002, -194.89, -21.93, 20.96, -44.27, -60.74, 18.11, -8.25, 40.03, 1224.83, 6220.82, 259.07, -174.31, 2552.01, 54.02, 692.21, 65, 126566, -207.71, -19.61, 16.83, -45.6, -67.3, 29.3, -8.49, 38.91, 1311.25, 6346.46, 281.47, -320.48, 2608.72, 54.13, 679.61, 65.5, 126046.1, -203.49, -15.9, 26.86, -39.21, -60.17, 38.65, -8.69, 37.71, 1405.35, 6486.29, 296.84, -467.47, 2670.63, 54.29, 667.07, 66, 125449.7, -209.42, -13.85, 28.23, -41.08, -61.03, 48.07, -9.1, 36.52, 1494.29, 6618.47, 323.11, -617.49, 2737.29, 54.49, 653.93, 66.5, 124774.2, -220.94, -17.47, 23.75, -50.64, -61.52, 58.36, -9.4, 35.41, 1581.57, 6750.15, 348.84, -770.62, 2794.2, 54.48, 640.25, 67, 124012, -226.5, -14.66, 26.95, -45.41, -62.84, 68.05, -9.89, 34.27, 1667.98, 6889.9, 376.95, -926.55, 2855.9, 54.59, 626.59, 67.5, 123169.1, -231.04, -10.97, 30.15, -55.71, -64.52, 77.4, -10.33, 40.82, 1761.45, 7037.01, 407.47, -1092.95, 2906.63, 54.39, 620.62, 68, 122236.5, -235.55, -6.9, 33.57, -51, -66.52, 86.65, -10.92, 32.05, 1853.67, 7185.58, 432.09, -1258.04, 2961.02, 54.29, 606.34, 68.5, 121213.8, -232.37, 5.24, 37.36, -54.46, -63.16, 102.92, -11.45, 30.97, 1943.42, 7334.1, 458.84, -1421.3, 3011.04, 53.97, 584, 69, 120112.2, -243.84, 4.99, 34.37, -65.88, -72.92, 103.85, -12.24, 37.33, 2033.71, 7483.93, 502.71, -1594.18, 3058.93, 53.44, 584.68, 69.5, 118911.8, -247.4, 9.38, 46.75, -62.98, -70.01, 119.19, -12.97, 28.87, 2117.47, 7633.56, 536.65, -1764.78, 3107.16, 53.1, 561.89, 70, 117621.7, -250.68, 16.49, 52.29, -68.07, -75.32, 126.81, -13.94, 27.85, 2205.93, 7781.07, 575.09, -1942.46, 3157.34, 52.69, 554.32, 70.5, 116234.5, -253.85, 24.39, 58.4, -66.57, -74.1, 134.5, -14.92, 26.83, 2304.16, 7934.66, 612.36, -2115.55, 3207.66, 52.25, 538.9, 71, 114756, -264.24, 25.76, 57.78, -74.73, -87.23, 142.47, -16.13, 25.83, 2393.84, 8085.26, 659.33, -2304.95, 3258.39, 51.78, 522.96, 71.5, 113178.1, -268.14, 34.28, 58.87, -85.22, -93.18, 151.15, -17.34, 24.82, 2485.96, 8227.74, 714.62, -2489.42, 3309.7, 51.3, 514.38, 72, 111500.9, -272.82, 36.17, 64.6, -84.11, -91.96, 161.11, -18.69, 23.82, 2581.54, 8368.56, 761.13, -2682.21, 3374.01, 50.87, 498.21, 72.5, 109717.2, -271.89, 50.33, 76.66, -82.47, -90.1, 177.54, -20.25, 22.79, 2680.88, 8507.41, 811.05, -2864.84, 3425.18, 50.25, 482.03, 73, 107839.3, -276.6, 57.97, 75.4, -93.47, -100.65, 182.41, -22.08, 21.76, 2786.7, 8654.56, 877.47, -3066.73, 3487.14, 56.22, 472.25, 73.5, 105855.4, -283.27, 55.62, 80.41, -91.42, -97.69, 191.54, -23.9, 20.72, 2887.95, 8793.85, 933.93, -3256.41, 3545.57, 49.09, 455.67, 74, 103771.4, -300, 61.7, 92.76, -106.12, -111.76, 203.94, -25.83, 19.7, 2981.73, 8939.89, 1003.89, -3446.74, 3598.61, 48.3, 438.95, 74.5, 101579.6, -298.92, 73.47, 96.78, -101.13, -105.65, 221.71, -28, 18.79, 3104.35, 9087.28, 1075.82, -3643.37, 3654.27, 47.49, 422.14, 75, 99287.7, -308.34, 72.58, 101.55, -105.63, -122.06, 234.52, -30.42, 17.75, 3193.18, 9249.1, 1166.94, -3839, 3687.87, 46.4, 411.49, 48, 121620.8, 3.98, -77.05, -45.64, 8.12, -70.61, -315.47, -10.57, 70.79, 885.84, 2683.74, 3.69, 2415.97, 1386.03, 31.59, 1004.41, 48.5, 122990.4, -0.33, -76.62, -44.71, 0.65, -70.49, -310.35, -10.41, 70.66, 834.11, 2773.99, 4.99, 2418.51, 1431.4, 32.33, 1008.65, 49, 124346.1, -5.12, -76.3, -43.89, -7.71, -70.26, -304.82, -10.22, 70.5, 771.88, 2873.01, 7.11, 2408.34, 1476.65, 40.7, 1003.65, 49.5, 125662.9, 4.03, -61.91, -29.09, 5.74, -55.99, -284.91, -10.03, 70.23, 751.43, 2974.72, -4.4, 2409.41, 1521.66, 33.7, 999, 50, 126974, -1.09, -69.44, -42, 4.87, -63.76, -300.19, -9.87, 69.94, 710.65, 3079.07, 12.29, 2397.94, 1567.78, 42.19, 1002.03, 50.5, 128255.2, -6.38, -74.4, -41, 3.96, -69.32, -293.48, -9.69, 69.55, 681.75, 3183.78, 7.45, 2381.87, 1615.55, 42.95, 996.26, 51, 129511.9, -24.48, -81.3, -39.68, 3.14, -76.85, -286.1, -9.53, 69.02, 658.76, 3290.08, 18.41, 2361.42, 1663.94, 43.7, 998.39, 51.5, 130722.2, -17.35, -67.77, -38.31, 1.94, -64.08, -278.54, -9.34, 68.61, 648.83, 3400.32, 14.02, 2345.04, 1712.24, 44.41, 982.61, 52, 131917.5, -31.44, -79.13, -36.8, 0.61, -68.49, -270.22, -9.18, 68.06, 616.38, 3525.41, 18.57, 2315.74, 1758.78, 45.08, 983.68, 52.5, 133075.3, -41.47, -69.04, -34.74, -4.48, -68.49, -252.53, -8.98, 67.36, 597.76, 3644.32, 22.73, 2281.75, 1798.67, 45.57, 975.53, 53, 134200.8, -45.71, -62.5, -31.28, -3.34, -66.26, -228.7, -8.88, 66.67, 583.41, 3783.39, 27.31, 2242.03, 1822.92, 45.68, 975.33, 53.5, 135310.9, -63.31, -51.67, -17.23, -14.98, -68.42, -218.77, -8.75, 66.02, 542.75, 3902.86, 23.23, 2197.87, 1849.3, 45.82, 965.66, 54, 136385.5, -69.55, -50.43, -15.95, -16.55, -68.9, -210.34, -8.65, 65.29, 495.21, 4014.37, 17.71, 2148.71, 1937.38, 47.34, 955.19, 54.5, 137421.9, -76.97, -59.72, -16.59, -19.53, -79.19, -203.79, -8.35, 64.43, 451.89, 4139.94, 26.37, 2094.32, 1990.69, 47.96, 953.65, 55, 138405.1, -82.11, -58.34, -15.03, -20.23, -78.58, -203.52, -8.3, 63.66, 426.58, 4267.46, 33.27, 2035.82, 2043.02, 48.51, 941.56, 55.5, 139335.5, -87.31, -57.06, -13.3, -21.02, -78.01, -185.85, -8.04, 62.78, 405.25, 4395.95, 40.95, 1981.55, 2097.12, 49.09, 929.01, 56, 140220, -101.44, -55.43, -20.42, -21.67, -77.49, -185.23, -7.93, 61.97, 383.94, 4527.6, 49.04, 1904.56, 2150.12, 49.6, 924.7, 56.5, 141048.3, -106.89, -62.7, -18.7, -22.55, -77, -175.63, -7.98, 69.93, 376.42, 4659.98, 66.55, 1832.72, 2205.7, 58.99, 919.96, 57, 141810.6, -103.93, -52.41, -17.03, -15.03, -68.02, -157.22, -7.9, 60.07, 402.45, 4791.23, 66.68, 1756.92, 2261.98, 50.73, 905.4, 57.5, 142523, -110, -50.29, -15.14, -16.48, -76.22, -155.74, -7.75, 59.11, 423.01, 4926.67, 67.57, 1676.07, 2316.98, 51.21, 899.68, 58, 143174.8, -114.83, -48.43, -4.22, -25.54, -66.7, -145.42, -7.67, 58.08, 456, 5066.64, 77.12, 1590.96, 2373.35, 51.69, 883.75, 58.5, 143766.2, -122.22, -39, -2.36, -19.45, -67.8, -135.02, -7.71, 56.98, 498.35, 5191.52, 80.03, 1493.23, 2436.4, 52.28, 876.7, 59, 144301.6, -126.4, -44.45, -9.2, -27.96, -74.83, -124.25, -7.67, 55.93, 526.66, 5320.8, 98.74, 1399.02, 2507.95, 53.1, 869.04, 59.5, 144773.4, -134.03, -44.78, -7.56, -30.98, -67.41, -114.4, -7.77, 54.83, 565.31, 5458.52, 104.5, 1292.15, 2574.39, 62.7, 860.75, 60, 145181.2, -144.22, -37.13, 9.54, -30.86, -72.13, -84.26, -7.68, 53.69, 604.06, 5594.32, 112.37, 1187.18, 2647.45, 54.37, 842.64, 60.5, 145545.4, -161.8, -35.13, 0.85, -35.26, -76.7, -82.53, -7.81, 61.58, 622.07, 5745.72, 130.15, 1063.98, 2710.91, 63.8, 842.83, 61, 145824.1, -166.56, -36.12, 8.42, -38.22, -75.7, -65.78, -7.93, 51.26, 660.31, 5901.83, 137.98, 935.18, 2772.55, 64.1, 823.48, 61.5, 146030.5, -172.17, -34.89, 3.41, -37.25, -74.69, -64.47, -7.76, 59.16, 701.53, 6056.59, 156.21, 801.04, 2837.87, 64.53, 812.91, 62, 146149.3, -180.08, -33.41, 3.13, -40.62, -76.42, -53.93, -7.94, 57.95, 763.06, 6232.91, 175.96, 663.88, 2878.55, 64.33, 802.4, 62.5, 146184, -182.22, -31.3, 16.14, -38.63, -64.25, -31.88, -7.97, 47.57, 835.16, 6394.77, 187.18, 529.22, 2940.02, 55.52, 781.67, 63, 146138.8, -188.12, -29.42, 15.08, -33.7, -63.83, -23.88, -8.09, 46.34, 917.64, 6607.94, 209.99, 383.23, 2957.69, 55.12, 769.93, 63.5, 146008.9, -188.01, -28.06, 17.35, -35.61, -65.88, -12.87, -8.26, 45.2, 1009.82, 6772.1, 232.58, 230.74, 3011.25, 63.95, 757.61, 64, 145793, -202.42, -25.97, 11.21, -45.96, -74.09, -10.28, -8.51, 52.87, 1099.71, 6964.66, 256.68, 66.94, 3055.83, 63.93, 754.41, 64.5, 145481.3, -207.79, -23.31, 13.63, -38.52, -64.85, 10.1, -8.73, 42.63, 1200.78, 7132.84, 272.75, -92.03, 3111.87, 63.71, 731.95, 65, 145081.9, -213.62, -20.69, 18.03, -40.15, -63.3, 23.15, -9.04, 41.36, 1303.76, 7282.11, 298.78, -266.71, 3182.8, 64, 718.53, 65.5, 144593.1, -218.23, -25.31, 20.49, -50.77, -64.24, 25.38, -9.33, 48.8, 1406.72, 7446.36, 325.75, -442.53, 3257.28, 64.18, 713.97, 66, 144005.6, -225.28, -22.88, 22.19, -44.15, -65.21, 45.27, -9.81, 38.64, 1512.98, 7605.67, 356.41, -621.81, 3339.09, 64.54, 699.88, 48, 136044, 38.22, -91.17, -57.81, 15.64, -76.45, -398.53, -11.04, 79.78, 908.82, 3015.12, -2.65, 2975.67, 1680.61, 46.26, 1087.57, 48.5, 137777.9, 33.09, -98.73, -56.61, -2.41, -84.33, -392.01, -10.84, 79.51, 837.21, 3120.62, -1.39, 2977.79, 1736.27, 47.26, 1094.57, 49, 139485.8, 27.43, -98.39, -55.59, -3.4, -84.12, -385.3, -10.7, 79.22, 769.85, 3236.18, 0.85, 2982.69, 1792, 48.23, 1092.59, 49.5, 141155.4, 38.63, -81.13, -46.21, 12.69, -67.15, -361.54, -10.4, 78.83, 735.35, 3355.99, -13.2, 2982.66, 1847.01, 49.13, 1080.08, 50, 142817.8, 24.19, -80.71, -61.72, 11.61, -67.25, -379.16, -10.13, 86.94, 685.91, 3477.12, 6.46, 2968.42, 1904.52, 50.07, 1085.42, 50.5, 144444.7, 18.01, -96, -60.57, 10.47, -83.42, -371.27, -9.83, 86.53, 641.51, 3597.99, 1.13, 2957.41, 1965.45, 51.08, 1081.07, 51, 146033, 5.31, -85.8, -50.25, 18.24, -74.2, -353.75, -9.81, 77.16, 621.92, 3726.21, -4.28, 2941.09, 2023.52, 51.94, 1066.58, 51.5, 147583.7, 14.08, -78.28, -48.52, 7.98, -58.87, -344.72, -9.71, 76.63, 600.48, 3853.79, -0.42, 2920.24, 2083.17, 52.82, 1069.71, 52, 149107.4, 7.21, -82.7, -46.66, 15.35, -73.77, -334.61, -9.46, 75.92, 561.19, 3996.83, 4.42, 2884.38, 2142.37, 53.7, 1062.53, 52.5, 150595.8, -14.49, -80.28, -44.07, -0.52, -73.76, -323.05, -9.15, 75.02, 538.47, 4136.17, 8.9, 2852.41, 2192.06, 54.3, 1054.15, 53, 152045.2, -18.99, -71.39, -39.62, 1.41, -70.49, -294.05, -9.13, 83.33, 511.98, 4299.32, 13.78, 2794.8, 2224.71, 54.46, 1054.52, 53.5, 153477.2, -39.73, -68.28, -22.67, -12.06, -82.63, -281.9, -8.96, 82.64, 462.97, 4438.4, 18.3, 2750.64, 2258.95, 54.61, 1044.76, 54, 154867.2, -47.25, -66.82, -21.12, -14, -73.99, -271.79, -8.91, 72.42, 405.57, 4566.88, 11.22, 2700.57, 2366.05, 56.54, 1034.23, 54.5, 156212.2, -56.73, -68.37, -22.53, -18.21, -86.14, -264.64, -8.68, 71.34, 343.62, 4715.73, 12.45, 2644.27, 2425.26, 57.05, 1023.14, 55, 157503.1, -72.37, -76.3, -30.25, -19.02, -85.36, -263.64, -8.49, 79.98, 303.24, 4865.01, 29.74, 2573.6, 2496.98, 67.6, 1020.41, 55.5, 158722.1, -68.89, -65.25, -18.59, -19.93, -84.59, -243.38, -8.4, 69.33, 276.57, 5015.71, 28.9, 2506.96, 2561.02, 58.63, 1007.72, 56, 159895.8, -84.92, -73.02, -26.33, -20.61, -83.9, -241.99, -8.42, 78.11, 242.09, 5173.24, 47.97, 2414.71, 2627.85, 69.06, 1003.12, 56.5, 160993.6, -91.34, -71.29, -24.27, -21.59, -83.23, -230.58, -8.34, 77.71, 232.71, 5329.73, 58.57, 2327.78, 2695.42, 69.78, 988.31, 57, 162023.3, -87.89, -59.2, -22.46, -12.73, -72.67, -208.91, -8.16, 75.92, 253.35, 5487.45, 58.61, 2246.21, 2762.94, 70.47, 983.17, 57.5, 162994, -95.06, -67.15, -20.28, -24.45, -82.21, -207.22, -8.16, 74.8, 278.22, 5648.62, 69.9, 2138.43, 2828.63, 71.04, 977.13, 58, 163893.4, -111.4, -64.99, -17.93, -25.27, -81.62, -194.92, -7.83, 73.65, 317.61, 5811.43, 81.24, 2045.62, 2898.42, 71.71, 959.8, 58.5, 164721.2, -109.62, -53.91, -15.6, -17.97, -82.37, -182.53, -8.03, 72.42, 358.05, 5960.85, 84.42, 1928.32, 2976.66, 72.55, 952.3, 59, 165473.3, -115.26, -50.3, -13.09, -18.01, -70.65, -159.79, -7.96, 61.18, 402.7, 6115.41, 96.14, 1824.61, 3062.73, 63.52, 934.24, 59.5, 166160.1, -123.97, -50.11, -11.02, -21.15, -72.04, -147.8, -8.18, 59.88, 449.08, 6274.58, 102.31, 1706.36, 3145.59, 64.34, 925.47, 60, 166782.6, -146.62, -40.98, -1.42, -31.44, -77.92, -122.28, -8.28, 68.6, 484.77, 6432.81, 110.87, 1569.49, 3232.37, 75.16, 916.06, 60.5, 167344.1, -157.34, -38.75, -0.75, -37.09, -83.38, -109.6, -8.24, 67.25, 495.3, 6617.33, 121.41, 1431.54, 3314.53, 75.88, 895.42, 61, 167815.5, -163.08, -39.59, 8.01, -40.24, -82.16, -100.07, -8.48, 55.7, 529.34, 6799, 140.74, 1286.94, 3391.58, 76.34, 885.11, 61.5, 168201.5, -169.72, -38.17, 2.33, -39.32, -91.01, -87.83, -8.19, 64.43, 567.5, 6987.24, 162.22, 1125.67, 3470.77, 76.82, 873.67, 62, 168484.4, -178.87, -36.47, 2.21, -43, -82.66, -75.37, -8.51, 63.01, 629.13, 7194.93, 185.06, 960.46, 3521.1, 76.54, 862.28, 62.5, 168668.3, -181.89, -34.09, 6.64, -40.99, -79.18, -60.21, -8.51, 51.4, 713.79, 7385.11, 198.39, 797.44, 3600.13, 77.02, 839.58, 63, 168757.5, -188.95, -31.95, 5.67, -35.46, -78.63, -50.42, -8.72, 60.01, 801.16, 7636.1, 224.89, 621.59, 3619.03, 76.16, 826.87, 63.5, 168746.8, -199.29, -30.35, 8.31, -47.66, -80.78, -37.37, -8.89, 58.64, 900.52, 7831.18, 251.14, 438.2, 3693.01, 76.39, 813.55, 64, 168634.6, -205.91, -37.97, 11.56, -49.3, -79.96, -23.83, -9.23, 57.16, 1018.63, 8066.76, 279.84, 241.3, 3742.83, 86, 799.61, 64.5, 168410, -212.49, -34.92, 14.37, -41.09, -79.56, -10.26, -9.55, 55.63, 1139.73, 8265.6, 298.89, 48.96, 3820.14, 76.25, 785.81, 65, 168081.4, -219.6, -31.86, 19.39, -43, -77.78, 5.13, -9.59, 54.1, 1263.48, 8444.34, 329.25, -151.84, 3904.8, 76.49, 771.29, 65.5, 167647, -225.39, -27.03, 12.43, -55, -78.78, 18.3, -10, 52.49, 1387.55, 8642.47, 360.99, -364.69, 3996.17, 86.61, 756.07, 66, 167095.7, -233.92, -24.23, 24.31, -47.73, -70.08, 31.59, -10.79, 50.87, 1515.73, 8830.12, 386.7, -572.72, 4095.34, 77.19, 740.9, 48, 153082.6, 82.79, -117.53, -82.07, 25.46, -92.24, -502.79, -11.64, 90.81, 930.25, 3402.4, -20.42, 3713.59, 2032.58, 55.12, 1186.56, 48.5, 155276.6, 76.9, -116.73, -71.83, 12.34, -83.29, -494.98, -11.35, 90.38, 851.73, 3523.43, -19.61, 3725.64, 2100.95, 56.34, 1178.08, 49, 157448.5, 70.42, -116.13, -70.49, 11.23, -82.9, -487.05, -11.2, 89.95, 749.75, 3660.83, -17.36, 3731.03, 2171.12, 57.57, 1178.55, 49.5, 159573.9, 84.35, -95.06, -48.85, 30.87, -62.18, -458.44, -10.93, 89.39, 706.95, 3799.92, -35.02, 3739.7, 2242.71, 58.8, 1177.81, 50, 161690.3, 77.57, -94.41, -76.72, 20.41, -71.39, -469.61, -11.07, 88.81, 646.33, 3948.3, -11.47, 3722.69, 2314.59, 59.98, 1175.66, 50.5, 163773.9, 70.5, -112.79, -75.29, 19.02, -90.93, -469.43, -10.41, 97.54, 582.71, 4091.17, -7.92, 3708.67, 2385.94, 70.53, 1172.09, 51, 165811.8, 44.91, -110.96, -73.37, 17.85, -80.69, -449.26, -10.18, 87.16, 547.35, 4240.04, -14.02, 3697.88, 2460.45, 62.24, 1168.36, 51.5, 167793.5, 55.54, -91.26, -61.66, 25.76, -62.08, -438.27, -10.33, 86.46, 531.09, 4391.21, -9.71, 3671.47, 2534.25, 63.33, 1152.35, 52, 169753.1, 47.32, -107.39, -59.39, 23.91, -79.98, -425.98, -9.92, 85.54, 483, 4559.22, -4.29, 3638.14, 2609.09, 64.47, 1145.75, 52.5, 171670.3, 21.15, -104.46, -56.14, 4.8, -79.91, -411.77, -9.69, 84.38, 444.68, 4730.55, -9.03, 3598.32, 2667.1, 65.02, 1137.94, 53, 173539.9, 16.33, -82.41, -60.53, 7.84, -75.19, -376.1, -9.56, 93.37, 413.43, 4921.06, -4.01, 3539.55, 2710.27, 65.22, 1139.81, 53.5, 175389.9, 1.92, -68.09, -29.73, 2.39, -79, -350.84, -9.37, 82.26, 353.46, 5083.54, -9.72, 3495.33, 2759.87, 65.59, 1130.93, 54, 177200.1, -7.11, -66.13, -27.83, 0.08, -79.87, -338.53, -9.43, 81.12, 272.92, 5242.43, -18.55, 3433.67, 2885.39, 67.82, 1120.13, 54.5, 178967.5, -40.18, -89.65, -40.83, -16.21, -94.37, -341.16, -9.26, 90.21, 187.56, 5416.83, 4.9, 3353.96, 2964.06, 79.14, 1119.39, 55, 180648.1, -36.9, -77.19, -38.72, -17.11, -93.3, -328.52, -9.19, 78.61, 138.7, 5592.11, 13.58, 3289.56, 3048.68, 69.7, 1095.11, 55.5, 182265.2, -44.1, -86.18, -36.25, -18.17, -92.32, -315.76, -8.89, 87.92, 83.49, 5771.71, 23.76, 3197.2, 3131.8, 81.29, 1092.75, 56, 183805.5, -51.63, -83.92, -33.98, -18.88, -91.38, -302.51, -8.78, 76.18, 54.01, 5958.25, 23.73, 3107.89, 3214.62, 71.5, 1078.02, 56.5, 185278, -59.13, -81.91, -31.5, -19.96, -90.49, -299.65, -8.96, 87.19, 31.12, 6146.57, 47.59, 3002.77, 3293.16, 82.95, 1073.56, 57, 186658, -55, -67.61, -29.55, -9.42, -77.93, -273.92, -8.31, 73.37, 55.85, 6330.67, 47.02, 2902.92, 3380.81, 73.05, 1056.96, 57.5, 187979, -74.46, -76.99, -38.01, -11.76, -89.15, -272.04, -8.75, 82.91, 74.95, 6526.49, 60.24, 2784.47, 3460.87, 84.64, 1050.36, 58, 189204.5, -82.92, -74.4, -24.19, -13.5, -88.55, -257.23, -8.23, 70.51, 122.04, 6716.23, 73.68, 2671.04, 3551.63, 85.67, 1032.41, 58.5, 190355.6, -91.92, -72.32, -32.32, -15.65, -88.68, -242.37, -8.62, 80.13, 160.11, 6895.85, 76.93, 2541.1, 3644.32, 86.55, 1024.24, 59, 191418, -99.5, -68.81, -18.26, -16.53, -87.38, -227.23, -8.7, 67.51, 213.63, 7079.72, 91.02, 2414.51, 3751.01, 87.84, 1004.52, 59.5, 192402, -109.44, -56.67, -15.61, -19.73, -77.33, -212.57, -8.72, 77.14, 258.08, 7271.22, 97.93, 2271.03, 3853.63, 88.91, 995.14, 60, 193310.4, -136.37, -56.91, -15.27, -31.73, -95.9, -170.29, -8.9, 75.59, 301, 7464.04, 107.67, 2117.4, 3965.67, 90.2, 985.37, 60.5, 194147.9, -149.97, -43.16, -2.95, -27.83, -91.33, -155.24, -8.67, 62.76, 324.39, 7682.91, 108.63, 1949.84, 4061.73, 90.83, 963.67, 61, 194889.7, -156.92, -43.74, 7.3, -31.1, -89.81, -132.15, -8.78, 61.01, 341.23, 7907.26, 131.68, 1775.11, 4156.36, 91.36, 940.25, 61.5, 195529.9, -164.84, -42.11, 0.79, -41.56, -99.6, -128.91, -8.95, 70.68, 374.9, 8128.83, 156.33, 1592.23, 4256.1, 103.34, 940.17, 62, 196048.8, -175.44, -40.17, 0.91, -45.56, -89.99, -114.14, -9.02, 69.04, 435.54, 8378.15, 183.1, 1392.36, 4323.78, 103.22, 915.7, 62.5, 196450.5, -179.63, -37.49, 5.83, -43.57, -86.17, -96.4, -9.17, 67.23, 523.57, 8606.77, 199.22, 1193.94, 4420.6, 92.47, 903.11, 63, 196739.1, -188.12, -35.02, 5.02, -37.32, -85.46, -84.33, -9.28, 65.52, 616.57, 8908.75, 230.55, 991.15, 4448.65, 91.44, 889.45, 63.5, 196908.6, -200.25, -44.37, 8.07, -39.85, -87.72, -68.75, -9.78, 63.92, 735.92, 9146.35, 261.64, 767.38, 4542.96, 91.86, 875.13, 64, 196956.6, -208.41, -41.58, 11.82, -53.01, -86.76, -52.48, -10.14, 62.18, 867.52, 9426.39, 295.3, 539.05, 4610.75, 102.81, 860.16, 64.5, 196870.6, -216.52, -38.06, 15.11, -43.94, -75.16, -25.08, -10.67, 60.38, 1014.53, 9667.98, 318.51, 303.99, 4705.56, 91.84, 833.33, 65, 196660, -225.27, -23.45, 20.87, -46.23, -73.23, -6.81, -11.44, 47.53, 1164.78, 9884.72, 343.23, 58.63, 4811.61, 92.23, 817.78, 65.5, 196322.5, -232.54, -29.02, 24.3, -48.81, -74.38, -1.98, -11.53, 56.73, 1315.76, 10125.38, 380.92, -201.06, 4924.43, 103.62, 801.48, 66, 195845.5, -231.97, -25.75, 26.76, -40.88, -75.64, 25.02, -12.06, 43.9, 1471.77, 10354.34, 412.04, -456.2, 5050.47, 93.37, 785.21, 48, 181358.5, 164.23, -159.8, -111.86, 44.17, -105.93, -695.24, -12.71, 119.98, 948.19, 4042.67, -40.24, 5101.95, 2632.7, 71.13, 1329.11, 48.5, 184424.3, 166.76, -148.97, -109.86, 24.79, -105.65, -685.23, -12.72, 119.49, 830.99, 4204.17, -39.55, 5129.02, 2722.05, 72.7, 1325.71, 49, 187461.5, 158.8, -148.03, -108.25, 23.31, -95.29, -674.98, -12.2, 109.09, 705.1, 4376.74, -47.27, 5147.15, 2821.68, 74.51, 1320.78, 49.5, 190447.5, 177.81, -130.2, -79.79, 49.38, -77.8, -637.36, -11.99, 118.36, 636.52, 4548.81, -71.76, 5157.3, 2916.16, 76.1, 1324.11, 50, 193422.1, 169.29, -129.51, -104.56, 47.88, -77.75, -652.32, -11.83, 117.68, 544.23, 4731.12, -41.81, 5158.32, 3012.95, 88.02, 1314.36, 50.5, 196353.7, 149.76, -153.93, -113.23, 46.29, -103.4, -650.25, -11.59, 116.83, 460.98, 4916.87, -37.8, 5139.78, 3104.02, 89.51, 1314.95, 51, 199237.8, 116.26, -151.58, -110.85, 45.03, -102.29, -636.29, -11.15, 115.63, 401.44, 5108.36, -34.08, 5123.41, 3208.73, 91.41, 1314.05, 51.5, 202048.3, 130.34, -125.8, -108.38, 42.81, -77.83, -622.07, -11.33, 114.83, 366.67, 5301.26, -29.1, 5099.23, 3307.39, 93.02, 1299.23, 52, 204830, 130.71, -147.11, -105.72, 40.35, -101.43, -605.95, -10.16, 113.7, 290.22, 5515.09, -33.78, 5065.97, 3409.19, 94.73, 1295.46, 52.5, 207556.5, 96.4, -143.17, -90.29, 15.24, -90.14, -575.78, -11.2, 112.21, 239.35, 5729.09, -28.19, 5035.9, 3496.12, 84.6, 1277.69, 53, 210220.1, 102.85, -102.23, -82.2, 32.07, -82.45, -516.19, -10.11, 110.78, 210.45, 5972.14, -34.21, 4971.1, 3561.62, 84.98, 1270.71, 53.5, 212884.2, 71.29, -96.27, -54.73, 12.64, -88.19, -495.66, -10.52, 109.62, 106.16, 6187.69, -40.92, 4910.81, 3622.75, 85.09, 1262.25, 54, 215496.2, 47.58, -93.72, -52.35, 9.43, -101.28, -491.28, -10.31, 108.2, -24.13, 6389.1, -41.85, 4829.42, 3792.02, 100.05, 1265.16, 54.5, 218041, 18.23, -110.73, -69.37, -11.71, -108.26, -482.93, -10.15, 106.43, -136.05, 6611.39, -24.14, 4762.38, 3897.34, 101.31, 1241.5, 55, 220498.8, 8.98, -120.4, -66.77, -12.79, -118.77, -478.72, -9.82, 105.06, -225.6, 6837.8, -13.79, 4663.77, 4008.79, 102.72, 1241.53, 55.5, 222862.3, -0.25, -118.62, -63.62, -14.12, -105.24, -462.51, -9.87, 103.36, -311.28, 7068.48, -13.56, 4568.81, 4126.64, 104.31, 1227.83, 56, 225140.2, -9.91, -115.76, -60.83, -14.8, -116.17, -445.67, -9.56, 102.15, -362.75, 7309.38, -0.59, 4451.33, 4236.23, 105.5, 1212.17, 56.5, 227317.9, -19.51, -113.49, -57.7, -3.57, -102.5, -428.23, -9.76, 116.35, -393.84, 7547.08, 29.03, 4327.56, 4352.21, 106.87, 1195.97, 57, 229390.4, -14.17, -95.3, -55.74, 10.15, -86.31, -395.32, -9.58, 98.66, -375.47, 7787.07, 15.06, 4209.3, 4466.59, 108.09, 1178.11, 57.5, 231373.8, -12.37, -94.71, -52.75, 6.98, -100.5, -393.26, -9.49, 96.82, -349.76, 8038.91, 31.01, 4067.83, 4579.87, 109.19, 1159.36, 58, 233263, -37.46, -91.37, -49.12, -9.5, -99.95, -374.11, -9.54, 95.09, -302.5, 8292.46, 49.23, 3932.42, 4699.09, 110.45, 1138.94, 58.5, 235042.1, -47.53, -87.21, -45, 2.47, -85.81, -354.87, -9.69, 93.37, -238.27, 8528.33, 52.38, 3764.27, 4824.75, 111.71, 1131.06, 59, 236724.1, -58.79, -97.08, -41.38, -13.07, -98.42, -335.74, -9.86, 91.45, -183.22, 8767.64, 70.77, 3598.73, 4970.49, 113.62, 1123.08, 59.5, 238292.4, -70.68, -81.51, -37.69, -3.18, -85.75, -316.23, -9.96, 89.55, -124.9, 9019.98, 78.8, 3424.45, 5106.91, 115.05, 1100.07, 60, 239778.7, -92.3, -54.08, -22.52, -18.11, -96.09, -261.65, -9.66, 87.58, -83.32, 9270.39, 76.77, 3236.93, 5252.35, 116.59, 1075.87, 60.5, 241204.8, -124.48, -64.13, -7.47, -41.87, -118.04, -242.55, -9.89, 85.53, -96.62, 9546, 91.22, 3030.53, 5388.91, 117.78, 1065.07, 61, 242494.1, -133.61, -51, 5.42, -32.12, -102.92, -213.27, -10.26, 83.37, -76.01, 9843.28, 107.27, 2800.41, 5524.71, 118.89, 1039.3, 61.5, 243653.1, -143.76, -48.96, -2.49, -31.67, -100.91, -194.57, -10.1, 81.31, -46.63, 10133.67, 138.1, 2572.11, 5659.53, 119.85, 1026.63, 62, 244669.8, -156.79, -59.72, -1.82, -36.02, -102.15, -188.61, -10.52, 79.21, 3.87, 10461.55, 171.9, 2322.84, 5756.85, 132.91, 1012.94, 62.5, 245536.5, -176.42, -56.56, -9.3, -34.28, -97.85, -166.39, -10.77, 76.95, 75.31, 10759.85, 193.12, 2060.61, 5890.08, 133.73, 999.01, 63, 246256.9, -187.45, -53.54, 3.42, -39.92, -109.9, -150.1, -10.68, 74.8, 182.68, 11148.97, 245.56, 1791.68, 5936.07, 132.37, 983.81, 63.5, 246810.9, -189.5, -38.03, 7.17, -29.92, -86.01, -116.89, -11.32, 72.76, 323.77, 11464.7, 258.83, 1509.64, 6070.14, 133.18, 954.85, 64, 247221.3, -200.41, -47.73, 11.76, -45.56, -97.88, -95.96, -11.92, 70.56, 496.97, 11835.63, 301.95, 1207.22, 6168.95, 133.02, 938.32, 64.5, 247472.9, -224.38, -43.46, 2.85, -48.26, -97.26, -87.94, -12.54, 68.32, 676.97, 12151.18, 345.29, 895.02, 6304.75, 146.67, 920.98, 65, 247549.7, -223.05, -39.14, 9.9, -51.19, -94.93, -64.43, -13.28, 66.1, 874.79, 12446.1, 391.38, 581.76, 6445.26, 133.92, 903.82, 65.5, 247461.5, -246.06, -45.39, 14.33, -54.48, -96.17, -43.6, -13.24, 63.75, 1074.49, 12761.11, 426.08, 249.59, 6602.55, 147.58, 885.79, 66, 247193, -246.91, -28.35, 17.67, -45.49, -84.74, -9.69, -14.22, 61.41, 1281.08, 13070.32, 467.15, -92.12, 6775.16, 135.79, 853.99, 48, 212559.1, 281.45, -201.31, -159.92, 79.06, -121.92, -936.45, -14.68, 144.81, 962.44, 4743.2, -78.16, 6871.29, 3296.55, 90.25, 1465.5, 48.5, 216734.7, 283.2, -199.75, -157.56, 41.24, -121.34, -923.79, -14.14, 144.03, 796.66, 4944.81, -78.55, 6919.01, 3426.28, 92.71, 1458.02, 49, 220885.4, 262.79, -198.76, -155.74, 39.33, -120.52, -910.87, -14.02, 143.27, 606.57, 5158.12, -76.93, 6954.93, 3552.41, 105.55, 1471.87, 49.5, 224957.7, 299.03, -162.31, -118.71, 73.66, -84.32, -861.86, -13.66, 142.28, 515.88, 5381.44, -120.46, 6979.53, 3678.37, 97.08, 1458.57, 50, 229027.4, 288.47, -161.4, -151.46, 71.76, -84.03, -892.93, -13.39, 141.28, 394.65, 5615.41, -82.07, 6992.26, 3802.14, 110.18, 1467.92, 50.5, 233041.8, 277.29, -193.36, -149.32, 81.18, -117.45, -877.04, -13.14, 140.02, 286.1, 5847.7, -77.98, 6993.52, 3934.46, 112.57, 1449.43, 51, 237006.6, 234.37, -201.88, -146.15, 68.22, -115.69, -858.96, -12.64, 138.3, 195.75, 6083.59, -74.61, 6984.05, 4070.43, 114.95, 1453.89, 51.5, 240876.7, 253.39, -168.45, -142.89, 65.32, -83.56, -840.58, -12.53, 137.17, 149.33, 6326.84, -81.19, 6964.53, 4201.55, 117.13, 1443, 52, 244710.5, 239.88, -184.17, -139.38, 74.31, -102.03, -819.52, -12.19, 135.59, 49.05, 6602.96, -73.79, 6933.37, 4331.28, 106.96, 1430.88, 52.5, 248498.7, 182.92, -191.2, -133.77, 29.36, -114.12, -794.62, -11.68, 145.94, -42.99, 6863.95, -68.36, 6879.35, 4450.88, 120.82, 1427.98, 53, 252193.7, 190.53, -139.53, -122.58, 50.75, -89.84, -718.02, -11.96, 131.53, -95.51, 7176.83, -75.32, 6822.49, 4541.39, 121.49, 1425.02, 53.5, 255903.1, 150.13, -131.23, -86.43, 26.69, -111.1, -690.9, -10.97, 142.85, -243.83, 7439.98, -71.3, 6757.72, 4635.8, 122.18, 1405.03, 54, 259533.1, 147.6, -114.89, -70.41, 35.42, -100.17, -657.31, -11.27, 128.09, -411.42, 7701.32, -114.92, 6681.2, 4846.17, 126.33, 1384.73, 54.5, 263119.8, 96.93, -150.05, -105.69, -4.94, -137.61, -675.31, -11.21, 138.96, -584.7, 7984.53, -64.88, 6579.75, 4995.57, 141.66, 1389.5, 55, 266567.5, 85.38, -147.21, -89.08, 7.29, -135.55, -654.93, -11.12, 123.87, -699.88, 8273.7, -66.3, 6482.23, 5146.69, 130.34, 1364.01, 55.5, 269911.1, 87.69, -145.16, -84.97, 5.87, -119.96, -634.61, -10.6, 121.6, -839.2, 8567.03, -65.14, 6374.37, 5296.36, 132.22, 1351.75, 56, 273146.2, 75.79, -141.53, -81.46, 5.49, -117.94, -613.43, -11.26, 120.17, -906.13, 8875.64, -49.76, 6239.95, 5453.09, 134.25, 1321.86, 56.5, 276270.3, 64.12, -138.88, -77.44, 4.34, -115.98, -591.55, -10.71, 138.3, -977.69, 9173.5, -13.53, 6113.78, 5600.18, 135.82, 1305.31, 57, 279262.8, 71.58, -115.81, -89.78, 22.05, -95.24, -564.39, -10.62, 115.7, -970.27, 9486.46, -30.5, 5963.26, 5751.01, 137.47, 1302.59, 57.5, 282145.3, 58.18, -131.28, -86.38, 17.69, -113.14, -562.87, -10.77, 113.29, -938.32, 9811.59, -11.38, 5797.9, 5904.02, 139.08, 1283.59, 58, 284923.9, 11.7, -141.62, -81.87, -3.55, -127.14, -538.66, -11.14, 125.54, -907.68, 10133.52, 26.57, 5608.93, 6062.61, 155.18, 1277.27, 58.5, 287534.7, 29.98, -105.49, -61.73, 27.01, -94.48, -499.7, -11.27, 109.07, -811.9, 10435.7, -0.28, 5438.02, 6235.35, 142.77, 1240.2, 59, 290053.8, -0.97, -118.16, -71.83, 7.01, -110.64, -490.06, -11.5, 106.53, -755.98, 10741.95, 38.09, 5240.34, 6430.3, 145.45, 1216.3, 59.5, 292429.4, -0.06, -98.16, -52.04, 4.6, -94.72, -449.76, -11.11, 104.13, -681.17, 11062.7, 31.7, 5016.34, 6612.72, 147.51, 1207.62, 60, 294717.8, -59.08, -79.21, -46.97, -13.94, -123.92, -379.73, -10.98, 116.44, -643.67, 11389.62, 43.73, 4775.69, 6810.3, 164.67, 1197.01, 60.5, 296933.5, -100.55, -75.79, -28.8, -29.41, -135.92, -355.79, -11.82, 99.02, -678.2, 11752.65, 46.94, 4524.76, 6993.21, 166.43, 1154.48, 61, 298992.2, -112.34, -59.73, -12.74, -32.39, -133.14, -319.11, -12.16, 96.34, -701.09, 12130.74, 82.33, 4260.31, 7170.49, 167.84, 1142.4, 61.5, 300886.6, -125.07, -72.24, -22.4, -32.55, -130.5, -310.46, -12.14, 93.72, -696.35, 12506.02, 105.11, 3965.48, 7356.68, 169.5, 1129.29, 62, 302601.1, -125.71, -69.45, -20.94, -37.05, -130.96, -286.42, -12.08, 106.09, -664.41, 12932.22, 147.14, 3643.98, 7495.85, 184.84, 1098.7, 62.5, 304127.1, -150.33, -65.8, -14.66, -35.82, -126.28, -259.05, -12.44, 88.26, -589.93, 13324.01, 174.96, 3335.55, 7674.69, 170.97, 1084.44, 63, 305466.9, -164.37, -62.19, 0.71, -41.95, -109.69, -237.41, -13.32, 85.55, -468.96, 13830.2, 224.45, 2986.5, 7751.45, 169.54, 1052.34, 63.5, 306612.2, -167.85, -59.17, 5.25, -30.6, -111.75, -196.81, -13.85, 82.95, -319.51, 14236.98, 258.18, 2635.12, 7933.58, 170.79, 1035.97, 64, 307573.4, -197.19, -70.11, -4.28, -48.85, -110.23, -185.21, -14.15, 95.24, -111.5, 14714.49, 311.89, 2242.23, 8065.84, 185.44, 1017.66, 64.5, 308316.9, -211.54, -64.99, 0.82, -52.28, -109.39, -158.33, -13.55, 92.43, 122.26, 15134.2, 366.82, 1850.31, 8247.44, 186.23, 999.75, 65, 308853.4, -226.82, -59.69, -5.74, -55.97, -106.66, -128.55, -15.61, 89.59, 378.11, 15515.91, 409, 1439.35, 8446.9, 187.24, 980.89, 65.5, 309163.1, -225.43, -51.7, 14.8, -45.19, -93.02, -101.63, -16.28, 71.69, 637.57, 15935.65, 454.79, 1018.59, 8663.87, 173.69, 946.17, 66, 309272.3, -258.18, -46.5, 4.31, -50.1, -109.52, -74.33, -17.86, 83.65, 891.61, 16341.88, 522.48, 568.86, 8889.99, 189.94, 941.41 }, + abs_err = 300, + aim_data = { 55, 55844.9, -85.08, -20.14, 3.68, -16.18, -35.95, -35.74, -8.33, 29.8, 527.46, 1572.18, 33.96, 834.58, 198.07, 11.85, 481.91, 55.5, 55978.8, -86.78, -19.58, 4.06, -16.57, -36.06, -33.81, -8.3, 26.21, 527.06, 1611.7, 36.42, 821.06, 216.29, 12.17, 476.82, 56, 56102.9, -92.05, -22.82, 0.94, -20.53, -39.69, -31.72, -8.21, 29.7, 527.37, 1650.58, 38.96, 801.92, 234.76, 16.05, 475.24, 56.5, 56209.1, -93.79, -22.45, 1.42, -20.39, -39.75, -29.43, -8.13, 29.59, 529.27, 1693.06, 41.78, 781.38, 249.77, 16.27, 473.86, 57, 56297.5, -92.71, -19.16, 4.9, -17.85, -36.94, -27.61, -8.03, 29.43, 535.19, 1738.63, 44.9, 762.96, 263.11, 12.92, 468.82, 57.5, 56373.2, -94.68, -18.8, 2.53, -21.79, -37.13, -24.34, -7.99, 29.26, 545.71, 1785.04, 48.23, 739.09, 276.04, 16.59, 467.28, 58, 56428.6, -95.57, -17.77, 6.53, -18.64, -36.2, -21.86, -7.96, 25.58, 556.58, 1831.3, 47.58, 720.84, 290.43, 13.27, 462.17, 58.5, 56471.1, -98.51, -18.2, 3.45, -22.73, -37.28, -20.14, -7.9, 28.93, 564.06, 1886.06, 56, 690.4, 295.56, 16.76, 460.42, 59, 56490.9, -99.36, -16.78, 7.59, -19.64, -36.24, -16.4, -7.88, 25.25, 576.79, 1939.72, 55.93, 665.02, 305.12, 13.28, 455.2, 59.5, 56495.8, -105.51, -17.49, 4.51, -23.42, -40.68, -14.93, -7.83, 28.49, 586.5, 2006.68, 65.41, 634.6, 301.96, 16.65, 453.32, 60, 56478.1, -105.29, -18.42, 7.25, -23.21, -38.92, -11.02, -7.78, 28.25, 600.21, 2053.82, 67.99, 601.93, 319.14, 16.85, 451.53, 60.5, 56438.2, -107.96, -18.87, 7.13, -24.45, -40.64, -8.96, -7.71, 27.99, 613.2, 2115.04, 74.51, 565.96, 327.93, 16.86, 445.81, 61, 56371.8, -107.24, -15.01, 9.73, -22.33, -38.11, -2.67, -7.69, 24.27, 637.02, 2163.63, 76.61, 532.33, 344.86, 13.61, 440.24, 61.5, 56283.9, -111.59, -14.73, 6.89, -22.96, -36.9, 0.29, -7.56, 27.45, 657.23, 2215.08, 82.74, 495.02, 366.27, 17.24, 437.98, 62, 56168.3, -109.88, -13.3, 12.03, -22.11, -36.79, 4.25, -7.54, 23.83, 685.06, 2264.56, 87.95, 461.35, 388.53, 14.07, 432.18, 62.5, 56029.4, -111.59, -13.71, 12.31, -23.44, -33.47, 6.19, -7.51, 23.51, 716.15, 2313.62, 92.23, 423.37, 407.99, 14.23, 426.2, 63, 55865.9, -114.32, -13.24, 11.83, -23.97, -36.71, 9.13, -7.5, 23.17, 745.77, 2371.3, 102.58, 382.23, 426.28, 14.43, 423.69, 63.5, 55677.4, -119.52, -16.12, 9.31, -24.51, -37.44, 12.51, -7.44, 26.16, 775.98, 2428.49, 110.17, 337.79, 438.97, 17.65, 421.01, 64, 55457.7, -120.25, -11.25, 11.02, -24.09, -33.06, 17, -7.45, 22.47, 806.89, 2485.64, 114.04, 290.06, 456.75, 14.47, 414.86, 64.5, 55211.8, -119.51, -11.23, 14.23, -25.44, -33.84, 19.8, -7.49, 22.06, 835.47, 2541.89, 123.36, 240.95, 475.11, 14.63, 408.48, 65, 54936.1, -124.65, -10.39, 11.79, -25.98, -37.18, 23.42, -7.44, 24.89, 865.47, 2598.93, 132.39, 189.83, 491.55, 17.9, 405.45, 65.5, 54630.6, -126.64, -12.79, 13.32, -26.58, -36.85, 24.46, -7.51, 24.44, 896.76, 2657.45, 145.01, 132.82, 508.71, 17.89, 402.16, 66, 54291.4, -128.39, -11.5, 13.83, -27.29, -37.13, 31.37, -7.58, 23.93, 928.95, 2715.55, 152.52, 78, 525.22, 17.84, 395.42, 66.5, 53919.7, -129.91, -9.69, 15.21, -27.93, -37.12, 35.7, -7.64, 23.4, 961.19, 2774.45, 163.01, 21.71, 541.77, 17.79, 391.89, 67, 53512.7, -131.77, -5.57, 16.46, -28.91, -34.51, 39.66, -7.78, 19.74, 996.41, 2828.1, 174.5, -32.91, 558.82, 14.57, 381.53, 67.5, 53075.8, -133.42, -7.05, 17.73, -29.92, -38.11, 43.5, -7.88, 22.35, 1028.32, 2882.1, 186.72, -95.48, 580.51, 17.67, 380.84, 68, 52602, -138.16, -5.21, 19.09, -31.03, -38.78, 47.32, -8.03, 21.83, 1059.78, 2936.22, 199.64, -159.32, 601.97, 17.65, 373.38, 68.5, 52090.7, -136.7, -3.66, 20.61, -29.36, -36.77, 51.02, -8.23, 18.28, 1096.94, 2990.39, 210.41, -219.25, 623.97, 17.62, 365.96, 69, 51546.6, -141.1, -0.72, 22.4, -33.22, -41.08, 54.55, -8.45, 20.78, 1128.24, 3048.19, 228.36, -288.14, 642.85, 17.41, 361.28, 69.5, 50964.4, -142.28, 1.07, 21.45, -35.72, -42.73, 57.9, -8.68, 20.26, 1158.01, 3105.33, 243.96, -350.5, 657.72, 17.04, 353.34, 70, 50341.4, -140.43, 3.98, 26.65, -34.83, -41.81, 61.2, -8.94, 19.73, 1193.8, 3164.77, 257.89, -415.13, 665.32, 16.75, 345.41, 70.5, 49680.9, -141.43, 7.23, 29.15, -35.52, -44.05, 67.3, -9.35, 16.35, 1225.7, 3217.68, 275.93, -483.29, 690.81, 16.64, 340.34, 71, 48982.2, -145.3, 10.69, 31.76, -40.35, -44.51, 67.82, -9.68, 18.68, 1259.99, 3294.44, 295.4, -552.09, 691.42, 16.2, 331.87, 71.5, 48242.1, -146.53, 14.16, 34.43, -39.53, -48.63, 74.21, -10.09, 18.15, 1297.28, 3373.41, 315.61, -621.97, 688.82, 15.73, 326.4, 72, 47463.7, -148.01, 12.22, 34.48, -46.78, -50.74, 75.43, -10.6, 17.6, 1331.1, 3437.25, 337.53, -693.14, 712.12, 15.54, 317.6, 72.5, 46641.2, -146.99, 20.75, 39.62, -43.38, -49.8, 82.4, -11.16, 17.05, 1371.13, 3501.71, 360.9, -762.9, 713.69, 15.05, 311.7, 73, 45778.9, -148.77, 21.28, 39.66, -47.76, -51.24, 84.63, -11.82, 16.48, 1404.7, 3570.88, 385.57, -833.85, 724.07, 14.66, 305.4, 73.5, 44875.2, -150.98, 24.26, 38.3, -49.44, -52.42, 89.78, -12.51, 15.87, 1444.85, 3629.85, 411.14, -904.32, 739.86, 14.34, 296.16, 74, 43930.4, -157.42, 25.48, 43.21, -48.43, -57.91, 93.57, -13.21, 15.3, 1477.58, 3688.76, 442.06, -972.05, 754.35, 14.02, 286.87, 74.5, 42944, -156.17, 25.44, 42.52, -53, -55.08, 98.4, -14.07, 14.77, 1519.74, 3748.62, 471.14, -1044.26, 769.8, 13.68, 279.98, 75, 41917, -159.38, 27.59, 44.48, -54.67, -56.16, 103.73, -14.95, 14.18, 1554.57, 3807.05, 507.85, -1113.5, 784.68, 13.29, 272.91, 55, 69539.7, -83.24, -23.55, -0.47, -16.4, -45.77, -75.78, -8.86, 34.74, 518.05, 2003.76, 31.29, 1133.58, 480.73, 17.86, 535.2, 55.5, 69859.5, -89.58, -31.79, -3.85, -16.96, -49.69, -76.63, -8.73, 38.52, 509.13, 2055.97, 38.13, 1107.61, 509.18, 22.3, 538.96, 56, 70155.1, -88.03, -27.43, -3.16, -17.38, -45.69, -69.47, -8.59, 38.36, 506.59, 2112.09, 37.58, 1082.83, 534.67, 22.7, 534.45, 56.5, 70429.8, -90.54, -26.95, 1.35, -18.08, -45.66, -66.03, -8.56, 34.28, 507.5, 2171.79, 41.21, 1057.95, 557.31, 19.11, 529.85, 57, 70683, -93.07, -26.43, 1.89, -18.56, -45.65, -62.55, -8.41, 38.01, 514.21, 2234.35, 45.13, 1033.17, 578.82, 19.42, 525.04, 57.5, 70914.6, -95.78, -26.11, 2.6, -19.21, -45.81, -59.23, -8.39, 33.95, 523.56, 2297.27, 45.4, 1005.66, 600.53, 19.73, 524.49, 58, 71127.8, -101.9, -29.27, -0.6, -19.73, -49.51, -59.35, -8.29, 37.56, 533.69, 2361.95, 53.38, 971.74, 621.81, 23.89, 523.51, 58.5, 71314.5, -104.81, -29, 0.19, -24.19, -49.81, -55.78, -8.25, 37.26, 543.94, 2437.26, 58.78, 934.2, 631.84, 23.9, 518.46, 59, 71476, -107.07, -27.9, 1.02, -20.98, -49.34, -51.25, -8.15, 36.93, 559.57, 2506.97, 63.55, 896.76, 652.42, 24.17, 513.47, 59.5, 71611.5, -106.46, -23.96, 1.8, -21.59, -46.04, -43.8, -8.1, 36.56, 577.15, 2598, 66.65, 856.86, 652.39, 24.02, 512.55, 60, 71721.6, -111.91, -20.12, 5.89, -21.96, -44.97, -36.73, -8.02, 36.18, 589.7, 2666.06, 69.59, 809.21, 677.98, 24.32, 507.25, 60.5, 71808.2, -116.85, -23.99, 6.24, -24.64, -51.44, -32.93, -7.97, 35.76, 602.62, 2748.23, 81.25, 756.79, 694.75, 24.42, 505.76, 61, 71857.9, -120.12, -19.64, 5.84, -25.81, -48.09, -28.6, -7.88, 35.29, 620.54, 2816.12, 84.69, 705.29, 721.21, 24.7, 500.22, 61.5, 71871.9, -121.89, -19.22, 10.35, -22.64, -46.75, -20.25, -7.84, 31.03, 644.13, 2887.92, 92.8, 650.82, 752.94, 21.21, 494.56, 62, 71853.6, -124.33, -21.49, 8.37, -25.81, -46.39, -18.46, -7.74, 34.37, 674.25, 2956.69, 100.17, 589.64, 786.7, 25.39, 492.51, 62.5, 71795.8, -130.6, -21.67, 5.12, -27.19, -49.88, -14.75, -7.72, 33.83, 706.21, 3025.9, 110.05, 526.94, 816.55, 25.63, 486.36, 63, 71696.4, -130.72, -21.03, 8.69, -27.89, -45.84, -9.85, -7.65, 33.29, 746.73, 3105.51, 116.23, 469.44, 842.74, 25.69, 480.33, 63.5, 71557.9, -133.6, -16.63, 9.74, -24.85, -42.71, -0.92, -7.69, 29.02, 792.11, 3183.39, 126.57, 408.08, 866.91, 25.73, 474.07, 64, 71384.3, -138.27, -18.57, 7.94, -28.15, -45.04, 1.17, -7.63, 32.15, 833.44, 3261.99, 139.48, 342.54, 893.99, 26.02, 471.35, 64.5, 71168.1, -137.79, -14.67, 11.73, -25.96, -45.64, 9.12, -7.62, 31.51, 875.53, 3340.41, 147.79, 272.5, 920.24, 26.2, 464.95, 65, 70914.5, -140.36, -17.28, 12.82, -30.34, -45.59, 10.68, -7.69, 30.87, 917.58, 3419.35, 159.72, 198.84, 946.31, 26.31, 457.97, 65.5, 70615.6, -143.19, -16.19, 14.69, -31.09, -45.06, 16.68, -7.72, 30.21, 962.36, 3500.92, 172.29, 121.36, 973.27, 26.39, 455.08, 66, 70274, -145.76, -14.59, 15.43, -32, -45.3, 22.05, -7.84, 29.52, 1008.88, 3581.78, 186.45, 42.13, 998.88, 26.39, 447.87, 66.5, 69884.3, -148.24, -12.43, 17.16, -29.28, -41.68, 31.58, -7.87, 28.85, 1059.19, 3663.61, 196.87, -39.5, 1024.73, 26.38, 440.73, 67, 69449.8, -151.01, -11.15, 18.79, -30.57, -42.27, 37.18, -8.1, 24.58, 1106.19, 3738.62, 212.19, -122.85, 1051.8, 26.36, 433.27, 67.5, 68969.1, -153.57, -9.06, 20.45, -31.9, -42.84, 42.69, -8.21, 27.45, 1153.2, 3814.22, 228.49, -209.81, 1085.1, 26.43, 425.51, 68, 68441.3, -159.63, -10.24, 18.73, -36.88, -47.13, 44.7, -8.46, 26.74, 1200.1, 3891.13, 245.85, -297.84, 1117.02, 29.95, 421.27, 68.5, 67860, -158.3, -4.77, 24.15, -35.09, -44.82, 53.23, -8.7, 22.58, 1251.86, 3968.78, 260.48, -383.25, 1149.51, 26.55, 413.53, 69, 67233.9, -163.88, -1.1, 23.02, -39.65, -46.42, 58.27, -8.98, 25.32, 1295.84, 4048.36, 283.53, -477.03, 1182.06, 26.62, 408.9, 69.5, 66555.9, -165.83, 1.23, 25.66, -42.8, -48.47, 63.18, -9.28, 24.61, 1343.27, 4131.43, 301.27, -570.86, 1207.61, 26.31, 400.47, 70, 65825.8, -167.61, 1.6, 28.63, -45.4, -54.27, 67.94, -9.72, 23.9, 1391.24, 4215.79, 327.23, -668.28, 1220.14, 29.18, 395.39, 70.5, 65040, -169.31, 5.8, 31.93, -46.35, -53.77, 72.74, -10.17, 23.19, 1441.91, 4290.83, 348.07, -767.23, 1258.44, 29.11, 386.58, 71, 64197.7, -171.09, 13.55, 38.64, -45.71, -54.38, 80.9, -10.72, 19.25, 1492.1, 4397.03, 371.05, -864.46, 1263.44, 25.26, 374.18, 71.5, 63304.8, -176.33, 14.88, 38.98, -51.54, -59.63, 82.93, -11.29, 21.77, 1543.29, 4505.73, 405.02, -969.39, 1263.85, 27.8, 368.23, 72, 62351.4, -175.55, 16.11, 39.29, -54.22, -62.38, 88.64, -11.9, 21.06, 1597, 4594.19, 431.38, -1068.98, 1298.64, 24.43, 358.98, 72.5, 61340, -174.71, 23.65, 46.01, -53.5, -61.31, 97.78, -12.68, 20.33, 1655.44, 4683.98, 462.74, -1169.95, 1304.4, 23.8, 352.76, 73, 60270.7, -177.43, 27.86, 49.62, -55.9, -60.22, 104.47, -13.59, 16.55, 1707.69, 4779.91, 495.95, -1273.84, 1321.02, 23.27, 343, 73.5, 59146.9, -183.71, 31.86, 48.11, -58.29, -64.88, 108.62, -14.47, 18.78, 1765.69, 4862.99, 530.62, -1380.71, 1344.64, 22.81, 332.83, 74, 57965.5, -192.38, 30.42, 51.36, -63.33, -72.06, 110.89, -15.48, 18.04, 1811.55, 4945.62, 572.26, -1484.43, 1366.53, 25.21, 325.76, 74.5, 56722.5, -191.26, 33.76, 53.88, -66.19, -68.6, 117.76, -16.6, 17.34, 1872.92, 5029.05, 611.67, -1591.58, 1390.01, 24.66, 315.33, 75, 55422.2, -195.89, 36.7, 56.61, -68.55, -70.17, 128, -17.79, 16.59, 1925.12, 5111.07, 658.38, -1695.77, 1413.64, 24.12, 307.82, 55, 78190.7, -73.02, -31.77, -8.27, -14.93, -50.32, -106.04, -9.21, 39.15, 468.16, 2272.71, 28.21, 1421.37, 665, 22.69, 569.12, 55.5, 78661.4, -79.9, -37.38, -7.8, -15.56, -54.6, -107.49, -9.08, 43.26, 449.48, 2337, 31.29, 1391.68, 698.39, 27.42, 569.27, 56, 79107.7, -82.64, -37.04, -7.02, -15.91, -54.45, -104.2, -8.95, 43.19, 443.02, 2403.79, 34.85, 1359.27, 730.53, 27.98, 565.27, 56.5, 79530.5, -86.08, -36.59, -6.37, -17.52, -54.54, -100.25, -8.82, 43.1, 442.26, 2473.45, 38.94, 1323.61, 761.65, 28.45, 565.66, 57, 79925.4, -88.78, -35.32, -5.19, -17.51, -49.81, -95.25, -8.77, 42.97, 447.54, 2547.02, 43.45, 1286.44, 789.86, 28.82, 561.31, 57.5, 80293.3, -92.29, -34.98, -4.9, -18.39, -49.97, -91.77, -8.66, 42.8, 461.58, 2622.45, 48.38, 1245.5, 817.17, 29.14, 561.44, 58, 80632.4, -96.39, -34.6, -3.94, -19.16, -54.73, -86.58, -8.56, 42.5, 475.94, 2700.38, 53.82, 1202.45, 846.19, 29.5, 557.01, 58.5, 80937.1, -95.48, -29.58, -2.77, -15.75, -50.32, -77.14, -8.44, 42.12, 500.94, 2789.49, 55.48, 1156.79, 858.23, 25.26, 552.72, 59, 81219.1, -103.32, -32.96, -1.78, -20.78, -54.61, -76.12, -8.42, 41.74, 513.67, 2872.87, 65.76, 1103.01, 885.19, 29.66, 552.22, 59.5, 81464.4, -107.2, -28.11, -0.65, -21.67, -50.72, -66.66, -8.38, 41.33, 536.58, 2978.44, 69.08, 1051.08, 888.61, 29.47, 547.42, 60, 81679.2, -114.56, -27.4, 4.48, -22.54, -54.41, -57.11, -8.29, 40.87, 552.48, 3059.62, 72.12, 994.72, 921.12, 29.84, 542.52, 60.5, 81867.3, -121.44, -27.04, 5.23, -26.41, -57.79, -51.95, -8.19, 40.37, 561.78, 3158.04, 80.95, 932.66, 942.54, 29.91, 537.29, 61, 82010.6, -121.08, -22.46, 9.28, -23.37, -53.85, -42.55, -8.15, 35.75, 580.94, 3240.21, 85.47, 867.41, 974.56, 30.18, 532.24, 61.5, 82114.7, -123.6, -21.96, 5.96, -28.08, -52.58, -36.96, -7.98, 39.26, 607.09, 3325.88, 94.89, 795.81, 1013.97, 30.59, 526.67, 62, 82174.7, -130.74, -24.52, 7.76, -27.66, -52.02, -34.36, -7.92, 38.66, 636.59, 3407.93, 103.77, 722.02, 1055.77, 31.04, 525.31, 62.5, 82186.8, -133.65, -24.55, 8.46, -28.98, -51.56, -29.48, -7.86, 37.99, 673.33, 3490.68, 114.86, 649.92, 1093.02, 31.38, 519.55, 63, 82154.3, -133.92, -23.79, 8.41, -29.72, -51.1, -23.57, -7.83, 37.32, 714.57, 3584.09, 126.18, 569.34, 1129.11, 31.68, 513.53, 63.5, 82075, -141.38, -23.04, 9.57, -30.5, -51.54, -17.29, -7.83, 36.67, 766.51, 3676.1, 138.09, 485.51, 1159.06, 31.72, 511.65, 64, 81946.7, -143.56, -21.08, 7.76, -30.27, -54.05, -9.86, -7.8, 35.95, 818.81, 3770.21, 149.83, 397.81, 1192.53, 35.86, 505.11, 64.5, 81767.1, -147.72, -20.77, 12.01, -31.96, -50.67, -4.21, -7.86, 35.21, 872.6, 3864.81, 160.28, 312.09, 1224.71, 31.99, 498.58, 65, 81536.3, -151.1, -19.51, 9.35, -32.79, -50.56, 2.33, -7.89, 34.45, 928.22, 3958.34, 174.43, 219.41, 1257, 36, 491.76, 65.5, 81250.3, -150.74, -18.27, 15.42, -29.8, -49.94, 13.5, -7.88, 33.67, 989.28, 4055.09, 189.3, 127.67, 1290.7, 32.14, 485.02, 66, 80916, -157.94, -16.45, 12.46, -34.79, -50.18, 16.21, -8.07, 32.86, 1043.56, 4151.12, 205.91, 29.98, 1322.72, 36.02, 481.8, 66.5, 80523.9, -161.06, -17.89, 14.5, -35.82, -50.12, 23.4, -8.16, 32.07, 1101.74, 4246.7, 222.26, -68.65, 1355.47, 36.01, 474.33, 67, 80076, -164.02, -12.57, 20.14, -37.17, -50.63, 33.6, -8.29, 31.24, 1161.86, 4335.25, 235.5, -163.3, 1390.41, 32.37, 466.91, 67.5, 79575.2, -167.06, -10.22, 22.03, -34.85, -47.4, 40.16, -8.48, 30.41, 1219.68, 4426.41, 254.41, -266.38, 1432.47, 32.62, 459.14, 68, 79019, -170.13, -7.58, 20.32, -40.3, -52, 46.74, -8.74, 29.58, 1275.52, 4518.65, 274.61, -376.36, 1471.75, 36.44, 451, 68.5, 78402.4, -173.14, -5.27, 26.39, -38.57, -49.6, 53.16, -8.98, 28.75, 1339.11, 4610.72, 292.41, -487.03, 1511, 32.68, 442.87, 69, 77726.5, -175.93, -4.8, 25.38, -39.95, -51.38, 59.42, -9.37, 27.91, 1395.8, 4707.64, 315.76, -602.04, 1548.6, 32.56, 434.36, 69.5, 76988.2, -178.54, 1.61, 32.09, -43.62, -53.69, 65.48, -9.69, 27.09, 1454.98, 4806.22, 340.55, -711.82, 1581.77, 32.31, 425.82, 70, 76187.5, -180.93, 5.88, 31.88, -46.67, -56.51, 71.37, -10.18, 26.26, 1514.43, 4907.09, 367.14, -828.55, 1599.5, 31.82, 416.9, 70.5, 75324.7, -186.62, 7.05, 35.65, -51.39, -59.7, 77.08, -10.77, 25.44, 1576.21, 4997.09, 395.13, -950.77, 1646.25, 35.43, 411.51, 71, 74395.8, -188.84, 12.21, 39.66, -54.39, -60.43, 83.02, -11.39, 24.62, 1632.51, 5123.22, 425.75, -1072.26, 1654.23, 34.73, 402.11, 71.5, 73399.5, -191.44, 17.46, 43.8, -53.97, -66.39, 92.83, -12.04, 23.79, 1701.62, 5251.64, 458.08, -1192.03, 1658.14, 34.02, 392.66, 72, 72338.8, -194.43, 18.97, 44.27, -60.71, -69.59, 96.24, -12.83, 22.96, 1763.29, 5357.58, 492.65, -1320.09, 1701.64, 33.86, 386.51, 72.5, 71205.8, -193.75, 24.25, 52.01, -60, -68.46, 103.54, -13.74, 22.12, 1833.8, 5465.19, 529.42, -1443.21, 1711.02, 33.1, 376.48, 73, 70003.7, -197.11, 32.52, 56.23, -62.83, -67.46, 114.85, -14.71, 21.26, 1897.61, 5580.58, 565.22, -1570.14, 1733.46, 32.5, 366.32, 73.5, 68736.5, -204.41, 33.94, 54.62, -65.65, -72.69, 120.15, -15.83, 20.34, 1968.14, 5679.92, 609.21, -1700.85, 1763.74, 31.97, 359.23, 74, 67397.2, -211.48, 35.63, 58.44, -68.22, -77.85, 126.28, -16.95, 19.49, 2028.27, 5779.36, 654.99, -1825.07, 1791.68, 28.2, 345.21, 74.5, 65987.5, -210.6, 39.56, 61.45, -71.7, -74.08, 134.47, -18.27, 18.7, 2106.41, 5879.16, 701.54, -1955.96, 1820.97, 30.71, 337.7, 75, 64508.9, -216.3, 43.04, 64.71, -74.61, -79.06, 143.37, -19.69, 17.85, 2170.86, 5977.88, 756.82, -2086.24, 1850.1, 30.05, 326.5, 55, 89634.7, -65.42, -38.76, -14.14, -13.1, -62.46, -156.01, -9.66, 50.9, 400.75, 2626.95, 23.28, 1810.03, 912.85, 33.38, 611.63, 55.5, 90321.9, -68.93, -41.6, -13.52, -13.87, -58.2, -151.99, -9.48, 50.74, 379.59, 2704.68, 22.49, 1783.25, 957.4, 34.25, 608.66, 56, 90985.2, -72.22, -45.44, -12.44, -14.17, -62.05, -147.43, -9.4, 50.54, 364.6, 2786.51, 26.62, 1742.55, 998.46, 34.95, 605.16, 56.5, 91614.5, -75.82, -44.88, -11.79, -16.83, -57.59, -142.49, -9.22, 50.29, 361.11, 2872.92, 31.09, 1707.73, 1037.22, 35.57, 602, 57, 92210.7, -73.35, -38.12, -9.81, -11.55, -55.62, -131.32, -9.13, 50.06, 362.94, 2963.15, 36, 1664.5, 1074.05, 36.14, 603.29, 57.5, 92779.9, -81.61, -42.1, -14.65, -16.9, -55.63, -132.44, -9.06, 49.81, 372.08, 3055.23, 41.55, 1615.45, 1110.15, 36.62, 599.45, 58, 93310, -87.59, -42.32, -9.12, -17.85, -57.43, -125.62, -8.9, 49.36, 392.16, 3152.11, 48.46, 1563.05, 1147.9, 37.12, 595.97, 58.5, 93806.9, -90.33, -40.33, -11.82, -18.46, -60.23, -117.92, -8.81, 53.11, 412.49, 3256.35, 53.85, 1506.83, 1169.94, 41.53, 596.53, 59, 94262.8, -95.89, -40.29, -6.35, -15.36, -57.03, -112.23, -8.73, 48.25, 431.72, 3357.99, 57.39, 1444.87, 1204.57, 37.58, 588.14, 59.5, 94682.4, -100.14, -34.04, -4.77, -20.92, -56.45, -99.9, -8.71, 47.7, 454.23, 3487.66, 65.3, 1379.69, 1211.3, 37.28, 588.65, 60, 95066, -110.11, -32.08, -2.44, -22.53, -61.52, -86.61, -8.63, 47.07, 471.76, 3587.37, 68.08, 1308.38, 1253.14, 37.78, 584.35, 60.5, 95419.7, -119.76, -31.1, 3.28, -28.25, -61.68, -79.42, -8.49, 46.39, 478.33, 3705.65, 77.76, 1229.76, 1283.43, 37.93, 579.88, 61, 95722.5, -123.85, -30.56, 3.93, -28.9, -61.1, -72.59, -8.42, 45.67, 491.8, 3805.16, 87.75, 1145.86, 1328.25, 38.46, 575.16, 61.5, 95971.8, -127.41, -29.94, 4.75, -29.53, -59.93, -65.47, -8.29, 44.91, 514.47, 3911.17, 94.51, 1050.11, 1378.01, 38.98, 570.32, 62, 96166, -131.3, -28.59, 6.36, -29.49, -59.08, -57.54, -8.18, 44.13, 546.11, 4014.82, 105.62, 953.4, 1430.32, 39.52, 570.04, 62.5, 96302.6, -139.97, -28.29, 3.09, -30.82, -62.69, -50.38, -8.17, 43.31, 585.91, 4116.86, 119.11, 850.1, 1476.07, 44.04, 564.49, 63, 96375.2, -140.9, -27.41, 7.74, -31.69, -57.74, -42.6, -8.1, 42.47, 639.6, 4230.16, 132.86, 748.6, 1522.77, 40.05, 559.07, 63.5, 96387.6, -145.37, -26.5, 9.08, -32.61, -57.91, -34.56, -8.07, 41.63, 700.88, 4342.39, 142.93, 644.16, 1564.53, 40.23, 553.32, 64, 96338, -148.62, -24.42, 11.43, -32.58, -56.36, -25.42, -8, 40.74, 768.59, 4456.85, 157.29, 531.36, 1609.04, 40.49, 542.53, 64.5, 96228, -153.73, -23.89, 7.69, -34.42, -56.78, -18.04, -8.11, 39.82, 838.32, 4572.68, 174.44, 416.42, 1651.09, 44.91, 540.75, 65, 96049.7, -158.1, -22.43, 13.51, -31.2, -56.54, -9.76, -8.11, 38.88, 909.69, 4687.16, 191.45, 302.94, 1693.11, 40.75, 534.35, 65.5, 95807.2, -162.64, -20.94, 15.95, -32.32, -55.81, -0.73, -8.16, 37.92, 987.04, 4805.56, 205.11, 182.03, 1736.95, 40.88, 527.53, 66, 95499.6, -166.82, -18.86, 12.92, -37.83, -55.98, 7.54, -8.34, 36.93, 1056.87, 4923.65, 224.96, 59.43, 1778.96, 45.15, 520.28, 66.5, 95121.8, -170.8, -16.1, 19.47, -34.88, -55.83, 20.51, -8.41, 35.96, 1134.3, 5043.33, 244.8, -67.01, 1820.84, 40.98, 508.43, 67, 94677.4, -175.16, -14.29, 21.72, -36.63, -56.42, 29.02, -8.63, 34.96, 1211.85, 5153.75, 266.3, -196.68, 1863.93, 40.98, 505.46, 67.5, 94164.4, -183.46, -15.67, 19.9, -42.58, -57.04, 33.32, -8.91, 33.97, 1285.7, 5266.31, 289.36, -333.58, 1916.85, 45.34, 497.37, 68, 93577.3, -187.56, -12.55, 22.42, -40.51, -57.97, 41.72, -9.18, 32.96, 1363.67, 5378.34, 313.65, -469.05, 1963.61, 45.16, 489.28, 68.5, 92919.5, -191.52, -9.76, 25.22, -46.99, -59.47, 49.84, -9.45, 36.03, 1436.48, 5490.01, 339.47, -611.25, 2016.21, 45.31, 480.71, 69, 92184.2, -195.24, -4.88, 28.46, -48.64, -61.47, 61.79, -9.97, 30.97, 1513.76, 5606.93, 363.27, -748.73, 2065.63, 45.26, 472.14, 69.5, 91373.1, -194.48, 2.32, 32.03, -48.85, -60.08, 69.22, -10.34, 29.99, 1592.71, 5727.96, 388.64, -890.07, 2109.52, 41.12, 459.06, 70, 90491.1, -201.59, 3.34, 36.08, -52.45, -63.34, 76.49, -10.98, 29.01, 1661.54, 5851.86, 424.37, -1038.21, 2133.95, 44.53, 453.97, 70.5, 89525, -204.65, 8.95, 40.57, -53.96, -63.18, 87.74, -11.57, 28.04, 1742.85, 5962.72, 454.39, -1185.32, 2193.04, 44.56, 444.85, 71, 88480.8, -207.8, 15.02, 45.36, -53.78, -64.16, 95.24, -12.29, 27.07, 1820.33, 6117.38, 487.69, -1338.83, 2206, 39.86, 435.2, 71.5, 87357.3, -211.31, 21.24, 50.32, -61.31, -74.98, 103.16, -13.15, 26.09, 1899.55, 6275.97, 531.07, -1497.18, 2212.54, 42.72, 425.01, 72, 86150.6, -215.31, 19.36, 51.03, -69.27, -78.79, 107.92, -14.09, 25.12, 1982.1, 6406.33, 572.85, -1652.92, 2267.08, 42.52, 414.7, 72.5, 84855.6, -214.93, 29.56, 60.14, -68.57, -73.91, 120.53, -15.17, 24.12, 2070.22, 6538.86, 617.06, -1810.62, 2281.17, 41.63, 404.29, 73, 83476.8, -219.3, 39.1, 65.2, -68.4, -76.7, 130.35, -16.34, 23.12, 2153.59, 6680.92, 660.65, -1969.93, 2311.11, 40.95, 393.71, 73.5, 82017.7, -228.06, 41.11, 63.48, -75.44, -82.72, 140.74, -17.69, 22.05, 2241.88, 6804.44, 710.01, -2133.71, 2350.61, 40.36, 386.47, 74, 80470.6, -237.03, 43.01, 68.09, -75.14, -89.09, 144.65, -19.05, 21.05, 2317.76, 6927.73, 769.09, -2293.88, 2386.78, 39.62, 371.48, 74.5, 78836.9, -239.92, 44.31, 71.78, -82.83, -84.83, 154.69, -20.67, 20.14, 2411.48, 7052.44, 825.6, -2458.72, 2425.3, 38.91, 363.66, 75, 77115.1, -243.71, 51.93, 75.75, -83.09, -87.3, 168.92, -22.31, 19.15, 2496.26, 7173.89, 892.45, -2623.47, 2463.3, 38.14, 352.1, 50, 91913.2, 12.65, -53.22, -34.08, 7.12, -47.1, -246.98, -11.58, 58.45, 621, 2122.34, 4.86, 2353.54, 797.71, 28.6, 646.09, 50.5, 93002.3, 5.28, -58.07, -38.06, 2.47, -62.7, -260.9, -11.44, 62.98, 588.95, 2200.48, 5.73, 2362.64, 832.92, 33.74, 653.09, 51, 94079, -4.38, -64.79, -37.85, 6.24, -58.81, -254.67, -11.37, 58.99, 570.52, 2282.26, 7.3, 2373.19, 868.7, 34.55, 651.19, 51.5, 95139.8, 3.07, -58.55, -26.75, 5.62, -48.36, -245.76, -11.25, 59.27, 558.17, 2371.67, 8.77, 2384.08, 899.58, 35.17, 649.16, 52, 96202.2, -0.3, -58.47, -36.73, 5.12, -48.93, -249.34, -11.11, 59.41, 536.09, 2455.91, 5.33, 2391.91, 938.79, 36.08, 651.95, 52.5, 97261, -15.14, -68.27, -35.57, 4.04, -60.12, -245.34, -11.01, 59.59, 504.32, 2545.27, 6.52, 2385.51, 977.4, 36.92, 654.58, 53, 98304.8, -16.24, -55.11, -26.41, -2.9, -56.49, -225.93, -10.83, 64.02, 487.22, 2637.83, 6.62, 2379.94, 1016.37, 37.72, 652.45, 53.5, 99353.1, -26.02, -48.12, -19.18, -2.69, -60.25, -214.69, -10.71, 59.76, 451.7, 2732.12, -2.52, 2368.14, 1057.76, 38.54, 650.82, 54, 100398.1, -40.87, -56.98, -23.2, -13.68, -66.51, -219.55, -10.52, 59.7, 396.15, 2829.49, 5.25, 2350.35, 1100.77, 39.37, 648.86, 54.5, 101413.7, -45.13, -56.43, -22.46, -14.42, -71.35, -214.88, -10.38, 59.61, 350.87, 2926.15, 8.44, 2322.77, 1146.96, 40.23, 651.64, 55, 102400.6, -48.97, -46.55, -21.31, -5.79, -66.39, -209.41, -10.22, 59.15, 312.74, 3019.77, 11.37, 2294.09, 1197.65, 41.2, 649.5, 55.5, 103356.7, -53.18, -55.68, -20.59, -6.72, -66.3, -204.42, -10.04, 58.89, 277.76, 3115.18, 10.79, 2259.85, 1252.11, 42.24, 647.38, 56, 104282.6, -61.61, -55.09, -23.74, -11.38, -70.02, -203.17, -9.95, 58.58, 251.63, 3213.94, 19.9, 2209.39, 1304.74, 43.18, 649.68, 56.5, 105167.2, -61.38, -54.43, -18.49, -15.5, -65.19, -192.56, -9.77, 58.24, 239.88, 3316.34, 20.26, 2164.45, 1355, 44.02, 647.4, 57, 106009.6, -62.84, -50.59, -15.41, -13.45, -61.81, -183.05, -9.67, 57.97, 240.88, 3424.32, 25.82, 2110.06, 1404.43, 44.83, 644.76, 57.5, 106813.6, -63.01, -45.68, -16.87, -10.22, -61.64, -180.08, -9.49, 57.66, 257.21, 3536.49, 32.28, 2053.05, 1450.01, 45.43, 642.22, 58, 107579.5, -76.02, -51.18, -19.92, -15.98, -69.44, -171.26, -9.4, 57.06, 276.35, 3652.61, 40.85, 1987.53, 1494.32, 45.89, 644.2, 58.5, 108293.6, -78.44, -47.94, -13.13, -11.97, -61.95, -160.56, -9.3, 56.25, 306.61, 3780.24, 41.7, 1921.85, 1526.72, 46.11, 636.21, 59, 108968.1, -86.22, -48.68, -11.81, -13.58, -64.23, -154.22, -9.18, 55.57, 329.76, 3901.25, 56.1, 1844.15, 1572.58, 46.66, 633.04, 59.5, 109592.3, -91, -45.45, -9.68, -15.21, -62.72, -138.43, -9.13, 54.86, 357.56, 4056.41, 59.81, 1762.62, 1585.75, 46.35, 634.73, 60, 110177.8, -108.68, -37.31, -5.75, -22.3, -69.37, -125.12, -8.99, 58.59, 372.72, 4176.46, 66.85, 1672.85, 1639.47, 51.61, 630.9, 60.5, 110728.9, -121.55, -35.57, -3.67, -30.2, -75.08, -110.92, -8.84, 57.68, 371.7, 4320.89, 73.19, 1574.59, 1679.34, 51.83, 627.14, 61, 111212.3, -121.43, -30.39, 2.39, -25.78, -69.04, -102.28, -8.76, 52.15, 383.41, 4444.05, 80.5, 1475.55, 1732.48, 47.72, 618.5, 61.5, 111639.5, -130.8, -34.25, -1.34, -30.99, -72.62, -93.47, -8.6, 55.76, 397.46, 4572.6, 98.08, 1361.49, 1795.49, 53.04, 618.98, 62, 111994.2, -135.6, -33.1, 0.05, -31.42, -71.45, -88.62, -8.54, 50.15, 426.85, 4696.92, 106.76, 1247.26, 1860.94, 53.75, 614.59, 62.5, 112280.2, -140.35, -32.44, 1.33, -32.49, -70.38, -79.7, -8.42, 53.71, 470.07, 4819.05, 121.42, 1127.97, 1922.57, 54.37, 609.68, 63, 112490.9, -141.47, -31.39, 6.67, -33.4, -64.8, -65.63, -8.42, 48.02, 528.13, 4957.3, 132.86, 1003.47, 1981.26, 54.84, 599.79, 63.5, 112633.4, -151.42, -34.89, 3.55, -34.42, -69.18, -60.41, -8.35, 51.55, 594.13, 5094.73, 154.41, 869.55, 2034.07, 55.09, 599.32, 64, 112696, -155.74, -28.1, 6.02, -34.61, -62.93, -44.94, -8.33, 45.83, 676.16, 5234.91, 167.08, 734.66, 2089.6, 55.4, 588.79, 64.5, 112684.3, -161.76, -27.29, 6.9, -36.53, -63.05, -35.53, -8.44, 44.68, 762.13, 5376.01, 187.11, 591.24, 2143.13, 55.6, 582.79, 65, 112594.3, -167.13, -30.18, 8.74, -37.74, -67.18, -25.31, -8.41, 48.08, 850.72, 5515.8, 207.31, 441.54, 2196.9, 55.77, 576.42, 65.5, 112420.8, -168.17, -23.83, 11.49, -34.5, -61.74, -14.25, -8.53, 42.33, 941.43, 5660.56, 224.2, 290.58, 2252.8, 55.95, 570.13, 66, 112165.8, -173.75, -21.44, 13.1, -36.1, -61.8, -3.63, -8.71, 41.11, 1035.33, 5804.56, 248.16, 133.26, 2306.22, 55.93, 558.2, 66.5, 111827.3, -183.57, -22.81, 15.88, -42.15, -61.59, 7.46, -8.86, 39.92, 1135.04, 5948.59, 271.97, -26.9, 2360.56, 55.98, 550.9, 67, 111401.2, -189.15, -20.65, 18.56, -39.71, -62.15, 18.16, -9.08, 38.71, 1229.25, 6084.42, 293.3, -190.12, 2417.48, 56.08, 543.6, 67.5, 110890.3, -194.48, -17.42, 21.35, -41.86, -62.77, 28.7, -9.38, 37.51, 1327.81, 6220.46, 320.71, -356.49, 2479.68, 56.06, 535.75, 68, 110288.9, -195.32, -9.36, 24.34, -44.27, -59.36, 43.59, -9.67, 36.31, 1425.86, 6358.24, 345.4, -525.37, 2543.11, 56.17, 522.89, 68.5, 109600.7, -200.55, -6.16, 27.65, -47.12, -61.05, 53.67, -10.06, 35.13, 1522.68, 6495.6, 376.35, -699.59, 2607.4, 56.27, 514.48, 69, 108823.2, -209.78, -4.99, 31.45, -49.17, -63.35, 63.45, -10.65, 33.96, 1619.33, 6638.25, 409.49, -879.77, 2669.93, 56.28, 510.44, 69.5, 107952.6, -214.37, -1.18, 35.74, -54.14, -66.37, 73, -11.16, 32.78, 1713.82, 6786.21, 445.13, -1060.2, 2725.85, 56.05, 496.46, 70, 106983.9, -218.73, 4.65, 40.54, -54.14, -70.12, 82.33, -11.81, 31.62, 1808.78, 6937.51, 479.1, -1246.53, 2758.59, 55.31, 487.4, 70.5, 105920.9, -222.92, 11.23, 45.88, -60.33, -70.23, 91.61, -12.59, 30.48, 1907.57, 7073.08, 519.82, -1434.56, 2832.74, 55.39, 477.72, 71, 104761.9, -231.41, 14.13, 47.36, -64.72, -75.67, 101.01, -13.44, 33.54, 2005.72, 7260.14, 564.33, -1628.63, 2851.94, 58.54, 472.13, 71.5, 103497.9, -231.76, 21.4, 53.24, -64.96, -79.64, 114.88, -14.46, 28.21, 2109.26, 7451.45, 611.48, -1817.12, 2863.96, 53.24, 457.47, 72, 102137.8, -241.06, 23.77, 54.3, -74.34, -84.23, 125.24, -15.57, 27.08, 2210.94, 7610.57, 661.46, -2017.14, 2934.29, 53.23, 446.83, 72.5, 100670.2, -241.29, 35.73, 65.1, -73.84, -83.08, 136.23, -16.87, 25.93, 2320.56, 7774.21, 711, -2211.61, 2954.46, 52.09, 436.05, 73, 99103.3, -246.89, 38.8, 71.28, -82.06, -90.47, 144.27, -18.28, 28.73, 2421.9, 7947.51, 771.84, -2419.3, 2993.4, 55.2, 424.49, 73.5, 97429.6, -253.5, 49.49, 69.56, -86.26, -89.61, 160.88, -19.9, 23.55, 2536.68, 8098.85, 827.26, -2623.52, 3043.64, 54.42, 413.13, 74, 95652.6, -268.63, 47.8, 75.21, -90.15, -101.33, 165.97, -21.57, 22.41, 2632.63, 8250.01, 898.07, -2823.4, 3090.77, 49.7, 401.44, 74.5, 93765.9, -268.51, 53.52, 79.75, -91.53, -96.54, 178.17, -23.45, 21.37, 2753, 8402.78, 962.16, -3029, 3140.51, 48.92, 389.46, 75, 91775.7, -277.44, 58.67, 84.66, -96.01, -99.65, 191.39, -25.47, 20.24, 2854.94, 8553.34, 1046.59, -3234.88, 3189.49, 48.05, 377.1, 48, 96103.5, 39.58, -79.17, -53.55, 15.13, -67.16, -329.5, -12.85, 69.01, 790.41, 1993.92, -0.14, 2730.03, 848.01, 35.12, 674.76, 48.5, 97480.2, 32.83, -79.56, -53.85, 14.66, -67.83, -330.12, -12.73, 69.56, 738.34, 2068.11, -4.74, 2766.2, 883.91, 36.11, 678.03, 49, 98859.6, 35.1, -80.15, -49.2, 0.66, -63.92, -329.91, -12.65, 65.8, 683.2, 2179.64, -2.77, 2798.75, 917.97, 37.02, 676.81, 49.5, 100230.4, 46.15, -67.04, -35.45, 13.89, -50.5, -315.82, -12.53, 66.43, 654.79, 2289.06, -14.54, 2827.62, 934.55, 37.37, 675.51, 50, 101613.2, 43.22, -67.72, -49.28, 13.5, -51.05, -315.14, -12.37, 66.9, 611.66, 2358.14, -6.15, 2854.06, 988.9, 38.82, 679.17, 50.5, 102996.5, 35.67, -68.52, -49.04, 13.28, -64.76, -327.67, -12.26, 67.19, 576.68, 2449.86, -1.19, 2881.87, 1032.57, 39.88, 677.79, 51, 104377.3, 23.96, -82.46, -49.17, 12.87, -65.39, -327.23, -12.12, 67.85, 547.6, 2546.21, -4.37, 2904.55, 1076.29, 40.97, 681.55, 51.5, 105745.9, 29.21, -69.6, -40.21, 12.27, -56.95, -312.18, -12.02, 68.29, 526.39, 2644.83, -3.59, 2918.12, 1121.81, 42.04, 685.27, 52, 107118.7, 25.05, -69.36, -47.92, 11.67, -57.55, -321.45, -11.88, 68.31, 498.09, 2745.86, -2.76, 2924.6, 1167.27, 43.04, 684.18, 52.5, 108479.7, 11.25, -81.22, -46.36, 10.32, -66.69, -311.24, -11.69, 68.39, 462.58, 2853.68, -1.58, 2921.28, 1211.94, 43.93, 683.34, 53, 109826.4, 10.59, -64.74, -29.4, 7.04, -61.46, -286.6, -11.6, 68.32, 440.81, 2960.99, -2.25, 2914.62, 1262.5, 45, 687.12, 53.5, 111184.8, -6.42, -61.23, -25.67, -3.02, -66.32, -277.51, -11.45, 68.39, 384.08, 3072.42, -14.06, 2899.36, 1313.67, 46.01, 686.09, 54, 112533.3, -19.89, -67.31, -31.36, -11.91, -79.26, -278.47, -11.2, 68.18, 313.58, 3184.77, -4.39, 2877.65, 1368.23, 47.08, 685.28, 54.5, 113849.7, -29.54, -71.2, -35.11, -17.38, -79.72, -277.16, -10.99, 72.58, 250.64, 3295.54, -1.21, 2845.08, 1427.15, 52.86, 688.88, 55, 115126.9, -29.34, -54.44, -29.06, -2.15, -78.88, -265.74, -10.85, 67.28, 201.78, 3410.55, -2.6, 2815.14, 1486.98, 49.37, 687.91, 55.5, 116372, -38.94, -65.65, -32.9, -3.24, -78.7, -259.71, -10.68, 66.91, 156.41, 3522.75, 1.6, 2773.77, 1552.75, 50.64, 686.49, 56, 117575.1, -43.45, -64.98, -31.23, -3.27, -77.57, -257.3, -10.5, 66.48, 122.77, 3637.23, 6.56, 2718.68, 1618.49, 51.87, 684.99, 56.5, 118734, -43.75, -64.19, -25.75, -13.63, -72.38, -245.22, -10.32, 66.01, 106.57, 3759.54, 7.34, 2664.09, 1680.07, 52.92, 683.41, 57, 119841.4, -44.52, -58.77, -21.48, -5.65, -67.36, -232.93, -10.22, 65.66, 101.39, 3887.67, 18.32, 2603.57, 1738.2, 53.81, 686.69, 57.5, 120903.3, -50.07, -58.44, -28.75, -7.2, -67.02, -234.96, -10.03, 65.29, 120.1, 4019.45, 20.87, 2529.28, 1795.27, 54.59, 679.63, 58, 121918.9, -65.91, -64.97, -26.91, -8.69, -76.57, -223.99, -9.92, 64.52, 142.19, 4152.51, 35.71, 2455.24, 1854.65, 55.4, 682.55, 58.5, 122872.5, -63.02, -55.55, -24.11, -9.14, -67.32, -205.46, -9.81, 63.47, 173.37, 4302.45, 36.09, 2376.06, 1893.58, 55.57, 680.38, 59, 123780.2, -73.25, -57.27, -22.65, -11.15, -70.94, -198.7, -9.67, 62.66, 200.27, 4447.06, 48.22, 2282.65, 1949.76, 56.25, 678.02, 59.5, 124627.7, -78.5, -52.52, -15.13, -13.22, -68.41, -184.06, -9.61, 61.81, 233.37, 4629.95, 52.06, 2189.5, 1967.33, 55.78, 670.03, 60, 125430.4, -99.82, -42.56, -9.5, -21.5, -76.88, -161.67, -9.52, 60.81, 250.51, 4771.72, 53.99, 2076.75, 2033.02, 61.42, 672.46, 60.5, 126195.8, -111.41, -35.19, -1.78, -31.81, -79.21, -144.81, -9.3, 59.7, 245.49, 4941.63, 61.12, 1963.19, 2083.17, 56.9, 664.47, 61, 126891, -121.15, -39.47, 0.59, -31.49, -81.69, -134.54, -9.24, 58.61, 244.92, 5086.73, 79.56, 1838.11, 2149.32, 62.4, 661.02, 61.5, 127508.9, -127.23, -38.57, -3.32, -32.03, -80.92, -128.76, -9, 62.23, 258.49, 5238.08, 94.31, 1705.11, 2225.34, 63.25, 657.52, 62, 128041.1, -128.19, -37.73, 2.59, -28.2, -74.6, -113.1, -8.87, 56.16, 289.29, 5383.15, 105, 1571.03, 2308.67, 59.5, 648.9, 62.5, 128495.2, -138.86, -36.62, -0.64, -33.91, -78.02, -101.86, -8.77, 59.76, 333.23, 5531.1, 121.8, 1421.38, 2380, 64.92, 650.02, 63, 128859.7, -145.33, -35.42, 0.54, -30.06, -76.75, -90.48, -8.79, 53.63, 394.87, 5694.01, 135.45, 1275.71, 2452.57, 65.56, 640.42, 63.5, 129137.5, -146.78, -34.12, 7.06, -31.2, -71.29, -78.77, -8.75, 52.33, 472.17, 5856.69, 155.08, 1119.19, 2517.91, 65.93, 635.94, 64, 129325.7, -157.22, -31.88, 4.76, -31.66, -69.53, -66.03, -8.65, 50.99, 570.25, 6023.1, 175.36, 956.43, 2585.41, 66.29, 625.65, 64.5, 129424.8, -164.25, -30.78, 5.99, -33.67, -69.38, -54.55, -8.79, 49.62, 673.82, 6189.15, 198.26, 784.8, 2651.33, 66.57, 620.14, 65, 129426, -165.86, -28.88, 12.95, -35.07, -68.73, -42.25, -8.79, 48.23, 780.37, 6352.91, 216.63, 612.63, 2719.21, 66.91, 609.38, 65.5, 129338.4, -177.37, -31.7, 11.15, -41.41, -72.48, -33.94, -8.85, 51.64, 884.47, 6524.35, 241.48, 429.04, 2788.48, 67.22, 608.42, 66, 129150.3, -183.84, -29.03, 13.03, -43.15, -67.56, -21.45, -9.07, 50.17, 995.45, 6695.23, 268.83, 241.58, 2853.96, 72.15, 602.04, 48, 106110.4, 76.91, -89.84, -62.8, 28.06, -70.13, -411.32, -13.9, 74.49, 826.03, 2212.48, -16.92, 3330.7, 1039.76, 41.51, 697.46, 48.5, 107858, 74.69, -94.83, -67.76, 23.27, -75.27, -412.98, -13.72, 79.56, 761.33, 2298.35, -13.46, 3381.96, 1085.64, 42.79, 701.42, 49, 109613.6, 68.3, -95.67, -67.57, 6.18, -75.75, -417.88, -13.59, 80.33, 687.44, 2428.09, -11.51, 3430.44, 1129.05, 43.97, 705.75, 49.5, 111357.8, 87.16, -79.68, -46.38, 27.11, -54.7, -397.03, -13.5, 76.74, 645.68, 2548.26, -31.5, 3489.96, 1159.28, 44.71, 705.64, 50, 113130.1, 84.93, -80.91, -63.95, 26.99, -55.4, -398.45, -13.34, 77.57, 595.43, 2633.74, -16.44, 3535.14, 1223.9, 46.59, 705.35, 50.5, 114912, 81.9, -82.1, -63.89, 22.48, -72.36, -415.36, -13.23, 77.98, 544.72, 2745.11, -16.34, 3569.76, 1274.03, 47.82, 709.89, 51, 116692.1, 61.8, -99.21, -63.95, 26.49, -72.89, -413.99, -13.07, 78.57, 506.63, 2858.22, -15.18, 3600.48, 1330.73, 49.21, 709.79, 51.5, 118453.8, 74.13, -83.14, -51.82, 25.82, -56.69, -394.7, -12.95, 78.97, 479.84, 2975.59, -14.68, 3618.92, 1386.96, 50.53, 714.59, 52, 120222.1, 69.31, -82.92, -62.44, 25.21, -57.37, -406.56, -12.77, 79, 443.6, 3091.63, -19.07, 3630.69, 1448.67, 51.96, 714.57, 52.5, 121983.7, 46.84, -97.57, -60.52, 18.99, -74.22, -399.58, -12.63, 79.08, 391.98, 3218.09, -18.4, 3629.74, 1507.67, 53.23, 719.49, 53, 123723.9, 46.99, -76.81, -39.19, 14.82, -66.85, -368.46, -12.5, 78.94, 363.29, 3349.38, -19.92, 3624.41, 1564.93, 54.37, 719.42, 53.5, 125486.6, 26.49, -72.23, -39.05, 2.94, -73.33, -357.34, -12.27, 83.79, 286.65, 3479.93, -35.7, 3610, 1629.64, 60.37, 724.41, 54, 127242.2, 4.17, -85.51, -47.16, -9.12, -89.54, -360.09, -12.02, 83.61, 191.61, 3614.61, -23.46, 3586.25, 1697.44, 61.76, 724.6, 54.5, 128954.5, -1.82, -84.68, -46.21, -10.16, -90.11, -353.13, -11.83, 83.39, 110.59, 3746.65, -20.26, 3558.8, 1769.25, 63.21, 729.86, 55, 130626.2, -7.02, -69.6, -44.47, 3.17, -88.92, -344.8, -11.71, 77.72, 47.01, 3879.87, -17.35, 3517.78, 1847.47, 60.07, 729.97, 55.5, 132254.2, -8.02, -78.92, -43.6, 1.91, -83.84, -337.58, -11.45, 77.22, -17.85, 4016.21, -17.51, 3472.96, 1926.65, 61.6, 724.83, 56, 133836.6, -18.08, -82.99, -41.52, 2.08, -87, -329.12, -11.28, 76.66, -61.99, 4154.41, -12, 3406.15, 2007.23, 63.11, 729.82, 56.5, 135365, -23.97, -81.99, -40.65, -10.63, -86.12, -319.73, -11.09, 75.95, -89.55, 4301.48, -5.83, 3338.43, 2082.57, 64.38, 729.43, 57, 136828.8, -18.76, -74.38, -34.74, -0.74, -73.98, -303.6, -10.9, 80.36, -97.33, 4454.29, 1.2, 3263.91, 2155.09, 70.38, 728.59, 57.5, 138237.8, -25.3, -69.14, -38.82, -2.65, -73.39, -306.42, -10.68, 79.92, -76, 4610.34, 9.42, 3177.64, 2226.67, 71.41, 728.05, 58, 139589.9, -44.89, -77.04, -41.49, -9.39, -85.32, -292.58, -10.54, 78.94, -55.18, 4767.16, 21.7, 3085.62, 2301.22, 72.49, 726.95, 58.5, 140866.6, -41.02, -65.42, -32.88, -4.8, -73.61, -269.49, -10.41, 77.54, -11.85, 4949.86, 21.71, 2986.04, 2354.14, 72.85, 726.08, 59, 142086.4, -54.57, -68.41, -31.14, -7.35, -78.96, -261.64, -10.31, 71.49, 15.22, 5119.97, 36.6, 2875.82, 2422.1, 68.61, 719.52, 59.5, 143236.9, -65.36, -61.49, -27.63, -10.02, -74.97, -242.29, -10.19, 75.38, 55.59, 5336.06, 45.4, 2760.88, 2448.6, 73.07, 723.34, 60, 144328.5, -86.33, -49.06, -14.63, -14.83, -85.77, -208.52, -10.11, 69.08, 74.91, 5506.2, 41.66, 2633.88, 2529.05, 74.1, 716.31, 60.5, 145388.3, -107.39, -45.37, -10.66, -33.38, -94.71, -193.08, -9.83, 72.71, 59.07, 5705.61, 54.59, 2489.58, 2593.93, 74.56, 714.43, 61, 146357, -112.63, -44.79, -7.04, -32.27, -91.09, -180.48, -9.72, 71.36, 48.84, 5879.61, 70.38, 2342.44, 2676.87, 75.48, 712.31, 61.5, 147232.8, -120.46, -43.72, -6.05, -27.66, -90.64, -167.6, -9.5, 69.82, 61.16, 6061.76, 82.4, 2180.32, 2771.46, 76.63, 704.45, 62, 148011.2, -127.49, -43.28, -5.49, -29.43, -88.71, -154.96, -9.39, 63.23, 87.79, 6236.34, 100.98, 2016.7, 2871.26, 77.9, 696.32, 62.5, 148688.9, -134.51, -41.61, -3.45, -29.95, -86.81, -135.67, -9.31, 61.7, 132.01, 6414.97, 114.96, 1840.57, 2957.64, 78.57, 693.32, 63, 149264.7, -141.7, -40.18, -1.62, -31, -85.13, -126.94, -9.27, 60.13, 197.49, 6609.47, 136.45, 1662.83, 3048.27, 79.44, 684.09, 63.5, 149736.1, -149.29, -38.62, 0.2, -32.26, -78.82, -112.85, -9.15, 63.64, 283, 6802.15, 159.13, 1467.43, 3131.46, 80.04, 680.31, 64, 150100.4, -156.39, -41.54, 2.82, -38.22, -82.09, -97.86, -9.06, 62.03, 400.95, 7001.04, 183.05, 1274.81, 3216.5, 80.61, 670.38, 64.5, 150351.8, -164.7, -34.93, 4.51, -35.11, -76.33, -78.54, -9.24, 55.23, 526.31, 7201.52, 204.51, 1071.43, 3298.41, 81.01, 660.32, 65, 150497, -172.58, -37.91, 6.94, -41.89, -80.57, -68.8, -9.26, 58.72, 650.43, 7400.43, 231.95, 856.05, 3380.71, 86.52, 660.9, 65.5, 150524.3, -180.76, -35.61, 10.32, -38.52, -74.18, -53.08, -9.34, 57.03, 782.71, 7606.14, 261.12, 638.69, 3466.42, 86.92, 649.83, 66, 150437.1, -188.75, -32.65, 7.46, -45.66, -78.97, -37.96, -9.6, 55.32, 917.58, 7811.37, 287.9, 411.27, 3547.88, 87.08, 644.01, 66.5, 150227.6, -196.65, -28.81, 16.18, -42.6, -73.32, -22.08, -9.83, 48.49, 1059.27, 8018.79, 315.45, 182.65, 3630.28, 82.09, 626.55, 67, 149899.7, -204.98, -25.92, 19.73, -45.27, -73.73, -1.49, -10.15, 46.8, 1202.22, 8211.95, 350.41, -56.78, 3715.39, 82.27, 620.15, 45, 105055.3, 158.61, -93.1, -85.14, 39.1, -51.29, -504.28, -15.95, 84, 1335.62, 1849.23, -8.42, 3558.55, 951.02, 39.99, 702.2, 45.5, 107068.8, 161.48, -89.23, -80.67, 42.87, -69.78, -504.16, -15.85, 80.88, 1278.9, 1939.38, -14.94, 3658.54, 1000.63, 37.3, 701.7, 46, 109130.5, 155.19, -89.54, -84.88, 41.8, -72.29, -507.85, -15.76, 82.3, 1212, 2031.54, -17.24, 3756.55, 1053.4, 43.21, 705.72, 46.5, 111233.8, 131.8, -111.08, -84.71, 36.71, -78.83, -511.43, -15.55, 87.76, 1114.64, 2134.39, -19.51, 3847.94, 1103.01, 44.73, 709.98, 47, 113371.6, 129.7, -111.75, -80.32, 40.23, -76.42, -515.16, -15.46, 84.7, 1036.33, 2237.7, -25.88, 3950.14, 1155.99, 46.35, 710.12, 47.5, 115548.8, 127.91, -112.81, -84.98, 35.41, -78.03, -518.8, -15.37, 85.87, 950.15, 2340.44, -23.47, 4035.24, 1215.75, 48.12, 719.55, 48, 117752.2, 126.23, -113.93, -85.28, 39.71, -79.22, -522.11, -15.21, 87.06, 862.9, 2456.92, -28.92, 4121.31, 1274.4, 49.81, 719.92, 48.5, 119982.6, 124.5, -114.94, -86.35, 39.47, -80.14, -525.7, -15.07, 87.99, 780.33, 2562.62, -30.63, 4210.86, 1329.55, 51.43, 725.2, 49, 122239, 124.03, -116.64, -86.74, 18.5, -80.86, -529.6, -14.85, 93.72, 681.47, 2717.98, -29.09, 4298.56, 1379.94, 52.93, 730.54, 49.5, 124498, 143.67, -96.92, -66.12, 39.66, -59.86, -511.74, -14.77, 90.56, 626.61, 2858.26, -49.8, 4370.91, 1424.03, 54.12, 731.52, 50, 126796, 141.02, -98.32, -83.77, 39.54, -60.5, -513.07, -14.61, 91.38, 555.16, 2960.71, -35.88, 4431.9, 1503.43, 56.43, 737.43, 50.5, 129103.5, 137.54, -99.74, -88.25, 39.63, -81.65, -534.01, -14.49, 91.71, 489.42, 3088.68, -36.64, 4477.88, 1575.01, 58.27, 743.31, 51, 131409.8, 112.66, -121.3, -88.44, 39.13, -82.15, -532.34, -14.3, 92.37, 438.7, 3230.81, -35.44, 4518.59, 1641.24, 59.85, 744.53, 51.5, 133693.6, 128.66, -101.03, -67.48, 38.39, -61.53, -508.08, -14.16, 92.78, 402.81, 3368.41, -35.69, 4549.24, 1712.25, 61.53, 745.63, 52, 135991.2, 123.09, -105.18, -86.58, 37.74, -62.08, -522.38, -13.93, 97.18, 348.75, 3509.41, -36.07, 4565.24, 1789.01, 63.33, 751.69, 52.5, 138274.7, 95.08, -118.76, -84.13, 35.76, -83.1, -513.14, -13.82, 92.45, 281.13, 3658.43, -40.84, 4570.45, 1863.5, 64.94, 758.24, 53, 140536.5, 96.4, -92.21, -56.98, 25.67, -72.77, -473.12, -13.61, 96.88, 243.29, 3814.39, -43.85, 4565.83, 1939.78, 66.56, 759.24, 53.5, 142827.5, 71.32, -90.86, -50.66, 16.21, -85.96, -458.66, -13.45, 97.05, 140.68, 3971.33, -64.7, 4554.52, 2020.43, 72.98, 765.63, 54, 145111.7, 43.47, -102.63, -61.91, -4.82, -101.56, -463.12, -13.14, 96.73, 24.34, 4135.71, -44.09, 4531.44, 2103.17, 69.84, 767.29, 54.5, 147342.2, 36.24, -101.56, -60.81, -6.05, -102.19, -454.4, -12.99, 91.53, -85.14, 4294.7, -45.71, 4496.95, 2193.01, 71.65, 768.78, 55, 149527.9, 30.14, -82.55, -58.6, 10.81, -100.49, -443.99, -12.69, 95.1, -177.78, 4454.03, -43.04, 4445.88, 2290.68, 78.55, 769.85, 55.5, 151660.6, 23.17, -100.42, -57.59, 9.27, -99.98, -435.17, -12.54, 89.53, -261.74, 4614.18, -43.23, 4388.25, 2394.84, 75.85, 771.12, 56, 153735.7, 16.87, -99.46, -59.9, 9.68, -97.77, -424.55, -12.27, 93.72, -323.88, 4785.12, -31.78, 4311.1, 2489.91, 82.48, 777.38, 56.5, 155739.6, 14.72, -98.4, -54.03, -1.12, -91.66, -413.26, -12.07, 87.96, -358.96, 4962.12, -29.91, 4233.31, 2584.13, 79.12, 773.16, 57, 157669.1, 16.44, -87.92, -45.94, 6.26, -81.38, -392.47, -11.88, 92.46, -369.63, 5145.85, -22.02, 4136.25, 2675.51, 85.59, 779.1, 57.5, 159532.9, 8.6, -87.7, -57.18, 3.88, -80.51, -396.51, -11.65, 91.95, -349.84, 5331.28, -12.76, 4035.12, 2768.42, 87.02, 779.86, 58, 161321.3, -10.77, -92.3, -49.29, 1.62, -90.5, -373.98, -11.49, 85.61, -319.3, 5522.76, -2.46, 3927.7, 2861, 88.35, 775, 58.5, 163027.7, -10.5, -83, -49.66, 1.48, -80.7, -350.3, -11.34, 88.85, -277.04, 5735.77, 1.09, 3801.22, 2928.62, 88.8, 774.79, 59, 164661.3, -33.53, -87.86, -42.53, -1.72, -93.6, -341.82, -11.2, 82.33, -239.86, 5947.07, 20.02, 3671.76, 3012.3, 89.68, 769.53, 59.5, 166209.4, -39.81, -78.15, -43.22, -5.16, -82.53, -316.46, -11.05, 86.15, -197.03, 6203.33, 23.38, 3531.86, 3052.14, 89.18, 769.2, 60, 167693.9, -66.49, -62.44, -26.88, -16.96, -101.68, -274.39, -10.9, 84.53, -176.07, 6407.7, 23.19, 3376.91, 3154.2, 90.59, 768.95, 60.5, 169138.5, -93.77, -51.99, -16.25, -29.63, -107.88, -249.49, -10.67, 77.53, -207.44, 6651.1, 32.3, 3211.75, 3235.38, 91.15, 763.42, 61, 170477.9, -99.32, -51.44, -5.59, -27.37, -97.25, -234.05, -10.53, 75.84, -225.94, 6862.58, 45.41, 3031.29, 3338.39, 92.29, 756.88, 61.5, 171710.8, -109.33, -50.12, -9.84, -27.65, -102.62, -218.41, -10.24, 79.18, -227.87, 7082.42, 70.41, 2833.2, 3454.7, 93.71, 755.79, 62, 172825.9, -123.3, -55.71, -15.43, -35.86, -100.15, -208.97, -10.06, 77.33, -213.05, 7294.63, 92.82, 2631.89, 3578.43, 100.7, 748.41, 62.5, 173812.8, -126.51, -53.26, -7.47, -30.48, -97.6, -185.56, -9.93, 75.5, -163.5, 7511.59, 109.11, 2415.59, 3692.51, 96.58, 741.07, 63, 174675.7, -134.61, -46.22, -4.76, -31.58, -95.31, -168.59, -9.83, 73.56, -87.96, 7744.17, 128.79, 2202.39, 3802.99, 97.58, 733.32, 63.5, 175417.1, -143.77, -49.8, -8.18, -38.35, -93.23, -156.72, -9.84, 71.56, 8.56, 7980.2, 155.67, 1964.64, 3905.1, 103.66, 730.6, 64, 176023.5, -152.97, -47.64, -0.2, -34.3, -85.95, -133.59, -9.76, 64.18, 151.23, 8221.57, 178.74, 1734.5, 4011.45, 99.02, 715.98, 64.5, 176499.2, -162.76, -40.26, 2.11, -36.29, -84.65, -115.92, -9.89, 62.18, 303.68, 8464.67, 209.63, 1485.88, 4114.39, 99.6, 712.91, 65, 176846.1, -172.41, -43.24, -0.51, -38.19, -88.78, -103.19, -9.96, 65.6, 455.85, 8706.35, 241.95, 1223.23, 4218.07, 105.57, 708.62, 65.5, 177045.8, -176.95, -35.16, 8.66, -34.79, -81.78, -78.81, -10.03, 58.13, 617.14, 8956.1, 271.01, 962.48, 4325.57, 100.71, 692.76, 66, 177112.3, -192.35, -37.35, 11.49, -42.58, -81.2, -60.34, -10.38, 56.05, 781.74, 9205.97, 308.61, 683.88, 4428.25, 106.46, 681.61, 66.5, 177036.8, -202.13, -38.53, 10.13, -45.03, -80.46, -46.52, -10.53, 59.48, 949.22, 9456.25, 347.21, 397.32, 4534.39, 106.87, 676.12, 67, 176812.3, -212.4, -29.61, 14.3, -48.13, -80.7, -22.18, -10.94, 57.42, 1118.59, 9693.51, 383.2, 108.96, 4638.82, 107, 664.32, 48, 136095.5, 220.5, -153.6, -123.47, 62.72, -97.7, -721.69, -17.57, 112.73, 889.42, 2845.59, -53.94, 5645.99, 1642.09, 68.96, 745.24, 48.5, 139235.1, 221.52, -156.23, -126.27, 63.3, -99.25, -733.64, -17.38, 114.67, 768.92, 2981.46, -58.06, 5796.02, 1718.99, 67.17, 752.03, 49, 142428.4, 226.64, -158.89, -122.73, 34.6, -95.66, -740.95, -17.19, 116.46, 635.31, 3166.47, -62, 5929.52, 1801.3, 69.71, 759.12, 49.5, 145634.4, 255.06, -131.67, -94.35, 64.16, -66.27, -716.82, -17.03, 118.24, 551.45, 3353.42, -91.38, 6043.49, 1856.8, 71.11, 761.43, 50, 148902.2, 252.97, -133.95, -125.6, 64.4, -66.99, -720.56, -16.95, 115, 444.67, 3483.7, -67.33, 6148.08, 1968.23, 74.56, 768.87, 50.5, 152192.3, 249.7, -136.32, -125.95, 64.97, -96.24, -751.76, -16.68, 120.07, 350.44, 3651.72, -69.58, 6233.24, 2063.66, 77.11, 776.44, 51, 155496.6, 216.47, -166.75, -131.27, 64.61, -96.88, -755.95, -16.53, 121.16, 270.93, 3828.55, -69.58, 6302.85, 2160.13, 84.2, 784.1, 51.5, 158772.6, 240.07, -138.66, -97.67, 68.51, -67.78, -718.78, -16.44, 117.11, 217.72, 4008.92, -75.83, 6359.03, 2259.41, 82.06, 787.14, 52, 162077.1, 228.7, -137.93, -129.24, 63.28, -68.27, -744, -16.21, 121.28, 139.36, 4194.91, -77.63, 6395.75, 2362.07, 89.19, 800.1, 52.5, 165368.5, 195.07, -163.51, -121.2, 65.4, -97.52, -726.95, -15.96, 121.12, 35.63, 4387.81, -84.04, 6414.54, 2466.18, 86.84, 803.31, 53, 168632.9, 199.03, -121.08, -82.79, 53.02, -76.64, -665.64, -15.9, 115.91, -25.6, 4585.92, -90.39, 6420.61, 2573.71, 89.22, 806.25, 53.5, 171947.6, 165.37, -116.76, -73.52, 34.44, -93.74, -645.22, -15.61, 120.87, -169.67, 4794.93, -121.27, 6409.95, 2684.71, 96.34, 814.48, 54, 175264.1, 126.97, -139.88, -96.02, 5, -122.25, -658.52, -15.31, 120.34, -347.8, 5008.48, -98.98, 6387.09, 2800.11, 98.72, 823.13, 54.5, 178508.8, 117.6, -138.41, -94.69, 3.38, -123.1, -646.84, -15.06, 119.76, -509.39, 5214.09, -96.19, 6341.77, 2927.81, 101.47, 826.26, 55, 181686.7, 109.85, -106.67, -91.62, 32.19, -120.19, -631.96, -14.73, 117.66, -640.8, 5423.97, -99, 6285.77, 3059.99, 104.29, 829.7, 55.5, 184803.2, 95.86, -136.88, -90.41, 25.24, -119.27, -625, -14.53, 116.6, -773.01, 5641.56, -88.52, 6205.04, 3194.5, 107.08, 832.25, 56, 187831.2, 93.21, -130.67, -86.83, 31.33, -115.62, -605.75, -14.19, 115.45, -863.74, 5858.16, -86.63, 6113.29, 3332.3, 109.85, 835.61, 56.5, 190781.4, 79.05, -134.34, -91, 4.58, -113.81, -595.74, -14, 114.31, -927.59, 6089.3, -78.9, 6008.86, 3463.95, 117.33, 837.82, 57, 193613, 94.32, -112.95, -68.34, 27, -92.26, -555.42, -13.73, 113.64, -946.67, 6330.79, -74.7, 5891.58, 3589.29, 114.3, 835.14, 57.5, 196369.4, 84.4, -112.84, -84.02, 23.81, -90.75, -567.2, -13.48, 112.96, -922.23, 6578.12, -63.34, 5754.55, 3712.73, 116.09, 837.54, 58, 199031.1, 50.6, -126.1, -85.44, 15.53, -112.09, -543.02, -13.28, 111.16, -894.95, 6828.39, -37.29, 5609.91, 3844.35, 123.37, 839.54, 58.5, 201570, 59.17, -106.18, -73.4, 21.12, -90.92, -503.39, -13.11, 108.48, -826.04, 7107.82, -46.72, 5453.37, 3938.92, 118.71, 841.94, 59, 204026.5, 27.6, -120.25, -76.32, 11.33, -109.13, -499.49, -12.9, 106.6, -790.69, 7379.13, -15.9, 5272.55, 4060.96, 125.56, 837.95, 59.5, 206362.1, 20.74, -99.37, -64.52, 6.43, -93.83, -457.14, -12.79, 104.74, -733.73, 7713.72, -13.65, 5090.29, 4122.67, 124.89, 839.91, 60, 208617.1, -17.62, -77.24, -41.59, -3.82, -114.22, -393.44, -12.55, 102.51, -711, 7984.62, -27.45, 4893.18, 4259, 121.38, 830.1, 60.5, 210843.8, -62.51, -63.5, -33.28, -35.93, -130.62, -365.6, -12.27, 100.13, -774.02, 8306.32, -11.34, 4666.83, 4376.49, 122.34, 831.89, 61, 212924.5, -68.35, -68.53, -18.87, -25.84, -121.53, -345, -12.07, 97.89, -827.67, 8582.6, 5.72, 4433.95, 4518.14, 129.44, 827.33, 61.5, 214866, -82.77, -66.92, -17.85, -25.7, -128.51, -324.51, -11.78, 95.26, -847.02, 8873.77, 29.78, 4178.46, 4675.63, 131.52, 822.32, 62, 216653.8, -94.21, -68.82, -25.51, -36.46, -124.95, -311.87, -11.53, 92.77, -845.79, 9155.57, 58.9, 3912.45, 4846.86, 134.07, 817.26, 62.5, 218273.5, -105.74, -59.12, -16.33, -29.54, -115.68, -280.97, -11.27, 90.38, -797, 9437.55, 72.73, 3638.32, 5003.48, 130.38, 805.82, 63, 219737.1, -109.25, -62.76, -11.81, -30.67, -112.39, -258.78, -11.28, 87.86, -720.02, 9753.06, 104.47, 3348.42, 5154.88, 137.48, 799.6, 63.5, 221035.6, -121.36, -60.49, -9.59, -32.23, -108.49, -236.35, -11.1, 85.21, -605.52, 10061.5, 137.67, 3044.87, 5300.09, 138.77, 793.1, 64, 222171.1, -140.37, -64.47, -13.05, -34.76, -106.8, -219.51, -11.13, 82.63, -425.22, 10381.47, 174.38, 2729.94, 5451.29, 145.89, 785.49, 64.5, 223121.7, -147.1, -55.9, -3.75, -30.76, -98.42, -189.79, -11.16, 80.05, -222.51, 10704.95, 206.88, 2404.08, 5593.58, 141.16, 772.04, 65, 223902.4, -160.1, -53.01, -6.01, -33.07, -96.38, -165.74, -11.34, 77.43, -18.69, 11029.34, 242.28, 2060.66, 5734.64, 141.84, 763.93, 65.5, 224503.8, -173.42, -49.81, -1.84, -41.37, -94.41, -141.12, -11.51, 74.78, 196.01, 11363.93, 286.37, 1711.2, 5888.01, 143.07, 755.11, 66, 224922.8, -192.71, -51.84, 2, -44.29, -98.96, -122.28, -12.02, 72.15, 409.22, 11695.14, 333.58, 1339.34, 6030.09, 149.38, 745.46, 66.5, 225149.4, -200.36, -47.01, 6.94, -41.62, -92.01, -91.19, -12.26, 69.5, 633.37, 12032.86, 377.51, 967.85, 6176.49, 144.23, 736.11, 67, 225186.7, -214.27, -36.89, 12.11, -45.43, -91.88, -65.99, -12.74, 66.84, 866.89, 12350.53, 424.36, 579.44, 6326.49, 144.86, 718.9, 48, 154547.3, 344.59, -202.42, -166.5, 92.41, -114.63, -975.14, -20.04, 139.11, 918.82, 3229.31, -92.24, 7540.77, 2018.2, 86.44, 748.16, 48.5, 158821.7, 352.33, -201.92, -170.72, 97.89, -112.24, -988.72, -19.95, 141.66, 753.34, 3394.62, -103.67, 7772.37, 2126.41, 85.94, 755.92, 49, 163186.5, 355.85, -205.97, -172.56, 59.75, -113.09, -1005.93, -19.89, 144.17, 559.27, 3635.22, -104.03, 7984.59, 2224.92, 89.15, 763.69, 49.5, 167588.2, 392.62, -173.92, -134.78, 96.05, -77.35, -976.53, -19.82, 151.05, 437.68, 3854.52, -141.95, 8171.6, 2318.93, 96.11, 776.08, 50, 172084.6, 396.74, -173.07, -177.95, 101.37, -73.7, -984.64, -19.74, 148.55, 293.42, 4026.87, -115.11, 8343.74, 2461.59, 96.48, 779.82, 50.5, 176630.6, 394.72, -176.71, -179.12, 102.83, -113.28, -1030.1, -19.59, 149.4, 155.16, 4243.62, -119.74, 8494.5, 2582.31, 99.9, 788.18, 51, 181214, 347.03, -223.18, -185.26, 98.51, -118.4, -1036.82, -19.39, 155.42, 32.51, 4464.77, -121.63, 8618.42, 2718.36, 108.15, 801.28, 51.5, 185773.9, 386.11, -185.21, -141.68, 102.57, -73.88, -994.98, -19.31, 151.94, -44.19, 4693.88, -130.26, 8718.59, 2853.95, 111.78, 810.05, 52, 190386.1, 374.44, -184.68, -183.77, 97.84, -78.85, -1026.25, -19.03, 156.02, -160.43, 4936.7, -134.46, 8795.8, 2989.46, 115.24, 818.65, 52.5, 195000.3, 323.15, -220.2, -179.68, 94.68, -119.12, -1011.41, -18.8, 155.95, -312.09, 5180.76, -138.95, 8838.37, 3132.21, 118.65, 827.55, 53, 199582.6, 336.14, -163.36, -121.9, 88.76, -85.86, -924.8, -18.64, 150.73, -395.34, 5432, -154.85, 8872.11, 3280.42, 122.2, 831.72, 53.5, 204247.5, 291.72, -150.4, -104.22, 64.6, -108.1, -897.44, -18.39, 151.07, -601.83, 5698.52, -204.76, 8876.45, 3434.25, 125.68, 840.91, 54, 208929, 239.66, -182.36, -140.24, 24.05, -152.25, -917.06, -17.96, 155.05, -861.52, 5977.75, -169.2, 8855.39, 3588.44, 128.95, 844.87, 54.5, 213513.7, 227.82, -180.46, -133.99, 22.1, -148.62, -897.3, -17.7, 149.47, -1088.88, 6244.13, -172.08, 8810.42, 3758.16, 132.68, 849.33, 55, 218025.8, 218.44, -143.47, -134.8, 55.55, -144.44, -883.16, -17.46, 146.54, -1284.53, 6515.26, -171.55, 8742.5, 3938.03, 136.7, 858.39, 55.5, 222449, 207.09, -178.95, -133.57, 53.09, -143.01, -868.21, -17.14, 145.08, -1476.22, 6793.77, -171.14, 8652.42, 4122.2, 140.78, 862.5, 56, 226769.2, 192.77, -182.52, -128.75, 55.13, -142.52, -849.72, -16.77, 148.41, -1617.07, 7082.48, -158.3, 8527.42, 4303.43, 149.35, 871.78, 56.5, 230975, 186.36, -180.86, -127.91, 25.42, -134.82, -834.91, -16.47, 146.84, -1707.33, 7379.76, -154.92, 8396.83, 4483.97, 152.81, 875.8, 57, 235030.8, 201.64, -146.43, -104.44, 49.63, -104.7, -782.42, -16.3, 141.02, -1744.51, 7694.88, -149.2, 8248.8, 4649.71, 150.48, 874.3, 57.5, 238987.3, 189.2, -151.69, -126.33, 45.35, -102.33, -798.46, -16.02, 140.17, -1721.17, 8014.24, -135.88, 8067.41, 4822.27, 158.27, 877.98, 58, 242813.8, 142.83, -164.77, -121.32, 46.31, -132.24, -760.39, -15.72, 137.7, -1681.68, 8337.56, -108.03, 7881.4, 4999.04, 156.02, 876.27, 58.5, 246488.2, 156.13, -142.51, -111.64, 42.32, -102.48, -711.41, -15.53, 139.03, -1598.04, 8699.81, -116.5, 7676.13, 5135.01, 162.15, 885.22, 59, 250050.3, 113.16, -162.25, -108.83, 36.03, -128.01, -707.34, -15.28, 136.47, -1552.92, 9048.02, -76.99, 7446.96, 5301.58, 164.36, 883.07, 59.5, 253454.2, 106.28, -133.28, -99.79, 29.18, -106.97, -644.31, -15.14, 128.86, -1480.34, 9485.57, -82.16, 7215.12, 5392.83, 163.55, 880.83, 60, 256764.6, 52.29, -96.87, -62.46, 13.83, -136.56, -559.05, -14.96, 125.82, -1470.98, 9831.6, -96.5, 6956, 5578.47, 160.89, 878.83, 60.5, 260052.7, -14.64, -84.01, -49.98, -36, -165.37, -520.57, -14.59, 127.9, -1574.91, 10250.39, -84.8, 6668.68, 5736.9, 167.49, 882.44, 61, 263151.6, -14.56, -83.86, -35.84, -22.29, -151.05, -493.73, -14.24, 125.02, -1672.48, 10608.17, -57.88, 6364.74, 5936.95, 170.29, 879.97, 61.5, 266065.2, -34.84, -81.79, -29.57, -16.01, -149.34, -466.86, -13.84, 116.03, -1720.02, 10991.54, -34.13, 6043.51, 6150.69, 173.37, 871.94, 62, 268791.2, -55.22, -91.84, -45.73, -35.68, -149.78, -450.63, -13.68, 118.21, -1753.74, 11361.88, 3.29, 5699.51, 6376.18, 182.3, 868.57, 62.5, 271299.7, -70.18, -85.28, -40.83, -26.67, -144.37, -415.76, -13.4, 115.19, -1717.88, 11732.75, 26.15, 5342.91, 6587.9, 185.09, 865.49, 63, 273600, -74.38, -83.01, -28.09, -27.61, -139.61, -381.49, -13.6, 111.88, -1638.34, 12140.4, 59.02, 4974.01, 6799.06, 187.77, 855.74, 63.5, 275688.2, -84.12, -74.53, -25.87, -23.65, -127.43, -352.66, -13.18, 102.76, -1505.48, 12556.78, 95.1, 4585.92, 6995.15, 184.06, 845.85, 64, 277566.5, -108.49, -79.56, -24.69, -33.46, -126.2, -330.56, -13.19, 99.41, -1275.4, 12971.81, 141.04, 4183.03, 7191.94, 185.73, 835.01, 64.5, 279219, -123.64, -75.28, -24.95, -34.38, -121.35, -298.45, -13.2, 101.76, -1025.03, 13399.73, 187.35, 3758.19, 7393.44, 193.35, 829.73, 65, 280640.4, -134.85, -66.21, -15.1, -31.51, -112.52, -261.49, -13.62, 92.64, -753.42, 13824.2, 226.64, 3316.47, 7589.96, 189.06, 818.65, 65.5, 281836, -152.08, -68.24, -10.66, -34.59, -109.94, -229.98, -13.63, 89.21, -474.67, 14262, 281.43, 2859.21, 7795.48, 196.54, 805.76, 66, 282795.4, -175.76, -64.05, -11.39, -38.05, -113.56, -203.51, -14.26, 85.78, -195.71, 14701.46, 340.03, 2385.33, 7998.13, 198.02, 799.07, 66.5, 283513.3, -193.74, -64.72, -5.63, -41.87, -111.7, -170.64, -14.56, 88.19, 92.09, 15149.59, 396.91, 1888.9, 8197.06, 204.95, 791.73, 67, 283979, -206.24, -53.47, 0.63, -46.35, -104.94, -131.65, -15.04, 78.87, 397.97, 15572.19, 456.93, 1376.46, 8402.82, 200.21, 777.47 }, data_asc = 1, engine_control_time = { 58, 62.5, 65, 68, 71, 73.7, 76.7, 80, 85, 99 }, pitch_trig_diff = 0.05, @@ -47,6 +47,7 @@ _G["weapons_table"]["weapons"]["missiles"]["SCUD_RAKETA"] = { }, fm = { A = 0.08, + Cx0 = { 0.32, 0.32, 0.32, 0.32, 0.34, 0.42, 0.6, 0.8, 0.9, 0.86, 0.78, 0.76, 0.73, 0.7, 0.67, 0.65, 0.62, 0.6, 0.58, 0.56, 0.55 }, I = 59108.5, L = 11, Ma = 2, @@ -60,6 +61,7 @@ _G["weapons_table"]["weapons"]["missiles"]["SCUD_RAKETA"] = { finsTau = 8, mass = 5862, maxAoa = 0.3, + table_scale = 0.2, wind_sigma = 0, wind_time = 0 }, @@ -113,16 +115,16 @@ _G["weapons_table"]["weapons"]["missiles"]["SCUD_RAKETA"] = { server = { autopilot = { Areq_limit = 3, - K = 3, + K = 3.095, Kconv = 1, - Kd = 7, - Ki = 5.5, - Kr = 0.1, - Krd = 0.1, - Kri = 0, - delay = 1, + Kd = 6.98, + Ki = 5.48, + Kr = 0.16, + Krd = 0.16, + Kri = 0.001, + delay = 0.6, fins_limit = 0.5, - fins_limit_x = 0.1, + fins_limit_x = 0.16, omega_ctrl = 1 }, booster = { @@ -139,8 +141,8 @@ _G["weapons_table"]["weapons"]["missiles"]["SCUD_RAKETA"] = { work_time = 3 }, control_block = { - abs_err = 50, - aim_data = { 55, 63989.2, -116.91, -21.23, 2.59, -25.06, -47.69, -28, -7.69, 34.91, 645.15, 1884.05, 45.96, 561.79, 372.86, 15.44, 578.31, 55.5, 64069.1, -118.49, -20.66, 3.05, -25.35, -47.62, -25.25, -7.62, 34.68, 647.3, 1931.96, 49.13, 545.23, 386.62, 15.61, 572.44, 56, 64131.5, -120.06, -20.17, 3.6, -25.74, -47.56, -22.43, -7.57, 34.33, 649.92, 1981.14, 57.31, 522.61, 399.38, 15.74, 571.53, 56.5, 64171, -117.03, -19.51, 8.82, -21.47, -42.84, -14.81, -7.49, 32.76, 659.19, 2029.08, 54.83, 503.3, 415.11, 11.27, 560.74, 57, 64197.9, -124.81, -20.26, 5.05, -27.93, -48.78, -17.8, -7.46, 33.75, 661.43, 2078.19, 59.91, 478.04, 430.03, 16.14, 559.51, 57.5, 64199.9, -121.95, -18.35, 10.48, -23.47, -42.75, -13.02, -7.44, 28.81, 673.65, 2128.62, 64.06, 456.13, 443.83, 11.6, 553.54, 58, 64186.3, -126.55, -17.77, 6.37, -26.71, -46.95, -10.1, -7.35, 33.12, 681.44, 2179.45, 66.85, 428.51, 458.85, 16.43, 552.13, 58.5, 64149.7, -130.05, -19, 6.59, -29.3, -43.99, -7.19, -7.33, 32.69, 692.39, 2225.18, 73.15, 405.41, 476.7, 16.62, 545.84, 59, 64090.8, -125.12, -16.66, 11.95, -23.08, -42.1, 0.57, -7.34, 27.8, 705.81, 2275.08, 71.6, 380.32, 495.97, 12.17, 539.56, 59.5, 64017, -132.82, -18.1, 7.49, -29.56, -48.24, -1.88, -7.32, 32.08, 714.69, 2325.33, 83.33, 344.17, 513.54, 16.91, 537.75, 60, 63911.4, -130.52, -15.51, 14.82, -24.02, -40.24, 4.18, -7.3, 27.09, 734.62, 2373.98, 82.25, 318.98, 535.32, 12.52, 526.47, 60.5, 63782.4, -132.11, -14.67, 9.76, -24.7, -41.78, 7.69, -7.27, 26.72, 757.09, 2427.89, 89.83, 281.62, 553.73, 12.7, 524.53, 61, 63627.9, -133.37, -15.7, 8.31, -26.44, -41.54, 9.27, -7.21, 30.82, 778.74, 2485.65, 96.43, 241.94, 571.4, 17.43, 517.43, 61.5, 63440.6, -130.61, -15.24, 15.01, -25.6, -41.23, 12.71, -7.2, 25.87, 813.91, 2542.35, 103.65, 204.77, 588.67, 12.98, 510.55, 62, 63231.3, -138.22, -14.61, 9.94, -27.37, -42.5, 16.21, -7.17, 29.96, 843.67, 2608.04, 111.39, 157.48, 596.53, 17.47, 507.96, 62.5, 62987.9, -137.9, -13.66, 11.83, -26.01, -40.87, 21.12, -7.13, 29.42, 881.06, 2666.15, 119.21, 116.69, 613.18, 17.55, 500.65, 63, 62717.5, -139.73, -12.87, 10.93, -28.02, -40.79, 23.23, -7.15, 28.93, 921.33, 2746.28, 128.03, 70.65, 608.69, 17.32, 493.06, 63.5, 62417.4, -143.06, -16.85, 11.85, -28.78, -41.95, 27.01, -7.2, 28.47, 955.23, 2805.56, 136.81, 22.09, 624.4, 17.37, 490.06, 64, 62082.5, -144.52, -11.53, 17.46, -29.23, -41.58, 31.08, -7.28, 23.52, 989.93, 2878.05, 146.25, -22.67, 631.94, 12.85, 482.34, 64.5, 61721.6, -150.31, -14.78, 13.96, -34.1, -41.43, 30.7, -7.31, 27.39, 1020.66, 2938.44, 155.89, -77.72, 648.02, 17.26, 478.77, 65, 61320.9, -147.54, -9.29, 20.19, -30.24, -36.28, 39.87, -7.38, 22.48, 1056.39, 2990.72, 161.6, -126.55, 667.43, 12.92, 466.17, 65.5, 60893, -148.54, -7.45, 16.72, -30.86, -41.02, 43.63, -7.41, 26.23, 1087.51, 3048.4, 171.89, -179.98, 689.06, 17.29, 462.36, 66, 60433.2, -154.96, -10.8, 17.24, -35.9, -41.4, 43.19, -7.59, 25.62, 1115.57, 3107.1, 188.41, -238.91, 714.02, 17.39, 453.59, 66.5, 59936, -155.88, -8.71, 18.78, -32.32, -41.55, 47.52, -7.7, 25.05, 1147.07, 3160.95, 199.75, -294.75, 730.7, 17.18, 449.49, 67, 59401.6, -153.57, -3.21, 20.2, -33.41, -37.93, 55.72, -7.89, 20.26, 1186.63, 3220.46, 208.21, -351.68, 751.73, 12.95, 436.3, 67.5, 58837.6, -159.12, -5.66, 21.62, -34.53, -42.84, 59.51, -8.06, 23.87, 1212.79, 3281.63, 221.84, -413.85, 767.97, 17.02, 431.56, 68, 58235, -160.42, -3.72, 23.13, -35.78, -43.7, 63.26, -8.27, 23.28, 1246.79, 3342.44, 236.12, -474.52, 785.49, 16.91, 426.8, 68.5, 57593.7, -157.55, -1.53, 24.8, -37.26, -41.57, 66.78, -8.53, 18.65, 1279.33, 3403.15, 247.21, -534.46, 801.75, 12.7, 413.21, 69, 56920.1, -162.59, 2, 26.8, -39.01, -46.55, 70.12, -8.83, 22.12, 1307.97, 3464.32, 267.35, -599.39, 817.93, 16.58, 407.81, 69.5, 56207.1, -163.38, 0.09, 25.08, -41, -48.54, 73.3, -9.14, 21.54, 1337.74, 3525.41, 285.85, -659, 832.61, 16.36, 402.33, 70, 55452, -164.03, 7.45, 31.54, -43.24, -47.01, 76.34, -9.48, 20.96, 1369.81, 3585.62, 298.87, -721.51, 848.45, 16.14, 392.57, 70.5, 54659.1, -164.58, 11.2, 34.31, -41.89, -49.67, 83.18, -9.98, 16.55, 1399.02, 3647.22, 318.49, -788.56, 863.87, 15.88, 382.55, 71, 53827.6, -165.23, 15.18, 37.21, -45.94, -52.37, 82.59, -10.4, 19.81, 1431.51, 3707.88, 339.25, -856.04, 879.15, 15.58, 376.33, 71.5, 52953.6, -166.15, 19.12, 37.42, -47.04, -54.98, 89.82, -10.92, 19.23, 1465.03, 3765.45, 360.22, -920.13, 895.1, 15.31, 365.98, 72, 52041.1, -167.43, 16.16, 39.88, -53.15, -57.36, 90.61, -11.53, 18.64, 1496.3, 3821.15, 387.29, -988.19, 917.55, 15.08, 355.35, 72.5, 51083.2, -169.19, 26.42, 42.15, -51.95, -56.07, 97.87, -12.2, 18.04, 1532.91, 3876.65, 408.51, -1054.02, 934.1, 14.8, 348.59, 73, 50086.7, -167.23, 26.32, 40.89, -53.7, -57.6, 99.19, -12.98, 17.42, 1568.68, 3935.89, 434.68, -1122.25, 955.4, 14.53, 337.62, 73.5, 49048.6, -172.82, 25.01, 43.01, -55.4, -58.87, 99.85, -13.78, 16.8, 1602.16, 3990.57, 461.98, -1190.33, 975.75, 14.33, 330.34, 74, 47969.1, -176.29, 27.72, 48.97, -58.62, -65.11, 108.53, -14.61, 16.18, 1632.25, 4048.3, 495.34, -1255.42, 992.74, 13.95, 319.27, 74.5, 46848, -177.98, 30.23, 47.29, -59.13, -61.75, 113.41, -15.6, 15.61, 1675.86, 4108.05, 526.58, -1326.22, 1012.23, 13.69, 311.46, 75, 45686, -181.24, 32.51, 49.31, -60.78, -69, 115.74, -16.61, 14.97, 1706.45, 4173.27, 566.43, -1390.41, 1020.71, 13.26, 300.03, 55, 81350.5, -114.16, -27.64, 5.31, -27.49, -51.34, -57.94, -7.85, 42.62, 650.11, 2445.66, 46.65, 781.9, 747.59, 16.76, 677.05, 55.5, 81574.6, -116.75, -26.94, 6.04, -22.3, -51.21, -53.8, -7.81, 36.67, 652.76, 2511.27, 50.94, 751.31, 769.29, 16.98, 665.95, 56, 81778.2, -125.01, -26.22, 1.19, -28.44, -56.73, -55.13, -7.69, 41.89, 651.88, 2581.31, 61.42, 718.5, 788.45, 22.73, 666.46, 56.5, 81949.3, -122.04, -25.37, 1.98, -23.37, -51.03, -45.06, -7.64, 40.36, 659.4, 2649.16, 65.19, 683.73, 809.45, 22.88, 661.15, 57, 82094, -126.08, -25.81, 3.13, -25.23, -52.16, -41.7, -7.53, 41.09, 671.8, 2716.62, 65.84, 641.48, 831.6, 23.07, 655.47, 57.5, 82209.2, -129.03, -23.72, 9.81, -25.72, -50.83, -35.44, -7.52, 35.06, 685.3, 2784.9, 71.38, 602.79, 853.76, 17.6, 649.75, 58, 82300.3, -135.69, -28.53, 5.05, -30.15, -55.97, -36.43, -7.44, 40.22, 699.77, 2852.84, 81.2, 556.32, 878.2, 23.5, 643.32, 58.5, 82351.8, -134.73, -23.9, 11.26, -27.39, -52.05, -26.07, -7.43, 33.98, 718.62, 2915.75, 77.87, 519.71, 904.86, 18.09, 637.55, 59, 82381.3, -141.07, -26.74, 6.7, -31.52, -55.57, -26.55, -7.36, 39.17, 735.06, 2980.09, 87.99, 469.09, 934.99, 24.01, 630.76, 59.5, 82374.4, -145.41, -22.45, 7.19, -28.16, -51.61, -16.89, -7.35, 38.62, 757.38, 3047.51, 91.48, 422.72, 964.07, 24.26, 624.2, 60, 82334.3, -143.64, -18.89, 10.95, -27.32, -53.34, -13.39, -7.32, 38.06, 775.49, 3113.3, 101.89, 372.94, 996.12, 24.55, 617.38, 60.5, 82260.6, -152.2, -23.38, 10.62, -34.14, -55.37, -8.13, -7.3, 37.52, 801.58, 3188.33, 112.07, 315.44, 1022.55, 24.7, 616.08, 61, 82143.9, -148.68, -24.53, 9.01, -30.66, -54.94, -5.22, -7.26, 36.85, 832.91, 3267.38, 115.57, 258.23, 1047.71, 24.79, 602.72, 61.5, 81986.9, -151.18, -18.31, 11.66, -29.67, -48.88, -0.32, -7.19, 36.28, 869.96, 3343.9, 125.11, 206.24, 1073.35, 24.92, 595.28, 62, 81794.5, -155.09, -17.52, 11.05, -31.81, -50.29, 4.47, -7.19, 35.65, 915.08, 3433.27, 135.28, 152.21, 1087.1, 24.92, 587.48, 62.5, 81562.7, -154.96, -16.31, 13.42, -30.17, -48.22, 11.04, -7.16, 34.92, 958.14, 3511.27, 139.96, 88.77, 1112.05, 25.07, 579.44, 63, 81294.1, -157.45, -20.84, 12.36, -32.65, -48.02, 14.19, -7.22, 34.26, 1000.19, 3622.19, 157.43, 24.22, 1109.3, 24.77, 570.98, 63.5, 80980.2, -161.86, -14.67, 19.05, -33.6, -49.37, 24.9, -7.31, 28.15, 1057.56, 3701.27, 163.39, -38.39, 1132.73, 24.86, 562.7, 64, 80630.9, -169.43, -19.03, 15.05, -34.21, -48.88, 24.96, -7.36, 32.94, 1094.33, 3799.56, 181.4, -113.07, 1146.39, 24.79, 559.55, 64.5, 80234.9, -171.44, -17.55, 16.26, -34.84, -48.62, 30.47, -7.44, 32.2, 1137.37, 3882, 194.19, -184.42, 1170.82, 24.83, 550.54, 65, 79791.7, -168.32, -10.69, 18.65, -35.53, -47.57, 36.98, -7.48, 31.47, 1186.94, 3954.18, 202.14, -253.98, 1199.52, 24.9, 535.76, 65.5, 79311.3, -175.27, -13.72, 14.46, -36.36, -48.05, 42.19, -7.65, 30.68, 1225.41, 4035.11, 215.99, -329.57, 1231.61, 25, 531.88, 66, 78782.3, -178.25, -12.46, 15.21, -37.37, -48.5, 47.49, -7.84, 29.89, 1276.73, 4111.06, 231.74, -412.35, 1266.6, 25.12, 522.2, 66.5, 78203.2, -174.46, -9.8, 22.55, -38.29, -48.69, 58.65, -7.95, 29.15, 1326.83, 4186.57, 241.75, -486.45, 1295.2, 25.12, 512.61, 67, 77584.7, -182.5, -8.09, 19.19, -39.75, -49.44, 58.86, -8.24, 28.39, 1365.81, 4268.24, 263.92, -572.84, 1326.1, 30.36, 507.85, 67.5, 76909.8, -179.37, -5.83, 26.29, -36.04, -45.19, 69.33, -8.52, 22.45, 1420.11, 4352.33, 276.9, -650.5, 1351.2, 25.04, 492.23, 68, 76193.4, -186.6, -3.31, 28.29, -42.89, -51.51, 69.38, -8.78, 26.87, 1463.19, 4436.5, 296.03, -742.35, 1378.06, 24.95, 487.03, 68.5, 75424.6, -188.49, -0.44, 30.52, -44.87, -54.01, 79.35, -9.11, 26.13, 1504.76, 4520.49, 316.34, -828.46, 1403.18, 24.81, 476.25, 69, 74606.3, -190.14, -0.92, 28.13, -47.19, -55.27, 79.01, -9.57, 25.38, 1551.84, 4605.64, 337.97, -921.03, 1428.21, 29.66, 470.52, 69.5, 73734.7, -191.56, 1.84, 31.16, -49.84, -57.9, 88.46, -9.97, 24.64, 1595.16, 4691.02, 362.8, -1012.15, 1451.47, 24.43, 459.31, 70, 72811.1, -192.78, 6.34, 34.54, -52.82, -61.02, 92.7, -10.52, 23.92, 1641.77, 4774.64, 385.57, -1107.01, 1476.11, 29.07, 447.73, 70.5, 71830.7, -193.93, 11.3, 38.27, -51.32, -59.68, 96.97, -11.09, 23.2, 1689.75, 4862.11, 407.24, -1198.15, 1501.17, 23.96, 436.18, 71, 70797.9, -195.18, 16.57, 42.18, -56.51, -63.27, 101.41, -11.75, 22.48, 1731.86, 4946.62, 435.09, -1295.09, 1525.33, 28.39, 429.37, 71.5, 69707.2, -196.81, 21.81, 42.63, -58.19, -66.77, 106.31, -12.47, 21.75, 1780.36, 5027.36, 468.24, -1392.78, 1550.5, 23.37, 417.36, 72, 68563.8, -203.51, 22.86, 46, -66.11, -70, 107.72, -13.29, 21.02, 1830.98, 5105.68, 499.8, -1491.15, 1583.26, 27.68, 409.9, 72.5, 67358.5, -206.18, 31.61, 49.14, -64.68, -68.47, 117.55, -14.22, 20.28, 1879.11, 5182.36, 533.14, -1586.96, 1607.5, 27.18, 397.42, 73, 66095.4, -204.02, 36.21, 52.26, -62.68, -70.6, 124.21, -15.22, 19.52, 1935.66, 5263.83, 563.86, -1686.36, 1639.03, 22.36, 384.89, 73.5, 64779.6, -207.24, 34.57, 55.14, -69.45, -72.44, 125.34, -16.34, 18.76, 1989.42, 5337.79, 600.46, -1790.15, 1667.68, 26.29, 376.63, 74, 63402.4, -212.48, 38.18, 62.9, -73.96, -76.58, 136.85, -17.52, 13.79, 2038.5, 5420.3, 641.59, -1885.73, 1695.76, 21.74, 359.35, 74.5, 61967.6, -210.92, 45.66, 65.1, -70.51, -72.45, 143.54, -18.82, 13.2, 2100.95, 5503.8, 684.11, -1984.88, 1722.71, 21.22, 350.78, 75, 60480, -219.86, 44.6, 63.74, -76.96, -86.29, 147.01, -20.19, 16.55, 2142.29, 5593.89, 737.93, -2087.66, 1738.36, 24.8, 341.63, 55, 92309, -114.65, -31.69, -2.79, -28.19, -61.63, -81.31, -7.95, 46.88, 628.43, 2800.67, 48.51, 978.07, 987.71, 27.13, 737.44, 55.5, 92647.9, -117.77, -30.89, -1.89, -22.46, -61.41, -76.19, -7.82, 46.45, 617.57, 2877.31, 53.43, 946.03, 1015.4, 27.43, 726.27, 56, 92955.3, -120.93, -30.03, 5.3, -22.97, -54.97, -70.89, -7.78, 39.71, 622.61, 2956.73, 58.79, 904.96, 1041.46, 21.41, 721.73, 56.5, 93236.7, -124.15, -35.33, 0.01, -29.84, -61.02, -71.66, -7.64, 50.77, 624.6, 3036.24, 69.7, 855.46, 1069.45, 27.93, 716.34, 57, 93479.6, -128.62, -35.5, 1.25, -25.39, -61.94, -60.92, -7.6, 44.95, 633.25, 3115.37, 70.29, 810.06, 1097.46, 28.18, 711.08, 57.5, 93687.6, -132.19, -33.4, 2.42, -26.03, -60.66, -60.03, -7.49, 44.47, 656.15, 3196.52, 76.7, 768.34, 1124.78, 28.4, 705.79, 58, 93860.2, -133.91, -26.09, 3.49, -24.99, -53.82, -48.01, -7.39, 43.88, 673.97, 3278.24, 75.61, 717.74, 1153.86, 28.65, 693.35, 58.5, 93998.5, -132.86, -26.92, 4.27, -27.91, -55.42, -42.17, -7.38, 43.18, 697.22, 3352.29, 84.37, 665.33, 1186.94, 28.95, 687.31, 59, 94103.8, -140.5, -30.27, 5.54, -32.83, -59.55, -42.2, -7.37, 42.62, 717.56, 3429.18, 89.86, 603.47, 1224.02, 29.32, 687.64, 59.5, 94166.1, -139.19, -25.2, 12.52, -28.94, -54.9, -30.74, -7.35, 41.97, 744.56, 3509.23, 93.81, 546.05, 1259.52, 29.62, 674.35, 60, 94195.6, -150.54, -27.22, 10.75, -34.48, -57.13, -25.7, -7.36, 41.3, 766.6, 3587.69, 105.5, 484.63, 1298.59, 29.96, 674.05, 60.5, 94180, -154.5, -25.95, 10.52, -29.95, -59.59, -19.35, -7.28, 40.63, 789.97, 3675.75, 117.09, 412.05, 1330.62, 30.11, 659.98, 61, 94119.8, -157.1, -20.8, 8.88, -32.24, -59.04, -15.56, -7.27, 39.85, 826.2, 3766.03, 121.14, 342.7, 1364.62, 30.37, 652.42, 61.5, 94011.5, -160.37, -20.08, 11.84, -31.26, -52.2, -9.55, -7.21, 39.18, 862.97, 3859.95, 132.78, 270.4, 1397.08, 30.51, 644.58, 62, 93857.5, -165.32, -25.43, 11.32, -33.71, -53.75, -3.43, -7.24, 38.45, 912.5, 3964.32, 145.03, 190.51, 1413.14, 30.28, 636.23, 62.5, 93653.9, -165.76, -24.02, 14.06, -32.01, -57.7, 4.53, -7.23, 37.62, 961.26, 4057.26, 157.39, 113.24, 1444.83, 30.41, 627.55, 63, 93398, -169.07, -16.58, 12.99, -34.87, -51.28, 8.69, -7.24, 36.86, 1021.37, 4183.83, 171.35, 35.05, 1444.15, 29.99, 618.88, 63.5, 93092.6, -168.27, -15.8, 14.41, -29.86, -52.85, 21.26, -7.29, 36.15, 1086.36, 4279.17, 179.02, -51.76, 1473.84, 30.06, 609.76, 64, 92743.1, -177.29, -20.66, 10.04, -36.85, -58.53, 21.8, -7.45, 35.36, 1134.78, 4395.07, 200.18, -137.11, 1490.58, 36.03, 606.38, 64.5, 92330.9, -173.72, -12.79, 17.65, -37.65, -52.13, 34.46, -7.49, 34.53, 1196.08, 4492.32, 209.05, -222.92, 1520.57, 29.88, 590.19, 65, 91876.1, -182.64, -17.25, 14.31, -38.5, -51.03, 35.82, -7.66, 33.71, 1249.93, 4577.58, 224.6, -313.36, 1555.81, 30, 586.37, 65.5, 91365.1, -184.59, -14.51, 21.82, -39.48, -51.61, 41.94, -7.8, 32.82, 1302.47, 4672.51, 240.7, -404.55, 1595.12, 30.15, 575.97, 66, 90803.5, -188.21, -13.04, 16.65, -40.69, -52.2, 48.13, -8.05, 31.93, 1357.76, 4761.87, 258.98, -498.09, 1638.17, 36.37, 565.1, 66.5, 90183.4, -190.15, -9.97, 25.02, -41.8, -52.47, 55.02, -8.22, 31.1, 1417.92, 4850.1, 276.71, -593.91, 1673.53, 30.38, 554.32, 67, 89510.7, -193.52, -8, 27.21, -43.51, -53.37, 61.46, -8.51, 30.24, 1471.46, 4946.98, 296.45, -691.87, 1711.5, 30.43, 543.08, 67.5, 88778.2, -196.13, -5.39, 29.38, -39.39, -48.64, 73.54, -8.81, 29.39, 1530.4, 5045.42, 311.65, -791.96, 1743.81, 30.42, 525.54, 68, 87996.5, -204.51, -8.29, 25.9, -47.22, -55.86, 73.82, -9.22, 28.54, 1582.83, 5145.07, 333.97, -902.5, 1777.52, 36.2, 526.06, 68.5, 87147.8, -201.15, 0.82, 34.31, -43.82, -53.05, 85.37, -9.59, 27.71, 1639.31, 5244.98, 357.74, -1006.55, 1809.05, 30.28, 508.18, 69, 86240.9, -203.31, 6.05, 37.37, -46.59, -54.61, 90.92, -10.11, 26.88, 1696.15, 5345.97, 377.32, -1112.62, 1839.3, 30.05, 496.17, 69.5, 85277.2, -205.25, 9.16, 35.2, -49.76, -57.78, 96.2, -10.61, 26.06, 1748.91, 5447.19, 406.36, -1222.86, 1868.7, 29.85, 489.76, 70, 84246.5, -206.96, 14.25, 44.67, -53.32, -61.5, 101.27, -11.24, 25.26, 1805.41, 5546.55, 433.1, -1337.55, 1898.83, 29.55, 477.28, 70.5, 83154.7, -214.05, 14.44, 43.47, -57.26, -65.63, 106.38, -11.96, 24.45, 1863.7, 5649.65, 464.05, -1453.73, 1929.83, 29.3, 464.38, 71, 81995.5, -210.35, 20.5, 48.01, -57.85, -69.83, 117.04, -12.71, 23.65, 1920.83, 5750.72, 491.33, -1571.11, 1960.62, 29, 457.27, 71.5, 80773.6, -217.84, 26.57, 48.58, -65.31, -73.95, 117.51, -13.62, 22.85, 1974.33, 5846.69, 530.11, -1689.67, 1991.62, 33.96, 443.87, 72, 79484, -220.53, 27.78, 52.51, -69.24, -77.76, 119.33, -14.56, 22.05, 2035.74, 5938.4, 566.9, -1809.08, 2032.25, 33.61, 436.04, 72.5, 78121.4, -223.96, 37.89, 56.18, -67.75, -76.08, 135.94, -15.67, 21.23, 2099.73, 6031.71, 606.28, -1925.64, 2063.91, 33.18, 422.52, 73, 76690.6, -221.82, 43.22, 64.84, -70.7, -73.68, 143.72, -16.9, 15.41, 2168.04, 6132.58, 643.11, -2046.41, 2104.1, 27.88, 408.94, 73.5, 75197.4, -225.91, 41.35, 63.22, -73.63, -80.87, 145.12, -18.12, 19.56, 2233.16, 6224.7, 686.68, -2172.35, 2138.49, 32.24, 400.18, 74, 73636.4, -237.2, 45.56, 67.35, -83.91, -90.64, 153.6, -19.51, 18.73, 2288.01, 6321.37, 739.59, -2294.08, 2170.11, 31.55, 386, 74.5, 72002.3, -235.68, 49.45, 70.08, -80.01, -85.87, 161.54, -21.08, 17.98, 2363.48, 6419.2, 789.21, -2420.02, 2203.22, 30.82, 376.77, 75, 70300.7, -246.22, 53.02, 73.35, -82.91, -97.25, 170.41, -22.69, 17.13, 2419.4, 6525.6, 852.19, -2540.96, 2220.82, 29.92, 362.34, 55, 106747.3, -107.27, -37.37, -6.42, -21.64, -67.07, -118.73, -8, 52.28, 579.45, 3263.69, 43.1, 1279.07, 1311.49, 33.6, 803.8, 55.5, 107255, -111.11, -36.45, -5.29, -22.19, -66.69, -112.35, -7.87, 51.72, 565.69, 3354.51, 48.77, 1230.42, 1348.71, 34.06, 800.09, 56, 107724.1, -115.01, -35.38, -4.16, -22.72, -66.35, -105.76, -7.75, 51.12, 563.88, 3448.4, 54.89, 1178.32, 1384.14, 34.44, 788.24, 56.5, 108153.5, -118.97, -34.25, -2.99, -23.4, -58.99, -98.98, -7.7, 49.81, 565.83, 3543.75, 60.73, 1130.71, 1420.25, 34.8, 783.86, 57, 108543.1, -123.95, -33.95, -1.59, -25.1, -59.59, -85.87, -7.59, 49.85, 584.37, 3639.63, 68.36, 1073.3, 1455.94, 35.11, 778.8, 57.5, 108890.4, -121.15, -31.79, -0.19, -25.99, -58.45, -84.79, -7.47, 49.21, 604.93, 3737.71, 75.86, 1012.44, 1490.88, 35.39, 765.8, 58, 109201.6, -130.89, -37.67, -5.99, -32.42, -65.02, -77.68, -7.46, 48.49, 620.33, 3836.34, 82.33, 948.61, 1528.11, 35.71, 767.5, 58.5, 109463.5, -136.84, -38.14, 2.28, -28.26, -66.56, -70.49, -7.45, 47.67, 649.43, 3926.2, 92.19, 882.38, 1570.23, 36.11, 761.35, 59, 109678.1, -138.96, -27.75, 3.83, -27.11, -57.27, -62.88, -7.37, 46.95, 682.14, 4022.65, 92.04, 819.45, 1615.33, 36.5, 747.37, 59.5, 109854.9, -144.75, -28.72, 4.81, -29.77, -58.97, -56.37, -7.4, 46.16, 701.02, 4118.47, 103.64, 739.83, 1658.35, 36.8, 740.05, 60, 109984.9, -151.27, -30.57, 3.24, -36.39, -61.98, -49.3, -7.41, 45.35, 728.19, 4212.95, 109.73, 662.39, 1707.71, 37.26, 732.54, 60.5, 110068.9, -156.53, -29.03, 3.19, -38.93, -65.11, -41.64, -7.37, 44.53, 755.66, 4319.52, 123.23, 578.92, 1750.58, 44.76, 724.62, 61, 110091.4, -159.74, -22.94, 8.77, -34.28, -57.26, -29.54, -7.32, 43.59, 798.2, 4430.88, 128.51, 491.53, 1792.94, 37.84, 708.99, 61.5, 110062.8, -163.67, -22.03, 12.11, -33.28, -56.57, -22.22, -7.28, 42.77, 842.02, 4540.73, 142.01, 400.55, 1834.58, 38.04, 700.26, 62, 109978.5, -169.52, -28.1, 11.65, -36.05, -58.23, -14.78, -7.37, 41.89, 886.44, 4666.34, 156.53, 307.85, 1859.62, 37.92, 698.76, 62.5, 109834, -177.58, -26.44, 7.62, -41.39, -62.83, -12.42, -7.3, 48.07, 945.24, 4779.31, 171.28, 203.39, 1900.05, 45.26, 689.03, 63, 109626, -174.49, -25.02, 13.71, -37.5, -62.55, 0.02, -7.44, 39.99, 1010.58, 4931.75, 187.93, 104.93, 1902.65, 37.58, 671.49, 63.5, 109357.9, -180.96, -24.03, 15.4, -38.9, -57.17, 7.81, -7.52, 39.16, 1082.22, 5047.47, 204.45, -5.11, 1941.16, 37.69, 661.27, 64, 109028.6, -184.55, -22.45, 17.52, -39.87, -56.61, 15.99, -7.66, 38.21, 1150.2, 5187.14, 222.27, -109.32, 1964.31, 44.54, 658.25, 64.5, 108630.7, -188.07, -20.43, 19.27, -33.84, -56.35, 24.12, -7.77, 37.24, 1226.37, 5306.3, 233.5, -223.13, 2003.24, 37.47, 639.92, 65, 108177.9, -191.93, -18.42, 15.55, -42, -62.12, 33.46, -7.91, 43.28, 1289.51, 5410.35, 252.46, -341.61, 2048.47, 44.6, 635.76, 65.5, 107654.9, -201.79, -22.19, 17.33, -43.26, -62.8, 41.18, -8.12, 42.21, 1359.28, 5526.14, 272.09, -460.53, 2096.94, 44.63, 624.02, 66, 107061.5, -199.61, -13.46, 25.41, -44.77, -56.57, 48.96, -8.44, 34.22, 1438.41, 5635.23, 287.32, -581.6, 2150.45, 37.84, 612.32, 66.5, 106402.6, -202.43, -9.85, 28.23, -39.33, -56.96, 57.5, -8.72, 33.26, 1508.91, 5743.96, 309.01, -696.7, 2195.27, 37.84, 600.12, 67, 105678.3, -213.73, -7.51, 24.08, -48.28, -58.09, 65.49, -9.07, 32.28, 1585.54, 5861.5, 332.91, -826.42, 2243.02, 44.66, 587.39, 67.5, 104881.4, -210.32, -4.44, 26.73, -43.65, -59.47, 73.01, -9.48, 31.31, 1653.38, 5982.34, 358.23, -951.33, 2282.7, 44.52, 574.71, 68, 104018.1, -220.41, -7.72, 29.59, -52.75, -61.13, 80.48, -9.95, 30.35, 1725.91, 6103.34, 384.93, -1088.69, 2324.9, 44.38, 561.55, 68.5, 103080.9, -223.61, -3.78, 32.76, -48.97, -58.05, 94.14, -10.4, 29.41, 1796.6, 6223.83, 406.63, -1218.84, 2365.15, 44.19, 548.41, 69, 102073, -226.5, 2.44, 36.48, -52.31, -66.47, 100.91, -11.08, 28.47, 1867.82, 6345.4, 436.78, -1357.91, 2405.12, 43.93, 541.85, 69.5, 100989.9, -229.11, 6.18, 40.66, -56.1, -63.75, 107.38, -11.65, 27.55, 1934.13, 6471.45, 471.83, -1489.04, 2443.72, 43.7, 528.17, 70, 99832.3, -231.46, 12.27, 45.35, -60.37, -68.22, 113.6, -12.45, 26.63, 2005.06, 6594.32, 504.12, -1638.49, 2482.76, 43.3, 514.06, 70.5, 98594.2, -233.73, 19.01, 50.51, -65.08, -73.17, 119.87, -13.3, 25.74, 2078.03, 6718.96, 534.76, -1777.31, 2519.69, 42.69, 506.69, 71, 97274.6, -236.16, 26.15, 55.91, -65.87, -72.06, 132.55, -14.23, 24.84, 2156.07, 6842.01, 573.97, -1924.07, 2561.32, 36.26, 485.87, 71.5, 95878.8, -239.11, 33.31, 56.65, -74.74, -77.13, 139.57, -15.34, 23.94, 2223.67, 6959.89, 614.36, -2072.49, 2600.96, 41.95, 477.81, 72, 94400.9, -242.75, 34.78, 61.36, -73.52, -81.85, 141.88, -16.45, 23.04, 2300.49, 7074.49, 658.92, -2227.96, 2653.07, 41.63, 463.09, 72.5, 92840.7, -253.12, 40.87, 65.77, -77.85, -85.97, 149.77, -17.8, 22.12, 2380.66, 7188.02, 706.18, -2380.31, 2692.68, 41.03, 454.21, 73, 91191.3, -245.24, 53.07, 70.18, -81.44, -83.43, 165.06, -19.25, 21.19, 2465.86, 7309.31, 750.47, -2531.93, 2741.95, 40.54, 439.29, 73.5, 89465.6, -256.17, 45.28, 74.25, -85.02, -91.92, 166.99, -20.81, 20.26, 2547.52, 7422.86, 803.01, -2689.62, 2787.72, 39.97, 429.87, 74, 87651.8, -264.42, 55.91, 79.22, -91.81, -98.13, 182.76, -22.4, 19.34, 2622.62, 7542.24, 861.24, -2836.81, 2829.6, 39.3, 414.61, 74.5, 85754.5, -268.48, 60.55, 82.55, -92.79, -92.8, 186.92, -24.28, 18.51, 2716.64, 7662.7, 926.59, -2999.9, 2873.6, 38.61, 398.9, 75, 83774.8, -275.95, 59.58, 81.27, -96.35, -111.78, 197.66, -26.27, 17.57, 2787.43, 7793.97, 1002.39, -3151.91, 2898.35, 42.86, 388.66, 55, 122687.3, -96.51, -43.69, -10.7, -20.98, -72.84, -155.41, -8.07, 58.06, 511.34, 3768.21, 42.83, 1642.49, 1678.44, 41.06, 879.02, 55.5, 123404.8, -108.89, -50.43, -17.16, -29.56, -72.42, -155.64, -7.91, 65.24, 486.04, 3879.55, 49.64, 1582.23, 1722.96, 41.54, 875.1, 56, 124067.7, -105.56, -49.07, -7.85, -22.28, -72.01, -139.84, -7.84, 56.65, 483.32, 3992.81, 56.83, 1525.65, 1766.25, 41.96, 862.83, 56.5, 124690.6, -118.19, -47.69, -14.35, -31.06, -71.65, -139.61, -7.8, 63.5, 477.04, 4106.42, 64.07, 1457.89, 1811.79, 50.4, 858.04, 57, 125257.1, -115.61, -46.84, -12.82, -24.64, -63.96, -123.9, -7.74, 55.05, 499.36, 4219.4, 64.37, 1394.92, 1858.27, 42.88, 853.25, 57.5, 125781, -120.78, -44.66, -11.17, -25.84, -71.07, -122.66, -7.66, 54.26, 516.32, 4340.66, 73.34, 1319.61, 1901.79, 51.26, 838.68, 58, 126253.1, -132.55, -43.08, -9.51, -33.6, -70.49, -113.97, -7.53, 61.47, 544.06, 4455.21, 89.12, 1248.79, 1948.78, 51.7, 832.62, 58.5, 126665.7, -123.01, -35.01, 0.06, -20.39, -63.77, -97.11, -7.54, 52.41, 579.69, 4564.14, 83.97, 1175, 2000.79, 44.09, 817.61, 59, 127038.5, -142.37, -39.72, -6.21, -27.67, -69.82, -96.04, -7.52, 51.54, 611.2, 4675.12, 100.33, 1088.44, 2058.32, 52.8, 818.98, 59.5, 127348.9, -140.95, -32.26, 3.23, -30.52, -63.35, -79.75, -7.56, 50.59, 643.51, 4790.86, 105.38, 998.83, 2114.37, 45.17, 802.71, 60, 127611.9, -149.27, -33.91, 1.92, -30.15, -67.21, -70.23, -7.59, 49.61, 676.48, 4904.8, 112.3, 903.22, 2175.45, 45.75, 794.51, 60.5, 127821.1, -156.13, -32.15, 10.22, -33.59, -71.04, -52.88, -7.53, 48.62, 700.14, 5033.93, 119.85, 799.96, 2228.41, 46.09, 786.17, 61, 127964.9, -160.09, -25.04, 8.64, -36.36, -70.21, -46.59, -7.56, 47.51, 741.59, 5168.73, 134.63, 700.29, 2280.36, 46.39, 768.36, 61.5, 128047.1, -173.03, -32.13, 4.19, -35.36, -69.37, -45.9, -7.48, 54.68, 776.89, 5300.82, 150.52, 579.72, 2332.71, 54.82, 767.31, 62, 128054.1, -171.76, -30.82, 11.97, -38.45, -71.07, -28.79, -7.63, 45.49, 838.14, 5450.95, 167.61, 464.99, 2365.81, 54.68, 748.53, 62.5, 127988.9, -173.25, -28.93, 15.53, -36.53, -68.19, -17.51, -7.67, 44.33, 899.94, 5587.65, 185.1, 344.77, 2416.68, 46.74, 738.26, 63, 127855.7, -186.35, -27.28, 14.45, -40.21, -67.85, -10.89, -7.82, 43.26, 978.41, 5770.56, 204.84, 222.81, 2422.87, 54.19, 727.22, 63.5, 127642.1, -185.93, -18.02, 16.43, -33.78, -61.65, -1.49, -7.83, 42.27, 1064.74, 5910.48, 216.33, 95.44, 2470.92, 46.19, 716.33, 64, 127363.1, -190.44, -24.27, 10.84, -43.03, -61.02, 8.34, -8.03, 41.16, 1139.95, 6078.55, 237.52, -41.8, 2502.41, 54, 704.22, 64.5, 127002, -194.89, -21.93, 20.96, -44.27, -60.74, 18.11, -8.25, 40.03, 1224.83, 6220.82, 259.07, -174.31, 2552.01, 54.02, 692.21, 65, 126566, -207.71, -19.61, 16.83, -45.6, -67.3, 29.3, -8.49, 38.91, 1311.25, 6346.46, 281.47, -320.48, 2608.72, 54.13, 679.61, 65.5, 126046.1, -203.49, -15.9, 26.86, -39.21, -60.17, 38.65, -8.69, 37.71, 1405.35, 6486.29, 296.84, -467.47, 2670.63, 54.29, 667.07, 66, 125449.7, -209.42, -13.85, 28.23, -41.08, -61.03, 48.07, -9.1, 36.52, 1494.29, 6618.47, 323.11, -617.49, 2737.29, 54.49, 653.93, 66.5, 124774.2, -220.94, -17.47, 23.75, -50.64, -61.52, 58.36, -9.4, 35.41, 1581.57, 6750.15, 348.84, -770.62, 2794.2, 54.48, 640.25, 67, 124012, -226.5, -14.66, 26.95, -45.41, -62.84, 68.05, -9.89, 34.27, 1667.98, 6889.9, 376.95, -926.55, 2855.9, 54.59, 626.59, 67.5, 123169.1, -231.04, -10.97, 30.15, -55.71, -64.52, 77.4, -10.33, 40.82, 1761.45, 7037.01, 407.47, -1092.95, 2906.63, 54.39, 620.62, 68, 122236.5, -235.55, -6.9, 33.57, -51, -66.52, 86.65, -10.92, 32.05, 1853.67, 7185.58, 432.09, -1258.04, 2961.02, 54.29, 606.34, 68.5, 121213.8, -232.37, 5.24, 37.36, -54.46, -63.16, 102.92, -11.45, 30.97, 1943.42, 7334.1, 458.84, -1421.3, 3011.04, 53.97, 584, 69, 120112.2, -243.84, 4.99, 34.37, -65.88, -72.92, 103.85, -12.24, 37.33, 2033.71, 7483.93, 502.71, -1594.18, 3058.93, 53.44, 584.68, 69.5, 118911.8, -247.4, 9.38, 46.75, -62.98, -70.01, 119.19, -12.97, 28.87, 2117.47, 7633.56, 536.65, -1764.78, 3107.16, 53.1, 561.89, 70, 117621.7, -250.68, 16.49, 52.29, -68.07, -75.32, 126.81, -13.94, 27.85, 2205.93, 7781.07, 575.09, -1942.46, 3157.34, 52.69, 554.32, 70.5, 116234.5, -253.85, 24.39, 58.4, -66.57, -74.1, 134.5, -14.92, 26.83, 2304.16, 7934.66, 612.36, -2115.55, 3207.66, 52.25, 538.9, 71, 114756, -264.24, 25.76, 57.78, -74.73, -87.23, 142.47, -16.13, 25.83, 2393.84, 8085.26, 659.33, -2304.95, 3258.39, 51.78, 522.96, 71.5, 113178.1, -268.14, 34.28, 58.87, -85.22, -93.18, 151.15, -17.34, 24.82, 2485.96, 8227.74, 714.62, -2489.42, 3309.7, 51.3, 514.38, 72, 111500.9, -272.82, 36.17, 64.6, -84.11, -91.96, 161.11, -18.69, 23.82, 2581.54, 8368.56, 761.13, -2682.21, 3374.01, 50.87, 498.21, 72.5, 109717.2, -271.89, 50.33, 76.66, -82.47, -90.1, 177.54, -20.25, 22.79, 2680.88, 8507.41, 811.05, -2864.84, 3425.18, 50.25, 482.03, 73, 107839.3, -276.6, 57.97, 75.4, -93.47, -100.65, 182.41, -22.08, 21.76, 2786.7, 8654.56, 877.47, -3066.73, 3487.14, 56.22, 472.25, 73.5, 105855.4, -283.27, 55.62, 80.41, -91.42, -97.69, 191.54, -23.9, 20.72, 2887.95, 8793.85, 933.93, -3256.41, 3545.57, 49.09, 455.67, 74, 103771.4, -300, 61.7, 92.76, -106.12, -111.76, 203.94, -25.83, 19.7, 2981.73, 8939.89, 1003.89, -3446.74, 3598.61, 48.3, 438.95, 74.5, 101579.6, -298.92, 73.47, 96.78, -101.13, -105.65, 221.71, -28, 18.79, 3104.35, 9087.28, 1075.82, -3643.37, 3654.27, 47.49, 422.14, 75, 99287.7, -308.34, 72.58, 101.55, -105.63, -122.06, 234.52, -30.42, 17.75, 3193.18, 9249.1, 1166.94, -3839, 3687.87, 46.4, 411.49, 48, 121620.8, 3.98, -77.05, -45.64, 8.12, -70.61, -315.47, -10.57, 70.79, 885.84, 2683.74, 3.69, 2415.97, 1386.03, 31.59, 1004.41, 48.5, 122990.4, -0.33, -76.62, -44.71, 0.65, -70.49, -310.35, -10.41, 70.66, 834.11, 2773.99, 4.99, 2418.51, 1431.4, 32.33, 1008.65, 49, 124346.1, -5.12, -76.3, -43.89, -7.71, -70.26, -304.82, -10.22, 70.5, 771.88, 2873.01, 7.11, 2408.34, 1476.65, 40.7, 1003.65, 49.5, 125662.9, 4.03, -61.91, -29.09, 5.74, -55.99, -284.91, -10.03, 70.23, 751.43, 2974.72, -4.4, 2409.41, 1521.66, 33.7, 999, 50, 126974, -1.09, -69.44, -42, 4.87, -63.76, -300.19, -9.87, 69.94, 710.65, 3079.07, 12.29, 2397.94, 1567.78, 42.19, 1002.03, 50.5, 128255.2, -6.38, -74.4, -41, 3.96, -69.32, -293.48, -9.69, 69.55, 681.75, 3183.78, 7.45, 2381.87, 1615.55, 42.95, 996.26, 51, 129511.9, -24.48, -81.3, -39.68, 3.14, -76.85, -286.1, -9.53, 69.02, 658.76, 3290.08, 18.41, 2361.42, 1663.94, 43.7, 998.39, 51.5, 130722.2, -17.35, -67.77, -38.31, 1.94, -64.08, -278.54, -9.34, 68.61, 648.83, 3400.32, 14.02, 2345.04, 1712.24, 44.41, 982.61, 52, 131917.5, -31.44, -79.13, -36.8, 0.61, -68.49, -270.22, -9.18, 68.06, 616.38, 3525.41, 18.57, 2315.74, 1758.78, 45.08, 983.68, 52.5, 133075.3, -41.47, -69.04, -34.74, -4.48, -68.49, -252.53, -8.98, 67.36, 597.76, 3644.32, 22.73, 2281.75, 1798.67, 45.57, 975.53, 53, 134200.8, -45.71, -62.5, -31.28, -3.34, -66.26, -228.7, -8.88, 66.67, 583.41, 3783.39, 27.31, 2242.03, 1822.92, 45.68, 975.33, 53.5, 135310.9, -63.31, -51.67, -17.23, -14.98, -68.42, -218.77, -8.75, 66.02, 542.75, 3902.86, 23.23, 2197.87, 1849.3, 45.82, 965.66, 54, 136385.5, -69.55, -50.43, -15.95, -16.55, -68.9, -210.34, -8.65, 65.29, 495.21, 4014.37, 17.71, 2148.71, 1937.38, 47.34, 955.19, 54.5, 137421.9, -76.97, -59.72, -16.59, -19.53, -79.19, -203.79, -8.35, 64.43, 451.89, 4139.94, 26.37, 2094.32, 1990.69, 47.96, 953.65, 55, 138405.1, -82.11, -58.34, -15.03, -20.23, -78.58, -203.52, -8.3, 63.66, 426.58, 4267.46, 33.27, 2035.82, 2043.02, 48.51, 941.56, 55.5, 139335.5, -87.31, -57.06, -13.3, -21.02, -78.01, -185.85, -8.04, 62.78, 405.25, 4395.95, 40.95, 1981.55, 2097.12, 49.09, 929.01, 56, 140220, -101.44, -55.43, -20.42, -21.67, -77.49, -185.23, -7.93, 61.97, 383.94, 4527.6, 49.04, 1904.56, 2150.12, 49.6, 924.7, 56.5, 141048.3, -106.89, -62.7, -18.7, -22.55, -77, -175.63, -7.98, 69.93, 376.42, 4659.98, 66.55, 1832.72, 2205.7, 58.99, 919.96, 57, 141810.6, -103.93, -52.41, -17.03, -15.03, -68.02, -157.22, -7.9, 60.07, 402.45, 4791.23, 66.68, 1756.92, 2261.98, 50.73, 905.4, 57.5, 142523, -110, -50.29, -15.14, -16.48, -76.22, -155.74, -7.75, 59.11, 423.01, 4926.67, 67.57, 1676.07, 2316.98, 51.21, 899.68, 58, 143174.8, -114.83, -48.43, -4.22, -25.54, -66.7, -145.42, -7.67, 58.08, 456, 5066.64, 77.12, 1590.96, 2373.35, 51.69, 883.75, 58.5, 143766.2, -122.22, -39, -2.36, -19.45, -67.8, -135.02, -7.71, 56.98, 498.35, 5191.52, 80.03, 1493.23, 2436.4, 52.28, 876.7, 59, 144301.6, -126.4, -44.45, -9.2, -27.96, -74.83, -124.25, -7.67, 55.93, 526.66, 5320.8, 98.74, 1399.02, 2507.95, 53.1, 869.04, 59.5, 144773.4, -134.03, -44.78, -7.56, -30.98, -67.41, -114.4, -7.77, 54.83, 565.31, 5458.52, 104.5, 1292.15, 2574.39, 62.7, 860.75, 60, 145181.2, -144.22, -37.13, 9.54, -30.86, -72.13, -84.26, -7.68, 53.69, 604.06, 5594.32, 112.37, 1187.18, 2647.45, 54.37, 842.64, 60.5, 145545.4, -161.8, -35.13, 0.85, -35.26, -76.7, -82.53, -7.81, 61.58, 622.07, 5745.72, 130.15, 1063.98, 2710.91, 63.8, 842.83, 61, 145824.1, -166.56, -36.12, 8.42, -38.22, -75.7, -65.78, -7.93, 51.26, 660.31, 5901.83, 137.98, 935.18, 2772.55, 64.1, 823.48, 61.5, 146030.5, -172.17, -34.89, 3.41, -37.25, -74.69, -64.47, -7.76, 59.16, 701.53, 6056.59, 156.21, 801.04, 2837.87, 64.53, 812.91, 62, 146149.3, -180.08, -33.41, 3.13, -40.62, -76.42, -53.93, -7.94, 57.95, 763.06, 6232.91, 175.96, 663.88, 2878.55, 64.33, 802.4, 62.5, 146184, -182.22, -31.3, 16.14, -38.63, -64.25, -31.88, -7.97, 47.57, 835.16, 6394.77, 187.18, 529.22, 2940.02, 55.52, 781.67, 63, 146138.8, -188.12, -29.42, 15.08, -33.7, -63.83, -23.88, -8.09, 46.34, 917.64, 6607.94, 209.99, 383.23, 2957.69, 55.12, 769.93, 63.5, 146008.9, -188.01, -28.06, 17.35, -35.61, -65.88, -12.87, -8.26, 45.2, 1009.82, 6772.1, 232.58, 230.74, 3011.25, 63.95, 757.61, 64, 145793, -202.42, -25.97, 11.21, -45.96, -74.09, -10.28, -8.51, 52.87, 1099.71, 6964.66, 256.68, 66.94, 3055.83, 63.93, 754.41, 64.5, 145481.3, -207.79, -23.31, 13.63, -38.52, -64.85, 10.1, -8.73, 42.63, 1200.78, 7132.84, 272.75, -92.03, 3111.87, 63.71, 731.95, 65, 145081.9, -213.62, -20.69, 18.03, -40.15, -63.3, 23.15, -9.04, 41.36, 1303.76, 7282.11, 298.78, -266.71, 3182.8, 64, 718.53, 65.5, 144593.1, -218.23, -25.31, 20.49, -50.77, -64.24, 25.38, -9.33, 48.8, 1406.72, 7446.36, 325.75, -442.53, 3257.28, 64.18, 713.97, 66, 144005.6, -225.28, -22.88, 22.19, -44.15, -65.21, 45.27, -9.81, 38.64, 1512.98, 7605.67, 356.41, -621.81, 3339.09, 64.54, 699.88, 48, 136044, 38.22, -91.17, -57.81, 15.64, -76.45, -398.53, -11.04, 79.78, 908.82, 3015.12, -2.65, 2975.67, 1680.61, 46.26, 1087.57, 48.5, 137777.9, 33.09, -98.73, -56.61, -2.41, -84.33, -392.01, -10.84, 79.51, 837.21, 3120.62, -1.39, 2977.79, 1736.27, 47.26, 1094.57, 49, 139485.8, 27.43, -98.39, -55.59, -3.4, -84.12, -385.3, -10.7, 79.22, 769.85, 3236.18, 0.85, 2982.69, 1792, 48.23, 1092.59, 49.5, 141155.4, 38.63, -81.13, -46.21, 12.69, -67.15, -361.54, -10.4, 78.83, 735.35, 3355.99, -13.2, 2982.66, 1847.01, 49.13, 1080.08, 50, 142817.8, 24.19, -80.71, -61.72, 11.61, -67.25, -379.16, -10.13, 86.94, 685.91, 3477.12, 6.46, 2968.42, 1904.52, 50.07, 1085.42, 50.5, 144444.7, 18.01, -96, -60.57, 10.47, -83.42, -371.27, -9.83, 86.53, 641.51, 3597.99, 1.13, 2957.41, 1965.45, 51.08, 1081.07, 51, 146033, 5.31, -85.8, -50.25, 18.24, -74.2, -353.75, -9.81, 77.16, 621.92, 3726.21, -4.28, 2941.09, 2023.52, 51.94, 1066.58, 51.5, 147583.7, 14.08, -78.28, -48.52, 7.98, -58.87, -344.72, -9.71, 76.63, 600.48, 3853.79, -0.42, 2920.24, 2083.17, 52.82, 1069.71, 52, 149107.4, 7.21, -82.7, -46.66, 15.35, -73.77, -334.61, -9.46, 75.92, 561.19, 3996.83, 4.42, 2884.38, 2142.37, 53.7, 1062.53, 52.5, 150595.8, -14.49, -80.28, -44.07, -0.52, -73.76, -323.05, -9.15, 75.02, 538.47, 4136.17, 8.9, 2852.41, 2192.06, 54.3, 1054.15, 53, 152045.2, -18.99, -71.39, -39.62, 1.41, -70.49, -294.05, -9.13, 83.33, 511.98, 4299.32, 13.78, 2794.8, 2224.71, 54.46, 1054.52, 53.5, 153477.2, -39.73, -68.28, -22.67, -12.06, -82.63, -281.9, -8.96, 82.64, 462.97, 4438.4, 18.3, 2750.64, 2258.95, 54.61, 1044.76, 54, 154867.2, -47.25, -66.82, -21.12, -14, -73.99, -271.79, -8.91, 72.42, 405.57, 4566.88, 11.22, 2700.57, 2366.05, 56.54, 1034.23, 54.5, 156212.2, -56.73, -68.37, -22.53, -18.21, -86.14, -264.64, -8.68, 71.34, 343.62, 4715.73, 12.45, 2644.27, 2425.26, 57.05, 1023.14, 55, 157503.1, -72.37, -76.3, -30.25, -19.02, -85.36, -263.64, -8.49, 79.98, 303.24, 4865.01, 29.74, 2573.6, 2496.98, 67.6, 1020.41, 55.5, 158722.1, -68.89, -65.25, -18.59, -19.93, -84.59, -243.38, -8.4, 69.33, 276.57, 5015.71, 28.9, 2506.96, 2561.02, 58.63, 1007.72, 56, 159895.8, -84.92, -73.02, -26.33, -20.61, -83.9, -241.99, -8.42, 78.11, 242.09, 5173.24, 47.97, 2414.71, 2627.85, 69.06, 1003.12, 56.5, 160993.6, -91.34, -71.29, -24.27, -21.59, -83.23, -230.58, -8.34, 77.71, 232.71, 5329.73, 58.57, 2327.78, 2695.42, 69.78, 988.31, 57, 162023.3, -87.89, -59.2, -22.46, -12.73, -72.67, -208.91, -8.16, 75.92, 253.35, 5487.45, 58.61, 2246.21, 2762.94, 70.47, 983.17, 57.5, 162994, -95.06, -67.15, -20.28, -24.45, -82.21, -207.22, -8.16, 74.8, 278.22, 5648.62, 69.9, 2138.43, 2828.63, 71.04, 977.13, 58, 163893.4, -111.4, -64.99, -17.93, -25.27, -81.62, -194.92, -7.83, 73.65, 317.61, 5811.43, 81.24, 2045.62, 2898.42, 71.71, 959.8, 58.5, 164721.2, -109.62, -53.91, -15.6, -17.97, -82.37, -182.53, -8.03, 72.42, 358.05, 5960.85, 84.42, 1928.32, 2976.66, 72.55, 952.3, 59, 165473.3, -115.26, -50.3, -13.09, -18.01, -70.65, -159.79, -7.96, 61.18, 402.7, 6115.41, 96.14, 1824.61, 3062.73, 63.52, 934.24, 59.5, 166160.1, -123.97, -50.11, -11.02, -21.15, -72.04, -147.8, -8.18, 59.88, 449.08, 6274.58, 102.31, 1706.36, 3145.59, 64.34, 925.47, 60, 166782.6, -146.62, -40.98, -1.42, -31.44, -77.92, -122.28, -8.28, 68.6, 484.77, 6432.81, 110.87, 1569.49, 3232.37, 75.16, 916.06, 60.5, 167344.1, -157.34, -38.75, -0.75, -37.09, -83.38, -109.6, -8.24, 67.25, 495.3, 6617.33, 121.41, 1431.54, 3314.53, 75.88, 895.42, 61, 167815.5, -163.08, -39.59, 8.01, -40.24, -82.16, -100.07, -8.48, 55.7, 529.34, 6799, 140.74, 1286.94, 3391.58, 76.34, 885.11, 61.5, 168201.5, -169.72, -38.17, 2.33, -39.32, -91.01, -87.83, -8.19, 64.43, 567.5, 6987.24, 162.22, 1125.67, 3470.77, 76.82, 873.67, 62, 168484.4, -178.87, -36.47, 2.21, -43, -82.66, -75.37, -8.51, 63.01, 629.13, 7194.93, 185.06, 960.46, 3521.1, 76.54, 862.28, 62.5, 168668.3, -181.89, -34.09, 6.64, -40.99, -79.18, -60.21, -8.51, 51.4, 713.79, 7385.11, 198.39, 797.44, 3600.13, 77.02, 839.58, 63, 168757.5, -188.95, -31.95, 5.67, -35.46, -78.63, -50.42, -8.72, 60.01, 801.16, 7636.1, 224.89, 621.59, 3619.03, 76.16, 826.87, 63.5, 168746.8, -199.29, -30.35, 8.31, -47.66, -80.78, -37.37, -8.89, 58.64, 900.52, 7831.18, 251.14, 438.2, 3693.01, 76.39, 813.55, 64, 168634.6, -205.91, -37.97, 11.56, -49.3, -79.96, -23.83, -9.23, 57.16, 1018.63, 8066.76, 279.84, 241.3, 3742.83, 86, 799.61, 64.5, 168410, -212.49, -34.92, 14.37, -41.09, -79.56, -10.26, -9.55, 55.63, 1139.73, 8265.6, 298.89, 48.96, 3820.14, 76.25, 785.81, 65, 168081.4, -219.6, -31.86, 19.39, -43, -77.78, 5.13, -9.59, 54.1, 1263.48, 8444.34, 329.25, -151.84, 3904.8, 76.49, 771.29, 65.5, 167647, -225.39, -27.03, 12.43, -55, -78.78, 18.3, -10, 52.49, 1387.55, 8642.47, 360.99, -364.69, 3996.17, 86.61, 756.07, 66, 167095.7, -233.92, -24.23, 24.31, -47.73, -70.08, 31.59, -10.79, 50.87, 1515.73, 8830.12, 386.7, -572.72, 4095.34, 77.19, 740.9, 48, 153082.6, 82.79, -117.53, -82.07, 25.46, -92.24, -502.79, -11.64, 90.81, 930.25, 3402.4, -20.42, 3713.59, 2032.58, 55.12, 1186.56, 48.5, 155276.6, 76.9, -116.73, -71.83, 12.34, -83.29, -494.98, -11.35, 90.38, 851.73, 3523.43, -19.61, 3725.64, 2100.95, 56.34, 1178.08, 49, 157448.5, 70.42, -116.13, -70.49, 11.23, -82.9, -487.05, -11.2, 89.95, 749.75, 3660.83, -17.36, 3731.03, 2171.12, 57.57, 1178.55, 49.5, 159573.9, 84.35, -95.06, -48.85, 30.87, -62.18, -458.44, -10.93, 89.39, 706.95, 3799.92, -35.02, 3739.7, 2242.71, 58.8, 1177.81, 50, 161690.3, 77.57, -94.41, -76.72, 20.41, -71.39, -469.61, -11.07, 88.81, 646.33, 3948.3, -11.47, 3722.69, 2314.59, 59.98, 1175.66, 50.5, 163773.9, 70.5, -112.79, -75.29, 19.02, -90.93, -469.43, -10.41, 97.54, 582.71, 4091.17, -7.92, 3708.67, 2385.94, 70.53, 1172.09, 51, 165811.8, 44.91, -110.96, -73.37, 17.85, -80.69, -449.26, -10.18, 87.16, 547.35, 4240.04, -14.02, 3697.88, 2460.45, 62.24, 1168.36, 51.5, 167793.5, 55.54, -91.26, -61.66, 25.76, -62.08, -438.27, -10.33, 86.46, 531.09, 4391.21, -9.71, 3671.47, 2534.25, 63.33, 1152.35, 52, 169753.1, 47.32, -107.39, -59.39, 23.91, -79.98, -425.98, -9.92, 85.54, 483, 4559.22, -4.29, 3638.14, 2609.09, 64.47, 1145.75, 52.5, 171670.3, 21.15, -104.46, -56.14, 4.8, -79.91, -411.77, -9.69, 84.38, 444.68, 4730.55, -9.03, 3598.32, 2667.1, 65.02, 1137.94, 53, 173539.9, 16.33, -82.41, -60.53, 7.84, -75.19, -376.1, -9.56, 93.37, 413.43, 4921.06, -4.01, 3539.55, 2710.27, 65.22, 1139.81, 53.5, 175389.9, 1.92, -68.09, -29.73, 2.39, -79, -350.84, -9.37, 82.26, 353.46, 5083.54, -9.72, 3495.33, 2759.87, 65.59, 1130.93, 54, 177200.1, -7.11, -66.13, -27.83, 0.08, -79.87, -338.53, -9.43, 81.12, 272.92, 5242.43, -18.55, 3433.67, 2885.39, 67.82, 1120.13, 54.5, 178967.5, -40.18, -89.65, -40.83, -16.21, -94.37, -341.16, -9.26, 90.21, 187.56, 5416.83, 4.9, 3353.96, 2964.06, 79.14, 1119.39, 55, 180648.1, -36.9, -77.19, -38.72, -17.11, -93.3, -328.52, -9.19, 78.61, 138.7, 5592.11, 13.58, 3289.56, 3048.68, 69.7, 1095.11, 55.5, 182265.2, -44.1, -86.18, -36.25, -18.17, -92.32, -315.76, -8.89, 87.92, 83.49, 5771.71, 23.76, 3197.2, 3131.8, 81.29, 1092.75, 56, 183805.5, -51.63, -83.92, -33.98, -18.88, -91.38, -302.51, -8.78, 76.18, 54.01, 5958.25, 23.73, 3107.89, 3214.62, 71.5, 1078.02, 56.5, 185278, -59.13, -81.91, -31.5, -19.96, -90.49, -299.65, -8.96, 87.19, 31.12, 6146.57, 47.59, 3002.77, 3293.16, 82.95, 1073.56, 57, 186658, -55, -67.61, -29.55, -9.42, -77.93, -273.92, -8.31, 73.37, 55.85, 6330.67, 47.02, 2902.92, 3380.81, 73.05, 1056.96, 57.5, 187979, -74.46, -76.99, -38.01, -11.76, -89.15, -272.04, -8.75, 82.91, 74.95, 6526.49, 60.24, 2784.47, 3460.87, 84.64, 1050.36, 58, 189204.5, -82.92, -74.4, -24.19, -13.5, -88.55, -257.23, -8.23, 70.51, 122.04, 6716.23, 73.68, 2671.04, 3551.63, 85.67, 1032.41, 58.5, 190355.6, -91.92, -72.32, -32.32, -15.65, -88.68, -242.37, -8.62, 80.13, 160.11, 6895.85, 76.93, 2541.1, 3644.32, 86.55, 1024.24, 59, 191418, -99.5, -68.81, -18.26, -16.53, -87.38, -227.23, -8.7, 67.51, 213.63, 7079.72, 91.02, 2414.51, 3751.01, 87.84, 1004.52, 59.5, 192402, -109.44, -56.67, -15.61, -19.73, -77.33, -212.57, -8.72, 77.14, 258.08, 7271.22, 97.93, 2271.03, 3853.63, 88.91, 995.14, 60, 193310.4, -136.37, -56.91, -15.27, -31.73, -95.9, -170.29, -8.9, 75.59, 301, 7464.04, 107.67, 2117.4, 3965.67, 90.2, 985.37, 60.5, 194147.9, -149.97, -43.16, -2.95, -27.83, -91.33, -155.24, -8.67, 62.76, 324.39, 7682.91, 108.63, 1949.84, 4061.73, 90.83, 963.67, 61, 194889.7, -156.92, -43.74, 7.3, -31.1, -89.81, -132.15, -8.78, 61.01, 341.23, 7907.26, 131.68, 1775.11, 4156.36, 91.36, 940.25, 61.5, 195529.9, -164.84, -42.11, 0.79, -41.56, -99.6, -128.91, -8.95, 70.68, 374.9, 8128.83, 156.33, 1592.23, 4256.1, 103.34, 940.17, 62, 196048.8, -175.44, -40.17, 0.91, -45.56, -89.99, -114.14, -9.02, 69.04, 435.54, 8378.15, 183.1, 1392.36, 4323.78, 103.22, 915.7, 62.5, 196450.5, -179.63, -37.49, 5.83, -43.57, -86.17, -96.4, -9.17, 67.23, 523.57, 8606.77, 199.22, 1193.94, 4420.6, 92.47, 903.11, 63, 196739.1, -188.12, -35.02, 5.02, -37.32, -85.46, -84.33, -9.28, 65.52, 616.57, 8908.75, 230.55, 991.15, 4448.65, 91.44, 889.45, 63.5, 196908.6, -200.25, -44.37, 8.07, -39.85, -87.72, -68.75, -9.78, 63.92, 735.92, 9146.35, 261.64, 767.38, 4542.96, 91.86, 875.13, 64, 196956.6, -208.41, -41.58, 11.82, -53.01, -86.76, -52.48, -10.14, 62.18, 867.52, 9426.39, 295.3, 539.05, 4610.75, 102.81, 860.16, 64.5, 196870.6, -216.52, -38.06, 15.11, -43.94, -75.16, -25.08, -10.67, 60.38, 1014.53, 9667.98, 318.51, 303.99, 4705.56, 91.84, 833.33, 65, 196660, -225.27, -23.45, 20.87, -46.23, -73.23, -6.81, -11.44, 47.53, 1164.78, 9884.72, 343.23, 58.63, 4811.61, 92.23, 817.78, 65.5, 196322.5, -232.54, -29.02, 24.3, -48.81, -74.38, -1.98, -11.53, 56.73, 1315.76, 10125.38, 380.92, -201.06, 4924.43, 103.62, 801.48, 66, 195845.5, -231.97, -25.75, 26.76, -40.88, -75.64, 25.02, -12.06, 43.9, 1471.77, 10354.34, 412.04, -456.2, 5050.47, 93.37, 785.21, 48, 181358.5, 164.23, -159.8, -111.86, 44.17, -105.93, -695.24, -12.71, 119.98, 948.19, 4042.67, -40.24, 5101.95, 2632.7, 71.13, 1329.11, 48.5, 184424.3, 166.76, -148.97, -109.86, 24.79, -105.65, -685.23, -12.72, 119.49, 830.99, 4204.17, -39.55, 5129.02, 2722.05, 72.7, 1325.71, 49, 187461.5, 158.8, -148.03, -108.25, 23.31, -95.29, -674.98, -12.2, 109.09, 705.1, 4376.74, -47.27, 5147.15, 2821.68, 74.51, 1320.78, 49.5, 190447.5, 177.81, -130.2, -79.79, 49.38, -77.8, -637.36, -11.99, 118.36, 636.52, 4548.81, -71.76, 5157.3, 2916.16, 76.1, 1324.11, 50, 193422.1, 169.29, -129.51, -104.56, 47.88, -77.75, -652.32, -11.83, 117.68, 544.23, 4731.12, -41.81, 5158.32, 3012.95, 88.02, 1314.36, 50.5, 196353.7, 149.76, -153.93, -113.23, 46.29, -103.4, -650.25, -11.59, 116.83, 460.98, 4916.87, -37.8, 5139.78, 3104.02, 89.51, 1314.95, 51, 199237.8, 116.26, -151.58, -110.85, 45.03, -102.29, -636.29, -11.15, 115.63, 401.44, 5108.36, -34.08, 5123.41, 3208.73, 91.41, 1314.05, 51.5, 202048.3, 130.34, -125.8, -108.38, 42.81, -77.83, -622.07, -11.33, 114.83, 366.67, 5301.26, -29.1, 5099.23, 3307.39, 93.02, 1299.23, 52, 204830, 130.71, -147.11, -105.72, 40.35, -101.43, -605.95, -10.16, 113.7, 290.22, 5515.09, -33.78, 5065.97, 3409.19, 94.73, 1295.46, 52.5, 207556.5, 96.4, -143.17, -90.29, 15.24, -90.14, -575.78, -11.2, 112.21, 239.35, 5729.09, -28.19, 5035.9, 3496.12, 84.6, 1277.69, 53, 210220.1, 102.85, -102.23, -82.2, 32.07, -82.45, -516.19, -10.11, 110.78, 210.45, 5972.14, -34.21, 4971.1, 3561.62, 84.98, 1270.71, 53.5, 212884.2, 71.29, -96.27, -54.73, 12.64, -88.19, -495.66, -10.52, 109.62, 106.16, 6187.69, -40.92, 4910.81, 3622.75, 85.09, 1262.25, 54, 215496.2, 47.58, -93.72, -52.35, 9.43, -101.28, -491.28, -10.31, 108.2, -24.13, 6389.1, -41.85, 4829.42, 3792.02, 100.05, 1265.16, 54.5, 218041, 18.23, -110.73, -69.37, -11.71, -108.26, -482.93, -10.15, 106.43, -136.05, 6611.39, -24.14, 4762.38, 3897.34, 101.31, 1241.5, 55, 220498.8, 8.98, -120.4, -66.77, -12.79, -118.77, -478.72, -9.82, 105.06, -225.6, 6837.8, -13.79, 4663.77, 4008.79, 102.72, 1241.53, 55.5, 222862.3, -0.25, -118.62, -63.62, -14.12, -105.24, -462.51, -9.87, 103.36, -311.28, 7068.48, -13.56, 4568.81, 4126.64, 104.31, 1227.83, 56, 225140.2, -9.91, -115.76, -60.83, -14.8, -116.17, -445.67, -9.56, 102.15, -362.75, 7309.38, -0.59, 4451.33, 4236.23, 105.5, 1212.17, 56.5, 227317.9, -19.51, -113.49, -57.7, -3.57, -102.5, -428.23, -9.76, 116.35, -393.84, 7547.08, 29.03, 4327.56, 4352.21, 106.87, 1195.97, 57, 229390.4, -14.17, -95.3, -55.74, 10.15, -86.31, -395.32, -9.58, 98.66, -375.47, 7787.07, 15.06, 4209.3, 4466.59, 108.09, 1178.11, 57.5, 231373.8, -12.37, -94.71, -52.75, 6.98, -100.5, -393.26, -9.49, 96.82, -349.76, 8038.91, 31.01, 4067.83, 4579.87, 109.19, 1159.36, 58, 233263, -37.46, -91.37, -49.12, -9.5, -99.95, -374.11, -9.54, 95.09, -302.5, 8292.46, 49.23, 3932.42, 4699.09, 110.45, 1138.94, 58.5, 235042.1, -47.53, -87.21, -45, 2.47, -85.81, -354.87, -9.69, 93.37, -238.27, 8528.33, 52.38, 3764.27, 4824.75, 111.71, 1131.06, 59, 236724.1, -58.79, -97.08, -41.38, -13.07, -98.42, -335.74, -9.86, 91.45, -183.22, 8767.64, 70.77, 3598.73, 4970.49, 113.62, 1123.08, 59.5, 238292.4, -70.68, -81.51, -37.69, -3.18, -85.75, -316.23, -9.96, 89.55, -124.9, 9019.98, 78.8, 3424.45, 5106.91, 115.05, 1100.07, 60, 239778.7, -92.3, -54.08, -22.52, -18.11, -96.09, -261.65, -9.66, 87.58, -83.32, 9270.39, 76.77, 3236.93, 5252.35, 116.59, 1075.87, 60.5, 241204.8, -124.48, -64.13, -7.47, -41.87, -118.04, -242.55, -9.89, 85.53, -96.62, 9546, 91.22, 3030.53, 5388.91, 117.78, 1065.07, 61, 242494.1, -133.61, -51, 5.42, -32.12, -102.92, -213.27, -10.26, 83.37, -76.01, 9843.28, 107.27, 2800.41, 5524.71, 118.89, 1039.3, 61.5, 243653.1, -143.76, -48.96, -2.49, -31.67, -100.91, -194.57, -10.1, 81.31, -46.63, 10133.67, 138.1, 2572.11, 5659.53, 119.85, 1026.63, 62, 244669.8, -156.79, -59.72, -1.82, -36.02, -102.15, -188.61, -10.52, 79.21, 3.87, 10461.55, 171.9, 2322.84, 5756.85, 132.91, 1012.94, 62.5, 245536.5, -176.42, -56.56, -9.3, -34.28, -97.85, -166.39, -10.77, 76.95, 75.31, 10759.85, 193.12, 2060.61, 5890.08, 133.73, 999.01, 63, 246256.9, -187.45, -53.54, 3.42, -39.92, -109.9, -150.1, -10.68, 74.8, 182.68, 11148.97, 245.56, 1791.68, 5936.07, 132.37, 983.81, 63.5, 246810.9, -189.5, -38.03, 7.17, -29.92, -86.01, -116.89, -11.32, 72.76, 323.77, 11464.7, 258.83, 1509.64, 6070.14, 133.18, 954.85, 64, 247221.3, -200.41, -47.73, 11.76, -45.56, -97.88, -95.96, -11.92, 70.56, 496.97, 11835.63, 301.95, 1207.22, 6168.95, 133.02, 938.32, 64.5, 247472.9, -224.38, -43.46, 2.85, -48.26, -97.26, -87.94, -12.54, 68.32, 676.97, 12151.18, 345.29, 895.02, 6304.75, 146.67, 920.98, 65, 247549.7, -223.05, -39.14, 9.9, -51.19, -94.93, -64.43, -13.28, 66.1, 874.79, 12446.1, 391.38, 581.76, 6445.26, 133.92, 903.82, 65.5, 247461.5, -246.06, -45.39, 14.33, -54.48, -96.17, -43.6, -13.24, 63.75, 1074.49, 12761.11, 426.08, 249.59, 6602.55, 147.58, 885.79, 66, 247193, -246.91, -28.35, 17.67, -45.49, -84.74, -9.69, -14.22, 61.41, 1281.08, 13070.32, 467.15, -92.12, 6775.16, 135.79, 853.99, 48, 212559.1, 281.45, -201.31, -159.92, 79.06, -121.92, -936.45, -14.68, 144.81, 962.44, 4743.2, -78.16, 6871.29, 3296.55, 90.25, 1465.5, 48.5, 216734.7, 283.2, -199.75, -157.56, 41.24, -121.34, -923.79, -14.14, 144.03, 796.66, 4944.81, -78.55, 6919.01, 3426.28, 92.71, 1458.02, 49, 220885.4, 262.79, -198.76, -155.74, 39.33, -120.52, -910.87, -14.02, 143.27, 606.57, 5158.12, -76.93, 6954.93, 3552.41, 105.55, 1471.87, 49.5, 224957.7, 299.03, -162.31, -118.71, 73.66, -84.32, -861.86, -13.66, 142.28, 515.88, 5381.44, -120.46, 6979.53, 3678.37, 97.08, 1458.57, 50, 229027.4, 288.47, -161.4, -151.46, 71.76, -84.03, -892.93, -13.39, 141.28, 394.65, 5615.41, -82.07, 6992.26, 3802.14, 110.18, 1467.92, 50.5, 233041.8, 277.29, -193.36, -149.32, 81.18, -117.45, -877.04, -13.14, 140.02, 286.1, 5847.7, -77.98, 6993.52, 3934.46, 112.57, 1449.43, 51, 237006.6, 234.37, -201.88, -146.15, 68.22, -115.69, -858.96, -12.64, 138.3, 195.75, 6083.59, -74.61, 6984.05, 4070.43, 114.95, 1453.89, 51.5, 240876.7, 253.39, -168.45, -142.89, 65.32, -83.56, -840.58, -12.53, 137.17, 149.33, 6326.84, -81.19, 6964.53, 4201.55, 117.13, 1443, 52, 244710.5, 239.88, -184.17, -139.38, 74.31, -102.03, -819.52, -12.19, 135.59, 49.05, 6602.96, -73.79, 6933.37, 4331.28, 106.96, 1430.88, 52.5, 248498.7, 182.92, -191.2, -133.77, 29.36, -114.12, -794.62, -11.68, 145.94, -42.99, 6863.95, -68.36, 6879.35, 4450.88, 120.82, 1427.98, 53, 252193.7, 190.53, -139.53, -122.58, 50.75, -89.84, -718.02, -11.96, 131.53, -95.51, 7176.83, -75.32, 6822.49, 4541.39, 121.49, 1425.02, 53.5, 255903.1, 150.13, -131.23, -86.43, 26.69, -111.1, -690.9, -10.97, 142.85, -243.83, 7439.98, -71.3, 6757.72, 4635.8, 122.18, 1405.03, 54, 259533.1, 147.6, -114.89, -70.41, 35.42, -100.17, -657.31, -11.27, 128.09, -411.42, 7701.32, -114.92, 6681.2, 4846.17, 126.33, 1384.73, 54.5, 263119.8, 96.93, -150.05, -105.69, -4.94, -137.61, -675.31, -11.21, 138.96, -584.7, 7984.53, -64.88, 6579.75, 4995.57, 141.66, 1389.5, 55, 266567.5, 85.38, -147.21, -89.08, 7.29, -135.55, -654.93, -11.12, 123.87, -699.88, 8273.7, -66.3, 6482.23, 5146.69, 130.34, 1364.01, 55.5, 269911.1, 87.69, -145.16, -84.97, 5.87, -119.96, -634.61, -10.6, 121.6, -839.2, 8567.03, -65.14, 6374.37, 5296.36, 132.22, 1351.75, 56, 273146.2, 75.79, -141.53, -81.46, 5.49, -117.94, -613.43, -11.26, 120.17, -906.13, 8875.64, -49.76, 6239.95, 5453.09, 134.25, 1321.86, 56.5, 276270.3, 64.12, -138.88, -77.44, 4.34, -115.98, -591.55, -10.71, 138.3, -977.69, 9173.5, -13.53, 6113.78, 5600.18, 135.82, 1305.31, 57, 279262.8, 71.58, -115.81, -89.78, 22.05, -95.24, -564.39, -10.62, 115.7, -970.27, 9486.46, -30.5, 5963.26, 5751.01, 137.47, 1302.59, 57.5, 282145.3, 58.18, -131.28, -86.38, 17.69, -113.14, -562.87, -10.77, 113.29, -938.32, 9811.59, -11.38, 5797.9, 5904.02, 139.08, 1283.59, 58, 284923.9, 11.7, -141.62, -81.87, -3.55, -127.14, -538.66, -11.14, 125.54, -907.68, 10133.52, 26.57, 5608.93, 6062.61, 155.18, 1277.27, 58.5, 287534.7, 29.98, -105.49, -61.73, 27.01, -94.48, -499.7, -11.27, 109.07, -811.9, 10435.7, -0.28, 5438.02, 6235.35, 142.77, 1240.2, 59, 290053.8, -0.97, -118.16, -71.83, 7.01, -110.64, -490.06, -11.5, 106.53, -755.98, 10741.95, 38.09, 5240.34, 6430.3, 145.45, 1216.3, 59.5, 292429.4, -0.06, -98.16, -52.04, 4.6, -94.72, -449.76, -11.11, 104.13, -681.17, 11062.7, 31.7, 5016.34, 6612.72, 147.51, 1207.62, 60, 294717.8, -59.08, -79.21, -46.97, -13.94, -123.92, -379.73, -10.98, 116.44, -643.67, 11389.62, 43.73, 4775.69, 6810.3, 164.67, 1197.01, 60.5, 296933.5, -100.55, -75.79, -28.8, -29.41, -135.92, -355.79, -11.82, 99.02, -678.2, 11752.65, 46.94, 4524.76, 6993.21, 166.43, 1154.48, 61, 298992.2, -112.34, -59.73, -12.74, -32.39, -133.14, -319.11, -12.16, 96.34, -701.09, 12130.74, 82.33, 4260.31, 7170.49, 167.84, 1142.4, 61.5, 300886.6, -125.07, -72.24, -22.4, -32.55, -130.5, -310.46, -12.14, 93.72, -696.35, 12506.02, 105.11, 3965.48, 7356.68, 169.5, 1129.29, 62, 302601.1, -125.71, -69.45, -20.94, -37.05, -130.96, -286.42, -12.08, 106.09, -664.41, 12932.22, 147.14, 3643.98, 7495.85, 184.84, 1098.7, 62.5, 304127.1, -150.33, -65.8, -14.66, -35.82, -126.28, -259.05, -12.44, 88.26, -589.93, 13324.01, 174.96, 3335.55, 7674.69, 170.97, 1084.44, 63, 305466.9, -164.37, -62.19, 0.71, -41.95, -109.69, -237.41, -13.32, 85.55, -468.96, 13830.2, 224.45, 2986.5, 7751.45, 169.54, 1052.34, 63.5, 306612.2, -167.85, -59.17, 5.25, -30.6, -111.75, -196.81, -13.85, 82.95, -319.51, 14236.98, 258.18, 2635.12, 7933.58, 170.79, 1035.97, 64, 307573.4, -197.19, -70.11, -4.28, -48.85, -110.23, -185.21, -14.15, 95.24, -111.5, 14714.49, 311.89, 2242.23, 8065.84, 185.44, 1017.66, 64.5, 308316.9, -211.54, -64.99, 0.82, -52.28, -109.39, -158.33, -13.55, 92.43, 122.26, 15134.2, 366.82, 1850.31, 8247.44, 186.23, 999.75, 65, 308853.4, -226.82, -59.69, -5.74, -55.97, -106.66, -128.55, -15.61, 89.59, 378.11, 15515.91, 409, 1439.35, 8446.9, 187.24, 980.89, 65.5, 309163.1, -225.43, -51.7, 14.8, -45.19, -93.02, -101.63, -16.28, 71.69, 637.57, 15935.65, 454.79, 1018.59, 8663.87, 173.69, 946.17, 66, 309272.3, -258.18, -46.5, 4.31, -50.1, -109.52, -74.33, -17.86, 83.65, 891.61, 16341.88, 522.48, 568.86, 8889.99, 189.94, 941.41 }, + abs_err = 300, + aim_data = { 55, 55844.9, -85.08, -20.14, 3.68, -16.18, -35.95, -35.74, -8.33, 29.8, 527.46, 1572.18, 33.96, 834.58, 198.07, 11.85, 481.91, 55.5, 55978.8, -86.78, -19.58, 4.06, -16.57, -36.06, -33.81, -8.3, 26.21, 527.06, 1611.7, 36.42, 821.06, 216.29, 12.17, 476.82, 56, 56102.9, -92.05, -22.82, 0.94, -20.53, -39.69, -31.72, -8.21, 29.7, 527.37, 1650.58, 38.96, 801.92, 234.76, 16.05, 475.24, 56.5, 56209.1, -93.79, -22.45, 1.42, -20.39, -39.75, -29.43, -8.13, 29.59, 529.27, 1693.06, 41.78, 781.38, 249.77, 16.27, 473.86, 57, 56297.5, -92.71, -19.16, 4.9, -17.85, -36.94, -27.61, -8.03, 29.43, 535.19, 1738.63, 44.9, 762.96, 263.11, 12.92, 468.82, 57.5, 56373.2, -94.68, -18.8, 2.53, -21.79, -37.13, -24.34, -7.99, 29.26, 545.71, 1785.04, 48.23, 739.09, 276.04, 16.59, 467.28, 58, 56428.6, -95.57, -17.77, 6.53, -18.64, -36.2, -21.86, -7.96, 25.58, 556.58, 1831.3, 47.58, 720.84, 290.43, 13.27, 462.17, 58.5, 56471.1, -98.51, -18.2, 3.45, -22.73, -37.28, -20.14, -7.9, 28.93, 564.06, 1886.06, 56, 690.4, 295.56, 16.76, 460.42, 59, 56490.9, -99.36, -16.78, 7.59, -19.64, -36.24, -16.4, -7.88, 25.25, 576.79, 1939.72, 55.93, 665.02, 305.12, 13.28, 455.2, 59.5, 56495.8, -105.51, -17.49, 4.51, -23.42, -40.68, -14.93, -7.83, 28.49, 586.5, 2006.68, 65.41, 634.6, 301.96, 16.65, 453.32, 60, 56478.1, -105.29, -18.42, 7.25, -23.21, -38.92, -11.02, -7.78, 28.25, 600.21, 2053.82, 67.99, 601.93, 319.14, 16.85, 451.53, 60.5, 56438.2, -107.96, -18.87, 7.13, -24.45, -40.64, -8.96, -7.71, 27.99, 613.2, 2115.04, 74.51, 565.96, 327.93, 16.86, 445.81, 61, 56371.8, -107.24, -15.01, 9.73, -22.33, -38.11, -2.67, -7.69, 24.27, 637.02, 2163.63, 76.61, 532.33, 344.86, 13.61, 440.24, 61.5, 56283.9, -111.59, -14.73, 6.89, -22.96, -36.9, 0.29, -7.56, 27.45, 657.23, 2215.08, 82.74, 495.02, 366.27, 17.24, 437.98, 62, 56168.3, -109.88, -13.3, 12.03, -22.11, -36.79, 4.25, -7.54, 23.83, 685.06, 2264.56, 87.95, 461.35, 388.53, 14.07, 432.18, 62.5, 56029.4, -111.59, -13.71, 12.31, -23.44, -33.47, 6.19, -7.51, 23.51, 716.15, 2313.62, 92.23, 423.37, 407.99, 14.23, 426.2, 63, 55865.9, -114.32, -13.24, 11.83, -23.97, -36.71, 9.13, -7.5, 23.17, 745.77, 2371.3, 102.58, 382.23, 426.28, 14.43, 423.69, 63.5, 55677.4, -119.52, -16.12, 9.31, -24.51, -37.44, 12.51, -7.44, 26.16, 775.98, 2428.49, 110.17, 337.79, 438.97, 17.65, 421.01, 64, 55457.7, -120.25, -11.25, 11.02, -24.09, -33.06, 17, -7.45, 22.47, 806.89, 2485.64, 114.04, 290.06, 456.75, 14.47, 414.86, 64.5, 55211.8, -119.51, -11.23, 14.23, -25.44, -33.84, 19.8, -7.49, 22.06, 835.47, 2541.89, 123.36, 240.95, 475.11, 14.63, 408.48, 65, 54936.1, -124.65, -10.39, 11.79, -25.98, -37.18, 23.42, -7.44, 24.89, 865.47, 2598.93, 132.39, 189.83, 491.55, 17.9, 405.45, 65.5, 54630.6, -126.64, -12.79, 13.32, -26.58, -36.85, 24.46, -7.51, 24.44, 896.76, 2657.45, 145.01, 132.82, 508.71, 17.89, 402.16, 66, 54291.4, -128.39, -11.5, 13.83, -27.29, -37.13, 31.37, -7.58, 23.93, 928.95, 2715.55, 152.52, 78, 525.22, 17.84, 395.42, 66.5, 53919.7, -129.91, -9.69, 15.21, -27.93, -37.12, 35.7, -7.64, 23.4, 961.19, 2774.45, 163.01, 21.71, 541.77, 17.79, 391.89, 67, 53512.7, -131.77, -5.57, 16.46, -28.91, -34.51, 39.66, -7.78, 19.74, 996.41, 2828.1, 174.5, -32.91, 558.82, 14.57, 381.53, 67.5, 53075.8, -133.42, -7.05, 17.73, -29.92, -38.11, 43.5, -7.88, 22.35, 1028.32, 2882.1, 186.72, -95.48, 580.51, 17.67, 380.84, 68, 52602, -138.16, -5.21, 19.09, -31.03, -38.78, 47.32, -8.03, 21.83, 1059.78, 2936.22, 199.64, -159.32, 601.97, 17.65, 373.38, 68.5, 52090.7, -136.7, -3.66, 20.61, -29.36, -36.77, 51.02, -8.23, 18.28, 1096.94, 2990.39, 210.41, -219.25, 623.97, 17.62, 365.96, 69, 51546.6, -141.1, -0.72, 22.4, -33.22, -41.08, 54.55, -8.45, 20.78, 1128.24, 3048.19, 228.36, -288.14, 642.85, 17.41, 361.28, 69.5, 50964.4, -142.28, 1.07, 21.45, -35.72, -42.73, 57.9, -8.68, 20.26, 1158.01, 3105.33, 243.96, -350.5, 657.72, 17.04, 353.34, 70, 50341.4, -140.43, 3.98, 26.65, -34.83, -41.81, 61.2, -8.94, 19.73, 1193.8, 3164.77, 257.89, -415.13, 665.32, 16.75, 345.41, 70.5, 49680.9, -141.43, 7.23, 29.15, -35.52, -44.05, 67.3, -9.35, 16.35, 1225.7, 3217.68, 275.93, -483.29, 690.81, 16.64, 340.34, 71, 48982.2, -145.3, 10.69, 31.76, -40.35, -44.51, 67.82, -9.68, 18.68, 1259.99, 3294.44, 295.4, -552.09, 691.42, 16.2, 331.87, 71.5, 48242.1, -146.53, 14.16, 34.43, -39.53, -48.63, 74.21, -10.09, 18.15, 1297.28, 3373.41, 315.61, -621.97, 688.82, 15.73, 326.4, 72, 47463.7, -148.01, 12.22, 34.48, -46.78, -50.74, 75.43, -10.6, 17.6, 1331.1, 3437.25, 337.53, -693.14, 712.12, 15.54, 317.6, 72.5, 46641.2, -146.99, 20.75, 39.62, -43.38, -49.8, 82.4, -11.16, 17.05, 1371.13, 3501.71, 360.9, -762.9, 713.69, 15.05, 311.7, 73, 45778.9, -148.77, 21.28, 39.66, -47.76, -51.24, 84.63, -11.82, 16.48, 1404.7, 3570.88, 385.57, -833.85, 724.07, 14.66, 305.4, 73.5, 44875.2, -150.98, 24.26, 38.3, -49.44, -52.42, 89.78, -12.51, 15.87, 1444.85, 3629.85, 411.14, -904.32, 739.86, 14.34, 296.16, 74, 43930.4, -157.42, 25.48, 43.21, -48.43, -57.91, 93.57, -13.21, 15.3, 1477.58, 3688.76, 442.06, -972.05, 754.35, 14.02, 286.87, 74.5, 42944, -156.17, 25.44, 42.52, -53, -55.08, 98.4, -14.07, 14.77, 1519.74, 3748.62, 471.14, -1044.26, 769.8, 13.68, 279.98, 75, 41917, -159.38, 27.59, 44.48, -54.67, -56.16, 103.73, -14.95, 14.18, 1554.57, 3807.05, 507.85, -1113.5, 784.68, 13.29, 272.91, 55, 69539.7, -83.24, -23.55, -0.47, -16.4, -45.77, -75.78, -8.86, 34.74, 518.05, 2003.76, 31.29, 1133.58, 480.73, 17.86, 535.2, 55.5, 69859.5, -89.58, -31.79, -3.85, -16.96, -49.69, -76.63, -8.73, 38.52, 509.13, 2055.97, 38.13, 1107.61, 509.18, 22.3, 538.96, 56, 70155.1, -88.03, -27.43, -3.16, -17.38, -45.69, -69.47, -8.59, 38.36, 506.59, 2112.09, 37.58, 1082.83, 534.67, 22.7, 534.45, 56.5, 70429.8, -90.54, -26.95, 1.35, -18.08, -45.66, -66.03, -8.56, 34.28, 507.5, 2171.79, 41.21, 1057.95, 557.31, 19.11, 529.85, 57, 70683, -93.07, -26.43, 1.89, -18.56, -45.65, -62.55, -8.41, 38.01, 514.21, 2234.35, 45.13, 1033.17, 578.82, 19.42, 525.04, 57.5, 70914.6, -95.78, -26.11, 2.6, -19.21, -45.81, -59.23, -8.39, 33.95, 523.56, 2297.27, 45.4, 1005.66, 600.53, 19.73, 524.49, 58, 71127.8, -101.9, -29.27, -0.6, -19.73, -49.51, -59.35, -8.29, 37.56, 533.69, 2361.95, 53.38, 971.74, 621.81, 23.89, 523.51, 58.5, 71314.5, -104.81, -29, 0.19, -24.19, -49.81, -55.78, -8.25, 37.26, 543.94, 2437.26, 58.78, 934.2, 631.84, 23.9, 518.46, 59, 71476, -107.07, -27.9, 1.02, -20.98, -49.34, -51.25, -8.15, 36.93, 559.57, 2506.97, 63.55, 896.76, 652.42, 24.17, 513.47, 59.5, 71611.5, -106.46, -23.96, 1.8, -21.59, -46.04, -43.8, -8.1, 36.56, 577.15, 2598, 66.65, 856.86, 652.39, 24.02, 512.55, 60, 71721.6, -111.91, -20.12, 5.89, -21.96, -44.97, -36.73, -8.02, 36.18, 589.7, 2666.06, 69.59, 809.21, 677.98, 24.32, 507.25, 60.5, 71808.2, -116.85, -23.99, 6.24, -24.64, -51.44, -32.93, -7.97, 35.76, 602.62, 2748.23, 81.25, 756.79, 694.75, 24.42, 505.76, 61, 71857.9, -120.12, -19.64, 5.84, -25.81, -48.09, -28.6, -7.88, 35.29, 620.54, 2816.12, 84.69, 705.29, 721.21, 24.7, 500.22, 61.5, 71871.9, -121.89, -19.22, 10.35, -22.64, -46.75, -20.25, -7.84, 31.03, 644.13, 2887.92, 92.8, 650.82, 752.94, 21.21, 494.56, 62, 71853.6, -124.33, -21.49, 8.37, -25.81, -46.39, -18.46, -7.74, 34.37, 674.25, 2956.69, 100.17, 589.64, 786.7, 25.39, 492.51, 62.5, 71795.8, -130.6, -21.67, 5.12, -27.19, -49.88, -14.75, -7.72, 33.83, 706.21, 3025.9, 110.05, 526.94, 816.55, 25.63, 486.36, 63, 71696.4, -130.72, -21.03, 8.69, -27.89, -45.84, -9.85, -7.65, 33.29, 746.73, 3105.51, 116.23, 469.44, 842.74, 25.69, 480.33, 63.5, 71557.9, -133.6, -16.63, 9.74, -24.85, -42.71, -0.92, -7.69, 29.02, 792.11, 3183.39, 126.57, 408.08, 866.91, 25.73, 474.07, 64, 71384.3, -138.27, -18.57, 7.94, -28.15, -45.04, 1.17, -7.63, 32.15, 833.44, 3261.99, 139.48, 342.54, 893.99, 26.02, 471.35, 64.5, 71168.1, -137.79, -14.67, 11.73, -25.96, -45.64, 9.12, -7.62, 31.51, 875.53, 3340.41, 147.79, 272.5, 920.24, 26.2, 464.95, 65, 70914.5, -140.36, -17.28, 12.82, -30.34, -45.59, 10.68, -7.69, 30.87, 917.58, 3419.35, 159.72, 198.84, 946.31, 26.31, 457.97, 65.5, 70615.6, -143.19, -16.19, 14.69, -31.09, -45.06, 16.68, -7.72, 30.21, 962.36, 3500.92, 172.29, 121.36, 973.27, 26.39, 455.08, 66, 70274, -145.76, -14.59, 15.43, -32, -45.3, 22.05, -7.84, 29.52, 1008.88, 3581.78, 186.45, 42.13, 998.88, 26.39, 447.87, 66.5, 69884.3, -148.24, -12.43, 17.16, -29.28, -41.68, 31.58, -7.87, 28.85, 1059.19, 3663.61, 196.87, -39.5, 1024.73, 26.38, 440.73, 67, 69449.8, -151.01, -11.15, 18.79, -30.57, -42.27, 37.18, -8.1, 24.58, 1106.19, 3738.62, 212.19, -122.85, 1051.8, 26.36, 433.27, 67.5, 68969.1, -153.57, -9.06, 20.45, -31.9, -42.84, 42.69, -8.21, 27.45, 1153.2, 3814.22, 228.49, -209.81, 1085.1, 26.43, 425.51, 68, 68441.3, -159.63, -10.24, 18.73, -36.88, -47.13, 44.7, -8.46, 26.74, 1200.1, 3891.13, 245.85, -297.84, 1117.02, 29.95, 421.27, 68.5, 67860, -158.3, -4.77, 24.15, -35.09, -44.82, 53.23, -8.7, 22.58, 1251.86, 3968.78, 260.48, -383.25, 1149.51, 26.55, 413.53, 69, 67233.9, -163.88, -1.1, 23.02, -39.65, -46.42, 58.27, -8.98, 25.32, 1295.84, 4048.36, 283.53, -477.03, 1182.06, 26.62, 408.9, 69.5, 66555.9, -165.83, 1.23, 25.66, -42.8, -48.47, 63.18, -9.28, 24.61, 1343.27, 4131.43, 301.27, -570.86, 1207.61, 26.31, 400.47, 70, 65825.8, -167.61, 1.6, 28.63, -45.4, -54.27, 67.94, -9.72, 23.9, 1391.24, 4215.79, 327.23, -668.28, 1220.14, 29.18, 395.39, 70.5, 65040, -169.31, 5.8, 31.93, -46.35, -53.77, 72.74, -10.17, 23.19, 1441.91, 4290.83, 348.07, -767.23, 1258.44, 29.11, 386.58, 71, 64197.7, -171.09, 13.55, 38.64, -45.71, -54.38, 80.9, -10.72, 19.25, 1492.1, 4397.03, 371.05, -864.46, 1263.44, 25.26, 374.18, 71.5, 63304.8, -176.33, 14.88, 38.98, -51.54, -59.63, 82.93, -11.29, 21.77, 1543.29, 4505.73, 405.02, -969.39, 1263.85, 27.8, 368.23, 72, 62351.4, -175.55, 16.11, 39.29, -54.22, -62.38, 88.64, -11.9, 21.06, 1597, 4594.19, 431.38, -1068.98, 1298.64, 24.43, 358.98, 72.5, 61340, -174.71, 23.65, 46.01, -53.5, -61.31, 97.78, -12.68, 20.33, 1655.44, 4683.98, 462.74, -1169.95, 1304.4, 23.8, 352.76, 73, 60270.7, -177.43, 27.86, 49.62, -55.9, -60.22, 104.47, -13.59, 16.55, 1707.69, 4779.91, 495.95, -1273.84, 1321.02, 23.27, 343, 73.5, 59146.9, -183.71, 31.86, 48.11, -58.29, -64.88, 108.62, -14.47, 18.78, 1765.69, 4862.99, 530.62, -1380.71, 1344.64, 22.81, 332.83, 74, 57965.5, -192.38, 30.42, 51.36, -63.33, -72.06, 110.89, -15.48, 18.04, 1811.55, 4945.62, 572.26, -1484.43, 1366.53, 25.21, 325.76, 74.5, 56722.5, -191.26, 33.76, 53.88, -66.19, -68.6, 117.76, -16.6, 17.34, 1872.92, 5029.05, 611.67, -1591.58, 1390.01, 24.66, 315.33, 75, 55422.2, -195.89, 36.7, 56.61, -68.55, -70.17, 128, -17.79, 16.59, 1925.12, 5111.07, 658.38, -1695.77, 1413.64, 24.12, 307.82, 55, 78190.7, -73.02, -31.77, -8.27, -14.93, -50.32, -106.04, -9.21, 39.15, 468.16, 2272.71, 28.21, 1421.37, 665, 22.69, 569.12, 55.5, 78661.4, -79.9, -37.38, -7.8, -15.56, -54.6, -107.49, -9.08, 43.26, 449.48, 2337, 31.29, 1391.68, 698.39, 27.42, 569.27, 56, 79107.7, -82.64, -37.04, -7.02, -15.91, -54.45, -104.2, -8.95, 43.19, 443.02, 2403.79, 34.85, 1359.27, 730.53, 27.98, 565.27, 56.5, 79530.5, -86.08, -36.59, -6.37, -17.52, -54.54, -100.25, -8.82, 43.1, 442.26, 2473.45, 38.94, 1323.61, 761.65, 28.45, 565.66, 57, 79925.4, -88.78, -35.32, -5.19, -17.51, -49.81, -95.25, -8.77, 42.97, 447.54, 2547.02, 43.45, 1286.44, 789.86, 28.82, 561.31, 57.5, 80293.3, -92.29, -34.98, -4.9, -18.39, -49.97, -91.77, -8.66, 42.8, 461.58, 2622.45, 48.38, 1245.5, 817.17, 29.14, 561.44, 58, 80632.4, -96.39, -34.6, -3.94, -19.16, -54.73, -86.58, -8.56, 42.5, 475.94, 2700.38, 53.82, 1202.45, 846.19, 29.5, 557.01, 58.5, 80937.1, -95.48, -29.58, -2.77, -15.75, -50.32, -77.14, -8.44, 42.12, 500.94, 2789.49, 55.48, 1156.79, 858.23, 25.26, 552.72, 59, 81219.1, -103.32, -32.96, -1.78, -20.78, -54.61, -76.12, -8.42, 41.74, 513.67, 2872.87, 65.76, 1103.01, 885.19, 29.66, 552.22, 59.5, 81464.4, -107.2, -28.11, -0.65, -21.67, -50.72, -66.66, -8.38, 41.33, 536.58, 2978.44, 69.08, 1051.08, 888.61, 29.47, 547.42, 60, 81679.2, -114.56, -27.4, 4.48, -22.54, -54.41, -57.11, -8.29, 40.87, 552.48, 3059.62, 72.12, 994.72, 921.12, 29.84, 542.52, 60.5, 81867.3, -121.44, -27.04, 5.23, -26.41, -57.79, -51.95, -8.19, 40.37, 561.78, 3158.04, 80.95, 932.66, 942.54, 29.91, 537.29, 61, 82010.6, -121.08, -22.46, 9.28, -23.37, -53.85, -42.55, -8.15, 35.75, 580.94, 3240.21, 85.47, 867.41, 974.56, 30.18, 532.24, 61.5, 82114.7, -123.6, -21.96, 5.96, -28.08, -52.58, -36.96, -7.98, 39.26, 607.09, 3325.88, 94.89, 795.81, 1013.97, 30.59, 526.67, 62, 82174.7, -130.74, -24.52, 7.76, -27.66, -52.02, -34.36, -7.92, 38.66, 636.59, 3407.93, 103.77, 722.02, 1055.77, 31.04, 525.31, 62.5, 82186.8, -133.65, -24.55, 8.46, -28.98, -51.56, -29.48, -7.86, 37.99, 673.33, 3490.68, 114.86, 649.92, 1093.02, 31.38, 519.55, 63, 82154.3, -133.92, -23.79, 8.41, -29.72, -51.1, -23.57, -7.83, 37.32, 714.57, 3584.09, 126.18, 569.34, 1129.11, 31.68, 513.53, 63.5, 82075, -141.38, -23.04, 9.57, -30.5, -51.54, -17.29, -7.83, 36.67, 766.51, 3676.1, 138.09, 485.51, 1159.06, 31.72, 511.65, 64, 81946.7, -143.56, -21.08, 7.76, -30.27, -54.05, -9.86, -7.8, 35.95, 818.81, 3770.21, 149.83, 397.81, 1192.53, 35.86, 505.11, 64.5, 81767.1, -147.72, -20.77, 12.01, -31.96, -50.67, -4.21, -7.86, 35.21, 872.6, 3864.81, 160.28, 312.09, 1224.71, 31.99, 498.58, 65, 81536.3, -151.1, -19.51, 9.35, -32.79, -50.56, 2.33, -7.89, 34.45, 928.22, 3958.34, 174.43, 219.41, 1257, 36, 491.76, 65.5, 81250.3, -150.74, -18.27, 15.42, -29.8, -49.94, 13.5, -7.88, 33.67, 989.28, 4055.09, 189.3, 127.67, 1290.7, 32.14, 485.02, 66, 80916, -157.94, -16.45, 12.46, -34.79, -50.18, 16.21, -8.07, 32.86, 1043.56, 4151.12, 205.91, 29.98, 1322.72, 36.02, 481.8, 66.5, 80523.9, -161.06, -17.89, 14.5, -35.82, -50.12, 23.4, -8.16, 32.07, 1101.74, 4246.7, 222.26, -68.65, 1355.47, 36.01, 474.33, 67, 80076, -164.02, -12.57, 20.14, -37.17, -50.63, 33.6, -8.29, 31.24, 1161.86, 4335.25, 235.5, -163.3, 1390.41, 32.37, 466.91, 67.5, 79575.2, -167.06, -10.22, 22.03, -34.85, -47.4, 40.16, -8.48, 30.41, 1219.68, 4426.41, 254.41, -266.38, 1432.47, 32.62, 459.14, 68, 79019, -170.13, -7.58, 20.32, -40.3, -52, 46.74, -8.74, 29.58, 1275.52, 4518.65, 274.61, -376.36, 1471.75, 36.44, 451, 68.5, 78402.4, -173.14, -5.27, 26.39, -38.57, -49.6, 53.16, -8.98, 28.75, 1339.11, 4610.72, 292.41, -487.03, 1511, 32.68, 442.87, 69, 77726.5, -175.93, -4.8, 25.38, -39.95, -51.38, 59.42, -9.37, 27.91, 1395.8, 4707.64, 315.76, -602.04, 1548.6, 32.56, 434.36, 69.5, 76988.2, -178.54, 1.61, 32.09, -43.62, -53.69, 65.48, -9.69, 27.09, 1454.98, 4806.22, 340.55, -711.82, 1581.77, 32.31, 425.82, 70, 76187.5, -180.93, 5.88, 31.88, -46.67, -56.51, 71.37, -10.18, 26.26, 1514.43, 4907.09, 367.14, -828.55, 1599.5, 31.82, 416.9, 70.5, 75324.7, -186.62, 7.05, 35.65, -51.39, -59.7, 77.08, -10.77, 25.44, 1576.21, 4997.09, 395.13, -950.77, 1646.25, 35.43, 411.51, 71, 74395.8, -188.84, 12.21, 39.66, -54.39, -60.43, 83.02, -11.39, 24.62, 1632.51, 5123.22, 425.75, -1072.26, 1654.23, 34.73, 402.11, 71.5, 73399.5, -191.44, 17.46, 43.8, -53.97, -66.39, 92.83, -12.04, 23.79, 1701.62, 5251.64, 458.08, -1192.03, 1658.14, 34.02, 392.66, 72, 72338.8, -194.43, 18.97, 44.27, -60.71, -69.59, 96.24, -12.83, 22.96, 1763.29, 5357.58, 492.65, -1320.09, 1701.64, 33.86, 386.51, 72.5, 71205.8, -193.75, 24.25, 52.01, -60, -68.46, 103.54, -13.74, 22.12, 1833.8, 5465.19, 529.42, -1443.21, 1711.02, 33.1, 376.48, 73, 70003.7, -197.11, 32.52, 56.23, -62.83, -67.46, 114.85, -14.71, 21.26, 1897.61, 5580.58, 565.22, -1570.14, 1733.46, 32.5, 366.32, 73.5, 68736.5, -204.41, 33.94, 54.62, -65.65, -72.69, 120.15, -15.83, 20.34, 1968.14, 5679.92, 609.21, -1700.85, 1763.74, 31.97, 359.23, 74, 67397.2, -211.48, 35.63, 58.44, -68.22, -77.85, 126.28, -16.95, 19.49, 2028.27, 5779.36, 654.99, -1825.07, 1791.68, 28.2, 345.21, 74.5, 65987.5, -210.6, 39.56, 61.45, -71.7, -74.08, 134.47, -18.27, 18.7, 2106.41, 5879.16, 701.54, -1955.96, 1820.97, 30.71, 337.7, 75, 64508.9, -216.3, 43.04, 64.71, -74.61, -79.06, 143.37, -19.69, 17.85, 2170.86, 5977.88, 756.82, -2086.24, 1850.1, 30.05, 326.5, 55, 89634.7, -65.42, -38.76, -14.14, -13.1, -62.46, -156.01, -9.66, 50.9, 400.75, 2626.95, 23.28, 1810.03, 912.85, 33.38, 611.63, 55.5, 90321.9, -68.93, -41.6, -13.52, -13.87, -58.2, -151.99, -9.48, 50.74, 379.59, 2704.68, 22.49, 1783.25, 957.4, 34.25, 608.66, 56, 90985.2, -72.22, -45.44, -12.44, -14.17, -62.05, -147.43, -9.4, 50.54, 364.6, 2786.51, 26.62, 1742.55, 998.46, 34.95, 605.16, 56.5, 91614.5, -75.82, -44.88, -11.79, -16.83, -57.59, -142.49, -9.22, 50.29, 361.11, 2872.92, 31.09, 1707.73, 1037.22, 35.57, 602, 57, 92210.7, -73.35, -38.12, -9.81, -11.55, -55.62, -131.32, -9.13, 50.06, 362.94, 2963.15, 36, 1664.5, 1074.05, 36.14, 603.29, 57.5, 92779.9, -81.61, -42.1, -14.65, -16.9, -55.63, -132.44, -9.06, 49.81, 372.08, 3055.23, 41.55, 1615.45, 1110.15, 36.62, 599.45, 58, 93310, -87.59, -42.32, -9.12, -17.85, -57.43, -125.62, -8.9, 49.36, 392.16, 3152.11, 48.46, 1563.05, 1147.9, 37.12, 595.97, 58.5, 93806.9, -90.33, -40.33, -11.82, -18.46, -60.23, -117.92, -8.81, 53.11, 412.49, 3256.35, 53.85, 1506.83, 1169.94, 41.53, 596.53, 59, 94262.8, -95.89, -40.29, -6.35, -15.36, -57.03, -112.23, -8.73, 48.25, 431.72, 3357.99, 57.39, 1444.87, 1204.57, 37.58, 588.14, 59.5, 94682.4, -100.14, -34.04, -4.77, -20.92, -56.45, -99.9, -8.71, 47.7, 454.23, 3487.66, 65.3, 1379.69, 1211.3, 37.28, 588.65, 60, 95066, -110.11, -32.08, -2.44, -22.53, -61.52, -86.61, -8.63, 47.07, 471.76, 3587.37, 68.08, 1308.38, 1253.14, 37.78, 584.35, 60.5, 95419.7, -119.76, -31.1, 3.28, -28.25, -61.68, -79.42, -8.49, 46.39, 478.33, 3705.65, 77.76, 1229.76, 1283.43, 37.93, 579.88, 61, 95722.5, -123.85, -30.56, 3.93, -28.9, -61.1, -72.59, -8.42, 45.67, 491.8, 3805.16, 87.75, 1145.86, 1328.25, 38.46, 575.16, 61.5, 95971.8, -127.41, -29.94, 4.75, -29.53, -59.93, -65.47, -8.29, 44.91, 514.47, 3911.17, 94.51, 1050.11, 1378.01, 38.98, 570.32, 62, 96166, -131.3, -28.59, 6.36, -29.49, -59.08, -57.54, -8.18, 44.13, 546.11, 4014.82, 105.62, 953.4, 1430.32, 39.52, 570.04, 62.5, 96302.6, -139.97, -28.29, 3.09, -30.82, -62.69, -50.38, -8.17, 43.31, 585.91, 4116.86, 119.11, 850.1, 1476.07, 44.04, 564.49, 63, 96375.2, -140.9, -27.41, 7.74, -31.69, -57.74, -42.6, -8.1, 42.47, 639.6, 4230.16, 132.86, 748.6, 1522.77, 40.05, 559.07, 63.5, 96387.6, -145.37, -26.5, 9.08, -32.61, -57.91, -34.56, -8.07, 41.63, 700.88, 4342.39, 142.93, 644.16, 1564.53, 40.23, 553.32, 64, 96338, -148.62, -24.42, 11.43, -32.58, -56.36, -25.42, -8, 40.74, 768.59, 4456.85, 157.29, 531.36, 1609.04, 40.49, 542.53, 64.5, 96228, -153.73, -23.89, 7.69, -34.42, -56.78, -18.04, -8.11, 39.82, 838.32, 4572.68, 174.44, 416.42, 1651.09, 44.91, 540.75, 65, 96049.7, -158.1, -22.43, 13.51, -31.2, -56.54, -9.76, -8.11, 38.88, 909.69, 4687.16, 191.45, 302.94, 1693.11, 40.75, 534.35, 65.5, 95807.2, -162.64, -20.94, 15.95, -32.32, -55.81, -0.73, -8.16, 37.92, 987.04, 4805.56, 205.11, 182.03, 1736.95, 40.88, 527.53, 66, 95499.6, -166.82, -18.86, 12.92, -37.83, -55.98, 7.54, -8.34, 36.93, 1056.87, 4923.65, 224.96, 59.43, 1778.96, 45.15, 520.28, 66.5, 95121.8, -170.8, -16.1, 19.47, -34.88, -55.83, 20.51, -8.41, 35.96, 1134.3, 5043.33, 244.8, -67.01, 1820.84, 40.98, 508.43, 67, 94677.4, -175.16, -14.29, 21.72, -36.63, -56.42, 29.02, -8.63, 34.96, 1211.85, 5153.75, 266.3, -196.68, 1863.93, 40.98, 505.46, 67.5, 94164.4, -183.46, -15.67, 19.9, -42.58, -57.04, 33.32, -8.91, 33.97, 1285.7, 5266.31, 289.36, -333.58, 1916.85, 45.34, 497.37, 68, 93577.3, -187.56, -12.55, 22.42, -40.51, -57.97, 41.72, -9.18, 32.96, 1363.67, 5378.34, 313.65, -469.05, 1963.61, 45.16, 489.28, 68.5, 92919.5, -191.52, -9.76, 25.22, -46.99, -59.47, 49.84, -9.45, 36.03, 1436.48, 5490.01, 339.47, -611.25, 2016.21, 45.31, 480.71, 69, 92184.2, -195.24, -4.88, 28.46, -48.64, -61.47, 61.79, -9.97, 30.97, 1513.76, 5606.93, 363.27, -748.73, 2065.63, 45.26, 472.14, 69.5, 91373.1, -194.48, 2.32, 32.03, -48.85, -60.08, 69.22, -10.34, 29.99, 1592.71, 5727.96, 388.64, -890.07, 2109.52, 41.12, 459.06, 70, 90491.1, -201.59, 3.34, 36.08, -52.45, -63.34, 76.49, -10.98, 29.01, 1661.54, 5851.86, 424.37, -1038.21, 2133.95, 44.53, 453.97, 70.5, 89525, -204.65, 8.95, 40.57, -53.96, -63.18, 87.74, -11.57, 28.04, 1742.85, 5962.72, 454.39, -1185.32, 2193.04, 44.56, 444.85, 71, 88480.8, -207.8, 15.02, 45.36, -53.78, -64.16, 95.24, -12.29, 27.07, 1820.33, 6117.38, 487.69, -1338.83, 2206, 39.86, 435.2, 71.5, 87357.3, -211.31, 21.24, 50.32, -61.31, -74.98, 103.16, -13.15, 26.09, 1899.55, 6275.97, 531.07, -1497.18, 2212.54, 42.72, 425.01, 72, 86150.6, -215.31, 19.36, 51.03, -69.27, -78.79, 107.92, -14.09, 25.12, 1982.1, 6406.33, 572.85, -1652.92, 2267.08, 42.52, 414.7, 72.5, 84855.6, -214.93, 29.56, 60.14, -68.57, -73.91, 120.53, -15.17, 24.12, 2070.22, 6538.86, 617.06, -1810.62, 2281.17, 41.63, 404.29, 73, 83476.8, -219.3, 39.1, 65.2, -68.4, -76.7, 130.35, -16.34, 23.12, 2153.59, 6680.92, 660.65, -1969.93, 2311.11, 40.95, 393.71, 73.5, 82017.7, -228.06, 41.11, 63.48, -75.44, -82.72, 140.74, -17.69, 22.05, 2241.88, 6804.44, 710.01, -2133.71, 2350.61, 40.36, 386.47, 74, 80470.6, -237.03, 43.01, 68.09, -75.14, -89.09, 144.65, -19.05, 21.05, 2317.76, 6927.73, 769.09, -2293.88, 2386.78, 39.62, 371.48, 74.5, 78836.9, -239.92, 44.31, 71.78, -82.83, -84.83, 154.69, -20.67, 20.14, 2411.48, 7052.44, 825.6, -2458.72, 2425.3, 38.91, 363.66, 75, 77115.1, -243.71, 51.93, 75.75, -83.09, -87.3, 168.92, -22.31, 19.15, 2496.26, 7173.89, 892.45, -2623.47, 2463.3, 38.14, 352.1, 50, 91913.2, 12.65, -53.22, -34.08, 7.12, -47.1, -246.98, -11.58, 58.45, 621, 2122.34, 4.86, 2353.54, 797.71, 28.6, 646.09, 50.5, 93002.3, 5.28, -58.07, -38.06, 2.47, -62.7, -260.9, -11.44, 62.98, 588.95, 2200.48, 5.73, 2362.64, 832.92, 33.74, 653.09, 51, 94079, -4.38, -64.79, -37.85, 6.24, -58.81, -254.67, -11.37, 58.99, 570.52, 2282.26, 7.3, 2373.19, 868.7, 34.55, 651.19, 51.5, 95139.8, 3.07, -58.55, -26.75, 5.62, -48.36, -245.76, -11.25, 59.27, 558.17, 2371.67, 8.77, 2384.08, 899.58, 35.17, 649.16, 52, 96202.2, -0.3, -58.47, -36.73, 5.12, -48.93, -249.34, -11.11, 59.41, 536.09, 2455.91, 5.33, 2391.91, 938.79, 36.08, 651.95, 52.5, 97261, -15.14, -68.27, -35.57, 4.04, -60.12, -245.34, -11.01, 59.59, 504.32, 2545.27, 6.52, 2385.51, 977.4, 36.92, 654.58, 53, 98304.8, -16.24, -55.11, -26.41, -2.9, -56.49, -225.93, -10.83, 64.02, 487.22, 2637.83, 6.62, 2379.94, 1016.37, 37.72, 652.45, 53.5, 99353.1, -26.02, -48.12, -19.18, -2.69, -60.25, -214.69, -10.71, 59.76, 451.7, 2732.12, -2.52, 2368.14, 1057.76, 38.54, 650.82, 54, 100398.1, -40.87, -56.98, -23.2, -13.68, -66.51, -219.55, -10.52, 59.7, 396.15, 2829.49, 5.25, 2350.35, 1100.77, 39.37, 648.86, 54.5, 101413.7, -45.13, -56.43, -22.46, -14.42, -71.35, -214.88, -10.38, 59.61, 350.87, 2926.15, 8.44, 2322.77, 1146.96, 40.23, 651.64, 55, 102400.6, -48.97, -46.55, -21.31, -5.79, -66.39, -209.41, -10.22, 59.15, 312.74, 3019.77, 11.37, 2294.09, 1197.65, 41.2, 649.5, 55.5, 103356.7, -53.18, -55.68, -20.59, -6.72, -66.3, -204.42, -10.04, 58.89, 277.76, 3115.18, 10.79, 2259.85, 1252.11, 42.24, 647.38, 56, 104282.6, -61.61, -55.09, -23.74, -11.38, -70.02, -203.17, -9.95, 58.58, 251.63, 3213.94, 19.9, 2209.39, 1304.74, 43.18, 649.68, 56.5, 105167.2, -61.38, -54.43, -18.49, -15.5, -65.19, -192.56, -9.77, 58.24, 239.88, 3316.34, 20.26, 2164.45, 1355, 44.02, 647.4, 57, 106009.6, -62.84, -50.59, -15.41, -13.45, -61.81, -183.05, -9.67, 57.97, 240.88, 3424.32, 25.82, 2110.06, 1404.43, 44.83, 644.76, 57.5, 106813.6, -63.01, -45.68, -16.87, -10.22, -61.64, -180.08, -9.49, 57.66, 257.21, 3536.49, 32.28, 2053.05, 1450.01, 45.43, 642.22, 58, 107579.5, -76.02, -51.18, -19.92, -15.98, -69.44, -171.26, -9.4, 57.06, 276.35, 3652.61, 40.85, 1987.53, 1494.32, 45.89, 644.2, 58.5, 108293.6, -78.44, -47.94, -13.13, -11.97, -61.95, -160.56, -9.3, 56.25, 306.61, 3780.24, 41.7, 1921.85, 1526.72, 46.11, 636.21, 59, 108968.1, -86.22, -48.68, -11.81, -13.58, -64.23, -154.22, -9.18, 55.57, 329.76, 3901.25, 56.1, 1844.15, 1572.58, 46.66, 633.04, 59.5, 109592.3, -91, -45.45, -9.68, -15.21, -62.72, -138.43, -9.13, 54.86, 357.56, 4056.41, 59.81, 1762.62, 1585.75, 46.35, 634.73, 60, 110177.8, -108.68, -37.31, -5.75, -22.3, -69.37, -125.12, -8.99, 58.59, 372.72, 4176.46, 66.85, 1672.85, 1639.47, 51.61, 630.9, 60.5, 110728.9, -121.55, -35.57, -3.67, -30.2, -75.08, -110.92, -8.84, 57.68, 371.7, 4320.89, 73.19, 1574.59, 1679.34, 51.83, 627.14, 61, 111212.3, -121.43, -30.39, 2.39, -25.78, -69.04, -102.28, -8.76, 52.15, 383.41, 4444.05, 80.5, 1475.55, 1732.48, 47.72, 618.5, 61.5, 111639.5, -130.8, -34.25, -1.34, -30.99, -72.62, -93.47, -8.6, 55.76, 397.46, 4572.6, 98.08, 1361.49, 1795.49, 53.04, 618.98, 62, 111994.2, -135.6, -33.1, 0.05, -31.42, -71.45, -88.62, -8.54, 50.15, 426.85, 4696.92, 106.76, 1247.26, 1860.94, 53.75, 614.59, 62.5, 112280.2, -140.35, -32.44, 1.33, -32.49, -70.38, -79.7, -8.42, 53.71, 470.07, 4819.05, 121.42, 1127.97, 1922.57, 54.37, 609.68, 63, 112490.9, -141.47, -31.39, 6.67, -33.4, -64.8, -65.63, -8.42, 48.02, 528.13, 4957.3, 132.86, 1003.47, 1981.26, 54.84, 599.79, 63.5, 112633.4, -151.42, -34.89, 3.55, -34.42, -69.18, -60.41, -8.35, 51.55, 594.13, 5094.73, 154.41, 869.55, 2034.07, 55.09, 599.32, 64, 112696, -155.74, -28.1, 6.02, -34.61, -62.93, -44.94, -8.33, 45.83, 676.16, 5234.91, 167.08, 734.66, 2089.6, 55.4, 588.79, 64.5, 112684.3, -161.76, -27.29, 6.9, -36.53, -63.05, -35.53, -8.44, 44.68, 762.13, 5376.01, 187.11, 591.24, 2143.13, 55.6, 582.79, 65, 112594.3, -167.13, -30.18, 8.74, -37.74, -67.18, -25.31, -8.41, 48.08, 850.72, 5515.8, 207.31, 441.54, 2196.9, 55.77, 576.42, 65.5, 112420.8, -168.17, -23.83, 11.49, -34.5, -61.74, -14.25, -8.53, 42.33, 941.43, 5660.56, 224.2, 290.58, 2252.8, 55.95, 570.13, 66, 112165.8, -173.75, -21.44, 13.1, -36.1, -61.8, -3.63, -8.71, 41.11, 1035.33, 5804.56, 248.16, 133.26, 2306.22, 55.93, 558.2, 66.5, 111827.3, -183.57, -22.81, 15.88, -42.15, -61.59, 7.46, -8.86, 39.92, 1135.04, 5948.59, 271.97, -26.9, 2360.56, 55.98, 550.9, 67, 111401.2, -189.15, -20.65, 18.56, -39.71, -62.15, 18.16, -9.08, 38.71, 1229.25, 6084.42, 293.3, -190.12, 2417.48, 56.08, 543.6, 67.5, 110890.3, -194.48, -17.42, 21.35, -41.86, -62.77, 28.7, -9.38, 37.51, 1327.81, 6220.46, 320.71, -356.49, 2479.68, 56.06, 535.75, 68, 110288.9, -195.32, -9.36, 24.34, -44.27, -59.36, 43.59, -9.67, 36.31, 1425.86, 6358.24, 345.4, -525.37, 2543.11, 56.17, 522.89, 68.5, 109600.7, -200.55, -6.16, 27.65, -47.12, -61.05, 53.67, -10.06, 35.13, 1522.68, 6495.6, 376.35, -699.59, 2607.4, 56.27, 514.48, 69, 108823.2, -209.78, -4.99, 31.45, -49.17, -63.35, 63.45, -10.65, 33.96, 1619.33, 6638.25, 409.49, -879.77, 2669.93, 56.28, 510.44, 69.5, 107952.6, -214.37, -1.18, 35.74, -54.14, -66.37, 73, -11.16, 32.78, 1713.82, 6786.21, 445.13, -1060.2, 2725.85, 56.05, 496.46, 70, 106983.9, -218.73, 4.65, 40.54, -54.14, -70.12, 82.33, -11.81, 31.62, 1808.78, 6937.51, 479.1, -1246.53, 2758.59, 55.31, 487.4, 70.5, 105920.9, -222.92, 11.23, 45.88, -60.33, -70.23, 91.61, -12.59, 30.48, 1907.57, 7073.08, 519.82, -1434.56, 2832.74, 55.39, 477.72, 71, 104761.9, -231.41, 14.13, 47.36, -64.72, -75.67, 101.01, -13.44, 33.54, 2005.72, 7260.14, 564.33, -1628.63, 2851.94, 58.54, 472.13, 71.5, 103497.9, -231.76, 21.4, 53.24, -64.96, -79.64, 114.88, -14.46, 28.21, 2109.26, 7451.45, 611.48, -1817.12, 2863.96, 53.24, 457.47, 72, 102137.8, -241.06, 23.77, 54.3, -74.34, -84.23, 125.24, -15.57, 27.08, 2210.94, 7610.57, 661.46, -2017.14, 2934.29, 53.23, 446.83, 72.5, 100670.2, -241.29, 35.73, 65.1, -73.84, -83.08, 136.23, -16.87, 25.93, 2320.56, 7774.21, 711, -2211.61, 2954.46, 52.09, 436.05, 73, 99103.3, -246.89, 38.8, 71.28, -82.06, -90.47, 144.27, -18.28, 28.73, 2421.9, 7947.51, 771.84, -2419.3, 2993.4, 55.2, 424.49, 73.5, 97429.6, -253.5, 49.49, 69.56, -86.26, -89.61, 160.88, -19.9, 23.55, 2536.68, 8098.85, 827.26, -2623.52, 3043.64, 54.42, 413.13, 74, 95652.6, -268.63, 47.8, 75.21, -90.15, -101.33, 165.97, -21.57, 22.41, 2632.63, 8250.01, 898.07, -2823.4, 3090.77, 49.7, 401.44, 74.5, 93765.9, -268.51, 53.52, 79.75, -91.53, -96.54, 178.17, -23.45, 21.37, 2753, 8402.78, 962.16, -3029, 3140.51, 48.92, 389.46, 75, 91775.7, -277.44, 58.67, 84.66, -96.01, -99.65, 191.39, -25.47, 20.24, 2854.94, 8553.34, 1046.59, -3234.88, 3189.49, 48.05, 377.1, 48, 96103.5, 39.58, -79.17, -53.55, 15.13, -67.16, -329.5, -12.85, 69.01, 790.41, 1993.92, -0.14, 2730.03, 848.01, 35.12, 674.76, 48.5, 97480.2, 32.83, -79.56, -53.85, 14.66, -67.83, -330.12, -12.73, 69.56, 738.34, 2068.11, -4.74, 2766.2, 883.91, 36.11, 678.03, 49, 98859.6, 35.1, -80.15, -49.2, 0.66, -63.92, -329.91, -12.65, 65.8, 683.2, 2179.64, -2.77, 2798.75, 917.97, 37.02, 676.81, 49.5, 100230.4, 46.15, -67.04, -35.45, 13.89, -50.5, -315.82, -12.53, 66.43, 654.79, 2289.06, -14.54, 2827.62, 934.55, 37.37, 675.51, 50, 101613.2, 43.22, -67.72, -49.28, 13.5, -51.05, -315.14, -12.37, 66.9, 611.66, 2358.14, -6.15, 2854.06, 988.9, 38.82, 679.17, 50.5, 102996.5, 35.67, -68.52, -49.04, 13.28, -64.76, -327.67, -12.26, 67.19, 576.68, 2449.86, -1.19, 2881.87, 1032.57, 39.88, 677.79, 51, 104377.3, 23.96, -82.46, -49.17, 12.87, -65.39, -327.23, -12.12, 67.85, 547.6, 2546.21, -4.37, 2904.55, 1076.29, 40.97, 681.55, 51.5, 105745.9, 29.21, -69.6, -40.21, 12.27, -56.95, -312.18, -12.02, 68.29, 526.39, 2644.83, -3.59, 2918.12, 1121.81, 42.04, 685.27, 52, 107118.7, 25.05, -69.36, -47.92, 11.67, -57.55, -321.45, -11.88, 68.31, 498.09, 2745.86, -2.76, 2924.6, 1167.27, 43.04, 684.18, 52.5, 108479.7, 11.25, -81.22, -46.36, 10.32, -66.69, -311.24, -11.69, 68.39, 462.58, 2853.68, -1.58, 2921.28, 1211.94, 43.93, 683.34, 53, 109826.4, 10.59, -64.74, -29.4, 7.04, -61.46, -286.6, -11.6, 68.32, 440.81, 2960.99, -2.25, 2914.62, 1262.5, 45, 687.12, 53.5, 111184.8, -6.42, -61.23, -25.67, -3.02, -66.32, -277.51, -11.45, 68.39, 384.08, 3072.42, -14.06, 2899.36, 1313.67, 46.01, 686.09, 54, 112533.3, -19.89, -67.31, -31.36, -11.91, -79.26, -278.47, -11.2, 68.18, 313.58, 3184.77, -4.39, 2877.65, 1368.23, 47.08, 685.28, 54.5, 113849.7, -29.54, -71.2, -35.11, -17.38, -79.72, -277.16, -10.99, 72.58, 250.64, 3295.54, -1.21, 2845.08, 1427.15, 52.86, 688.88, 55, 115126.9, -29.34, -54.44, -29.06, -2.15, -78.88, -265.74, -10.85, 67.28, 201.78, 3410.55, -2.6, 2815.14, 1486.98, 49.37, 687.91, 55.5, 116372, -38.94, -65.65, -32.9, -3.24, -78.7, -259.71, -10.68, 66.91, 156.41, 3522.75, 1.6, 2773.77, 1552.75, 50.64, 686.49, 56, 117575.1, -43.45, -64.98, -31.23, -3.27, -77.57, -257.3, -10.5, 66.48, 122.77, 3637.23, 6.56, 2718.68, 1618.49, 51.87, 684.99, 56.5, 118734, -43.75, -64.19, -25.75, -13.63, -72.38, -245.22, -10.32, 66.01, 106.57, 3759.54, 7.34, 2664.09, 1680.07, 52.92, 683.41, 57, 119841.4, -44.52, -58.77, -21.48, -5.65, -67.36, -232.93, -10.22, 65.66, 101.39, 3887.67, 18.32, 2603.57, 1738.2, 53.81, 686.69, 57.5, 120903.3, -50.07, -58.44, -28.75, -7.2, -67.02, -234.96, -10.03, 65.29, 120.1, 4019.45, 20.87, 2529.28, 1795.27, 54.59, 679.63, 58, 121918.9, -65.91, -64.97, -26.91, -8.69, -76.57, -223.99, -9.92, 64.52, 142.19, 4152.51, 35.71, 2455.24, 1854.65, 55.4, 682.55, 58.5, 122872.5, -63.02, -55.55, -24.11, -9.14, -67.32, -205.46, -9.81, 63.47, 173.37, 4302.45, 36.09, 2376.06, 1893.58, 55.57, 680.38, 59, 123780.2, -73.25, -57.27, -22.65, -11.15, -70.94, -198.7, -9.67, 62.66, 200.27, 4447.06, 48.22, 2282.65, 1949.76, 56.25, 678.02, 59.5, 124627.7, -78.5, -52.52, -15.13, -13.22, -68.41, -184.06, -9.61, 61.81, 233.37, 4629.95, 52.06, 2189.5, 1967.33, 55.78, 670.03, 60, 125430.4, -99.82, -42.56, -9.5, -21.5, -76.88, -161.67, -9.52, 60.81, 250.51, 4771.72, 53.99, 2076.75, 2033.02, 61.42, 672.46, 60.5, 126195.8, -111.41, -35.19, -1.78, -31.81, -79.21, -144.81, -9.3, 59.7, 245.49, 4941.63, 61.12, 1963.19, 2083.17, 56.9, 664.47, 61, 126891, -121.15, -39.47, 0.59, -31.49, -81.69, -134.54, -9.24, 58.61, 244.92, 5086.73, 79.56, 1838.11, 2149.32, 62.4, 661.02, 61.5, 127508.9, -127.23, -38.57, -3.32, -32.03, -80.92, -128.76, -9, 62.23, 258.49, 5238.08, 94.31, 1705.11, 2225.34, 63.25, 657.52, 62, 128041.1, -128.19, -37.73, 2.59, -28.2, -74.6, -113.1, -8.87, 56.16, 289.29, 5383.15, 105, 1571.03, 2308.67, 59.5, 648.9, 62.5, 128495.2, -138.86, -36.62, -0.64, -33.91, -78.02, -101.86, -8.77, 59.76, 333.23, 5531.1, 121.8, 1421.38, 2380, 64.92, 650.02, 63, 128859.7, -145.33, -35.42, 0.54, -30.06, -76.75, -90.48, -8.79, 53.63, 394.87, 5694.01, 135.45, 1275.71, 2452.57, 65.56, 640.42, 63.5, 129137.5, -146.78, -34.12, 7.06, -31.2, -71.29, -78.77, -8.75, 52.33, 472.17, 5856.69, 155.08, 1119.19, 2517.91, 65.93, 635.94, 64, 129325.7, -157.22, -31.88, 4.76, -31.66, -69.53, -66.03, -8.65, 50.99, 570.25, 6023.1, 175.36, 956.43, 2585.41, 66.29, 625.65, 64.5, 129424.8, -164.25, -30.78, 5.99, -33.67, -69.38, -54.55, -8.79, 49.62, 673.82, 6189.15, 198.26, 784.8, 2651.33, 66.57, 620.14, 65, 129426, -165.86, -28.88, 12.95, -35.07, -68.73, -42.25, -8.79, 48.23, 780.37, 6352.91, 216.63, 612.63, 2719.21, 66.91, 609.38, 65.5, 129338.4, -177.37, -31.7, 11.15, -41.41, -72.48, -33.94, -8.85, 51.64, 884.47, 6524.35, 241.48, 429.04, 2788.48, 67.22, 608.42, 66, 129150.3, -183.84, -29.03, 13.03, -43.15, -67.56, -21.45, -9.07, 50.17, 995.45, 6695.23, 268.83, 241.58, 2853.96, 72.15, 602.04, 48, 106110.4, 76.91, -89.84, -62.8, 28.06, -70.13, -411.32, -13.9, 74.49, 826.03, 2212.48, -16.92, 3330.7, 1039.76, 41.51, 697.46, 48.5, 107858, 74.69, -94.83, -67.76, 23.27, -75.27, -412.98, -13.72, 79.56, 761.33, 2298.35, -13.46, 3381.96, 1085.64, 42.79, 701.42, 49, 109613.6, 68.3, -95.67, -67.57, 6.18, -75.75, -417.88, -13.59, 80.33, 687.44, 2428.09, -11.51, 3430.44, 1129.05, 43.97, 705.75, 49.5, 111357.8, 87.16, -79.68, -46.38, 27.11, -54.7, -397.03, -13.5, 76.74, 645.68, 2548.26, -31.5, 3489.96, 1159.28, 44.71, 705.64, 50, 113130.1, 84.93, -80.91, -63.95, 26.99, -55.4, -398.45, -13.34, 77.57, 595.43, 2633.74, -16.44, 3535.14, 1223.9, 46.59, 705.35, 50.5, 114912, 81.9, -82.1, -63.89, 22.48, -72.36, -415.36, -13.23, 77.98, 544.72, 2745.11, -16.34, 3569.76, 1274.03, 47.82, 709.89, 51, 116692.1, 61.8, -99.21, -63.95, 26.49, -72.89, -413.99, -13.07, 78.57, 506.63, 2858.22, -15.18, 3600.48, 1330.73, 49.21, 709.79, 51.5, 118453.8, 74.13, -83.14, -51.82, 25.82, -56.69, -394.7, -12.95, 78.97, 479.84, 2975.59, -14.68, 3618.92, 1386.96, 50.53, 714.59, 52, 120222.1, 69.31, -82.92, -62.44, 25.21, -57.37, -406.56, -12.77, 79, 443.6, 3091.63, -19.07, 3630.69, 1448.67, 51.96, 714.57, 52.5, 121983.7, 46.84, -97.57, -60.52, 18.99, -74.22, -399.58, -12.63, 79.08, 391.98, 3218.09, -18.4, 3629.74, 1507.67, 53.23, 719.49, 53, 123723.9, 46.99, -76.81, -39.19, 14.82, -66.85, -368.46, -12.5, 78.94, 363.29, 3349.38, -19.92, 3624.41, 1564.93, 54.37, 719.42, 53.5, 125486.6, 26.49, -72.23, -39.05, 2.94, -73.33, -357.34, -12.27, 83.79, 286.65, 3479.93, -35.7, 3610, 1629.64, 60.37, 724.41, 54, 127242.2, 4.17, -85.51, -47.16, -9.12, -89.54, -360.09, -12.02, 83.61, 191.61, 3614.61, -23.46, 3586.25, 1697.44, 61.76, 724.6, 54.5, 128954.5, -1.82, -84.68, -46.21, -10.16, -90.11, -353.13, -11.83, 83.39, 110.59, 3746.65, -20.26, 3558.8, 1769.25, 63.21, 729.86, 55, 130626.2, -7.02, -69.6, -44.47, 3.17, -88.92, -344.8, -11.71, 77.72, 47.01, 3879.87, -17.35, 3517.78, 1847.47, 60.07, 729.97, 55.5, 132254.2, -8.02, -78.92, -43.6, 1.91, -83.84, -337.58, -11.45, 77.22, -17.85, 4016.21, -17.51, 3472.96, 1926.65, 61.6, 724.83, 56, 133836.6, -18.08, -82.99, -41.52, 2.08, -87, -329.12, -11.28, 76.66, -61.99, 4154.41, -12, 3406.15, 2007.23, 63.11, 729.82, 56.5, 135365, -23.97, -81.99, -40.65, -10.63, -86.12, -319.73, -11.09, 75.95, -89.55, 4301.48, -5.83, 3338.43, 2082.57, 64.38, 729.43, 57, 136828.8, -18.76, -74.38, -34.74, -0.74, -73.98, -303.6, -10.9, 80.36, -97.33, 4454.29, 1.2, 3263.91, 2155.09, 70.38, 728.59, 57.5, 138237.8, -25.3, -69.14, -38.82, -2.65, -73.39, -306.42, -10.68, 79.92, -76, 4610.34, 9.42, 3177.64, 2226.67, 71.41, 728.05, 58, 139589.9, -44.89, -77.04, -41.49, -9.39, -85.32, -292.58, -10.54, 78.94, -55.18, 4767.16, 21.7, 3085.62, 2301.22, 72.49, 726.95, 58.5, 140866.6, -41.02, -65.42, -32.88, -4.8, -73.61, -269.49, -10.41, 77.54, -11.85, 4949.86, 21.71, 2986.04, 2354.14, 72.85, 726.08, 59, 142086.4, -54.57, -68.41, -31.14, -7.35, -78.96, -261.64, -10.31, 71.49, 15.22, 5119.97, 36.6, 2875.82, 2422.1, 68.61, 719.52, 59.5, 143236.9, -65.36, -61.49, -27.63, -10.02, -74.97, -242.29, -10.19, 75.38, 55.59, 5336.06, 45.4, 2760.88, 2448.6, 73.07, 723.34, 60, 144328.5, -86.33, -49.06, -14.63, -14.83, -85.77, -208.52, -10.11, 69.08, 74.91, 5506.2, 41.66, 2633.88, 2529.05, 74.1, 716.31, 60.5, 145388.3, -107.39, -45.37, -10.66, -33.38, -94.71, -193.08, -9.83, 72.71, 59.07, 5705.61, 54.59, 2489.58, 2593.93, 74.56, 714.43, 61, 146357, -112.63, -44.79, -7.04, -32.27, -91.09, -180.48, -9.72, 71.36, 48.84, 5879.61, 70.38, 2342.44, 2676.87, 75.48, 712.31, 61.5, 147232.8, -120.46, -43.72, -6.05, -27.66, -90.64, -167.6, -9.5, 69.82, 61.16, 6061.76, 82.4, 2180.32, 2771.46, 76.63, 704.45, 62, 148011.2, -127.49, -43.28, -5.49, -29.43, -88.71, -154.96, -9.39, 63.23, 87.79, 6236.34, 100.98, 2016.7, 2871.26, 77.9, 696.32, 62.5, 148688.9, -134.51, -41.61, -3.45, -29.95, -86.81, -135.67, -9.31, 61.7, 132.01, 6414.97, 114.96, 1840.57, 2957.64, 78.57, 693.32, 63, 149264.7, -141.7, -40.18, -1.62, -31, -85.13, -126.94, -9.27, 60.13, 197.49, 6609.47, 136.45, 1662.83, 3048.27, 79.44, 684.09, 63.5, 149736.1, -149.29, -38.62, 0.2, -32.26, -78.82, -112.85, -9.15, 63.64, 283, 6802.15, 159.13, 1467.43, 3131.46, 80.04, 680.31, 64, 150100.4, -156.39, -41.54, 2.82, -38.22, -82.09, -97.86, -9.06, 62.03, 400.95, 7001.04, 183.05, 1274.81, 3216.5, 80.61, 670.38, 64.5, 150351.8, -164.7, -34.93, 4.51, -35.11, -76.33, -78.54, -9.24, 55.23, 526.31, 7201.52, 204.51, 1071.43, 3298.41, 81.01, 660.32, 65, 150497, -172.58, -37.91, 6.94, -41.89, -80.57, -68.8, -9.26, 58.72, 650.43, 7400.43, 231.95, 856.05, 3380.71, 86.52, 660.9, 65.5, 150524.3, -180.76, -35.61, 10.32, -38.52, -74.18, -53.08, -9.34, 57.03, 782.71, 7606.14, 261.12, 638.69, 3466.42, 86.92, 649.83, 66, 150437.1, -188.75, -32.65, 7.46, -45.66, -78.97, -37.96, -9.6, 55.32, 917.58, 7811.37, 287.9, 411.27, 3547.88, 87.08, 644.01, 66.5, 150227.6, -196.65, -28.81, 16.18, -42.6, -73.32, -22.08, -9.83, 48.49, 1059.27, 8018.79, 315.45, 182.65, 3630.28, 82.09, 626.55, 67, 149899.7, -204.98, -25.92, 19.73, -45.27, -73.73, -1.49, -10.15, 46.8, 1202.22, 8211.95, 350.41, -56.78, 3715.39, 82.27, 620.15, 45, 105055.3, 158.61, -93.1, -85.14, 39.1, -51.29, -504.28, -15.95, 84, 1335.62, 1849.23, -8.42, 3558.55, 951.02, 39.99, 702.2, 45.5, 107068.8, 161.48, -89.23, -80.67, 42.87, -69.78, -504.16, -15.85, 80.88, 1278.9, 1939.38, -14.94, 3658.54, 1000.63, 37.3, 701.7, 46, 109130.5, 155.19, -89.54, -84.88, 41.8, -72.29, -507.85, -15.76, 82.3, 1212, 2031.54, -17.24, 3756.55, 1053.4, 43.21, 705.72, 46.5, 111233.8, 131.8, -111.08, -84.71, 36.71, -78.83, -511.43, -15.55, 87.76, 1114.64, 2134.39, -19.51, 3847.94, 1103.01, 44.73, 709.98, 47, 113371.6, 129.7, -111.75, -80.32, 40.23, -76.42, -515.16, -15.46, 84.7, 1036.33, 2237.7, -25.88, 3950.14, 1155.99, 46.35, 710.12, 47.5, 115548.8, 127.91, -112.81, -84.98, 35.41, -78.03, -518.8, -15.37, 85.87, 950.15, 2340.44, -23.47, 4035.24, 1215.75, 48.12, 719.55, 48, 117752.2, 126.23, -113.93, -85.28, 39.71, -79.22, -522.11, -15.21, 87.06, 862.9, 2456.92, -28.92, 4121.31, 1274.4, 49.81, 719.92, 48.5, 119982.6, 124.5, -114.94, -86.35, 39.47, -80.14, -525.7, -15.07, 87.99, 780.33, 2562.62, -30.63, 4210.86, 1329.55, 51.43, 725.2, 49, 122239, 124.03, -116.64, -86.74, 18.5, -80.86, -529.6, -14.85, 93.72, 681.47, 2717.98, -29.09, 4298.56, 1379.94, 52.93, 730.54, 49.5, 124498, 143.67, -96.92, -66.12, 39.66, -59.86, -511.74, -14.77, 90.56, 626.61, 2858.26, -49.8, 4370.91, 1424.03, 54.12, 731.52, 50, 126796, 141.02, -98.32, -83.77, 39.54, -60.5, -513.07, -14.61, 91.38, 555.16, 2960.71, -35.88, 4431.9, 1503.43, 56.43, 737.43, 50.5, 129103.5, 137.54, -99.74, -88.25, 39.63, -81.65, -534.01, -14.49, 91.71, 489.42, 3088.68, -36.64, 4477.88, 1575.01, 58.27, 743.31, 51, 131409.8, 112.66, -121.3, -88.44, 39.13, -82.15, -532.34, -14.3, 92.37, 438.7, 3230.81, -35.44, 4518.59, 1641.24, 59.85, 744.53, 51.5, 133693.6, 128.66, -101.03, -67.48, 38.39, -61.53, -508.08, -14.16, 92.78, 402.81, 3368.41, -35.69, 4549.24, 1712.25, 61.53, 745.63, 52, 135991.2, 123.09, -105.18, -86.58, 37.74, -62.08, -522.38, -13.93, 97.18, 348.75, 3509.41, -36.07, 4565.24, 1789.01, 63.33, 751.69, 52.5, 138274.7, 95.08, -118.76, -84.13, 35.76, -83.1, -513.14, -13.82, 92.45, 281.13, 3658.43, -40.84, 4570.45, 1863.5, 64.94, 758.24, 53, 140536.5, 96.4, -92.21, -56.98, 25.67, -72.77, -473.12, -13.61, 96.88, 243.29, 3814.39, -43.85, 4565.83, 1939.78, 66.56, 759.24, 53.5, 142827.5, 71.32, -90.86, -50.66, 16.21, -85.96, -458.66, -13.45, 97.05, 140.68, 3971.33, -64.7, 4554.52, 2020.43, 72.98, 765.63, 54, 145111.7, 43.47, -102.63, -61.91, -4.82, -101.56, -463.12, -13.14, 96.73, 24.34, 4135.71, -44.09, 4531.44, 2103.17, 69.84, 767.29, 54.5, 147342.2, 36.24, -101.56, -60.81, -6.05, -102.19, -454.4, -12.99, 91.53, -85.14, 4294.7, -45.71, 4496.95, 2193.01, 71.65, 768.78, 55, 149527.9, 30.14, -82.55, -58.6, 10.81, -100.49, -443.99, -12.69, 95.1, -177.78, 4454.03, -43.04, 4445.88, 2290.68, 78.55, 769.85, 55.5, 151660.6, 23.17, -100.42, -57.59, 9.27, -99.98, -435.17, -12.54, 89.53, -261.74, 4614.18, -43.23, 4388.25, 2394.84, 75.85, 771.12, 56, 153735.7, 16.87, -99.46, -59.9, 9.68, -97.77, -424.55, -12.27, 93.72, -323.88, 4785.12, -31.78, 4311.1, 2489.91, 82.48, 777.38, 56.5, 155739.6, 14.72, -98.4, -54.03, -1.12, -91.66, -413.26, -12.07, 87.96, -358.96, 4962.12, -29.91, 4233.31, 2584.13, 79.12, 773.16, 57, 157669.1, 16.44, -87.92, -45.94, 6.26, -81.38, -392.47, -11.88, 92.46, -369.63, 5145.85, -22.02, 4136.25, 2675.51, 85.59, 779.1, 57.5, 159532.9, 8.6, -87.7, -57.18, 3.88, -80.51, -396.51, -11.65, 91.95, -349.84, 5331.28, -12.76, 4035.12, 2768.42, 87.02, 779.86, 58, 161321.3, -10.77, -92.3, -49.29, 1.62, -90.5, -373.98, -11.49, 85.61, -319.3, 5522.76, -2.46, 3927.7, 2861, 88.35, 775, 58.5, 163027.7, -10.5, -83, -49.66, 1.48, -80.7, -350.3, -11.34, 88.85, -277.04, 5735.77, 1.09, 3801.22, 2928.62, 88.8, 774.79, 59, 164661.3, -33.53, -87.86, -42.53, -1.72, -93.6, -341.82, -11.2, 82.33, -239.86, 5947.07, 20.02, 3671.76, 3012.3, 89.68, 769.53, 59.5, 166209.4, -39.81, -78.15, -43.22, -5.16, -82.53, -316.46, -11.05, 86.15, -197.03, 6203.33, 23.38, 3531.86, 3052.14, 89.18, 769.2, 60, 167693.9, -66.49, -62.44, -26.88, -16.96, -101.68, -274.39, -10.9, 84.53, -176.07, 6407.7, 23.19, 3376.91, 3154.2, 90.59, 768.95, 60.5, 169138.5, -93.77, -51.99, -16.25, -29.63, -107.88, -249.49, -10.67, 77.53, -207.44, 6651.1, 32.3, 3211.75, 3235.38, 91.15, 763.42, 61, 170477.9, -99.32, -51.44, -5.59, -27.37, -97.25, -234.05, -10.53, 75.84, -225.94, 6862.58, 45.41, 3031.29, 3338.39, 92.29, 756.88, 61.5, 171710.8, -109.33, -50.12, -9.84, -27.65, -102.62, -218.41, -10.24, 79.18, -227.87, 7082.42, 70.41, 2833.2, 3454.7, 93.71, 755.79, 62, 172825.9, -123.3, -55.71, -15.43, -35.86, -100.15, -208.97, -10.06, 77.33, -213.05, 7294.63, 92.82, 2631.89, 3578.43, 100.7, 748.41, 62.5, 173812.8, -126.51, -53.26, -7.47, -30.48, -97.6, -185.56, -9.93, 75.5, -163.5, 7511.59, 109.11, 2415.59, 3692.51, 96.58, 741.07, 63, 174675.7, -134.61, -46.22, -4.76, -31.58, -95.31, -168.59, -9.83, 73.56, -87.96, 7744.17, 128.79, 2202.39, 3802.99, 97.58, 733.32, 63.5, 175417.1, -143.77, -49.8, -8.18, -38.35, -93.23, -156.72, -9.84, 71.56, 8.56, 7980.2, 155.67, 1964.64, 3905.1, 103.66, 730.6, 64, 176023.5, -152.97, -47.64, -0.2, -34.3, -85.95, -133.59, -9.76, 64.18, 151.23, 8221.57, 178.74, 1734.5, 4011.45, 99.02, 715.98, 64.5, 176499.2, -162.76, -40.26, 2.11, -36.29, -84.65, -115.92, -9.89, 62.18, 303.68, 8464.67, 209.63, 1485.88, 4114.39, 99.6, 712.91, 65, 176846.1, -172.41, -43.24, -0.51, -38.19, -88.78, -103.19, -9.96, 65.6, 455.85, 8706.35, 241.95, 1223.23, 4218.07, 105.57, 708.62, 65.5, 177045.8, -176.95, -35.16, 8.66, -34.79, -81.78, -78.81, -10.03, 58.13, 617.14, 8956.1, 271.01, 962.48, 4325.57, 100.71, 692.76, 66, 177112.3, -192.35, -37.35, 11.49, -42.58, -81.2, -60.34, -10.38, 56.05, 781.74, 9205.97, 308.61, 683.88, 4428.25, 106.46, 681.61, 66.5, 177036.8, -202.13, -38.53, 10.13, -45.03, -80.46, -46.52, -10.53, 59.48, 949.22, 9456.25, 347.21, 397.32, 4534.39, 106.87, 676.12, 67, 176812.3, -212.4, -29.61, 14.3, -48.13, -80.7, -22.18, -10.94, 57.42, 1118.59, 9693.51, 383.2, 108.96, 4638.82, 107, 664.32, 48, 136095.5, 220.5, -153.6, -123.47, 62.72, -97.7, -721.69, -17.57, 112.73, 889.42, 2845.59, -53.94, 5645.99, 1642.09, 68.96, 745.24, 48.5, 139235.1, 221.52, -156.23, -126.27, 63.3, -99.25, -733.64, -17.38, 114.67, 768.92, 2981.46, -58.06, 5796.02, 1718.99, 67.17, 752.03, 49, 142428.4, 226.64, -158.89, -122.73, 34.6, -95.66, -740.95, -17.19, 116.46, 635.31, 3166.47, -62, 5929.52, 1801.3, 69.71, 759.12, 49.5, 145634.4, 255.06, -131.67, -94.35, 64.16, -66.27, -716.82, -17.03, 118.24, 551.45, 3353.42, -91.38, 6043.49, 1856.8, 71.11, 761.43, 50, 148902.2, 252.97, -133.95, -125.6, 64.4, -66.99, -720.56, -16.95, 115, 444.67, 3483.7, -67.33, 6148.08, 1968.23, 74.56, 768.87, 50.5, 152192.3, 249.7, -136.32, -125.95, 64.97, -96.24, -751.76, -16.68, 120.07, 350.44, 3651.72, -69.58, 6233.24, 2063.66, 77.11, 776.44, 51, 155496.6, 216.47, -166.75, -131.27, 64.61, -96.88, -755.95, -16.53, 121.16, 270.93, 3828.55, -69.58, 6302.85, 2160.13, 84.2, 784.1, 51.5, 158772.6, 240.07, -138.66, -97.67, 68.51, -67.78, -718.78, -16.44, 117.11, 217.72, 4008.92, -75.83, 6359.03, 2259.41, 82.06, 787.14, 52, 162077.1, 228.7, -137.93, -129.24, 63.28, -68.27, -744, -16.21, 121.28, 139.36, 4194.91, -77.63, 6395.75, 2362.07, 89.19, 800.1, 52.5, 165368.5, 195.07, -163.51, -121.2, 65.4, -97.52, -726.95, -15.96, 121.12, 35.63, 4387.81, -84.04, 6414.54, 2466.18, 86.84, 803.31, 53, 168632.9, 199.03, -121.08, -82.79, 53.02, -76.64, -665.64, -15.9, 115.91, -25.6, 4585.92, -90.39, 6420.61, 2573.71, 89.22, 806.25, 53.5, 171947.6, 165.37, -116.76, -73.52, 34.44, -93.74, -645.22, -15.61, 120.87, -169.67, 4794.93, -121.27, 6409.95, 2684.71, 96.34, 814.48, 54, 175264.1, 126.97, -139.88, -96.02, 5, -122.25, -658.52, -15.31, 120.34, -347.8, 5008.48, -98.98, 6387.09, 2800.11, 98.72, 823.13, 54.5, 178508.8, 117.6, -138.41, -94.69, 3.38, -123.1, -646.84, -15.06, 119.76, -509.39, 5214.09, -96.19, 6341.77, 2927.81, 101.47, 826.26, 55, 181686.7, 109.85, -106.67, -91.62, 32.19, -120.19, -631.96, -14.73, 117.66, -640.8, 5423.97, -99, 6285.77, 3059.99, 104.29, 829.7, 55.5, 184803.2, 95.86, -136.88, -90.41, 25.24, -119.27, -625, -14.53, 116.6, -773.01, 5641.56, -88.52, 6205.04, 3194.5, 107.08, 832.25, 56, 187831.2, 93.21, -130.67, -86.83, 31.33, -115.62, -605.75, -14.19, 115.45, -863.74, 5858.16, -86.63, 6113.29, 3332.3, 109.85, 835.61, 56.5, 190781.4, 79.05, -134.34, -91, 4.58, -113.81, -595.74, -14, 114.31, -927.59, 6089.3, -78.9, 6008.86, 3463.95, 117.33, 837.82, 57, 193613, 94.32, -112.95, -68.34, 27, -92.26, -555.42, -13.73, 113.64, -946.67, 6330.79, -74.7, 5891.58, 3589.29, 114.3, 835.14, 57.5, 196369.4, 84.4, -112.84, -84.02, 23.81, -90.75, -567.2, -13.48, 112.96, -922.23, 6578.12, -63.34, 5754.55, 3712.73, 116.09, 837.54, 58, 199031.1, 50.6, -126.1, -85.44, 15.53, -112.09, -543.02, -13.28, 111.16, -894.95, 6828.39, -37.29, 5609.91, 3844.35, 123.37, 839.54, 58.5, 201570, 59.17, -106.18, -73.4, 21.12, -90.92, -503.39, -13.11, 108.48, -826.04, 7107.82, -46.72, 5453.37, 3938.92, 118.71, 841.94, 59, 204026.5, 27.6, -120.25, -76.32, 11.33, -109.13, -499.49, -12.9, 106.6, -790.69, 7379.13, -15.9, 5272.55, 4060.96, 125.56, 837.95, 59.5, 206362.1, 20.74, -99.37, -64.52, 6.43, -93.83, -457.14, -12.79, 104.74, -733.73, 7713.72, -13.65, 5090.29, 4122.67, 124.89, 839.91, 60, 208617.1, -17.62, -77.24, -41.59, -3.82, -114.22, -393.44, -12.55, 102.51, -711, 7984.62, -27.45, 4893.18, 4259, 121.38, 830.1, 60.5, 210843.8, -62.51, -63.5, -33.28, -35.93, -130.62, -365.6, -12.27, 100.13, -774.02, 8306.32, -11.34, 4666.83, 4376.49, 122.34, 831.89, 61, 212924.5, -68.35, -68.53, -18.87, -25.84, -121.53, -345, -12.07, 97.89, -827.67, 8582.6, 5.72, 4433.95, 4518.14, 129.44, 827.33, 61.5, 214866, -82.77, -66.92, -17.85, -25.7, -128.51, -324.51, -11.78, 95.26, -847.02, 8873.77, 29.78, 4178.46, 4675.63, 131.52, 822.32, 62, 216653.8, -94.21, -68.82, -25.51, -36.46, -124.95, -311.87, -11.53, 92.77, -845.79, 9155.57, 58.9, 3912.45, 4846.86, 134.07, 817.26, 62.5, 218273.5, -105.74, -59.12, -16.33, -29.54, -115.68, -280.97, -11.27, 90.38, -797, 9437.55, 72.73, 3638.32, 5003.48, 130.38, 805.82, 63, 219737.1, -109.25, -62.76, -11.81, -30.67, -112.39, -258.78, -11.28, 87.86, -720.02, 9753.06, 104.47, 3348.42, 5154.88, 137.48, 799.6, 63.5, 221035.6, -121.36, -60.49, -9.59, -32.23, -108.49, -236.35, -11.1, 85.21, -605.52, 10061.5, 137.67, 3044.87, 5300.09, 138.77, 793.1, 64, 222171.1, -140.37, -64.47, -13.05, -34.76, -106.8, -219.51, -11.13, 82.63, -425.22, 10381.47, 174.38, 2729.94, 5451.29, 145.89, 785.49, 64.5, 223121.7, -147.1, -55.9, -3.75, -30.76, -98.42, -189.79, -11.16, 80.05, -222.51, 10704.95, 206.88, 2404.08, 5593.58, 141.16, 772.04, 65, 223902.4, -160.1, -53.01, -6.01, -33.07, -96.38, -165.74, -11.34, 77.43, -18.69, 11029.34, 242.28, 2060.66, 5734.64, 141.84, 763.93, 65.5, 224503.8, -173.42, -49.81, -1.84, -41.37, -94.41, -141.12, -11.51, 74.78, 196.01, 11363.93, 286.37, 1711.2, 5888.01, 143.07, 755.11, 66, 224922.8, -192.71, -51.84, 2, -44.29, -98.96, -122.28, -12.02, 72.15, 409.22, 11695.14, 333.58, 1339.34, 6030.09, 149.38, 745.46, 66.5, 225149.4, -200.36, -47.01, 6.94, -41.62, -92.01, -91.19, -12.26, 69.5, 633.37, 12032.86, 377.51, 967.85, 6176.49, 144.23, 736.11, 67, 225186.7, -214.27, -36.89, 12.11, -45.43, -91.88, -65.99, -12.74, 66.84, 866.89, 12350.53, 424.36, 579.44, 6326.49, 144.86, 718.9, 48, 154547.3, 344.59, -202.42, -166.5, 92.41, -114.63, -975.14, -20.04, 139.11, 918.82, 3229.31, -92.24, 7540.77, 2018.2, 86.44, 748.16, 48.5, 158821.7, 352.33, -201.92, -170.72, 97.89, -112.24, -988.72, -19.95, 141.66, 753.34, 3394.62, -103.67, 7772.37, 2126.41, 85.94, 755.92, 49, 163186.5, 355.85, -205.97, -172.56, 59.75, -113.09, -1005.93, -19.89, 144.17, 559.27, 3635.22, -104.03, 7984.59, 2224.92, 89.15, 763.69, 49.5, 167588.2, 392.62, -173.92, -134.78, 96.05, -77.35, -976.53, -19.82, 151.05, 437.68, 3854.52, -141.95, 8171.6, 2318.93, 96.11, 776.08, 50, 172084.6, 396.74, -173.07, -177.95, 101.37, -73.7, -984.64, -19.74, 148.55, 293.42, 4026.87, -115.11, 8343.74, 2461.59, 96.48, 779.82, 50.5, 176630.6, 394.72, -176.71, -179.12, 102.83, -113.28, -1030.1, -19.59, 149.4, 155.16, 4243.62, -119.74, 8494.5, 2582.31, 99.9, 788.18, 51, 181214, 347.03, -223.18, -185.26, 98.51, -118.4, -1036.82, -19.39, 155.42, 32.51, 4464.77, -121.63, 8618.42, 2718.36, 108.15, 801.28, 51.5, 185773.9, 386.11, -185.21, -141.68, 102.57, -73.88, -994.98, -19.31, 151.94, -44.19, 4693.88, -130.26, 8718.59, 2853.95, 111.78, 810.05, 52, 190386.1, 374.44, -184.68, -183.77, 97.84, -78.85, -1026.25, -19.03, 156.02, -160.43, 4936.7, -134.46, 8795.8, 2989.46, 115.24, 818.65, 52.5, 195000.3, 323.15, -220.2, -179.68, 94.68, -119.12, -1011.41, -18.8, 155.95, -312.09, 5180.76, -138.95, 8838.37, 3132.21, 118.65, 827.55, 53, 199582.6, 336.14, -163.36, -121.9, 88.76, -85.86, -924.8, -18.64, 150.73, -395.34, 5432, -154.85, 8872.11, 3280.42, 122.2, 831.72, 53.5, 204247.5, 291.72, -150.4, -104.22, 64.6, -108.1, -897.44, -18.39, 151.07, -601.83, 5698.52, -204.76, 8876.45, 3434.25, 125.68, 840.91, 54, 208929, 239.66, -182.36, -140.24, 24.05, -152.25, -917.06, -17.96, 155.05, -861.52, 5977.75, -169.2, 8855.39, 3588.44, 128.95, 844.87, 54.5, 213513.7, 227.82, -180.46, -133.99, 22.1, -148.62, -897.3, -17.7, 149.47, -1088.88, 6244.13, -172.08, 8810.42, 3758.16, 132.68, 849.33, 55, 218025.8, 218.44, -143.47, -134.8, 55.55, -144.44, -883.16, -17.46, 146.54, -1284.53, 6515.26, -171.55, 8742.5, 3938.03, 136.7, 858.39, 55.5, 222449, 207.09, -178.95, -133.57, 53.09, -143.01, -868.21, -17.14, 145.08, -1476.22, 6793.77, -171.14, 8652.42, 4122.2, 140.78, 862.5, 56, 226769.2, 192.77, -182.52, -128.75, 55.13, -142.52, -849.72, -16.77, 148.41, -1617.07, 7082.48, -158.3, 8527.42, 4303.43, 149.35, 871.78, 56.5, 230975, 186.36, -180.86, -127.91, 25.42, -134.82, -834.91, -16.47, 146.84, -1707.33, 7379.76, -154.92, 8396.83, 4483.97, 152.81, 875.8, 57, 235030.8, 201.64, -146.43, -104.44, 49.63, -104.7, -782.42, -16.3, 141.02, -1744.51, 7694.88, -149.2, 8248.8, 4649.71, 150.48, 874.3, 57.5, 238987.3, 189.2, -151.69, -126.33, 45.35, -102.33, -798.46, -16.02, 140.17, -1721.17, 8014.24, -135.88, 8067.41, 4822.27, 158.27, 877.98, 58, 242813.8, 142.83, -164.77, -121.32, 46.31, -132.24, -760.39, -15.72, 137.7, -1681.68, 8337.56, -108.03, 7881.4, 4999.04, 156.02, 876.27, 58.5, 246488.2, 156.13, -142.51, -111.64, 42.32, -102.48, -711.41, -15.53, 139.03, -1598.04, 8699.81, -116.5, 7676.13, 5135.01, 162.15, 885.22, 59, 250050.3, 113.16, -162.25, -108.83, 36.03, -128.01, -707.34, -15.28, 136.47, -1552.92, 9048.02, -76.99, 7446.96, 5301.58, 164.36, 883.07, 59.5, 253454.2, 106.28, -133.28, -99.79, 29.18, -106.97, -644.31, -15.14, 128.86, -1480.34, 9485.57, -82.16, 7215.12, 5392.83, 163.55, 880.83, 60, 256764.6, 52.29, -96.87, -62.46, 13.83, -136.56, -559.05, -14.96, 125.82, -1470.98, 9831.6, -96.5, 6956, 5578.47, 160.89, 878.83, 60.5, 260052.7, -14.64, -84.01, -49.98, -36, -165.37, -520.57, -14.59, 127.9, -1574.91, 10250.39, -84.8, 6668.68, 5736.9, 167.49, 882.44, 61, 263151.6, -14.56, -83.86, -35.84, -22.29, -151.05, -493.73, -14.24, 125.02, -1672.48, 10608.17, -57.88, 6364.74, 5936.95, 170.29, 879.97, 61.5, 266065.2, -34.84, -81.79, -29.57, -16.01, -149.34, -466.86, -13.84, 116.03, -1720.02, 10991.54, -34.13, 6043.51, 6150.69, 173.37, 871.94, 62, 268791.2, -55.22, -91.84, -45.73, -35.68, -149.78, -450.63, -13.68, 118.21, -1753.74, 11361.88, 3.29, 5699.51, 6376.18, 182.3, 868.57, 62.5, 271299.7, -70.18, -85.28, -40.83, -26.67, -144.37, -415.76, -13.4, 115.19, -1717.88, 11732.75, 26.15, 5342.91, 6587.9, 185.09, 865.49, 63, 273600, -74.38, -83.01, -28.09, -27.61, -139.61, -381.49, -13.6, 111.88, -1638.34, 12140.4, 59.02, 4974.01, 6799.06, 187.77, 855.74, 63.5, 275688.2, -84.12, -74.53, -25.87, -23.65, -127.43, -352.66, -13.18, 102.76, -1505.48, 12556.78, 95.1, 4585.92, 6995.15, 184.06, 845.85, 64, 277566.5, -108.49, -79.56, -24.69, -33.46, -126.2, -330.56, -13.19, 99.41, -1275.4, 12971.81, 141.04, 4183.03, 7191.94, 185.73, 835.01, 64.5, 279219, -123.64, -75.28, -24.95, -34.38, -121.35, -298.45, -13.2, 101.76, -1025.03, 13399.73, 187.35, 3758.19, 7393.44, 193.35, 829.73, 65, 280640.4, -134.85, -66.21, -15.1, -31.51, -112.52, -261.49, -13.62, 92.64, -753.42, 13824.2, 226.64, 3316.47, 7589.96, 189.06, 818.65, 65.5, 281836, -152.08, -68.24, -10.66, -34.59, -109.94, -229.98, -13.63, 89.21, -474.67, 14262, 281.43, 2859.21, 7795.48, 196.54, 805.76, 66, 282795.4, -175.76, -64.05, -11.39, -38.05, -113.56, -203.51, -14.26, 85.78, -195.71, 14701.46, 340.03, 2385.33, 7998.13, 198.02, 799.07, 66.5, 283513.3, -193.74, -64.72, -5.63, -41.87, -111.7, -170.64, -14.56, 88.19, 92.09, 15149.59, 396.91, 1888.9, 8197.06, 204.95, 791.73, 67, 283979, -206.24, -53.47, 0.63, -46.35, -104.94, -131.65, -15.04, 78.87, 397.97, 15572.19, 456.93, 1376.46, 8402.82, 200.21, 777.47 }, data_asc = 1, engine_control_time = { 58, 62.5, 65, 68, 71, 73.7, 76.7, 80, 85, 99 }, pitch_trig_diff = 0.05, @@ -155,6 +157,7 @@ _G["weapons_table"]["weapons"]["missiles"]["SCUD_RAKETA"] = { }, fm = { A = 0.08, + Cx0 = { 0.32, 0.32, 0.32, 0.32, 0.34, 0.42, 0.6, 0.8, 0.9, 0.86, 0.78, 0.76, 0.73, 0.7, 0.67, 0.65, 0.62, 0.6, 0.58, 0.56, 0.55 }, I = 59108.5, L = 11, Ma = 2, @@ -168,6 +171,7 @@ _G["weapons_table"]["weapons"]["missiles"]["SCUD_RAKETA"] = { finsTau = 8, mass = 5862, maxAoa = 0.3, + table_scale = 0.2, wind_sigma = 0, wind_time = 0 }, diff --git a/_G/weapons_table/weapons/missiles/SD-10.lua b/_G/weapons_table/weapons/missiles/SD-10.lua index d932267c..60543ba9 100644 --- a/_G/weapons_table/weapons/missiles/SD-10.lua +++ b/_G/weapons_table/weapons/missiles/SD-10.lua @@ -85,6 +85,7 @@ _G["weapons_table"]["weapons"]["missiles"]["SD-10"] = { boost_start = 0.5, march_start = 6.5 }, + display_name_short = "SD-10", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 27.6, 27.6, 27.6, 27.6, 27.55, 30.38, 31.982, 32.774, 33.234, 33.561, 33.829, 34.07, 34.286, 34.491, 34.687, 34.875, 35.056, 35.232, 35.401, 35.564, 35.721, 35.871, 36.015, 36.151, 36.279, 36.4 }, @@ -211,6 +212,7 @@ _G["weapons_table"]["weapons"]["missiles"]["SD-10"] = { wsTypeOfWeapon = { 4, 4, 7, "Redacted" } }, display_name = "SD-10", + display_name_short = "SD-10", mass = 199, model = "pl12", name = "SD-10", @@ -295,6 +297,7 @@ _G["weapons_table"]["weapons"]["missiles"]["SD-10"] = { boost_start = 0.5, march_start = 6.5 }, + display_name_short = "SD-10", exhaust = { 1, 1, 1, 0.8 }, fm = { A1trim = { 27.6, 27.6, 27.6, 27.6, 27.55, 30.38, 31.982, 32.774, 33.234, 33.561, 33.829, 34.07, 34.286, 34.491, 34.687, 34.875, 35.056, 35.232, 35.401, 35.564, 35.721, 35.871, 36.015, 36.151, 36.279, 36.4 }, diff --git a/_G/weapons_table/weapons/missiles/Sea_Cat.lua b/_G/weapons_table/weapons/missiles/Sea_Cat.lua index 98393642..400e095e 100644 --- a/_G/weapons_table/weapons/missiles/Sea_Cat.lua +++ b/_G/weapons_table/weapons/missiles/Sea_Cat.lua @@ -61,6 +61,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Cat"] = { boost_start = 0, march_start = 0.8 }, + display_name_short = "GWS-20 Mod. 1 Sea Cat", err = { max_time_interval = 0.9, min_time_interval = 0, @@ -149,6 +150,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Cat"] = { wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, display_name = "GWS-20 Mod. 1 Sea Cat", + display_name_short = "GWS-20 Mod. 1 Sea Cat", mass = 68, model = "SeaCat", name = "Sea_Cat", @@ -209,6 +211,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Cat"] = { boost_start = 0, march_start = 0.8 }, + display_name_short = "GWS-20 Mod. 1 Sea Cat", err = { max_time_interval = 0.9, min_time_interval = 0, diff --git a/_G/weapons_table/weapons/missiles/Sea_Dart.lua b/_G/weapons_table/weapons/missiles/Sea_Dart.lua index 154e40fd..f67a67ad 100644 --- a/_G/weapons_table/weapons/missiles/Sea_Dart.lua +++ b/_G/weapons_table/weapons/missiles/Sea_Dart.lua @@ -71,6 +71,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { boost_start = 0, march_start = 2.9 }, + display_name_short = "GWS-30 Sea Dart", fm = { A = 0.36, I = 885.72, @@ -179,6 +180,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, display_name = "GWS-30 Sea Dart", + display_name_short = "GWS-30 Sea Dart", mass = 549, model = "SeaDart", name = "Sea_Dart", @@ -249,6 +251,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Dart"] = { boost_start = 0, march_start = 2.9 }, + display_name_short = "GWS-30 Sea Dart", fm = { A = 0.36, I = 885.72, diff --git a/_G/weapons_table/weapons/missiles/Sea_Wolf.lua b/_G/weapons_table/weapons/missiles/Sea_Wolf.lua index 5d27466b..957cad81 100644 --- a/_G/weapons_table/weapons/missiles/Sea_Wolf.lua +++ b/_G/weapons_table/weapons/missiles/Sea_Wolf.lua @@ -61,6 +61,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Wolf"] = { boost_start = 0, march_start = 0 }, + display_name_short = "GWS-25 Sea Wolf", err = { max_time_interval = 0.2, min_time_interval = 0, @@ -149,6 +150,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Wolf"] = { wsTypeOfWeapon = { 4, 4, 34, "Redacted" } }, display_name = "GWS-25 Sea Wolf", + display_name_short = "GWS-25 Sea Wolf", mass = 68, model = "SeaCat", name = "Sea_Wolf", @@ -209,6 +211,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Sea_Wolf"] = { boost_start = 0, march_start = 0 }, + display_name_short = "GWS-25 Sea Wolf", err = { max_time_interval = 0.2, min_time_interval = 0, diff --git a/_G/weapons_table/weapons/missiles/Vikhr_M.lua b/_G/weapons_table/weapons/missiles/Vikhr_M.lua index 6d4e2510..0e29d051 100644 --- a/_G/weapons_table/weapons/missiles/Vikhr_M.lua +++ b/_G/weapons_table/weapons/missiles/Vikhr_M.lua @@ -38,9 +38,11 @@ _G["weapons_table"]["weapons"]["missiles"]["Vikhr_M"] = { Kp = 0.078, delay = 0.2, fins_discreet = 0.04, + fins_limit = 3, max_ctrl_angle = 1.35, no_ctrl_center_ang = 4e-05, - op_time = 24 + op_time = 24, + ray_limit_data = { 2, 0.087266462599716, 12, 0.0087266462599716 } }, booster = { custom_smoke_dissipation_factor = 0.8, @@ -60,6 +62,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Vikhr_M"] = { boost_start = 0, march_start = 0.5 }, + display_name_short = "9M127-1 Vikhr-M", eng_err = { max_time_interval = 1, min_time_interval = 0.1, @@ -145,6 +148,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Vikhr_M"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "9M127-1 Vikhr-M", + display_name_short = "9M127-1 Vikhr-M", mass = 45, model = "vikhr", name = "Vikhr_M", @@ -182,9 +186,11 @@ _G["weapons_table"]["weapons"]["missiles"]["Vikhr_M"] = { Kp = 0.078, delay = 0.2, fins_discreet = 0.04, + fins_limit = 3, max_ctrl_angle = 1.35, no_ctrl_center_ang = 4e-05, - op_time = 24 + op_time = 24, + ray_limit_data = { 2, 0.087266462599716, 12, 0.0087266462599716 } }, booster = { custom_smoke_dissipation_factor = 0.8, @@ -204,6 +210,7 @@ _G["weapons_table"]["weapons"]["missiles"]["Vikhr_M"] = { boost_start = 0, march_start = 0.5 }, + display_name_short = "9M127-1 Vikhr-M", eng_err = { max_time_interval = 1, min_time_interval = 0.1, diff --git a/_G/weapons_table/weapons/missiles/X_25ML.lua b/_G/weapons_table/weapons/missiles/X_25ML.lua index f1732d8a..a617ea59 100644 --- a/_G/weapons_table/weapons/missiles/X_25ML.lua +++ b/_G/weapons_table/weapons/missiles/X_25ML.lua @@ -4,18 +4,25 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { caliber = 0.275, client = { autopilot = { - J_Angle_K = 0.20943951023932, - J_Angle_W = 3.5, - J_Diff_K = 0.6, - J_FinAngle_K = 0.27925268031909, - J_Int_K = 0, - J_Power_K = 1.2, - K = 20, - Kg = 3.8, - Ki = 0.0002, - delay = 1, - finsLimit = 0.22, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.10471975511966, + K_Eloc = 0.002, + K_Eloc_x = 0.0001, + K_Fi = 10, + K_LOS_omega = 10, + K_fins = 1, + K_fins_x = 0.4, + K_n = 0.035, + K_roll = 1, + Ki_LOS_omega = 25, + Ki_dG = -2.5, + delay_guidance = 1, + delay_roll = 0.4, + fins_limit = 0.26179938779915, + fins_limit_x = 0.33161255787892, + n_limit = 10, + n_req = 5, + null_roll = 0.78539816339745, + op_time = 40 }, booster = { boost_factor = 0, @@ -35,24 +42,48 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { march_start = 2 }, fm = { - A = 0.36, - I = 338.8275, - I_x = 30, - L = 3.7, - Ma = 0.4, - Ma_x = 0.01, - Mw = 1.1, - Mw_x = 0.08, - Sw = 0.5, + A1trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + A2trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + Cx0 = { 0.289, 0.289, 0.289, 0.289, 0.306, 0.6, 0.659, 0.69, 0.7, 0.71, 0.719, 0.706 }, + CxB = { 0.038, 0.038, 0.038, 0.038, 0.04, 0.126, 0.162, 0.154, 0.144, 0.132, 0.122, 0.114 }, + Cya = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Cza = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Ix = 4.5, + Iy = 215, + Iz = 215, + K1 = { 0.00041, 0.00041, 0.00041, 0.00041, 0.00041, 0.00052, 0.00044, 0.00042, 0.0004, 0.0003, 0.0002, 0.00015 }, + K2 = { -0.00024, -0.00024, -0.00024, -0.00024, -0.00018, 5e-05, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001 }, + L = 3.705, + Mxd = 0.23875, + Mxw = -1.6458333333333, + Mya = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Myw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + Mza = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Mzw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + S = 0.059, caliber = 0.275, - cx_coeff = { 1, 0.55, 1, 0.75, 1.2 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, + delta_max = 0.26179938779915, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, mass = 297, - maxAoa = 0.3, + model_roll = 0.78539816339745, + rotated_fins_inp = 0, + table_degree_values = 1, + table_scale = 0.2, + tail_first = 1, wind_sigma = 0, wind_time = 0 }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.1221730476396, + op_time = 40, + pitch_max = 0.5235987755983, + tracking_gain = 10, + yaw_max = 0.5235987755983 + }, march = { boost_factor = 0, boost_time = 0, @@ -66,14 +97,11 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { tail_width = 0.1, work_time = 7 }, - scheme = "schemes/missiles/laser_homing_gyrost_missile.sch", + scheme = "schemes/missiles/KH-29L.sch", seeker = { - FOV = 1.0471975511966, + FOV = 0.034906585039887, delay = 0, - max_seeker_range = 13000 - }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 + max_seeker_range = 8000 }, warhead = { caliber = 275, @@ -110,18 +138,25 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { name = "X_25ML", server = { autopilot = { - J_Angle_K = 0.20943951023932, - J_Angle_W = 3.5, - J_Diff_K = 0.6, - J_FinAngle_K = 0.27925268031909, - J_Int_K = 0, - J_Power_K = 1.2, - K = 20, - Kg = 3.8, - Ki = 0.0002, - delay = 1, - finsLimit = 0.22, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.10471975511966, + K_Eloc = 0.002, + K_Eloc_x = 0.0001, + K_Fi = 10, + K_LOS_omega = 10, + K_fins = 1, + K_fins_x = 0.4, + K_n = 0.035, + K_roll = 1, + Ki_LOS_omega = 25, + Ki_dG = -2.5, + delay_guidance = 1, + delay_roll = 0.4, + fins_limit = 0.26179938779915, + fins_limit_x = 0.33161255787892, + n_limit = 10, + n_req = 5, + null_roll = 0.78539816339745, + op_time = 40 }, booster = { boost_factor = 0, @@ -141,24 +176,48 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { march_start = 2 }, fm = { - A = 0.36, - I = 338.8275, - I_x = 30, - L = 3.7, - Ma = 0.4, - Ma_x = 0.01, - Mw = 1.1, - Mw_x = 0.08, - Sw = 0.5, + A1trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + A2trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + Cx0 = { 0.289, 0.289, 0.289, 0.289, 0.306, 0.6, 0.659, 0.69, 0.7, 0.71, 0.719, 0.706 }, + CxB = { 0.038, 0.038, 0.038, 0.038, 0.04, 0.126, 0.162, 0.154, 0.144, 0.132, 0.122, 0.114 }, + Cya = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Cza = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Ix = 4.5, + Iy = 215, + Iz = 215, + K1 = { 0.00041, 0.00041, 0.00041, 0.00041, 0.00041, 0.00052, 0.00044, 0.00042, 0.0004, 0.0003, 0.0002, 0.00015 }, + K2 = { -0.00024, -0.00024, -0.00024, -0.00024, -0.00018, 5e-05, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001 }, + L = 3.705, + Mxd = 0.23875, + Mxw = -1.6458333333333, + Mya = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Myw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + Mza = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Mzw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + S = 0.059, caliber = 0.275, - cx_coeff = { 1, 0.55, 1, 0.75, 1.2 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, + delta_max = 0.26179938779915, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, mass = 297, - maxAoa = 0.3, + model_roll = 0.78539816339745, + rotated_fins_inp = 0, + table_degree_values = 1, + table_scale = 0.2, + tail_first = 1, wind_sigma = 0, wind_time = 0 }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.1221730476396, + op_time = 40, + pitch_max = 0.5235987755983, + tracking_gain = 10, + yaw_max = 0.5235987755983 + }, march = { boost_factor = 0, boost_time = 0, @@ -172,14 +231,11 @@ _G["weapons_table"]["weapons"]["missiles"]["X_25ML"] = { tail_width = 0.1, work_time = 7 }, - scheme = "schemes/missiles/laser_homing_gyrost_missile.sch", + scheme = "schemes/missiles/KH-29L.sch", seeker = { - FOV = 1.0471975511966, + FOV = 0.034906585039887, delay = 0, - max_seeker_range = 13000 - }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 + max_seeker_range = 8000 }, warhead = { caliber = 275, diff --git a/_G/weapons_table/weapons/missiles/X_29L.lua b/_G/weapons_table/weapons/missiles/X_29L.lua index a6e943f3..47f73271 100644 --- a/_G/weapons_table/weapons/missiles/X_29L.lua +++ b/_G/weapons_table/weapons/missiles/X_29L.lua @@ -4,25 +4,32 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { caliber = 0.38, client = { autopilot = { - J_Angle_K = 0.24434609527921, - J_Angle_W = 4.5, - J_Diff_K = 1, - J_FinAngle_K = 0.31415926535898, - J_Int_K = 0, - J_Power_K = 3.6, - K = 36, - Kg = 6, - Ki = 0.0005, - delay = 0.8, - finsLimit = 0.2, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.10471975511966, + K_Eloc = 0.001, + K_Eloc_x = 0.0001, + K_Fi = 10, + K_LOS_omega = 10, + K_fins = 1, + K_fins_x = 0.6, + K_n = 0.035, + K_roll = 1, + Ki_LOS_omega = 25, + Ki_dG = -2.5, + delay_guidance = 0.8, + delay_roll = 0.4, + fins_limit = 0.31415926535898, + fins_limit_x = 0.43633231299858, + n_limit = 10, + n_req = 5, + null_roll = 0.78539816339745, + op_time = 40 }, booster = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, - impulse = 208, + impulse = 0, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.9, tail_width = 0.4, @@ -30,48 +37,70 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { }, controller = { boost_start = 0, - march_start = 0.8 + march_start = 0.2 }, fm = { - A = 0.36, - I = 810.84375, - I_x = 45, + A1trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + A2trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + Cx0 = { 0.289, 0.289, 0.289, 0.289, 0.306, 0.6, 0.659, 0.69, 0.7, 0.71, 0.719, 0.706 }, + CxB = { 0.038, 0.038, 0.038, 0.038, 0.04, 0.126, 0.162, 0.154, 0.144, 0.132, 0.122, 0.114 }, + Cya = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Cza = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Ix = 17.5, + Iy = 508, + Iz = 508, + K1 = { 0.00041, 0.00041, 0.00041, 0.00041, 0.00041, 0.00052, 0.00044, 0.00042, 0.0004, 0.0003, 0.0002, 0.00015 }, + K2 = { -0.00024, -0.00024, -0.00024, -0.00024, -0.00018, 5e-05, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001 }, L = 3.875, - Ma = 0.3, - Ma_x = 0.005, - Mw = 1.2, - Mw_x = 0.1, - Sw = 1.55, + Mxd = 0.23875, + Mxw = -1.6458333333333, + Mya = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Myw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + Mza = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Mzw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + S = 0.11, caliber = 0.38, - cx_coeff = { 1, 0.55, 1, 0.75, 1.25 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, + delta_max = 0.31415926535898, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, mass = 648, - maxAoa = 0.3, + model_roll = 0.78539816339745, + rotated_fins_inp = 0, + table_degree_values = 1, + table_scale = 0.2, + tail_first = 1, wind_sigma = 0, wind_time = 0 }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.1221730476396, + op_time = 40, + pitch_max = 0.5235987755983, + tracking_gain = 10, + yaw_max = 0.5235987755983 + }, march = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, - fuel_mass = 132, - impulse = 208, + fuel_mass = 110, + impulse = 212, + nozzle_exit_area = 0.038, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.9, tail_width = 0.4, - work_time = 5 + work_time = 4.7 }, - scheme = "schemes/missiles/laser_homing_gyrost_missile.sch", + scheme = "schemes/missiles/KH-29L.sch", seeker = { - FOV = 1.0471975511966, + FOV = 0.034906585039887, delay = 0, - max_seeker_range = 13000 - }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 + max_seeker_range = 8000 }, warhead = { caliber = 380, @@ -108,25 +137,32 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { name = "X_29L", server = { autopilot = { - J_Angle_K = 0.24434609527921, - J_Angle_W = 4.5, - J_Diff_K = 1, - J_FinAngle_K = 0.31415926535898, - J_Int_K = 0, - J_Power_K = 3.6, - K = 36, - Kg = 6, - Ki = 0.0005, - delay = 0.8, - finsLimit = 0.2, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.10471975511966, + K_Eloc = 0.001, + K_Eloc_x = 0.0001, + K_Fi = 10, + K_LOS_omega = 10, + K_fins = 1, + K_fins_x = 0.6, + K_n = 0.035, + K_roll = 1, + Ki_LOS_omega = 25, + Ki_dG = -2.5, + delay_guidance = 0.8, + delay_roll = 0.4, + fins_limit = 0.31415926535898, + fins_limit_x = 0.43633231299858, + n_limit = 10, + n_req = 5, + null_roll = 0.78539816339745, + op_time = 40 }, booster = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, - impulse = 208, + impulse = 0, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.9, tail_width = 0.4, @@ -134,48 +170,70 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29L"] = { }, controller = { boost_start = 0, - march_start = 0.8 + march_start = 0.2 }, fm = { - A = 0.36, - I = 810.84375, - I_x = 45, + A1trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + A2trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + Cx0 = { 0.289, 0.289, 0.289, 0.289, 0.306, 0.6, 0.659, 0.69, 0.7, 0.71, 0.719, 0.706 }, + CxB = { 0.038, 0.038, 0.038, 0.038, 0.04, 0.126, 0.162, 0.154, 0.144, 0.132, 0.122, 0.114 }, + Cya = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Cza = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Ix = 17.5, + Iy = 508, + Iz = 508, + K1 = { 0.00041, 0.00041, 0.00041, 0.00041, 0.00041, 0.00052, 0.00044, 0.00042, 0.0004, 0.0003, 0.0002, 0.00015 }, + K2 = { -0.00024, -0.00024, -0.00024, -0.00024, -0.00018, 5e-05, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001 }, L = 3.875, - Ma = 0.3, - Ma_x = 0.005, - Mw = 1.2, - Mw_x = 0.1, - Sw = 1.55, + Mxd = 0.23875, + Mxw = -1.6458333333333, + Mya = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Myw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + Mza = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Mzw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + S = 0.11, caliber = 0.38, - cx_coeff = { 1, 0.55, 1, 0.75, 1.25 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, + delta_max = 0.31415926535898, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, mass = 648, - maxAoa = 0.3, + model_roll = 0.78539816339745, + rotated_fins_inp = 0, + table_degree_values = 1, + table_scale = 0.2, + tail_first = 1, wind_sigma = 0, wind_time = 0 }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.1221730476396, + op_time = 40, + pitch_max = 0.5235987755983, + tracking_gain = 10, + yaw_max = 0.5235987755983 + }, march = { boost_factor = 0, boost_time = 0, custom_smoke_dissipation_factor = 0.2, - fuel_mass = 132, - impulse = 208, + fuel_mass = 110, + impulse = 212, + nozzle_exit_area = 0.038, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.9, tail_width = 0.4, - work_time = 5 + work_time = 4.7 }, - scheme = "schemes/missiles/laser_homing_gyrost_missile.sch", + scheme = "schemes/missiles/KH-29L.sch", seeker = { - FOV = 1.0471975511966, + FOV = 0.034906585039887, delay = 0, - max_seeker_range = 13000 - }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 + max_seeker_range = 8000 }, warhead = { caliber = 380, diff --git a/_G/weapons_table/weapons/missiles/X_29T.lua b/_G/weapons_table/weapons/missiles/X_29T.lua index c73cb7f1..fecbc309 100644 --- a/_G/weapons_table/weapons/missiles/X_29T.lua +++ b/_G/weapons_table/weapons/missiles/X_29T.lua @@ -4,25 +4,32 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { caliber = 0.38, client = { autopilot = { - J_Angle_K = 0.24434609527921, - J_Angle_W = 4.5, - J_Diff_K = 1, - J_FinAngle_K = 0.31415926535898, - J_Int_K = 0, - J_Power_K = 3.6, - K = 36, - Kg = 6, - Ki = 0.0005, - delay = 0.8, - finsLimit = 0.2, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.10471975511966, + K_Eloc = 0.001, + K_Eloc_x = 0.0001, + K_Fi = 10, + K_LOS_omega = 10, + K_fins = 1, + K_fins_x = 0.6, + K_n = 0.035, + K_roll = 1, + Ki_LOS_omega = 25, + Ki_dG = -2.5, + delay_guidance = 0.8, + delay_roll = 0.4, + fins_limit = 0.31415926535898, + fins_limit_x = 0.43633231299858, + n_limit = 10, + n_req = 5, + null_roll = 0.78539816339745, + op_time = 40 }, boost = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, - impulse = 148, + impulse = 0, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.9, tail_width = 0.4, @@ -30,39 +37,65 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { }, controller = { boost_start = 0, - march_start = 0.8 + march_start = 0.2 }, fm = { - A = 0.36, - I = 835.86979166667, - I_x = 45, - L = 3.875, - Ma = 0.3, - Ma_x = 0.005, - Mw = 1.2, - Mw_x = 0.1, - Sw = 1.55, + A1trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + A2trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + Cx0 = { 0.289, 0.289, 0.289, 0.289, 0.306, 0.542, 0.712, 0.751, 0.751, 0.736, 0.719, 0.706 }, + CxB = { 0.038, 0.038, 0.038, 0.038, 0.04, 0.126, 0.162, 0.154, 0.144, 0.132, 0.122, 0.114 }, + Cya = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Cza = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Ix = 17.5, + Iy = 508, + Iz = 508, + K1 = { 0.00041, 0.00041, 0.00041, 0.00041, 0.00041, 0.00052, 0.00044, 0.00042, 0.0004, 0.0003, 0.0002, 0.00015 }, + K2 = { -0.00024, -0.00024, -0.00024, -0.00024, -0.00018, 5e-05, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001 }, + L = 3.9, + Mxd = 0.23875, + Mxw = -1.6458333333333, + Mya = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Myw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + Mza = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Mzw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + S = 0.11, caliber = 0.38, - cx_coeff = { 1, 0.55, 1, 0.75, 1.25 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - mass = 668, - maxAoa = 0.3, + delta_max = 0.31415926535898, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, + mass = 680, + model_roll = 0.78539816339745, + rotated_fins_inp = 0, + table_degree_values = 1, + table_scale = 0.2, + tail_first = 1, wind_sigma = 0, - wind_time = 1000 + wind_time = 0 + }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.17453292519943, + mount_roll_angle = -0.78539816339745, + op_time = 40, + pitch_max = 0.5235987755983, + tracking_gain = 50, + yaw_max = 0.5235987755983 }, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 100, - impulse = 148, + fuel_mass = 110, + impulse = 212, + nozzle_exit_area = 0.038, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.9, tail_width = 0.4, - work_time = 6.2 + work_time = 4.7 }, - scheme = "schemes/missiles/tv_homing_gyrost_missile.sch", + scheme = "schemes/missiles/KH-29T.sch", seeker = { FOV = 1.0471975511966, aim_sigma = 0.5, @@ -72,9 +105,6 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { op_time = 40, send_off_data = 0 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, warhead = { caliber = 380, concrete_factors = { 5, 1, 10 }, @@ -105,30 +135,37 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { } }, display_name = "Kh-29T", - mass = 668, + mass = 680, model = "X-29T", name = "X_29T", server = { autopilot = { - J_Angle_K = 0.24434609527921, - J_Angle_W = 4.5, - J_Diff_K = 1, - J_FinAngle_K = 0.31415926535898, - J_Int_K = 0, - J_Power_K = 3.6, - K = 36, - Kg = 6, - Ki = 0.0005, - delay = 0.8, - finsLimit = 0.2, - useJumpByDefault = 1 + Fi_fix_angle_req = -0.10471975511966, + K_Eloc = 0.001, + K_Eloc_x = 0.0001, + K_Fi = 10, + K_LOS_omega = 10, + K_fins = 1, + K_fins_x = 0.6, + K_n = 0.035, + K_roll = 1, + Ki_LOS_omega = 25, + Ki_dG = -2.5, + delay_guidance = 0.8, + delay_roll = 0.4, + fins_limit = 0.31415926535898, + fins_limit_x = 0.43633231299858, + n_limit = 10, + n_req = 5, + null_roll = 0.78539816339745, + op_time = 40 }, boost = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, - impulse = 148, + impulse = 0, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.9, tail_width = 0.4, @@ -136,39 +173,65 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { }, controller = { boost_start = 0, - march_start = 0.8 + march_start = 0.2 }, fm = { - A = 0.36, - I = 835.86979166667, - I_x = 45, - L = 3.875, - Ma = 0.3, - Ma_x = 0.005, - Mw = 1.2, - Mw_x = 0.1, - Sw = 1.55, + A1trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + A2trim = { 147.91, 147.91, 147.91, 147.91, 147.91, 123.68, 21.93, 15.64, 9, 7, 6.3, 6.3 }, + Cx0 = { 0.289, 0.289, 0.289, 0.289, 0.306, 0.542, 0.712, 0.751, 0.751, 0.736, 0.719, 0.706 }, + CxB = { 0.038, 0.038, 0.038, 0.038, 0.04, 0.126, 0.162, 0.154, 0.144, 0.132, 0.122, 0.114 }, + Cya = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Cza = { 0.357, 0.357, 0.357, 0.357, 0.357, 0.378, 0.347, 0.34, 0.332, 0.325, 0.315, 0.307 }, + Ix = 17.5, + Iy = 508, + Iz = 508, + K1 = { 0.00041, 0.00041, 0.00041, 0.00041, 0.00041, 0.00052, 0.00044, 0.00042, 0.0004, 0.0003, 0.0002, 0.00015 }, + K2 = { -0.00024, -0.00024, -0.00024, -0.00024, -0.00018, 5e-05, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001, 0.0001 }, + L = 3.9, + Mxd = 0.23875, + Mxw = -1.6458333333333, + Mya = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Myw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + Mza = { -0.0023, -0.0023, -0.0023, -0.0023, -0.0023, -0.0031, -0.012, -0.015, -0.017, -0.018, -0.019, -0.02 }, + Mzw = { -1.62, -1.62, -1.62, -1.62, -1.7, -2.06, -2.052, -2.047, -2.033, -1.967, -1.849, -1.69 }, + S = 0.11, caliber = 0.38, - cx_coeff = { 1, 0.55, 1, 0.75, 1.25 }, - dCydA = { 0.07, 0.036 }, - finsTau = 0.1, - mass = 668, - maxAoa = 0.3, + delta_max = 0.31415926535898, + draw_fins_conv = { 1.5707963267949, 1, 1 }, + fins_part_val = 0, + fins_stall = 0, + mass = 680, + model_roll = 0.78539816339745, + rotated_fins_inp = 0, + table_degree_values = 1, + table_scale = 0.2, + tail_first = 1, wind_sigma = 0, - wind_time = 1000 + wind_time = 0 + }, + gimbal = { + delay = 0, + lock_time = 0, + max_tracking_rate = 0.17453292519943, + mount_roll_angle = -0.78539816339745, + op_time = 40, + pitch_max = 0.5235987755983, + tracking_gain = 50, + yaw_max = 0.5235987755983 }, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 100, - impulse = 148, + fuel_mass = 110, + impulse = 212, + nozzle_exit_area = 0.038, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.9, tail_width = 0.4, - work_time = 6.2 + work_time = 4.7 }, - scheme = "schemes/missiles/tv_homing_gyrost_missile.sch", + scheme = "schemes/missiles/KH-29T.sch", seeker = { FOV = 1.0471975511966, aim_sigma = 0.5, @@ -178,9 +241,6 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29T"] = { op_time = 40, send_off_data = 0 }, - simple_gyrostab_seeker = { - omega_max = 0.13962634015955 - }, warhead = { caliber = 380, concrete_factors = { 5, 1, 10 }, diff --git a/_G/weapons_table/weapons/missiles/X_29TE.lua b/_G/weapons_table/weapons/missiles/X_29TE.lua index 7aa04960..dd969471 100644 --- a/_G/weapons_table/weapons/missiles/X_29TE.lua +++ b/_G/weapons_table/weapons/missiles/X_29TE.lua @@ -13,16 +13,16 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { K = 36, Kg = 6, Ki = 0.0005, - delay = 0.8, + delay = 0.15, finsLimit = 0.2, useJumpByDefault = 1 }, boost = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, - impulse = 148, + impulse = 0, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.1, tail_width = 0.4, @@ -30,7 +30,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { }, controller = { boost_start = 0, - march_start = 0.8 + march_start = 0.2 }, fm = { A = 0.36, @@ -53,14 +53,15 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { }, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 100, - impulse = 148, + fuel_mass = 110, + impulse = 212, + nozzle_exit_area = 0.038, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.1, tail_width = 0.4, - work_time = 6.2 + work_time = 4.7 }, scheme = "schemes/missiles/tv_homing_gyrost_missile.sch", seeker = { @@ -119,16 +120,16 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { K = 36, Kg = 6, Ki = 0.0005, - delay = 0.8, + delay = 0.15, finsLimit = 0.2, useJumpByDefault = 1 }, boost = { custom_smoke_dissipation_factor = 0.2, fuel_mass = 0, - impulse = 148, + impulse = 0, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.1, tail_width = 0.4, @@ -136,7 +137,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { }, controller = { boost_start = 0, - march_start = 0.8 + march_start = 0.2 }, fm = { A = 0.36, @@ -159,14 +160,15 @@ _G["weapons_table"]["weapons"]["missiles"]["X_29TE"] = { }, march = { custom_smoke_dissipation_factor = 0.2, - fuel_mass = 100, - impulse = 148, + fuel_mass = 110, + impulse = 212, + nozzle_exit_area = 0.038, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -1.3, -0.19, 0 } }, + nozzle_position = { { -2, 0, 0 } }, smoke_color = { 1, 1, 1 }, smoke_transparency = 0.1, tail_width = 0.4, - work_time = 6.2 + work_time = 4.7 }, scheme = "schemes/missiles/tv_homing_gyrost_missile.sch", seeker = { diff --git a/_G/weapons_table/weapons/missiles/X_59M.lua b/_G/weapons_table/weapons/missiles/X_59M.lua index 95c8686d..4f4829b8 100644 --- a/_G/weapons_table/weapons/missiles/X_59M.lua +++ b/_G/weapons_table/weapons/missiles/X_59M.lua @@ -84,7 +84,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { impulse = 235, nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -3, -0.196, 0 } }, + nozzle_position = { { -2.85, 0, 0 } }, smoke_color = { 0.9, 0.9, 0.9 }, smoke_transparency = 0.1, tail_width = 0.5, @@ -96,9 +96,10 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { default_cruise_height = 100 }, controller = { - boost_start = 0, - march_start = 1 + boost_start = 0.5, + march_start = 1.5 }, + display_name_short = "Kh-59M (AS-18 Kazoo)", engine_control = { K = 240, Kd = 1, @@ -167,11 +168,11 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.88, -0.67, 0 } }, + nozzle_position = { { -0.745, -0.475, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.2, start_burn_effect = 1, - start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_delay = { 1, 1.3, 1.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 }, @@ -255,6 +256,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "Kh-59M (AS-18 Kazoo)", + display_name_short = "Kh-59M (AS-18 Kazoo)", mass = 930, model = "X-59M", name = "X_59M", @@ -337,7 +339,7 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { impulse = 235, nozzle_exit_area = 0.01368, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -3, -0.196, 0 } }, + nozzle_position = { { -2.85, 0, 0 } }, smoke_color = { 0.9, 0.9, 0.9 }, smoke_transparency = 0.1, tail_width = 0.5, @@ -349,9 +351,10 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { default_cruise_height = 100 }, controller = { - boost_start = 0, - march_start = 1 + boost_start = 0.5, + march_start = 1.5 }, + display_name_short = "Kh-59M (AS-18 Kazoo)", engine_control = { K = 240, Kd = 1, @@ -420,11 +423,11 @@ _G["weapons_table"]["weapons"]["missiles"]["X_59M"] = { min_fuel_rate = 0.005, min_thrust = -100, nozzle_orientationXYZ = { { 0, 0, 0 } }, - nozzle_position = { { -0.88, -0.67, 0 } }, + nozzle_position = { { -0.745, -0.475, 0 } }, smoke_color = { 0.5, 0.5, 0.5 }, smoke_transparency = 0.2, start_burn_effect = 1, - start_effect_delay = { 0, 0.3, 0.8 }, + start_effect_delay = { 1, 1.3, 1.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 }, diff --git a/_G/weapons_table/weapons/missiles/YJ-12.lua b/_G/weapons_table/weapons/missiles/YJ-12.lua index 0a0284b4..5e56455c 100644 --- a/_G/weapons_table/weapons/missiles/YJ-12.lua +++ b/_G/weapons_table/weapons/missiles/YJ-12.lua @@ -96,6 +96,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-12"] = { march_start = 6.5 }, display_name = "YJ-12", + display_name_short = "YJ-12", exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { K = 60, @@ -236,6 +237,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-12"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "YJ-12", + display_name_short = "YJ-12", encyclopediaAnimation = { args = { 1 } }, @@ -333,6 +335,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-12"] = { march_start = 6.5 }, display_name = "YJ-12", + display_name_short = "YJ-12", exhaust1 = { 1, 1, 1, 1 }, final_autopilot = { K = 60, diff --git a/_G/weapons_table/weapons/missiles/YJ-62.lua b/_G/weapons_table/weapons/missiles/YJ-62.lua index 4541ed25..8ac2691b 100644 --- a/_G/weapons_table/weapons/missiles/YJ-62.lua +++ b/_G/weapons_table/weapons/missiles/YJ-62.lua @@ -75,6 +75,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { march_start = 0.01, suppres_march = 0.01 }, + display_name_short = "YJ-62", engine_control = { K = 235, Kd = 0.01, @@ -197,6 +198,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { wsTypeOfWeapon = { 4, 4, 11, "Redacted" } }, display_name = "YJ-62", + display_name_short = "YJ-62", encyclopediaAnimation = { args = { 1 } }, @@ -273,6 +275,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-62"] = { march_start = 0.01, suppres_march = 0.01 }, + display_name_short = "YJ-62", engine_control = { K = 235, Kd = 0.01, diff --git a/_G/weapons_table/weapons/missiles/YJ-83.lua b/_G/weapons_table/weapons/missiles/YJ-83.lua index c814d668..149cee1f 100644 --- a/_G/weapons_table/weapons/missiles/YJ-83.lua +++ b/_G/weapons_table/weapons/missiles/YJ-83.lua @@ -78,6 +78,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { boost_start = 0.001, march_start = 0.01 }, + display_name_short = "YJ-83", engine_control = { K = 300, Kd = 0.01, @@ -200,6 +201,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { wsTypeOfWeapon = { 4, 4, 11, "Redacted" } }, display_name = "YJ-83", + display_name_short = "YJ-83", encyclopediaAnimation = { args = { 1 } }, @@ -279,6 +281,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83"] = { boost_start = 0.001, march_start = 0.01 }, + display_name_short = "YJ-83", engine_control = { K = 300, Kd = 0.01, diff --git a/_G/weapons_table/weapons/missiles/YJ-83K.lua b/_G/weapons_table/weapons/missiles/YJ-83K.lua index f5757700..967ef4e7 100644 --- a/_G/weapons_table/weapons/missiles/YJ-83K.lua +++ b/_G/weapons_table/weapons/missiles/YJ-83K.lua @@ -99,6 +99,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83K"] = { boost_start = 0, march_start = 5 }, + display_name_short = "YJ-83K", engine_control = { K = 265, Kd = 0.01, @@ -256,6 +257,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83K"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "YJ-83K", + display_name_short = "YJ-83K", mass = 715, model = "yj83k", name = "YJ-83K", @@ -353,6 +355,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-83K"] = { boost_start = 0, march_start = 5 }, + display_name_short = "YJ-83K", engine_control = { K = 265, Kd = 0.01, diff --git a/_G/weapons_table/weapons/missiles/YJ-84.lua b/_G/weapons_table/weapons/missiles/YJ-84.lua index 9e88fdb0..07359454 100644 --- a/_G/weapons_table/weapons/missiles/YJ-84.lua +++ b/_G/weapons_table/weapons/missiles/YJ-84.lua @@ -78,6 +78,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { boost_start = 0.001, march_start = 0.01 }, + display_name_short = "YJ-84", engine_control = { K = 300, Kd = 0.01, @@ -200,6 +201,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { wsTypeOfWeapon = { 4, 4, 8, "Redacted" } }, display_name = "YJ-84", + display_name_short = "YJ-84", encyclopediaAnimation = { args = { 1 } }, @@ -279,6 +281,7 @@ _G["weapons_table"]["weapons"]["missiles"]["YJ-84"] = { boost_start = 0.001, march_start = 0.01 }, + display_name_short = "YJ-84", engine_control = { K = 300, Kd = 0.01, diff --git a/_G/weapons_table/weapons/nurs/AGR_20_M151_unguided.lua b/_G/weapons_table/weapons/nurs/AGR_20_M151_unguided.lua index 9cc5fc5c..26f61fd7 100644 --- a/_G/weapons_table/weapons/nurs/AGR_20_M151_unguided.lua +++ b/_G/weapons_table/weapons/nurs/AGR_20_M151_unguided.lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["nurs"]["AGR_20_M151_unguided"] = { }, cx_pil = 4.7679923901827e-05, display_name = "APKWS M151 unguided", + display_name_short = "APKWS M151 unguided", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/AGR_20_M282_unguided.lua b/_G/weapons_table/weapons/nurs/AGR_20_M282_unguided.lua index 0ff89c8f..8c9357db 100644 --- a/_G/weapons_table/weapons/nurs/AGR_20_M282_unguided.lua +++ b/_G/weapons_table/weapons/nurs/AGR_20_M282_unguided.lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["nurs"]["AGR_20_M282_unguided"] = { }, cx_pil = 4.7679923901827e-05, display_name = "APKWS M282 unguided", + display_name_short = "APKWS M282 unguided", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/ARAKM70BAP.lua b/_G/weapons_table/weapons/nurs/ARAKM70BAP.lua index 060485d1..5f847df2 100644 --- a/_G/weapons_table/weapons/nurs/ARAKM70BAP.lua +++ b/_G/weapons_table/weapons/nurs/ARAKM70BAP.lua @@ -68,6 +68,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARAKM70BAP"] = { }, cx_pil = 8.0387366684076e-05, display_name = "ARAKM70BAP", + display_name_short = "ARAKM70BAP", dist_max = 7000, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/ARAKM70BHE.lua b/_G/weapons_table/weapons/nurs/ARAKM70BHE.lua index 2477ecdc..277bf759 100644 --- a/_G/weapons_table/weapons/nurs/ARAKM70BHE.lua +++ b/_G/weapons_table/weapons/nurs/ARAKM70BHE.lua @@ -68,6 +68,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARAKM70BHE"] = { }, cx_pil = 8.0387366684076e-05, display_name = "ARAKM70BHE", + display_name_short = "ARAKM70BHE", dist_max = 7000, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/ARF8M3API.lua b/_G/weapons_table/weapons/nurs/ARF8M3API.lua index 33058e35..21be5ec6 100644 --- a/_G/weapons_table/weapons/nurs/ARF8M3API.lua +++ b/_G/weapons_table/weapons/nurs/ARF8M3API.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3API"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "ARF-8/M3 API", + display_name_short = "ARF-8/M3 API", engine = { boost_factor = 1, boost_tail = 1, @@ -74,6 +75,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3API"] = { }, cx_pil = 1.1027073619215e-05, display_name = "ARF-8/M3 API", + display_name_short = "ARF-8/M3 API", dist_max = 4500, dist_max_ballistic = 8000, dist_min = 450, @@ -86,6 +88,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3API"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "ARF-8/M3 API", + display_name_short = "ARF-8/M3 API", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/ARF8M3HEI.lua b/_G/weapons_table/weapons/nurs/ARF8M3HEI.lua index 9b57a12d..fd37422a 100644 --- a/_G/weapons_table/weapons/nurs/ARF8M3HEI.lua +++ b/_G/weapons_table/weapons/nurs/ARF8M3HEI.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3HEI"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "ARF-8/M3 HEI Heavy", + display_name_short = "ARF-8/M3 HEI Heavy", engine = { boost_factor = 1, boost_tail = 1, @@ -74,6 +75,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3HEI"] = { }, cx_pil = 1.1027073619215e-05, display_name = "ARF-8/M3 HEI Heavy", + display_name_short = "ARF-8/M3 HEI Heavy", dist_max = 4500, dist_max_ballistic = 8000, dist_min = 450, @@ -86,6 +88,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3HEI"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "ARF-8/M3 HEI Heavy", + display_name_short = "ARF-8/M3 HEI Heavy", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/ARF8M3TPSM.lua b/_G/weapons_table/weapons/nurs/ARF8M3TPSM.lua index e5a07226..7356f7fb 100644 --- a/_G/weapons_table/weapons/nurs/ARF8M3TPSM.lua +++ b/_G/weapons_table/weapons/nurs/ARF8M3TPSM.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3TPSM"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "ARF-8/M3 TP-SM", + display_name_short = "ARF-8/M3 TP-SM", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3TPSM"] = { }, cx_pil = 1.1027073619215e-05, display_name = "ARF-8/M3 TP-SM", + display_name_short = "ARF-8/M3 TP-SM", dist_max = 4500, dist_max_ballistic = 8000, dist_min = 450, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["ARF8M3TPSM"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "ARF-8/M3 TP-SM", + display_name_short = "ARF-8/M3 TP-SM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/BRM1_90MM_UG.lua b/_G/weapons_table/weapons/nurs/BRM1_90MM_UG.lua index 1fcc8a9e..bd85c196 100644 --- a/_G/weapons_table/weapons/nurs/BRM1_90MM_UG.lua +++ b/_G/weapons_table/weapons/nurs/BRM1_90MM_UG.lua @@ -82,6 +82,7 @@ _G["weapons_table"]["weapons"]["nurs"]["BRM1_90MM_UG"] = { }, cx_pil = 3.3779071452315e-05, display_name = "BRM1_90MM_UG", + display_name_short = "BRM1_90MM_UG", dist_max = 8000, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/British_AP_25LBNo1_3INCHNo1.lua b/_G/weapons_table/weapons/nurs/British_AP_25LBNo1_3INCHNo1.lua index 5c41025c..7fa4cb8e 100644 --- a/_G/weapons_table/weapons/nurs/British_AP_25LBNo1_3INCHNo1.lua +++ b/_G/weapons_table/weapons/nurs/British_AP_25LBNo1_3INCHNo1.lua @@ -71,6 +71,7 @@ _G["weapons_table"]["weapons"]["nurs"]["British_AP_25LBNo1_3INCHNo1"] = { }, cx_pil = 3.3383947770031e-05, display_name = "RP-3 AP", + display_name_short = "RP-3 AP", dist_max = 800, dist_max_ballistic = 8000, dist_min = 300, diff --git a/_G/weapons_table/weapons/nurs/British_HE_60LBFNo1_3INCHNo1.lua b/_G/weapons_table/weapons/nurs/British_HE_60LBFNo1_3INCHNo1.lua index 6f5494d6..2978f87d 100644 --- a/_G/weapons_table/weapons/nurs/British_HE_60LBFNo1_3INCHNo1.lua +++ b/_G/weapons_table/weapons/nurs/British_HE_60LBFNo1_3INCHNo1.lua @@ -75,6 +75,7 @@ _G["weapons_table"]["weapons"]["nurs"]["British_HE_60LBFNo1_3INCHNo1"] = { }, cx_pil = 5.7320357407759e-05, display_name = "RP-3 HE", + display_name_short = "RP-3 HE", dist_max = 1600, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/British_HE_60LBSAPNo2_3INCHNo1.lua b/_G/weapons_table/weapons/nurs/British_HE_60LBSAPNo2_3INCHNo1.lua index 3fb702ad..f650a1e5 100644 --- a/_G/weapons_table/weapons/nurs/British_HE_60LBSAPNo2_3INCHNo1.lua +++ b/_G/weapons_table/weapons/nurs/British_HE_60LBSAPNo2_3INCHNo1.lua @@ -74,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["British_HE_60LBSAPNo2_3INCHNo1"] = { }, cx_pil = 0.0001024398941418, display_name = "RP-3 SAP", + display_name_short = "RP-3 SAP", dist_max = 1200, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/C_13.lua b/_G/weapons_table/weapons/nurs/C_13.lua index ff65285e..460ad4ad 100644 --- a/_G/weapons_table/weapons/nurs/C_13.lua +++ b/_G/weapons_table/weapons/nurs/C_13.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_13"] = { _unique_resource_name = "weapons.nurs.C_13", caliber = 0.112, client = { + display_name_short = "S-13", engine = { boost_factor = 1, boost_tail = 1, @@ -49,6 +50,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_13"] = { }, cx_pil = 5.5329444591773e-05, display_name = "S-13OF", + display_name_short = "S-13", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 1100, @@ -56,6 +58,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_13"] = { model = "c-13", name = "C_13", server = { + display_name_short = "S-13", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_24.lua b/_G/weapons_table/weapons/nurs/C_24.lua index 32f7b031..38a8861e 100644 --- a/_G/weapons_table/weapons/nurs/C_24.lua +++ b/_G/weapons_table/weapons/nurs/C_24.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_24"] = { _unique_resource_name = "weapons.nurs.C_24", caliber = 0.24, client = { + display_name_short = "S-24", engine = { boost_factor = 1, boost_tail = 1, @@ -48,6 +49,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_24"] = { }, cx_pil = 0.00025405144557455, display_name = "S-24B", + display_name_short = "S-24", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 2000, @@ -55,6 +57,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_24"] = { model = "c-24", name = "C_24", server = { + display_name_short = "S-24", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_25.lua b/_G/weapons_table/weapons/nurs/C_25.lua index da7ac11f..f9fdbd35 100644 --- a/_G/weapons_table/weapons/nurs/C_25.lua +++ b/_G/weapons_table/weapons/nurs/C_25.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_25"] = { _unique_resource_name = "weapons.nurs.C_25", caliber = 0.34, client = { + display_name_short = "S-25", engine = { boost_factor = 1, boost_tail = 1, @@ -48,6 +49,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_25"] = { }, cx_pil = 0.00048520673702783, display_name = "S-25-OFM", + display_name_short = "S-25", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 2000, @@ -55,6 +57,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_25"] = { model = "c-25", name = "C_25", server = { + display_name_short = "S-25", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_5.lua b/_G/weapons_table/weapons/nurs/C_5.lua index 50b31beb..4902e355 100644 --- a/_G/weapons_table/weapons/nurs/C_5.lua +++ b/_G/weapons_table/weapons/nurs/C_5.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { _unique_resource_name = "weapons.nurs.C_5", caliber = 0.057, client = { + display_name_short = "S-5", engine = { boost_factor = 1, boost_tail = 1, @@ -50,6 +51,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { }, cx_pil = 2.0422352116713e-05, display_name = "S-5KO", + display_name_short = "S-5", dist_max = 2500, dist_max_ballistic = 8000, dist_min = 600, @@ -57,6 +59,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_5"] = { model = "s-5ko", name = "C_5", server = { + display_name_short = "S-5", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8.lua b/_G/weapons_table/weapons/nurs/C_8.lua index a914bd9a..ba1e8ea1 100644 --- a/_G/weapons_table/weapons/nurs/C_8.lua +++ b/_G/weapons_table/weapons/nurs/C_8.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8KOM HEAT/Frag", + display_name_short = "S-8KOM", engine = { boost_factor = 1, boost_tail = 1, @@ -76,6 +77,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8KOM HEAT/Frag", + display_name_short = "S-8KOM", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 600, @@ -88,6 +90,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8KOM HEAT/Frag", + display_name_short = "S-8KOM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8CM.lua b/_G/weapons_table/weapons/nurs/C_8CM.lua index 05e33273..a7d416c8 100644 --- a/_G/weapons_table/weapons/nurs/C_8CM.lua +++ b/_G/weapons_table/weapons/nurs/C_8CM.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Orange", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, @@ -75,6 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8TsM SM Orange", + display_name_short = "S-8TsM", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 600, @@ -87,6 +89,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Orange", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8CM_BU.lua b/_G/weapons_table/weapons/nurs/C_8CM_BU.lua index a2497bc3..3087c4d7 100644 --- a/_G/weapons_table/weapons/nurs/C_8CM_BU.lua +++ b/_G/weapons_table/weapons/nurs/C_8CM_BU.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_BU"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Blue", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, @@ -75,6 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_BU"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8TsM SM Blue", + display_name_short = "S-8TsM", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 600, @@ -87,6 +89,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_BU"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Blue", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8CM_GN.lua b/_G/weapons_table/weapons/nurs/C_8CM_GN.lua index 129435ca..9c3c0b34 100644 --- a/_G/weapons_table/weapons/nurs/C_8CM_GN.lua +++ b/_G/weapons_table/weapons/nurs/C_8CM_GN.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_GN"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Green", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, @@ -75,6 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_GN"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8TsM SM Green", + display_name_short = "S-8TsM", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 600, @@ -87,6 +89,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_GN"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Green", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8CM_RD.lua b/_G/weapons_table/weapons/nurs/C_8CM_RD.lua index 6f7ccc42..1c30ea30 100644 --- a/_G/weapons_table/weapons/nurs/C_8CM_RD.lua +++ b/_G/weapons_table/weapons/nurs/C_8CM_RD.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_RD"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Red", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, @@ -75,6 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_RD"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8TsM SM Red", + display_name_short = "S-8TsM", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 600, @@ -87,6 +89,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_RD"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Red", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8CM_VT.lua b/_G/weapons_table/weapons/nurs/C_8CM_VT.lua index e90721d3..a94719df 100644 --- a/_G/weapons_table/weapons/nurs/C_8CM_VT.lua +++ b/_G/weapons_table/weapons/nurs/C_8CM_VT.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_VT"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Violet", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, @@ -75,6 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_VT"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8TsM SM Violet", + display_name_short = "S-8TsM", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 600, @@ -87,6 +89,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_VT"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Violet", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8CM_WH.lua b/_G/weapons_table/weapons/nurs/C_8CM_WH.lua index 8ef721d0..f264031e 100644 --- a/_G/weapons_table/weapons/nurs/C_8CM_WH.lua +++ b/_G/weapons_table/weapons/nurs/C_8CM_WH.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_WH"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM White", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, @@ -75,6 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_WH"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8TsM SM White", + display_name_short = "S-8TsM", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 600, @@ -87,6 +89,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_WH"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM White", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8CM_YE.lua b/_G/weapons_table/weapons/nurs/C_8CM_YE.lua index e4e2153e..98d2d6ae 100644 --- a/_G/weapons_table/weapons/nurs/C_8CM_YE.lua +++ b/_G/weapons_table/weapons/nurs/C_8CM_YE.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_YE"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Yellow", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, @@ -75,6 +76,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_YE"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8TsM SM Yellow", + display_name_short = "S-8TsM", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 600, @@ -87,6 +89,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8CM_YE"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8TsM SM Yellow", + display_name_short = "S-8TsM", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8OFP2.lua b/_G/weapons_table/weapons/nurs/C_8OFP2.lua index 55a85ed3..3ebd64db 100644 --- a/_G/weapons_table/weapons/nurs/C_8OFP2.lua +++ b/_G/weapons_table/weapons/nurs/C_8OFP2.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OFP2"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8OFP2 MPP", + display_name_short = "S-8OFP2", engine = { boost_factor = 1, boost_tail = 1, @@ -76,6 +77,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OFP2"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8OFP2 MPP", + display_name_short = "S-8OFP2", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 600, @@ -88,6 +90,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OFP2"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "S-8OFP2 MPP", + display_name_short = "S-8OFP2", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/C_8OM.lua b/_G/weapons_table/weapons/nurs/C_8OM.lua index 10a22f04..247d9f5c 100644 --- a/_G/weapons_table/weapons/nurs/C_8OM.lua +++ b/_G/weapons_table/weapons/nurs/C_8OM.lua @@ -12,6 +12,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { delay = 15 }, displayName = "S-8OM IL", + display_name_short = "S-8OM", engine = { boost_factor = 1, boost_tail = 1, @@ -129,6 +130,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "S-8OM Flare", + display_name_short = "S-8OM Flare", mass = 4.4, model = "s-8_om_parashut", name = "S_8OM_FLARE", @@ -233,6 +235,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { }, cx_pil = 2.9560311751026e-05, display_name = "S-8OM IL", + display_name_short = "S-8OM", dist_max = 4500, dist_max_ballistic = 8000, dist_min = 4000, @@ -249,6 +252,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { delay = 15 }, displayName = "S-8OM IL", + display_name_short = "S-8OM", engine = { boost_factor = 1, boost_tail = 1, @@ -366,6 +370,7 @@ _G["weapons_table"]["weapons"]["nurs"]["C_8OM"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "S-8OM Flare", + display_name_short = "S-8OM Flare", mass = 4.4, model = "s-8_om_parashut", name = "S_8OM_FLARE", diff --git a/_G/weapons_table/weapons/nurs/FFAR M156 WP.lua b/_G/weapons_table/weapons/nurs/FFAR M156 WP.lua index 6f964659..769c6856 100644 --- a/_G/weapons_table/weapons/nurs/FFAR M156 WP.lua +++ b/_G/weapons_table/weapons/nurs/FFAR M156 WP.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["nurs"]["FFAR M156 WP"] = { }, cx_pil = 1.4920965811477e-05, display_name = '2.75" FFAR, UnGd Rkts M156, Wht Phos', + display_name_short = '2.75" FFAR, UnGd Rkts M156, Wht Phos', dist_max = 1200, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/FFAR Mk1 HE.lua b/_G/weapons_table/weapons/nurs/FFAR Mk1 HE.lua index b6295460..acf89e2b 100644 --- a/_G/weapons_table/weapons/nurs/FFAR Mk1 HE.lua +++ b/_G/weapons_table/weapons/nurs/FFAR Mk1 HE.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["nurs"]["FFAR Mk1 HE"] = { }, cx_pil = 1.4920965811477e-05, display_name = '2.75" FFAR, UnGd Rkts Mk1, HE', + display_name_short = '2.75" FFAR, UnGd Rkts Mk1, HE', dist_max = 1200, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/FFAR Mk5 HEAT.lua b/_G/weapons_table/weapons/nurs/FFAR Mk5 HEAT.lua index d4e920d0..85934a1e 100644 --- a/_G/weapons_table/weapons/nurs/FFAR Mk5 HEAT.lua +++ b/_G/weapons_table/weapons/nurs/FFAR Mk5 HEAT.lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["nurs"]["FFAR Mk5 HEAT"] = { }, cx_pil = 1.4920965811477e-05, display_name = '2.75" FFAR, UnGd Rkts Mk5, HEAT', + display_name_short = '2.75" FFAR, UnGd Rkts Mk5, HEAT', dist_max = 1200, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/GRAD_9M22U.lua b/_G/weapons_table/weapons/nurs/GRAD_9M22U.lua index 017ff567..694d0b28 100644 --- a/_G/weapons_table/weapons/nurs/GRAD_9M22U.lua +++ b/_G/weapons_table/weapons/nurs/GRAD_9M22U.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["GRAD_9M22U"] = { _unique_resource_name = "weapons.nurs.GRAD_9M22U", caliber = 0.122, client = { + display_name_short = "9M22U (122mm HE)", engine = { boost_factor = 1, boost_tail = 0, @@ -48,6 +49,7 @@ _G["weapons_table"]["weapons"]["nurs"]["GRAD_9M22U"] = { }, cx_pil = 4.1380057571708e-05, display_name = "9M22U (122mm HE)", + display_name_short = "9M22U (122mm HE)", dist_max = 0, dist_min = 0, mass = 67, @@ -55,6 +57,7 @@ _G["weapons_table"]["weapons"]["nurs"]["GRAD_9M22U"] = { model = "9M22U", name = "GRAD_9M22U", server = { + display_name_short = "9M22U (122mm HE)", engine = { boost_factor = 1, boost_tail = 0, diff --git a/_G/weapons_table/weapons/nurs/HVAR.lua b/_G/weapons_table/weapons/nurs/HVAR.lua index 7c91477e..1f897812 100644 --- a/_G/weapons_table/weapons/nurs/HVAR.lua +++ b/_G/weapons_table/weapons/nurs/HVAR.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HVAR"] = { _unique_resource_name = "weapons.nurs.HVAR", caliber = 0.13, client = { + display_name_short = "HVAR", engine = { boost_factor = 1, boost_tail = 1, @@ -48,6 +49,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HVAR"] = { }, cx_pil = 7.4539399830034e-05, display_name = "HVAR", + display_name_short = "HVAR", dist_max = 1500, dist_max_ballistic = 8000, dist_min = 800, @@ -55,6 +57,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HVAR"] = { model = "HVAR_rocket", name = "HVAR", server = { + display_name_short = "HVAR", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M151.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M151.lua index 5d7aae73..b0c0f236 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M151.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M151.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M151"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M151 HE", + display_name_short = "Hydra 70 M151", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M151"] = { }, cx_pil = 4.7679923901827e-05, display_name = "Hydra 70 M151 HE", + display_name_short = "Hydra 70 M151", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M151"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M151 HE", + display_name_short = "Hydra 70 M151", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M151_M433.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M151_M433.lua index 723a6a1b..d1c2221f 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M151_M433.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M151_M433.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M151_M433"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M151 HE, M433 RC Fuze", + display_name_short = "Hydra 70 M151 RC", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M151_M433"] = { }, cx_pil = 4.7679923901827e-05, display_name = "Hydra 70 M151 HE, M433 RC Fuze", + display_name_short = "Hydra 70 M151 RC", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M151_M433"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M151 HE, M433 RC Fuze", + display_name_short = "Hydra 70 M151 RC", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M156.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M156.lua index 1856e565..bf7e06db 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M156.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M156.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M156"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M156 SM", + display_name_short = "Hydra 70 M156", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M156"] = { }, cx_pil = 4.7679923901827e-05, display_name = "Hydra 70 M156 SM", + display_name_short = "Hydra 70 M156", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M156"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M156 SM", + display_name_short = "Hydra 70 M156", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M229.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M229.lua index ce1d820a..feff2c17 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M229.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M229.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M229"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M229 HE", + display_name_short = "Hydra 70 M229", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M229"] = { }, cx_pil = 4.7679923901827e-05, display_name = "Hydra 70 M229 HE", + display_name_short = "Hydra 70 M229", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M229"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M229 HE", + display_name_short = "Hydra 70 M229", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M257.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M257.lua index 5df0a74f..50bb053d 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M257.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M257.lua @@ -12,6 +12,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { delay = 10.1 }, displayName = "Hydra 70 M257 IL", + display_name_short = "Hydra 70 M257", engine = { boost_factor = 1, boost_tail = 1, @@ -127,6 +128,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "M257 Flare", + display_name_short = "M257 Flare", mass = 5, model = "Hydra_M257_Parashute", name = "M257_FLARE", @@ -232,6 +234,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { }, cx_pil = 4.7679923901827e-05, display_name = "Hydra 70 M257 IL", + display_name_short = "Hydra 70 M257", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 1000, @@ -248,6 +251,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { delay = 10.1 }, displayName = "Hydra 70 M257 IL", + display_name_short = "Hydra 70 M257", engine = { boost_factor = 1, boost_tail = 1, @@ -363,6 +367,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M257"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "M257 Flare", + display_name_short = "M257 Flare", mass = 5, model = "Hydra_M257_Parashute", name = "M257_FLARE", diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M259.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M259.lua index 51864544..ad960af4 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M259.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M259.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M259"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M259 SM", + display_name_short = "Hydra 70 M259", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M259"] = { }, cx_pil = 4.7679923901827e-05, display_name = "Hydra 70 M259 SM", + display_name_short = "Hydra 70 M259", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M259"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M259 SM", + display_name_short = "Hydra 70 M259", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M274.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M274.lua index 0d2bc547..da16c7ee 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M274.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M274.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M274"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M274 TP-SM", + display_name_short = "Hydra 70 M274", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M274"] = { }, cx_pil = 4.7679923901827e-05, display_name = "Hydra 70 M274 TP-SM", + display_name_short = "Hydra 70 M274", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M274"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M274 TP-SM", + display_name_short = "Hydra 70 M274", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_M282.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_M282.lua index 7b2688a3..15831c83 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_M282.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_M282.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M282"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M282 MPP", + display_name_short = "Hydra 70 M282", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M282"] = { }, cx_pil = 4.7679923901827e-05, display_name = "Hydra 70 M282 MPP", + display_name_short = "Hydra 70 M282", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_M282"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "Hydra 70 M282 MPP", + display_name_short = "Hydra 70 M282", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_MK1.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_MK1.lua index c206fda4..f71a1229 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_MK1.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_MK1.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK1"] = { _unique_resource_name = "weapons.nurs.HYDRA_70_MK1", caliber = 0.07, client = { + display_name_short = "HYDRA-70", engine = { boost_factor = 1, boost_tail = 1, @@ -50,6 +51,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK1"] = { }, cx_pil = 4.7679923901827e-05, display_name = "HYDRA-70 MK1", + display_name_short = "HYDRA-70", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -57,6 +59,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK1"] = { model = "hydra_m151he", name = "HYDRA_70_MK1", server = { + display_name_short = "HYDRA-70", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_MK5.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_MK5.lua index 4c0f0775..af4b7796 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_MK5.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_MK5.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK5"] = { _unique_resource_name = "weapons.nurs.HYDRA_70_MK5", caliber = 0.07, client = { + display_name_short = "HYDRA-70", engine = { boost_factor = 1, boost_tail = 1, @@ -50,6 +51,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK5"] = { }, cx_pil = 4.7679923901827e-05, display_name = "HYDRA-70 MK5", + display_name_short = "HYDRA-70", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -57,6 +59,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK5"] = { model = "hydra_m151he", name = "HYDRA_70_MK5", server = { + display_name_short = "HYDRA-70", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_MK61.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_MK61.lua index 741af063..bb189e00 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_MK61.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_MK61.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK61"] = { _unique_resource_name = "weapons.nurs.HYDRA_70_MK61", caliber = 0.07, client = { + display_name_short = "HYDRA-70", engine = { boost_factor = 1, boost_tail = 1, @@ -49,6 +50,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK61"] = { }, cx_pil = 4.7679923901827e-05, display_name = "HYDRA-70 MK61", + display_name_short = "HYDRA-70", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -56,6 +58,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_MK61"] = { model = "hydra_m156", name = "HYDRA_70_MK61", server = { + display_name_short = "HYDRA-70", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/HYDRA_70_WTU1B.lua b/_G/weapons_table/weapons/nurs/HYDRA_70_WTU1B.lua index 6615a2a9..443e5b73 100644 --- a/_G/weapons_table/weapons/nurs/HYDRA_70_WTU1B.lua +++ b/_G/weapons_table/weapons/nurs/HYDRA_70_WTU1B.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_WTU1B"] = { _unique_resource_name = "weapons.nurs.HYDRA_70_WTU1B", caliber = 0.07, client = { + display_name_short = "HYDRA-70", engine = { boost_factor = 1, boost_tail = 1, @@ -50,6 +51,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_WTU1B"] = { }, cx_pil = 4.7679923901827e-05, display_name = "HYDRA-70 WTU-1/B", + display_name_short = "HYDRA-70", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -57,6 +59,7 @@ _G["weapons_table"]["weapons"]["nurs"]["HYDRA_70_WTU1B"] = { model = "hydra_m156", name = "HYDRA_70_WTU1B", server = { + display_name_short = "HYDRA-70", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/M26.lua b/_G/weapons_table/weapons/nurs/M26.lua index 50aa9006..7bf888ae 100644 --- a/_G/weapons_table/weapons/nurs/M26.lua +++ b/_G/weapons_table/weapons/nurs/M26.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["M26"] = { _unique_resource_name = "weapons.nurs.M26", caliber = 0.23, client = { + display_name_short = "M26 (270mm DPICM)", engine = { boost_factor = 1, boost_tail = 1, @@ -113,6 +114,7 @@ _G["weapons_table"]["weapons"]["nurs"]["M26"] = { }, cx_pil = 0.00014707101891584, display_name = "M26 (270mm DPICM)", + display_name_short = "M26 (270mm DPICM)", dist_max = 0, dist_min = 0, mass = 306, @@ -120,6 +122,7 @@ _G["weapons_table"]["weapons"]["nurs"]["M26"] = { model = "M26", name = "M26", server = { + display_name_short = "M26 (270mm DPICM)", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/M26HE.lua b/_G/weapons_table/weapons/nurs/M26HE.lua new file mode 100644 index 00000000..93fdeaa9 --- /dev/null +++ b/_G/weapons_table/weapons/nurs/M26HE.lua @@ -0,0 +1,130 @@ +_G["weapons_table"]["weapons"]["nurs"]["M26HE"] = { + _unique_resource_name = "weapons.nurs.M26HE", + caliber = 0.23, + client = { + display_name_short = "M26 (270mm DPICM)", + engine = { + boost_factor = 1, + boost_tail = 1, + boost_time = 0, + fuel_mass = 85, + impulse = 270, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -2.05, 0, 0 } }, + smoke_color = { 0.9, 0.9, 0.9 }, + smoke_transparency = 0.5, + tail_width = 1, + work_tail = 1, + work_time = 2 + }, + fm = { + I = 433.01467, + L = 3.56, + Ma = 0.192352, + Mw = 2.521688, + caliber = 0.23, + cx_coeff = { 1, 0.66, 0.49, 0.2, 1.53 }, + freq = 7, + mass = 306, + rail_open = false, + shapeName = "", + wind_sigma = 30, + wind_sigma_z_coeff = 1, + wind_time = 2 + }, + scheme = "schemes/rockets/nurs-standard.sch", + warhead = { + caliber = 230, + concrete_factors = { 1, 1, 0.1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 92.5, + fantom = 1, + mass = 246, + obj_factors = { 0.3, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 49.2 + } + }, + cx_pil = 0.00014707101891584, + display_name = "M26HE", + display_name_short = "M26 (270mm DPICM)", + dist_max = 0, + dist_min = 0, + mass = 306, + max_TOF = 120, + model = "M26", + name = "M26HE", + server = { + display_name_short = "M26 (270mm DPICM)", + engine = { + boost_factor = 1, + boost_tail = 1, + boost_time = 0, + fuel_mass = 85, + impulse = 270, + nozzle_orientationXYZ = { { 0, 0, 0 } }, + nozzle_position = { { -2.05, 0, 0 } }, + smoke_color = { 0.9, 0.9, 0.9 }, + smoke_transparency = 0.5, + tail_width = 1, + work_tail = 1, + work_time = 2 + }, + fm = { + I = 433.01467, + L = 3.56, + Ma = 0.192352, + Mw = 2.521688, + caliber = 0.23, + cx_coeff = { 1, 0.66, 0.49, 0.2, 1.53 }, + freq = 7, + mass = 306, + rail_open = false, + shapeName = "", + wind_sigma = 30, + wind_sigma_z_coeff = 1, + wind_time = 2 + }, + scheme = "schemes/rockets/nurs-standard.sch", + warhead = { + caliber = 230, + concrete_factors = { 1, 1, 0.1 }, + concrete_obj_factor = 0, + cumulative_factor = 0, + cumulative_thickness = 0, + expl_mass = 92.5, + fantom = 0, + mass = 246, + obj_factors = { 0.3, 1 }, + other_factors = { 1, 1, 1 }, + piercing_mass = 49.2 + } + }, + sight_data = { + engine = { + fuel_mass = 85, + impulse = 270, + work_time = 2 + }, + fm = { + I = 433.01467, + L = 3.56, + Ma = 0.192352, + Mw = 2.521688, + caliber = 0.23, + cx_coeff = { 1, 0.66, 0.49, 0.2, 1.53 }, + freq = 7, + mass = 306, + rail_open = false, + shapeName = "", + wind_sigma = 30, + wind_sigma_z_coeff = 1, + wind_time = 2 + } + }, + sounderName = "Weapons/Rocket", + type_name = "rocket", + ws_type = { 4, 7, 33, "Redacted" } +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/nurs/M8rocket.lua b/_G/weapons_table/weapons/nurs/M8rocket.lua index 07a8606e..2db63004 100644 --- a/_G/weapons_table/weapons/nurs/M8rocket.lua +++ b/_G/weapons_table/weapons/nurs/M8rocket.lua @@ -68,6 +68,7 @@ _G["weapons_table"]["weapons"]["nurs"]["M8rocket"] = { }, cx_pil = 5.8676899395319e-05, display_name = "4.5-Inch M8", + display_name_short = "4.5-Inch M8", dist_max = 2000, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/R4M.lua b/_G/weapons_table/weapons/nurs/R4M.lua index 49e16f8c..e4ce510b 100644 --- a/_G/weapons_table/weapons/nurs/R4M.lua +++ b/_G/weapons_table/weapons/nurs/R4M.lua @@ -68,6 +68,7 @@ _G["weapons_table"]["weapons"]["nurs"]["R4M"] = { }, cx_pil = 1.3657865548695e-05, display_name = "R4M 3.2kg UnGd air-to-air rocket", + display_name_short = "R4M 3.2kg UnGd air-to-air rocket", dist_max = 1200, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/RS-82.lua b/_G/weapons_table/weapons/nurs/RS-82.lua index bc50803c..a9ecd1d5 100644 --- a/_G/weapons_table/weapons/nurs/RS-82.lua +++ b/_G/weapons_table/weapons/nurs/RS-82.lua @@ -72,6 +72,7 @@ _G["weapons_table"]["weapons"]["nurs"]["RS-82"] = { }, cx_pil = 0.00017, display_name = "RS-82", + display_name_short = "RS-82", dist_max = 1200, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/S-24A.lua b/_G/weapons_table/weapons/nurs/S-24A.lua index cc2aa813..0c23a173 100644 --- a/_G/weapons_table/weapons/nurs/S-24A.lua +++ b/_G/weapons_table/weapons/nurs/S-24A.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S-24A"] = { }, cx_pil = 0.00078250625229522, display_name = "S-24A (21) - 180 kg, cumulative unguided rocket", + display_name_short = "S-24A (21) - 180 kg, cumulative unguided rocket", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 2000, diff --git a/_G/weapons_table/weapons/nurs/S-24B.lua b/_G/weapons_table/weapons/nurs/S-24B.lua index 107876b8..d3f41fc5 100644 --- a/_G/weapons_table/weapons/nurs/S-24B.lua +++ b/_G/weapons_table/weapons/nurs/S-24B.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S-24B"] = { }, cx_pil = 0.00079051314330613, display_name = "S-24B (21) - 180 kg, fragmented unguided rocket", + display_name_short = "S-24B (21) - 180 kg, fragmented unguided rocket", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 2000, diff --git a/_G/weapons_table/weapons/nurs/S-25-O.lua b/_G/weapons_table/weapons/nurs/S-25-O.lua index 8dced76c..5e24db72 100644 --- a/_G/weapons_table/weapons/nurs/S-25-O.lua +++ b/_G/weapons_table/weapons/nurs/S-25-O.lua @@ -67,6 +67,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S-25-O"] = { }, cx_pil = 0.00074040197587984, display_name = "S-25-O", + display_name_short = "S-25-O", dist_max = 3000, dist_max_ballistic = 8000, dist_min = 1600, diff --git a/_G/weapons_table/weapons/nurs/S-5M.lua b/_G/weapons_table/weapons/nurs/S-5M.lua index 39191f21..96fc28c8 100644 --- a/_G/weapons_table/weapons/nurs/S-5M.lua +++ b/_G/weapons_table/weapons/nurs/S-5M.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S-5M"] = { }, cx_pil = 4.3004286920946e-05, display_name = "S-5M - unguided rocket 57mm", + display_name_short = "S-5M - unguided rocket 57mm", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/S5M1_HEFRAG_FFAR.lua b/_G/weapons_table/weapons/nurs/S5M1_HEFRAG_FFAR.lua index a9d3ba9e..7058f212 100644 --- a/_G/weapons_table/weapons/nurs/S5M1_HEFRAG_FFAR.lua +++ b/_G/weapons_table/weapons/nurs/S5M1_HEFRAG_FFAR.lua @@ -71,6 +71,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S5M1_HEFRAG_FFAR"] = { }, cx_pil = 2.0422352116713e-05, display_name = "S-5M1 HE-FRAG FFAR", + display_name_short = "S-5M1 HE-FRAG FFAR", dist_max = 2500, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/S5MO_HEFRAG_FFAR.lua b/_G/weapons_table/weapons/nurs/S5MO_HEFRAG_FFAR.lua index 592bb0f6..d0b62408 100644 --- a/_G/weapons_table/weapons/nurs/S5MO_HEFRAG_FFAR.lua +++ b/_G/weapons_table/weapons/nurs/S5MO_HEFRAG_FFAR.lua @@ -71,6 +71,7 @@ _G["weapons_table"]["weapons"]["nurs"]["S5MO_HEFRAG_FFAR"] = { }, cx_pil = 2.0422352116713e-05, display_name = "S-5MO HE-FRAG FFAR", + display_name_short = "S-5MO HE-FRAG FFAR", dist_max = 2500, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/SMERCH_9M55F.lua b/_G/weapons_table/weapons/nurs/SMERCH_9M55F.lua index 2693e37d..07a228d1 100644 --- a/_G/weapons_table/weapons/nurs/SMERCH_9M55F.lua +++ b/_G/weapons_table/weapons/nurs/SMERCH_9M55F.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SMERCH_9M55F"] = { _unique_resource_name = "weapons.nurs.SMERCH_9M55F", caliber = 0.3, client = { + display_name_short = "9M55K (300mm CM-AP)", engine = { boost_factor = 1, boost_tail = 0, @@ -48,6 +49,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SMERCH_9M55F"] = { }, cx_pil = 2.5021534409122e-05, display_name = "9M55F (300mm HE)", + display_name_short = "9M55K (300mm CM-AP)", dist_max = 0, dist_min = 0, mass = 810, @@ -55,6 +57,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SMERCH_9M55F"] = { model = "9M55", name = "SMERCH_9M55F", server = { + display_name_short = "9M55K (300mm CM-AP)", engine = { boost_factor = 1, boost_tail = 0, diff --git a/_G/weapons_table/weapons/nurs/SMERCH_9M55K.lua b/_G/weapons_table/weapons/nurs/SMERCH_9M55K.lua index ca5e2d36..532c54f0 100644 --- a/_G/weapons_table/weapons/nurs/SMERCH_9M55K.lua +++ b/_G/weapons_table/weapons/nurs/SMERCH_9M55K.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SMERCH_9M55K"] = { _unique_resource_name = "weapons.nurs.SMERCH_9M55K", caliber = 0.3, client = { + display_name_short = "9M55K (300mm CM-AP)", engine = { boost_factor = 1, boost_tail = 0, @@ -113,6 +114,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SMERCH_9M55K"] = { }, cx_pil = 2.5021534409122e-05, display_name = "9M55K (300mm CM-AP)", + display_name_short = "9M55K (300mm CM-AP)", dist_max = 0, dist_min = 0, mass = 800.9, @@ -120,6 +122,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SMERCH_9M55K"] = { model = "9M55", name = "SMERCH_9M55K", server = { + display_name_short = "9M55K (300mm CM-AP)", engine = { boost_factor = 1, boost_tail = 0, diff --git a/_G/weapons_table/weapons/nurs/SNEB68_EAP.lua b/_G/weapons_table/weapons/nurs/SNEB68_EAP.lua index 58dfa489..f4ab9788 100644 --- a/_G/weapons_table/weapons/nurs/SNEB68_EAP.lua +++ b/_G/weapons_table/weapons/nurs/SNEB68_EAP.lua @@ -69,6 +69,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB68_EAP"] = { }, cx_pil = 2.9065237361551e-05, display_name = "SNEB68_EAP", + display_name_short = "SNEB68_EAP", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/SNEB68_WP.lua b/_G/weapons_table/weapons/nurs/SNEB68_WP.lua index c3c09a18..d0709938 100644 --- a/_G/weapons_table/weapons/nurs/SNEB68_WP.lua +++ b/_G/weapons_table/weapons/nurs/SNEB68_WP.lua @@ -65,6 +65,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB68_WP"] = { }, cx_pil = 2.9065237361551e-05, display_name = "SNEB68_WP", + display_name_short = "SNEB68_WP", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE250_F1B.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE250_F1B.lua index 023a1ce3..e81d5b11 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE250_F1B.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE250_F1B.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE250_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 250 F1B TP-SM", + display_name_short = "SNEB Type 250", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE250_F1B"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 250 F1B TP-SM", + display_name_short = "SNEB Type 250", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE250_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 250 F1B TP-SM", + display_name_short = "SNEB Type 250", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE251_F1B.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE251_F1B.lua index 51e2edcf..a3f45684 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE251_F1B.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE251_F1B.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE251_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 251 F1B HE", + display_name_short = "SNEB Type 251", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE251_F1B"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 251 F1B HE", + display_name_short = "SNEB Type 251", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE251_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 251 F1B HE", + display_name_short = "SNEB Type 251", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE251_H1.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE251_H1.lua index 83a911e6..5641947e 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE251_H1.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE251_H1.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE251_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 251 H1 HE", + display_name_short = "SNEB Type 251", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE251_H1"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 251 H1 HE", + display_name_short = "SNEB Type 251", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE251_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 251 H1 HE", + display_name_short = "SNEB Type 251", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE252_F1B.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE252_F1B.lua index a43285bf..6bf0bcac 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE252_F1B.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE252_F1B.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE252_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 252 F1B TP", + display_name_short = "SNEB Type 252", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE252_F1B"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 252 F1B TP", + display_name_short = "SNEB Type 252", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE252_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 252 F1B TP", + display_name_short = "SNEB Type 252", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE252_H1.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE252_H1.lua index 320d7a60..e0a3b3e4 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE252_H1.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE252_H1.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE252_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 252 H1 TP", + display_name_short = "SNEB Type 252", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE252_H1"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 252 H1 TP", + display_name_short = "SNEB Type 252", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE252_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 252 H1 TP", + display_name_short = "SNEB Type 252", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE253_F1B.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE253_F1B.lua index b71b4793..74b74d8b 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE253_F1B.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE253_F1B.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE253_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 253 F1B HEAT", + display_name_short = "SNEB Type 253", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE253_F1B"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 253 F1B HEAT", + display_name_short = "SNEB Type 253", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE253_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 253 F1B HEAT", + display_name_short = "SNEB Type 253", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE253_H1.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE253_H1.lua index f195fef0..c222a15d 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE253_H1.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE253_H1.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE253_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 253 H1 HEAT", + display_name_short = "SNEB Type 253", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE253_H1"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 253 H1 HEAT", + display_name_short = "SNEB Type 253", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE253_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 253 H1 HEAT", + display_name_short = "SNEB Type 253", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_GREEN.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_GREEN.lua index 6ce0ba6f..118227cc 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_GREEN.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_GREEN.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_GREEN"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 F1B SM Green", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_GREEN"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 254 F1B SM Green", + display_name_short = "SNEB Type 254", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_GREEN"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 F1B SM Green", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_RED.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_RED.lua index 83a318fc..cedcbf8b 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_RED.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_RED.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_RED"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 F1B SM Red", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_RED"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 254 F1B SM Red", + display_name_short = "SNEB Type 254", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_RED"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 F1B SM Red", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_YELLOW.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_YELLOW.lua index 9b229654..e990ef29 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_YELLOW.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_F1B_YELLOW.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_YELLOW"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 F1B SM Yellow", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_YELLOW"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 254 F1B SM Yellow", + display_name_short = "SNEB Type 254", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_F1B_YELLOW"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 F1B SM Yellow", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_GREEN.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_GREEN.lua index 1e10defa..d9d87dd0 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_GREEN.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_GREEN.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_GREEN"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 H1 SM Green", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_GREEN"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 254 H1 SM Green", + display_name_short = "SNEB Type 254", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_GREEN"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 H1 SM Green", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_RED.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_RED.lua index d1c9c5bf..428132b3 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_RED.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_RED.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_RED"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 H1 SM Red", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_RED"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 254 H1 SM Red", + display_name_short = "SNEB Type 254", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_RED"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 H1 SM Red", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_YELLOW.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_YELLOW.lua index ce6d36b1..edd8f424 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_YELLOW.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE254_H1_YELLOW.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_YELLOW"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 H1 SM Yellow", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, @@ -72,6 +73,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_YELLOW"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 254 H1 SM Yellow", + display_name_short = "SNEB Type 254", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -84,6 +86,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE254_H1_YELLOW"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 254 H1 SM Yellow", + display_name_short = "SNEB Type 254", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE256_F1B.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE256_F1B.lua index 396ea22c..18c23a5c 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE256_F1B.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE256_F1B.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE256_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 256 F1B HE/Frag", + display_name_short = "SNEB Type 256", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE256_F1B"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 256 F1B HE/Frag", + display_name_short = "SNEB Type 256", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE256_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 256 F1B HE/Frag", + display_name_short = "SNEB Type 256", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE256_H1.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE256_H1.lua index 424254f5..25d3c3bd 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE256_H1.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE256_H1.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE256_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 256 H1 HE/Frag", + display_name_short = "SNEB Type 256", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE256_H1"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 256 H1 HE/Frag", + display_name_short = "SNEB Type 256", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE256_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 256 H1 HE/Frag", + display_name_short = "SNEB Type 256", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE257_F1B.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE257_F1B.lua index b393fec5..00b26843 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE257_F1B.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE257_F1B.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE257_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 257 F1B HE/Frag Lg Whd", + display_name_short = "SNEB Type 257", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE257_F1B"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 257 F1B HE/Frag Lg Whd", + display_name_short = "SNEB Type 257", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE257_F1B"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 257 F1B HE/Frag Lg Whd", + display_name_short = "SNEB Type 257", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE257_H1.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE257_H1.lua index e5085bbb..dfb5b89a 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE257_H1.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE257_H1.lua @@ -9,6 +9,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE257_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 257 H1 HE/Frag Lg Whd", + display_name_short = "SNEB Type 257", engine = { boost_factor = 1, boost_tail = 1, @@ -73,6 +74,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE257_H1"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 257 H1 HE/Frag Lg Whd", + display_name_short = "SNEB Type 257", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -85,6 +87,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE257_H1"] = { category = 3, class_name = "wAmmunitionNURS", displayName = "SNEB Type 257 H1 HE/Frag Lg Whd", + display_name_short = "SNEB Type 257", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_F1B.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_F1B.lua index 49872c70..21c8d6c4 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_F1B.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_F1B.lua @@ -12,6 +12,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { delay = 10.1 }, displayName = "SNEB Type 259E F1B IL", + display_name_short = "SNEB Type 259E", engine = { boost_factor = 1, boost_tail = 1, @@ -126,6 +127,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "S-8OM Flare", + display_name_short = "S-8OM Flare", mass = 4.4, model = "s-8_om_parashut", name = "S_8OM_FLARE", @@ -229,6 +231,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 259E F1B IL", + display_name_short = "SNEB Type 259E", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -244,6 +247,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { delay = 10.1 }, displayName = "SNEB Type 259E F1B IL", + display_name_short = "SNEB Type 259E", engine = { boost_factor = 1, boost_tail = 1, @@ -358,6 +362,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_F1B"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "S-8OM Flare", + display_name_short = "S-8OM Flare", mass = 4.4, model = "s-8_om_parashut", name = "S_8OM_FLARE", diff --git a/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_H1.lua b/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_H1.lua index adbc259f..7c7ec157 100644 --- a/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_H1.lua +++ b/_G/weapons_table/weapons/nurs/SNEB_TYPE259E_H1.lua @@ -12,6 +12,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { delay = 10.1 }, displayName = "SNEB Type 259E H1 IL", + display_name_short = "SNEB Type 259E", engine = { boost_factor = 1, boost_tail = 1, @@ -126,6 +127,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "S-8OM Flare", + display_name_short = "S-8OM Flare", mass = 4.4, model = "s-8_om_parashut", name = "S_8OM_FLARE", @@ -229,6 +231,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { }, cx_pil = 1.414105917984e-05, display_name = "SNEB Type 259E H1 IL", + display_name_short = "SNEB Type 259E", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 500, @@ -244,6 +247,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { delay = 10.1 }, displayName = "SNEB Type 259E H1 IL", + display_name_short = "SNEB Type 259E", engine = { boost_factor = 1, boost_tail = 1, @@ -358,6 +362,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SNEB_TYPE259E_H1"] = { }, cx = { 1, 0.39, 0.38, 0.236, 1.31 }, display_name = "S-8OM Flare", + display_name_short = "S-8OM Flare", mass = 4.4, model = "s-8_om_parashut", name = "S_8OM_FLARE", diff --git a/_G/weapons_table/weapons/nurs/SPRD-99.lua b/_G/weapons_table/weapons/nurs/SPRD-99.lua index 1c845c8e..797be8b8 100644 --- a/_G/weapons_table/weapons/nurs/SPRD-99.lua +++ b/_G/weapons_table/weapons/nurs/SPRD-99.lua @@ -71,6 +71,7 @@ _G["weapons_table"]["weapons"]["nurs"]["SPRD-99"] = { }, cx_pil = 0.0011259690484105, display_name = "SPRD-99 takeoff rocket", + display_name_short = "SPRD-99 takeoff rocket", dist_max = 10000, dist_max_ballistic = 8000, dist_min = 1, diff --git a/_G/weapons_table/weapons/nurs/UG_90MM.lua b/_G/weapons_table/weapons/nurs/UG_90MM.lua index 26189e16..53dc8ac6 100644 --- a/_G/weapons_table/weapons/nurs/UG_90MM.lua +++ b/_G/weapons_table/weapons/nurs/UG_90MM.lua @@ -82,6 +82,7 @@ _G["weapons_table"]["weapons"]["nurs"]["UG_90MM"] = { }, cx_pil = 3.6031009549136e-05, display_name = "UG_90MM", + display_name_short = "UG_90MM", dist_max = 8000, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/URAGAN_9M27F.lua b/_G/weapons_table/weapons/nurs/URAGAN_9M27F.lua index 452e0e3e..18650e28 100644 --- a/_G/weapons_table/weapons/nurs/URAGAN_9M27F.lua +++ b/_G/weapons_table/weapons/nurs/URAGAN_9M27F.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["URAGAN_9M27F"] = { _unique_resource_name = "weapons.nurs.URAGAN_9M27F", caliber = 0.22, client = { + display_name_short = "9M27F (220mm HE)", engine = { boost_factor = 1, boost_tail = 0, @@ -48,6 +49,7 @@ _G["weapons_table"]["weapons"]["nurs"]["URAGAN_9M27F"] = { }, cx_pil = 1.3456025171128e-05, display_name = "9M27F (220mm HE)", + display_name_short = "9M27F (220mm HE)", dist_max = 0, dist_min = 0, mass = 280, @@ -55,6 +57,7 @@ _G["weapons_table"]["weapons"]["nurs"]["URAGAN_9M27F"] = { model = "9m27f", name = "URAGAN_9M27F", server = { + display_name_short = "9M27F (220mm HE)", engine = { boost_factor = 1, boost_tail = 0, diff --git a/_G/weapons_table/weapons/nurs/WGr21.lua b/_G/weapons_table/weapons/nurs/WGr21.lua index 28c143c2..98dde2b1 100644 --- a/_G/weapons_table/weapons/nurs/WGr21.lua +++ b/_G/weapons_table/weapons/nurs/WGr21.lua @@ -70,6 +70,7 @@ _G["weapons_table"]["weapons"]["nurs"]["WGr21"] = { }, cx_pil = 0.00019450813801802, display_name = "Werfer-Granate 21", + display_name_short = "Werfer-Granate 21", dist_max = 1200, dist_max_ballistic = 8000, dist_min = 600, diff --git a/_G/weapons_table/weapons/nurs/Zuni_127.lua b/_G/weapons_table/weapons/nurs/Zuni_127.lua index afa25144..6dc8f269 100644 --- a/_G/weapons_table/weapons/nurs/Zuni_127.lua +++ b/_G/weapons_table/weapons/nurs/Zuni_127.lua @@ -2,6 +2,7 @@ _G["weapons_table"]["weapons"]["nurs"]["Zuni_127"] = { _unique_resource_name = "weapons.nurs.Zuni_127", caliber = 0.13, client = { + display_name_short = "Zuni Mk. 71", engine = { boost_factor = 1, boost_tail = 1, @@ -48,6 +49,7 @@ _G["weapons_table"]["weapons"]["nurs"]["Zuni_127"] = { }, cx_pil = 0.00016444708447773, display_name = "Zuni Mk. 71 HE GP", + display_name_short = "Zuni Mk. 71", dist_max = 4000, dist_max_ballistic = 8000, dist_min = 1200, @@ -55,6 +57,7 @@ _G["weapons_table"]["weapons"]["nurs"]["Zuni_127"] = { model = "zuni", name = "Zuni_127", server = { + display_name_short = "Zuni Mk. 71", engine = { boost_factor = 1, boost_tail = 1, diff --git a/_G/weapons_table/weapons/shells/2A46M_125_HE.lua b/_G/weapons_table/weapons/shells/2A46M_125_HE.lua index 5d8c809b..f05dd9da 100644 --- a/_G/weapons_table/weapons/shells/2A46M_125_HE.lua +++ b/_G/weapons_table/weapons/shells/2A46M_125_HE.lua @@ -4,6 +4,13 @@ _G["weapons_table"]["weapons"]["shells"]["2A46M_125_HE"] = { Da1 = 0.0002, Dv0 = 0.002, _unique_resource_name = "weapons.shells.2A46M_125_HE", + animationParams = { + animStartTime = 0.05, + argNumber = 2, + argRateOpening = -5, + finalArgState = 0, + initialArgState = 1 + }, caliber = 125, cartridge = 0, cartridge_mass = 0, @@ -21,7 +28,7 @@ _G["weapons_table"]["weapons"]["shells"]["2A46M_125_HE"] = { life_time = 100, manualWeaponFlag = 21, mass = 23, - model_name = "pula", + model_name = "OF26_shell", name = "2A46M_125_HE", payload = 4.2458925604578, payload_type = 0, diff --git a/_G/weapons_table/weapons/shells/2A60_120.lua b/_G/weapons_table/weapons/shells/2A60_120.lua index 747f9444..e0ec21cd 100644 --- a/_G/weapons_table/weapons/shells/2A60_120.lua +++ b/_G/weapons_table/weapons/shells/2A60_120.lua @@ -21,7 +21,7 @@ _G["weapons_table"]["weapons"]["shells"]["2A60_120"] = { life_time = 100, manualWeaponFlag = 21, mass = 15.9, - model_name = "pula", + model_name = "OF36_mina", name = "2A60_120", payload = 2.9352039874469, payload_type = 0, diff --git a/_G/weapons_table/weapons/shells/M185_155.lua b/_G/weapons_table/weapons/shells/M185_155.lua index 459389e4..bd855a66 100644 --- a/_G/weapons_table/weapons/shells/M185_155.lua +++ b/_G/weapons_table/weapons/shells/M185_155.lua @@ -1,6 +1,6 @@ _G["weapons_table"]["weapons"]["shells"]["M185_155"] = { AP_cap_caliber = 155, - Da0 = 0.001, + Da0 = 0.0008, Da1 = 0.00044, Dv0 = 0.003, _unique_resource_name = "weapons.shells.M185_155", diff --git a/_G/weapons_table/weapons/shells/M246_20_HE_gr.lua b/_G/weapons_table/weapons/shells/M246_20_HE_gr.lua new file mode 100644 index 00000000..62a9008d --- /dev/null +++ b/_G/weapons_table/weapons/shells/M246_20_HE_gr.lua @@ -0,0 +1,68 @@ +_G["weapons_table"]["weapons"]["shells"]["M246_20_HE_gr"] = { + AP_cap_caliber = 20, + Da0 = 0.00094, + Da1 = 0, + Dv0 = 0.006, + _file = "./CoreMods/tech/HeavyMetalCore/Database/Weapons/ammunition.lua", + _origin = "HeavyMetalCore", + _unique_resource_name = "weapons.shells.M246_20_HE_gr", + caliber = 20, + cartridge = 0, + cartridge_mass = 0.12, + category = 7, + charTime = 0, + cumulative_mass = 0, + cumulative_thickness = 0, + cx = { 0.2, 1.27, 0.65, 0.26, 2.35 }, + damage_factor = 639, + display_name = "M246_20_HE", + explosive = 0.11, + full_scale_time = -1, + j = 0, + k1 = 2.3e-08, + l = 0, + life_time = 3, + manualWeaponFlag = 21, + mass = 0.1, + model_name = "tracer_bullet_red", + name = "M246_20_HE_gr", + payload = 0.02030644268045, + payload_type = 0, + piercing_mass = 0.02, + rebound_concrete = <1>{ + angle0 = 50, + angle100 = 75, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_ground = { + angle0 = 55, + angle100 = 73, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rebound_object =
, + rebound_water = { + angle0 = 65, + angle100 = 83, + cx_factor = 5, + deviation_angle = 30, + velocity_loss_factor = 0.5 + }, + rotation_freq = 7, + round_mass = 0.26, + s = 0, + scale_tracer = true, + silent_self_destruction = false, + smoke_tail_life_time = -1, + subcalibre = false, + tracer_off = 3, + tracer_on = 0, + type_name = "shell", + user_name = "M246_20_HE", + v0 = 1050, + visual_effect_correction = 0, + visual_effect_correction_rebound = 0.1 +} \ No newline at end of file diff --git a/_G/weapons_table/weapons/shells/M485_155_IL.lua b/_G/weapons_table/weapons/shells/M485_155_IL.lua index 08a53679..0a0916db 100644 --- a/_G/weapons_table/weapons/shells/M485_155_IL.lua +++ b/_G/weapons_table/weapons/shells/M485_155_IL.lua @@ -1,6 +1,6 @@ _G["weapons_table"]["weapons"]["shells"]["M485_155_IL"] = { AP_cap_caliber = 155, - Da0 = 0.001, + Da0 = 0.0008, Da1 = 0.00044, Dv0 = 0.003, _unique_resource_name = "weapons.shells.M485_155_IL", diff --git a/_G/weapons_table/weapons/shells/M825A1_155_SM.lua b/_G/weapons_table/weapons/shells/M825A1_155_SM.lua index 6ad3af26..08b9822c 100644 --- a/_G/weapons_table/weapons/shells/M825A1_155_SM.lua +++ b/_G/weapons_table/weapons/shells/M825A1_155_SM.lua @@ -1,6 +1,6 @@ _G["weapons_table"]["weapons"]["shells"]["M825A1_155_SM"] = { AP_cap_caliber = 155, - Da0 = 0.001, + Da0 = 0.0008, Da1 = 0.00044, Dv0 = 0.003, _unique_resource_name = "weapons.shells.M825A1_155_SM", diff --git a/_G/weapons_table/weapons/torpedoes/G7A_T1.lua b/_G/weapons_table/weapons/torpedoes/G7A_T1.lua index 7482fa91..aa7a0e4f 100644 --- a/_G/weapons_table/weapons/torpedoes/G7A_T1.lua +++ b/_G/weapons_table/weapons/torpedoes/G7A_T1.lua @@ -1,4 +1,5 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { + Reflection = 0.5, _file = "./Mods/tech/WWII Units/Database/Weapons/torpedoes.lua", _unique_resource_name = "weapons.torpedoes.G7A_T1", caliber = 0.533, @@ -25,9 +26,9 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { delay = 2, fins_limit = 0.25, hKp_err_croll = 0, - hor_spir_on_time = 350, - hor_spir_period = 30, - hor_spir_power = 0.4, + hor_spir_on_time = 0, + hor_spir_period = 0, + hor_spir_power = 0, roll_diff_correction = 1, steady_depth = 5, v_vel_limit = 25, @@ -37,7 +38,9 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { category = 11, class_name = "wAmmunition", engine = { - thrust = 9900 + data_table = { 6600, 777, 11300, 365, 13600, 222 }, + default_thrust = 11300, + rail_thrust = 6000 }, fm = { A = 0.5, @@ -66,7 +69,7 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { mass = 1528, model = "Torpedo_G7A_T1", name = "G7A_T1", - scheme = "schemes/torpedoes/unguided_torpedo.sch", + scheme = "schemes/torpedoes/unguided_preset_torpedo.sch", shape_table_data = { { file = "Torpedo_G7A_T1", fire = { 0, 1 }, @@ -80,30 +83,32 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { warhead = { caliber = 533, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 280, fantom = 1, mass = 280, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 56, - time_self_destruct = 430 + time_self_destruct = 777 }, warhead_water = { caliber = 533, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 280, fantom = 1, mass = 280, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 56, - time_self_destruct = 430 + time_self_destruct = 777 }, wsTypeOfWeapon = { 4, 8, 11, "Redacted" } }, @@ -134,9 +139,9 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { delay = 2, fins_limit = 0.25, hKp_err_croll = 0, - hor_spir_on_time = 350, - hor_spir_period = 30, - hor_spir_power = 0.4, + hor_spir_on_time = 0, + hor_spir_period = 0, + hor_spir_power = 0, roll_diff_correction = 1, steady_depth = 5, v_vel_limit = 25, @@ -146,7 +151,9 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { category = 11, class_name = "wAmmunition", engine = { - thrust = 9900 + data_table = { 6600, 777, 11300, 365, 13600, 222 }, + default_thrust = 11300, + rail_thrust = 6000 }, fm = { A = 0.5, @@ -175,7 +182,7 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { mass = 1528, model = "Torpedo_G7A_T1", name = "G7A_T1", - scheme = "schemes/torpedoes/unguided_torpedo.sch", + scheme = "schemes/torpedoes/unguided_preset_torpedo.sch", shape_table_data = { { file = "Torpedo_G7A_T1", fire = { 0, 1 }, @@ -189,30 +196,32 @@ _G["weapons_table"]["weapons"]["torpedoes"]["G7A_T1"] = { warhead = { caliber = 533, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 280, fantom = 0, mass = 280, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 56, - time_self_destruct = 430 + time_self_destruct = 777 }, warhead_water = { caliber = 533, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 280, fantom = 0, mass = 280, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 56, - time_self_destruct = 430 + time_self_destruct = 777 }, wsTypeOfWeapon = { 4, 8, 11, "Redacted" } }, diff --git a/_G/weapons_table/weapons/torpedoes/LTF_5B.lua b/_G/weapons_table/weapons/torpedoes/LTF_5B.lua index bcbdd505..a9208be6 100644 --- a/_G/weapons_table/weapons/torpedoes/LTF_5B.lua +++ b/_G/weapons_table/weapons/torpedoes/LTF_5B.lua @@ -1,4 +1,5 @@ _G["weapons_table"]["weapons"]["torpedoes"]["LTF_5B"] = { + Reflection = 0.5, _file = "./CoreMods/WWII Units/Weapons/Weapons.lua", _unique_resource_name = "weapons.torpedoes.LTF_5B", caliber = 0.45, @@ -101,32 +102,32 @@ _G["weapons_table"]["weapons"]["torpedoes"]["LTF_5B"] = { warhead = { caliber = 450, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 200, fantom = 1, mass = 200, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 40, - time_self_destruct = 600, - water_explosion_factor = 10 + time_self_destruct = 600 }, warhead_water = { caliber = 450, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 200, fantom = 1, mass = 200, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 40, - time_self_destruct = 600, - water_explosion_factor = 10 + time_self_destruct = 600 }, wsTypeOfWeapon = { 4, 8, 10, "Redacted" } }, @@ -233,32 +234,32 @@ _G["weapons_table"]["weapons"]["torpedoes"]["LTF_5B"] = { warhead = { caliber = 450, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 200, fantom = 0, mass = 200, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 40, - time_self_destruct = 600, - water_explosion_factor = 10 + time_self_destruct = 600 }, warhead_water = { caliber = 450, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 200, fantom = 0, mass = 200, obj_factors = { 1, 1 }, other_factors = { 1, 1, 1 }, piercing_mass = 40, - time_self_destruct = 600, - water_explosion_factor = 10 + time_self_destruct = 600 }, wsTypeOfWeapon = { 4, 8, 10, "Redacted" } }, diff --git a/_G/weapons_table/weapons/torpedoes/Mark_46.lua b/_G/weapons_table/weapons/torpedoes/Mark_46.lua index 90d6569a..e9386d4f 100644 --- a/_G/weapons_table/weapons/torpedoes/Mark_46.lua +++ b/_G/weapons_table/weapons/torpedoes/Mark_46.lua @@ -1,4 +1,5 @@ _G["weapons_table"]["weapons"]["torpedoes"]["Mark_46"] = { + Reflection = 0.5, _file = "./CoreMods/tech/TechWeaponPack/Database/Weapons/torpedoes.lua", _unique_resource_name = "weapons.torpedoes.Mark_46", caliber = 0.324, @@ -103,9 +104,10 @@ _G["weapons_table"]["weapons"]["torpedoes"]["Mark_46"] = { warhead = { caliber = 324, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 50, fantom = 1, mass = 50, @@ -117,9 +119,10 @@ _G["weapons_table"]["weapons"]["torpedoes"]["Mark_46"] = { warhead_water = { caliber = 324, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 50, fantom = 1, mass = 50, @@ -235,9 +238,10 @@ _G["weapons_table"]["weapons"]["torpedoes"]["Mark_46"] = { warhead = { caliber = 324, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 50, fantom = 0, mass = 50, @@ -249,9 +253,10 @@ _G["weapons_table"]["weapons"]["torpedoes"]["Mark_46"] = { warhead_water = { caliber = 324, concrete_factors = { 1, 1, 1 }, - concrete_obj_factor = 0, - cumulative_factor = 0, - cumulative_thickness = 0, + concrete_obj_factor = 0.25, + cumulative_factor = 1, + cumulative_thickness = 0.15, + default_fuze_delay = 0, expl_mass = 50, fantom = 0, mass = 50, diff --git a/_G/weapons_table/weapons/torpedoes/YU-6.lua b/_G/weapons_table/weapons/torpedoes/YU-6.lua index 51045487..9ddbd184 100644 --- a/_G/weapons_table/weapons/torpedoes/YU-6.lua +++ b/_G/weapons_table/weapons/torpedoes/YU-6.lua @@ -1,6 +1,6 @@ _G["weapons_table"]["weapons"]["torpedoes"]["YU-6"] = { + Reflection = 0.5, _file = "./CoreMods/aircraft/ChinaAssetPack/Entries/Tech/weapons.lua", - _unique_resource_name = "weapons.torpedoes.YU-6", caliber = 0.533, client = { D_max = 20000, diff --git a/_G/weapons_table/weapons/torpedoes/mk46torp_name.lua b/_G/weapons_table/weapons/torpedoes/mk46torp_name.lua index 02398109..677feec0 100644 --- a/_G/weapons_table/weapons/torpedoes/mk46torp_name.lua +++ b/_G/weapons_table/weapons/torpedoes/mk46torp_name.lua @@ -1,4 +1,5 @@ _G["weapons_table"]["weapons"]["torpedoes"]["mk46torp_name"] = { + Reflection = 0.5, _file = "./CoreMods/tech/SouthAtlanticAssets/Entries/Weapons.lua", _unique_resource_name = "weapons.torpedoes.mk46torp_name", caliber = 0.533,